Merge branch 'master_after0506' into mater_procurement

房远帅
2 parents bb79861b 23f5f6ac
Showing 7 changed files with 97 additions and 27 deletions
xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/contract/ContractDistributorStandardController.java
xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/contract/ContractDistributorStandardServiceImpl.java
xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/contract/SpecLockDelayApplicationServiceImpl.java
xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/customer/CustomerDevelopPlanServiceImpl.java
xingyun-sc/src/main/resources/templates/foreignStandardContractTemplate.xls
xingyun-sc/src/main/resources/templates/processStdAgmtTemplate.xls
xingyun-sc/src/main/resources/templates/standardContractTemplate.xls
--- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/contract/ContractDistributorStandardController.java
View file @f7d0906
+++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/contract/ContractDistributorStandardController.java
View file @f7d0906
@@ -1191,19 +1191,19 @@ public class ContractDistributorStandardController extends DefaultBaseController
                             setCellValue(sheet, startRow, 6, line.getMaterialCode());
                             setCellValue(sheet, startRow, 7, line.getStatus());
-                            setCellValue(sheet, startRow, 8, line.getQuantity());
+                            setCellValue(sheet, startRow, 8, line.getQuantity() == null ? "" : line.getQuantity().setScale(2, RoundingMode.HALF_UP).toString());
                             if ("INTL_STD_CONTRACT".equals(data.getType())
                                     || "INTL_INVENTORY_AGMT".equals(data.getType())
                                     || "INTL_OPEN_SPEC_AGMT".equals(data.getType())) {
-                                setCellValue(sheet, startRow, 10, line.getProcessingFee());
-                                setCellValue(sheet, startRow, 11, line.getUnitPrice());
+                                setCellValue(sheet, startRow, 10, line.getProcessingFee() == null ? "" : line.getProcessingFee().toString());
+                                setCellValue(sheet, startRow, 11, line.getUnitPrice() == null ? "" : line.getUnitPrice().toString());
                             } else {
-                                setCellValue(sheet, startRow, 10, line.getUnitPrice());
-                                setCellValue(sheet, startRow, 11, line.getAmountExcludingTax());
+                                setCellValue(sheet, startRow, 10, line.getUnitPrice() == null ? "" : line.getUnitPrice().toString());
+                                setCellValue(sheet, startRow, 11, line.getAmountExcludingTax() == null ? "" : line.getAmountExcludingTax().toString());
                             }
-                            setCellValue(sheet, startRow, 12, line.getTotalAmount());
+                            setCellValue(sheet, startRow, 12, line.getTotalAmount() == null ? "" : line.getTotalAmount().toString());
                             setCellValue(sheet, startRow, 13,
                                     line.getDeliveryDate() != null ? line.getDeliveryDate().format(dateFormatter) : "");
                             startRow++;
@@ -1234,9 +1234,9 @@ public class ContractDistributorStandardController extends DefaultBaseController
                             }
                             setCellValue(sheet, startRow, 10, line.getMaterialCode());
                             setCellValue(sheet, startRow, 11, line.getProductStatus());
-                            setCellValue(sheet, startRow, 12, line.getUnitPrice());
-                            setCellValue(sheet, startRow, 13, line.getAmountExcludingTax());
-                            setCellValue(sheet, startRow, 14, line.getTotalAmount());
+                            setCellValue(sheet, startRow, 12, line.getUnitPrice() == null ? "" : line.getUnitPrice().toString());
+                            setCellValue(sheet, startRow, 13, line.getAmountExcludingTax() == null ? "" : line.getAmountExcludingTax().toString());
+                            setCellValue(sheet, startRow, 14, line.getTotalAmount() == null ? "" : line.getTotalAmount().toString());
                             setCellValue(sheet, startRow, 15,
                                     line.getDeliveryDate() != null ? line.getDeliveryDate().format(dateFormatter) : "");
                             startRow++;
@@ -1405,7 +1405,11 @@ public class ContractDistributorStandardController extends DefaultBaseController
             if ("DEALER".equals(query.get(0).getEnterpriseType())) {
                 dataMap.put("remarks", "");
             } else if ("TERMINAL".equals(query.get(0).getEnterpriseType())) {
-                dataMap.put("remarks", "10、贵司在我司的所有订货限于生产使用.");
+                if ("PROCESS_STD_AGMT".equals(data.getType())) {
+                    dataMap.put("remarks", "11、贵司在我司的所有订货限于生产使用.");
+                } else {
+                    dataMap.put("remarks", "10、贵司在我司的所有订货限于生产使用.");
+                }
             } else {
                 dataMap.put("remarks", "");
             }
--- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/contract/ContractDistributorStandardServiceImpl.java
View file @f7d0906
+++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/contract/ContractDistributorStandardServiceImpl.java
View file @f7d0906
@@ -34,6 +34,7 @@ import com.lframework.starter.web.core.components.resp.PageResult;
 import com.lframework.starter.common.utils.ObjectUtil;
 import com.lframework.starter.common.utils.Assert;
 import com.lframework.xingyun.sc.enums.CustomerDevelopStatus;
+import com.lframework.xingyun.sc.handlers.TransactorHandler;
 import com.lframework.xingyun.sc.mappers.ContractDistributorStandardMapper;
 import com.lframework.xingyun.sc.service.contract.ContractDistributorLineService;
 import com.lframework.xingyun.sc.service.contract.ContractDistributorStandardService;
@@ -107,6 +108,8 @@ public class ContractDistributorStandardServiceImpl extends
     private SysUserDeptService sysUserDeptService;
     @Resource
     private PurchaseOrderLineService purchaseOrderLineService;
+    @Resource
+    private TransactorHandler transactorHandler;
     @Override
     public PageResult<ContractDistributorStandard> query(Integer pageIndex, Integer pageSize, QueryContractDistributorStandardVo vo) {
@@ -1527,9 +1530,10 @@ public class ContractDistributorStandardServiceImpl extends
     @Override
     public void supplementContractSpecReminder() {
         Wrapper<ContractDistributorStandard> wrapper = Wrappers.lambdaQuery(ContractDistributorStandard.class)
-                .in(ContractDistributorStandard::getFormalApproved, Arrays.asList("REFUSE", "CANCEL"))
-                .or()
-                .in(ContractDistributorStandard::getStandardApproved, Arrays.asList("REFUSE", "CANCEL"));
+                .and(w -> w.eq(ContractDistributorStandard::getStatus, "FORMAL")
+                        .in(ContractDistributorStandard::getFormalApproved, Arrays.asList("REFUSE", "CANCEL")))
+                .or(w -> w.eq(ContractDistributorStandard::getStatus, "STANDARD")
+                        .in(ContractDistributorStandard::getStandardApproved, Arrays.asList("REFUSE", "CANCEL")));
         List<ContractDistributorStandard> contractDistributorStandardList = list(wrapper);
         if (CollectionUtils.isEmpty(contractDistributorStandardList)) {
             return;
@@ -1538,6 +1542,7 @@ public class ContractDistributorStandardServiceImpl extends
         Set<String> workshopIds = contractDistributorStandardList
                 .stream()
                 .map(ContractDistributorStandard::getWorkshopId)
+                .filter(StringUtils::isNotBlank)
                 .collect(Collectors.toSet());
         List<Workshop> workshopList = workshopService.listByIds(workshopIds);
         Map<String, String> workshopIdAndCodeMap = CollectionUtils.emptyIfNull(workshopList)
@@ -1553,8 +1558,6 @@ public class ContractDistributorStandardServiceImpl extends
         jybzgCodeAndUserIdMap.put("efcjybzg", sysUserRoleService.listUserIdByRoleCodes(Collections.singletonList("efcjybzg")));
         jybzgCodeAndUserIdMap.put("sfcjybzg", sysUserRoleService.listUserIdByRoleCodes(Collections.singletonList("sfcjybzg")));
         jybzgCodeAndUserIdMap.put("ztcjybzg", sysUserRoleService.listUserIdByRoleCodes(Collections.singletonList("ztcjybzg")));
-
-        List<String> bsczgUserIdList = sysUserRoleService.listUserIdByRoleCodes(Collections.singletonList("bsczg"));
         contractDistributorStandardList.forEach(contractDistributorStandard -> {
             try {
                 StringBuilder stringBuilder = new StringBuilder("您的");
@@ -1577,8 +1580,8 @@ public class ContractDistributorStandardServiceImpl extends
                 stringBuilder.append("（");
                 LocalDate lastApprovedTime = LocalDate.now();
                 if ("FORMAL".equals(contractDistributorStandard.getStatus())) {
-                    if (!"REFUSE".equals(contractDistributorStandard.getFormalApproved())
-                            && !"CANCEL".equals(contractDistributorStandard.getFormalApproved())) {
+                    if (!Arrays.asList("REFUSE", "CANCEL").contains(contractDistributorStandard.getFormalApproved())
+                            || contractDistributorStandard.getFormalTime() == null) {
                         return;
                     }
@@ -1587,8 +1590,8 @@ public class ContractDistributorStandardServiceImpl extends
                 }
                 if ("STANDARD".equals(contractDistributorStandard.getStatus())) {
-                    if (!"REFUSE".equals(contractDistributorStandard.getStandardApproved())
-                            && !"CANCEL".equals(contractDistributorStandard.getStandardApproved())) {
+                    if (!Arrays.asList("REFUSE", "CANCEL").contains(contractDistributorStandard.getStandardApproved())
+                            || contractDistributorStandard.getStandardTime() == null) {
                         return;
                     }
@@ -1598,22 +1601,32 @@ public class ContractDistributorStandardServiceImpl extends
                 stringBuilder.append("，合同号：").append(contractDistributorStandard.getCode());
                 stringBuilder.append("，请尽快补充规范合同。");
-                List<String> userIdList = new ArrayList<>();
-                userIdList.add(contractDistributorStandard.getCreateById());
+                Set<String> userIdSet = new LinkedHashSet<>();
+                if (StringUtils.isNotBlank(contractDistributorStandard.getCreateById())) {
+                    userIdSet.add(contractDistributorStandard.getCreateById());
+                }
                 LocalDate currentDate = LocalDate.now();
                 // 如果最后批准时间加3天还在当前时间之前，说明超过3天
                 if (lastApprovedTime.plusDays(3).isBefore(currentDate)) {
+                    List<String> officeManagerIds = transactorHandler.listTransactorsByRoleCode("bsczg",
+                            contractDistributorStandard.getCreateById());
+                    if (CollectionUtils.isNotEmpty(officeManagerIds)) {
+                        userIdSet.addAll(officeManagerIds);
+                    }
                     Optional.ofNullable(contractDistributorStandard.getWorkshopId())
                             .map(workshopIdAndCodeMap::get)
                             .filter(StringUtils::isNotBlank)
                             .map(workshopCodeAndJybzgCodeMap::get)
                             .filter(StringUtils::isNotBlank)
                             .map(jybzgCodeAndUserIdMap::get)
-                            .ifPresent(userIdList::addAll);
+                            .ifPresent(userIdSet::addAll);
+                }
-                    userIdList.addAll(bsczgUserIdList);
+                if (CollectionUtils.isEmpty(userIdSet)) {
+                    return;
                 }
+                List<String> userIdList = new ArrayList<>(userIdSet);
                 // 发送消息
                 SysSiteMessageDto messageDto = new SysSiteMessageDto();
--- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/contract/SpecLockDelayApplicationServiceImpl.java
View file @f7d0906
+++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/contract/SpecLockDelayApplicationServiceImpl.java
View file @f7d0906
@@ -30,6 +30,7 @@ import com.lframework.xingyun.basedata.service.workshop.WorkshopService;
 import com.lframework.xingyun.sc.entity.ContractDistributorStandard;
 import com.lframework.xingyun.sc.entity.SpecLockDelayApplication;
 import com.lframework.xingyun.sc.enums.CustomerDevelopStatus;
+import com.lframework.xingyun.sc.handlers.TransactorHandler;
 import com.lframework.xingyun.sc.mappers.SpecLockDelayApplicationMapper;
 import com.lframework.xingyun.sc.service.HolidaysService;
 import com.lframework.xingyun.sc.service.contract.ContractDistributorStandardService;
@@ -76,6 +77,8 @@ public class SpecLockDelayApplicationServiceImpl extends BaseMpServiceImpl<SpecL
     private WorkshopService workshopService;
     @Resource
     private SysDeptService sysDeptService;
+    @Resource
+    private TransactorHandler transactorHandler;
     @Override
     public PageResult<SpecLockDelayApplication> query(Integer pageIndex, Integer pageSize, QuerySpecLockDelayApplicationVo vo) {
@@ -376,9 +379,27 @@ public class SpecLockDelayApplicationServiceImpl extends BaseMpServiceImpl<SpecL
                 // 获取用户列表
                 log.info("开始获取需要通知的用户列表");
-                List<String> userIdList = sysUserRoleService.listUserIdByRoleCodes(Arrays.asList("bsczg", "jybzg"));
-                userIdList.add(contractDistributorStandard.getCreateById());
+                Set<String> userIdSet = new LinkedHashSet<>();
+                List<String> officeManagerIds = transactorHandler.listTransactorsByRoleCode("bsczg",
+                        contractDistributorStandard.getCreateById());
+                if (CollectionUtils.isNotEmpty(officeManagerIds)) {
+                    userIdSet.addAll(officeManagerIds);
+                }
+
+                String workshopManagerRoleCode = getWorkshopManagerRoleCode(contractDistributorStandard.getWorkshopId());
+                if (StringUtils.isNotBlank(workshopManagerRoleCode)) {
+                    List<String> workshopManagerIds = sysUserRoleService.listUserIdByRoleCodes(
+                            Collections.singletonList(workshopManagerRoleCode));
+                    if (CollectionUtils.isNotEmpty(workshopManagerIds)) {
+                        userIdSet.addAll(workshopManagerIds);
+                    }
+                }
+                List<String> userIdList = new ArrayList<>(userIdSet);
                 log.info("合同{}需要通知的用户数量：{}", contractCode, userIdList.size());
+                if (CollectionUtils.isEmpty(userIdList)) {
+                    log.info("合同{}未匹配到任何通知人员，跳过发送", contractCode);
+                    continue;
+                }
                 // 构建消息内容
                 StringBuilder sb = new StringBuilder();
@@ -419,4 +440,36 @@ public class SpecLockDelayApplicationServiceImpl extends BaseMpServiceImpl<SpecL
         log.info("延迟锁规消息发送任务执行完成：总共处理{}个合同，成功发送{}条消息，失败{}个",
                 totalCount, sentCount, errorCount);
     }
+
+    /**
+     * 获取分厂经营办主管角色编码
+     *
+     * @param workshopId 分厂ID
+     * @return 角色编码
+     */
+    private String getWorkshopManagerRoleCode(String workshopId) {
+        if (StringUtils.isBlank(workshopId)) {
+            return null;
+        }
+
+        Workshop workshop = workshopService.findById(workshopId);
+        if (workshop == null || StringUtils.isBlank(workshop.getCode())) {
+            return null;
+        }
+
+        String workshopCode = workshop.getCode();
+        if ("yfc".equals(workshopCode)) {
+            return "yfcjybzg";
+        }
+        if ("efc".equals(workshopCode)) {
+            return "efcjybzg";
+        }
+        if ("sfc".equals(workshopCode)) {
+            return "sfcjybzg";
+        }
+        if ("ztfc".equals(workshopCode)) {
+            return "ztcjybzg";
+        }
+        return null;
+    }
 }
--- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/customer/CustomerDevelopPlanServiceImpl.java
View file @f7d0906
+++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/customer/CustomerDevelopPlanServiceImpl.java
View file @f7d0906
@@ -435,7 +435,7 @@ public class CustomerDevelopPlanServiceImpl extends BaseMpServiceImpl<CustomerDe
         // 获取客户信息
         Customer customer = customerService.findById(plan.getCustomerId());
-        messageHandler.sendMsg(receiveUserIds, customer.getName() + "开发审核通过消息通知测试"
-                , customer.getName() +"开发审核通过消息通知测试", bizKey, null);
+        messageHandler.sendMsg(receiveUserIds, customer.getName() + "开发审核通过消息通知"
+                , customer.getName() +"开发审核通过消息通知", bizKey, null);
     }
 }
--- a/xingyun-sc/src/main/resources/templates/foreignStandardContractTemplate.xls
View file @f7d0906
+++ b/xingyun-sc/src/main/resources/templates/foreignStandardContractTemplate.xls
View file @f7d0906
--- a/xingyun-sc/src/main/resources/templates/processStdAgmtTemplate.xls
View file @f7d0906
+++ b/xingyun-sc/src/main/resources/templates/processStdAgmtTemplate.xls
View file @f7d0906
--- a/xingyun-sc/src/main/resources/templates/standardContractTemplate.xls
View file @f7d0906
+++ b/xingyun-sc/src/main/resources/templates/standardContractTemplate.xls
View file @f7d0906