Merge remote-tracking branch 'origin/master'

jwtech-quartz/src/main/java/com/jwtech/quartz/task/evaluateTask.java

@@ -1,5 +1,6 @@
 package com.jwtech.quartz.task;
 
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -411,7 +412,7 @@ public class evaluateTask {
             List<BsSgcJsjdBuiContInfo> bsSgcJsjdBuiContInfos = bsSgcJsjdBuiContInfoMapper.selectList(lw.eq(BsSgcJsjdBuiContInfo::getProNo, bs.getProNo())
                     .eq(BsSgcJsjdBuiContInfo::getProCode, bs.getProCode())
                     .eq(BsSgcJsjdBuiContInfo::getContractType, "1").orderByAsc(BsSgcJsjdBuiContInfo::getSigningTime));
-            if (ObjectUtil.isNotEmpty(bsSgcJsjdBuiContInfos)){
+            if (CollectionUtil.isNotEmpty(bsSgcJsjdBuiContInfos)){
                 BsSgcJsjdBuiContInfo bsSgcJsjdBuiContInfo = bsSgcJsjdBuiContInfos.get(0);
                 LambdaQueryWrapper<BsSgcJsjdBuiDedicatedAccount>bsalw=new LambdaQueryWrapper<>();
                 List<BsSgcJsjdBuiDedicatedAccount> bsSgcJsjdBuiDedicatedAccounts = bsSgcJsjdBuiDedicatedAccountMapper.selectList(bsalw.eq(BsSgcJsjdBuiDedicatedAccount::getProCode, bs.getProCode())

jwtech-system/src/main/java/com/kms/warn/WarnOperate.java

@@ -1,8 +1,10 @@
 package com.kms.warn;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.jianwei.common.mybaitsplus.BeanToWrapper;
+import com.jwtech.util.StringUtil;
 import com.kms.warn.domain.BsSgcJsjdWarnResult;
 import com.kms.warn.service.BsSgcJsjdWarnResultService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -22,15 +24,16 @@ public class WarnOperate {
             bsSgcJsjdWarnResult.setProNo(proNo);
             bsSgcJsjdWarnResult.setProCode(proCode);
             bsSgcJsjdWarnResult.setWarnType(warnType.getWarnType());
-            bsSgcJsjdWarnResult.setWarnSubType(warnType.getWarnSubType());
-            bsSgcJsjdWarnResult.setIsHandle("0");  //未处理的
+            bsSgcJsjdWarnResult.setWarnSubType(warnType.getWarnSubType());//未处理的
             QueryWrapper<BsSgcJsjdWarnResult> wrapper = BeanToWrapper.getWrapper(bsSgcJsjdWarnResult);
             BsSgcJsjdWarnResult one = bsSgcJsjdWarnResultService.getOne(wrapper, false);
-            if(one==null) {
+            one.setIsHandle("0");
+        if(ObjectUtil.isEmpty(one)) {
                 bsSgcJsjdWarnResult.setWarnResult(warnResult);
                 bsSgcJsjdWarnResult.preInsert();
                 bsSgcJsjdWarnResult.setCreateUid("1"); //系统账号
                 bsSgcJsjdWarnResult.setResultType("2"); //预警
+                bsSgcJsjdWarnResult.setIsHandle("0");
                 bsSgcJsjdWarnResult.setAlertType(warnType.getAlertType());
                 bsSgcJsjdWarnResultService.save(bsSgcJsjdWarnResult);
             }else {

jwtech-system/src/main/java/com/kms/warn/WarnType.java

@@ -32,7 +32,7 @@ public enum WarnType {
     //检测结果合格率<90%
     DETECTION_QUALIFICATION_RATE("C002","001","检测结果合格率为%s,小于90%","","0"),
     //每年4月15日，年度度汛方案未备案
-    FLOOD_CONTROL("D001","001","检测结果合格率为%s,小于90%","","0"),
+    FLOOD_CONTROL("D001","001","%s年度度汛方案未备案","","0"),
     //累计工程进度款支付金额＜85%累计应付款金额
     CUMULATIVE_ENGINEERING("E001","001","累计工程进度款支付金额＜85%累计应付款金额","","0"),
     //每年工程进度款支付滞后超过2个月且超过2次，非基本建设程序项目工程进度款支付滞后超过3个月
@@ -40,31 +40,33 @@ public enum WarnType {
     //累计工程进度款实际支付金额＞累计实际应付款金额
     AMOUNT_PAID("E003","001","累计工程进度款实际支付金额＞累计实际应付款金额","","0"),
     //开工60日内未设立农民工工资专用账户的(仅针对基本建设程序项目)
-    PEASANT_WAGES_SIXTY_DAYS("E004","001","累计工程进度款实际支付金额＞累计实际应付款金额","","0"),
+    PEASANT_WAGES_SIXTY_DAYS("E004","001","开工60日内未设立农民工工资专用账户","","0"),
+    //合同签订30内后都未能开立专用账户
+    NO_OPEN_ACCOUNT("E004","002","总包单位未能在工程施工合同签订之日起30日内开立专用账户","","0"),
     //连续两个月未支付农民工工资，非基本建设程序项目连续一个季度未支付农民工工资
     WAGE_ARREARS("E005","001","连续两个月未支付农民工工资，非基本建设程序项目连续一个季度未支付农民工工资","","0"),
     //未缴纳农民工工资保证金的(仅针对基本建设程序项目)
     NON_PAYMENT_DEPOSIT("E006","001","未缴纳农民工工资保证金的(仅针对基本建设程序项目)","","0"),
     //合同签订时间迟于实际开工时间
-    VIOLATION_CONTRACT_EXECUTION("F001","001","%项目，合同签订时间迟于实际开工时间","","0"),
+    VIOLATION_CONTRACT_EXECUTION("F001","001","合同签订时间迟于实际开工时间","","0"),
     //合同履约评价到期未评价
-    CONTRACT_WITHOUT_EVALUATION("F002","001","%项目，合同履约评价到期未评价","","0"),
+    CONTRACT_WITHOUT_EVALUATION("F002","001","合同履约评价到期未评价","","0"),
     //发生合同提前终止的
-    EARLY_TERMINATION_CONTRACT("F003","001","%项目，发生合同提前终止的","","0"),
+    EARLY_TERMINATION_CONTRACT("F003","001","发生合同提前终止的","","0"),
     //项目负责人社会保险与所在单位不符
-    PROJECT_LEADER_UNIT_DISCREPANCY("G001","001","%项目，发生合同提前终止的","","0"),
+    PROJECT_LEADER_UNIT_DISCREPANCY("G001","001","发生合同提前终止的","","0"),
     //总监理工程师社会保险与所在单位不符(仅针对基本建设程序项目)
-    CHIEF_ENGINEER_UNIT_DISCREPANCY("G002","001","%项目，总监理工程师社会保险与所在单位不符(仅针对基本建设程序项目)","","0"),
+    CHIEF_ENGINEER_UNIT_DISCREPANCY("G002","001","总监理工程师社会保险与所在单位不符(仅针对基本建设程序项目)","","0"),
     //项目管理机构技术负责人或专职安全生产管理人员社会保险与所在单位不符
-    TECHNICAL_DIRECTOR_UNIT_DISCREPANCY("G003","001","%项目，项目管理机构技术负责人或专职安全生产管理人员社会保险与所在单位不符","","0"),
+    TECHNICAL_DIRECTOR_UNIT_DISCREPANCY("G003","001","项目管理机构技术负责人或专职安全生产管理人员社会保险与所在单位不符","","0"),
     //项目负责人月度出勤天数小于22天
-    PROJECT_LEADER_ATTENDANCE_DAYS("G004","001","%项目，项目负责人月度出勤天数小于22天","","0"),
+    PROJECT_LEADER_ATTENDANCE_DAYS("G004","001","项目负责人月度出勤天数小于22天","","0"),
     //总监理工程师月度出勤天数小于22天(仅针对基本建设程序项目)
-    CHIEF_ENGINEER_ATTENDANCE_DAYS("G005","001","%项目，总监理工程师月度出勤天数小于22天(仅针对基本建设程序项目)","","0"),
+    CHIEF_ENGINEER_ATTENDANCE_DAYS("G005","001","总监理工程师月度出勤天数小于22天(仅针对基本建设程序项目)","","0"),
     //项目负责人或技术负责人变更2次及以上，非基本建设程序项目的项目负责人变更2次及以上
     CHANGE_IN_CHARGE("G006","001","%项目，项目负责人或技术负责人变更2次及以上，非基本建设程序项目的项目负责人变更2次及以上","","0"),
     //总监理工程师变更2次及以上(仅针对基本建设程序项目)
-    CHIEF_ENGINEER_CHANGE_IN_CHARGE("G007","001","%项目，总监理工程师变更2次及以上(仅针对基本建设程序项目)","","0"),
+    CHIEF_ENGINEER_CHANGE_IN_CHARGE("G007","001","总监理工程师变更2次及以上(仅针对基本建设程序项目)","","0"),
     //同时担任2个及以上项目的总监理工程师(仅针对基本建设程序项目)
     CHIEF_ENGINEER_TWO_ITEM("G008","001","%项目，总监理工程师变更2次及以上(仅针对基本建设程序项目)","","0"),
     //超过批准施工进度计划确定的阶段验收时间1个月(仅针对基本建设程序项目)