设备子系统———大修发送超期任务提醒bug修复以及保修商导入优化

cx-equipment/cx-equipment-common/src/main/java/com/rongwei/bscommon/sys/service/EquipmentSendNotifyService.java

@@ -100,4 +100,9 @@ public interface EquipmentSendNotifyService {
      *
      */
     R endUnfinishedTaskNotify();
+
+    /**
+     * 删除大修计划任务发送移动端的超期任务提醒
+     */
+    void deletePlanningTasksNotify();
 }

cx-equipment/cx-equipment-common/src/main/java/com/rongwei/bscommon/sys/service/impl/EquOverhaulPlanningTasksServiceImpl.java

@@ -148,6 +148,10 @@ public class EquOverhaulPlanningTasksServiceImpl extends ServiceImpl<EquOverhaul
         List<SysDictDo> taskByType = sysDictService.getDictsByType("task_state");
         List<SysDictDo> ynByType = sysDictService.getDictsByType("srm_yn");
         List<EquOverhaulPlanningTasksVo> equOverhaulPlanningTasksDos = equOverhaulPlanningTasksMapperDao.selectAllOverdueTaskQuantity();
+        if (equOverhaulPlanningTasksDos.size()>0){
+            //提前删除大修任务超期提醒
+            equipmentSendNotifyService.deletePlanningTasksNotify();
+        }
         for (EquOverhaulPlanningTasksVo planningTasksVo:equOverhaulPlanningTasksDos){
             if (planningTasksVo.getTaskquantity()>0){
                 List<EquOverhaulPlanningTasksVo> tasksVos = equOverhaulPlanningTasksMapperDao.selectTasksByFactoryId(planningTasksVo.getTenantid());

cx-equipment/cx-equipment-common/src/main/java/com/rongwei/bscommon/sys/service/impl/EquWarrantyProviderServiceImpl.java

@@ -10,6 +10,7 @@ import com.rongwei.bscommon.sys.utils.ExceptionUtils;
 import com.rongwei.bscommon.sys.utils.StringUtil;
 import com.rongwei.bsentity.domain.EquWarrantyProviderDo;
 import com.rongwei.rwadmincommon.system.domain.*;
+import com.rongwei.rwadmincommon.system.service.SysDictService;
 import com.rongwei.rwadmincommon.system.vo.SysOrganizationVo;
 import com.rongwei.rwcommon.base.R;
 import com.rongwei.rwcommon.utils.SecurityUtil;
@@ -43,11 +44,15 @@ public class EquWarrantyProviderServiceImpl extends ServiceImpl<EquWarrantyProvi
     @Autowired
     private EquWarrantyProviderService equWarrantyProviderService;
 
+    @Autowired
+    private SysDictService sysDictService;
+
     @Autowired
     private CommonDao commonDao;
 
     @Override
     public R importEquWarrantyProvider(MultipartFile file) {
+        List<SysDictDo> ynByType = sysDictService.getDictsByType("srm_yn");
         try {
             // 查询所有工厂数据
             List<SysOrganizationVo> factoryList = commonDao.getAllFactoryNameAndId();
@@ -77,7 +82,12 @@ public class EquWarrantyProviderServiceImpl extends ServiceImpl<EquWarrantyProvi
                 String factory = row.getCell(7) == null ? "" : row.getCell(7).toString().trim();
                 String dept = row.getCell(8) == null ? "" : row.getCell(8).toString().trim();
                 if (StringUtils.isNotBlank(code)){
-                    code = StringUtil.formatDecimal(code);
+                    if (StringUtil.isScience(code)){
+                        BigDecimal formatAccount = new BigDecimal(code);
+                        code = formatAccount.setScale(0,BigDecimal.ROUND_HALF_UP).toPlainString();
+                    }else {
+                        code = StringUtil.formatDecimal(code);
+                    }
                 }else {
                     stringBuilder.append("保修商编号必填");
                 }
@@ -118,9 +128,10 @@ public class EquWarrantyProviderServiceImpl extends ServiceImpl<EquWarrantyProvi
                         phone = formatPhone.setScale(0,BigDecimal.ROUND_HALF_UP).toPlainString();
                     }
                 }
-                SysDictDo sysDictDo = commonDao.getDictValueByNameAndType(isPrivately,"srm_yn");
-                if (sysDictDo!= null){
-                    isPrivately = sysDictDo.getValue();
+                if (org.apache.commons.lang.StringUtils.isNotBlank(isPrivately)) {
+                    String isPrivatelyDictName = isPrivately;
+                    isPrivately = ynByType.stream().filter(dictDo -> isPrivatelyDictName.contains(dictDo.getName()))
+                            .map(SysDictDo::getValue).collect(Collectors.joining(","));
                 }
                 if (StringUtils.isNotBlank(factory)){
                     List<SysOrganizationVo> resultList = factoryList.stream().filter(p -> p.getFullname().equals(factory)).collect(Collectors.toList());

cx-equipment/cx-equipment-common/src/main/java/com/rongwei/bscommon/sys/service/impl/EquipmentSendNotifyServiceImpl.java

@@ -219,7 +219,6 @@ public class EquipmentSendNotifyServiceImpl implements EquipmentSendNotifyServic
     public void sendPlanningTasksNotify(String planyear, String belongfactory, Integer taskquantity, String taskId, List<String> userId, String fileItemId) {
         String notifyId = SecurityUtil.getUUID();
         String formatFileNameAndId = PLANNING_TASK_FILE_NAME + "-;-" + fileItemId;
-        CXCommonUtils.deleteSendNotify("mobilePlanningTask", null);
         // 发送消息提醒
         CXCommonUtils.sendNotify(notifyId, PLANNING_TASK_TITLE,
                 String.format(PLANNING_TASK_CONTENT, planyear, belongfactory, taskquantity), formatFileNameAndId
@@ -519,6 +518,11 @@ public class EquipmentSendNotifyServiceImpl implements EquipmentSendNotifyServic
         return R.ok();
     }
 
+    @Override
+    public void deletePlanningTasksNotify() {
+        CXCommonUtils.deleteSendNotify("mobilePlanningTask", null);
+    }
+
 
     /**
      * 润滑任务导出数据迁移