bug修改

jwtech-admin/src/main/java/com/kms/config/scheduled/WaterScheduled.java

@@ -89,13 +89,14 @@ public class WaterScheduled {
                 if(user.getMd5()!=null&&md.equals(user.getMd5())){
                     continue;
                 }
+
             }
             SingleOrg org = singleUser.getOrg();
             List<String> collect = singleUser.getRoleList().stream().map(singleRole -> singleRole.getId()).collect(Collectors.toList());
             List<SysRole> roles = roleService.listByIds(collect);
             if(org!=null){
                 user.setDeptId(org.getId());
-                String type = org.getType();
+                String type = singleUser.getType();
                 if(type.equals("GA")){ //政务机构
                     user.setUserType("00");
                     if(CollectionUtil.isEmpty(roles)){
@@ -120,7 +121,7 @@ public class WaterScheduled {
                             collect.add(YW00110);
                         }
                     }
-                }else if(type.equals("SVA")||type.equals("ORG")){  //服务机构
+                }else if(type.equals("SVC")||type.equals("ORG")){  //服务机构
                     user.setUserType("01");
                     if(CollectionUtil.isEmpty(roles)){
                         collect.add(YW00112);

jwtech-admin/src/main/java/com/kms/web/controller/tool/TestController.java

@@ -47,7 +47,7 @@ public class TestController extends BaseController
 
     @PostMapping("test")
     public WaterResult test(@RequestBody BsSgcjsjdBuiProInfo bsSgcjsjdBuiProInfo){
-        WaterResult waterResult = waterRequestUtil.getRolePage();
+        WaterResult waterResult =waterRequestUtil.usersPage();
 //        List<SingleMenu> singleMenus = JSONObject.parseArray(waterResult.getData(), SingleMenu.class);
 //        List<SingleMenu> singleAllMenus = new ArrayList<>();
 //        setChildren(singleMenus,singleAllMenus);

jwtech-pc/src/main/java/com/kms/web/controller/system/SysXzqhController.java

@@ -94,7 +94,8 @@ public class SysXzqhController extends BaseController
         String xzqhId = sysDept.getXzqhId();
         SysXzqh xzqh = sysXzqhService.getById(xzqhId);
         String userName = user.getUserName();
-        if (userName.equals("admin")) {
+        String userType=user.getUserType();
+        if (userType.equals("00")) {
             List<SysXzqh> list = sysXzqhService.list();
             return AjaxResult.success(list);
         }else if (xzqh.getLayer()==1) {

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

@@ -3,8 +3,12 @@ package com.jwtech.quartz.task;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.kms.build.domain.BsSgcJsjdBuiContInfo;
 import com.kms.build.domain.BsSgcJsjdBuiLegalEvaluate;
+import com.kms.build.domain.BsSgcJsjdBuiSafeFilings;
+import com.kms.build.domain.BsSgcjsjdBuiProInfo;
 import com.kms.build.mapper.BsSgcJsjdBuiContInfoMapper;
 import com.kms.build.mapper.BsSgcJsjdBuiLegalEvaluateMapper;
+import com.kms.build.mapper.BsSgcJsjdBuiSafeFilingsMapper;
+import com.kms.build.mapper.BsSgcjsjdBuiProInfoMapper;
 import com.kms.common.utils.BaseEntityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
@@ -23,7 +27,11 @@ public class evaluateTask {
     @Autowired
     private BsSgcJsjdBuiContInfoMapper bsSgcJsjdBuiContInfoMapper;
 
+    @Autowired
+    private BsSgcjsjdBuiProInfoMapper bsSgcjsjdBuiProInfoMapper;
 
+    @Autowired
+    private BsSgcJsjdBuiSafeFilingsMapper bsSgcJsjdBuiSafeFilingsMapper;
 //    @Scheduled(cron = "0 1 0 * * ?") //每天0点1分执行
 //    @Scheduled(cron="0/2 * * * * ?") //每个2秒执行一次
     public void evaluate() {
@@ -118,4 +126,12 @@ public class evaluateTask {
             }
         }
     }
+
+    public void floodPlan(){
+        List<BsSgcjsjdBuiProInfo> bsSgcjsjdBuiProInfos = bsSgcjsjdBuiProInfoMapper.selectList(null);
+        bsSgcjsjdBuiProInfos.forEach((BsSgcjsjdBuiProInfo item)->{
+            QueryWrapper<BsSgcJsjdBuiSafeFilings>qw=new QueryWrapper<>();
+
+        });
+    }
 }

jwtech-system/src/main/java/com/kms/build/mapper/BsSgcjsjdBuiProInfoMapper.java

@@ -78,8 +78,9 @@ public interface BsSgcjsjdBuiProInfoMapper extends BaseMapper<BsSgcjsjdBuiProInf
 
     List<HistogramDto> getHistogram(@Param("userId")String userId,@Param("userType")String userType);
 
-    List<Num> getNum(@Param("userId")String userId,@Param("userType") String userType);
+    List<Num> getNum(@Param("adcd") String xzqhId,@Param("userId")String userId,@Param("userType") String userType);
 
-    FlowDto statistics(@Param("proNo") String proNo,
+    FlowDto statistics(
+                        @Param("proNo") String proNo,
                        @Param("proCode") String proCode);
 }

jwtech-system/src/main/java/com/kms/build/service/BsSgcjsjdBuiProInfoService.java

@@ -352,8 +352,11 @@ public class BsSgcjsjdBuiProInfoService extends BaseService<BsSgcjsjdBuiProInfoM
 
     public NumberDto getNum() {
         SysUser user = UserUtils.getUser();
-        List<Num> dto=bsSgcjsjdBuiProInfoMapper.getNum(user.getId(),user.getUserType());
+        String deptId = user.getDeptId();
+        SysDept sysDept = sysDeptService.get(deptId);
+        List<Num> dto=bsSgcjsjdBuiProInfoMapper.getNum(sysXzqhService.getSubString(sysDept.getXzqhId()),user.getId(),user.getUserType());
         NumberDto numDto = new NumberDto();
+        if (dto.size() > 1) {
         for (Num num : dto) {
             if (num.getName().equals("ms")) {
                 numDto.setMs(Integer.valueOf(num.getNum()));
@@ -362,14 +365,11 @@ public class BsSgcjsjdBuiProInfoService extends BaseService<BsSgcjsjdBuiProInfoM
                 numDto.setZd(Integer.valueOf(num.getNum()));
             }
         }
-        if (dto.size() > 1) {
             numDto.setNum(Integer.parseInt(dto.get(0).getNum())+Integer.parseInt(dto.get(1).getNum()));
 
         }else {
-            numDto.setNum(Integer.parseInt(dto.get(0).getNum()));
+            numDto.setNum(0);
         }
-
-
         return numDto;
 
     }

jwtech-system/src/main/java/com/kms/common/api/CommonApi.java

@@ -174,7 +174,7 @@ public class CommonApi {
     public AjaxResult isLegal() {
         SysUser user = UserUtils.getUser();
         List<SysRole> sysRoles = sysRoleService.getRoleByUserId(user.getId());
-        List<SysRole> legalPerson = sysRoles.stream().filter(x -> x.getRoleKey().equals("legalPerson")).collect(Collectors.toList());
+        List<SysRole> legalPerson = sysRoles.stream().filter(x -> x.getRoleKey().equals("YW00111")|| x.getRoleKey().equals("legalPerson")).collect(Collectors.toList());
 //        List<SysRole> enterprise = sysRoles.stream().filter(x -> x.getRoleKey().equals("enterprise")).collect(Collectors.toList());
 
         if (CollectionUtil.isEmpty(legalPerson)) {

jwtech-system/src/main/java/com/kms/enterprise/controller/BsSgcYxjdDynamicCreditController.java

@@ -7,7 +7,9 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 import cn.dev33.satoken.stp.StpUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.jianwei.common.core.controller.BaseController;
 import com.jianwei.common.core.domain.SearchParam;
@@ -155,16 +157,24 @@ public class BsSgcYxjdDynamicCreditController extends BaseController {
 
             return page;
         } else {
-            LambdaQueryWrapper<SysUserRole> lambdaQuery = Wrappers.lambdaQuery(SysUserRole.class);
-
-            lambdaQuery.eq(SysUserRole::getUserId, user.getId());
-
-            SysUserRole userRole = sysUserRoleService.getOne(lambdaQuery);
-
-            SysRole byId = sysRoleService.getById(userRole.getRoleId());
+            QueryWrapper<SysUserRole> qw = new QueryWrapper<>();
+
+            qw.eq("user_id", user.getId());
+            List<SysUserRole> userRoleList = sysUserRoleService.list(qw);
+            List<String>roleList=new ArrayList<>();
+            int i=0;
+            for (SysUserRole ur:userRoleList){
+                SysRole byId = sysRoleService.getById(ur.getRoleId());
+                String roleName="";
+                if (ObjectUtil.isNotEmpty(byId)){
+                roleName = byId.getRoleName();
+                }
+                roleList.add(i,roleName);
+                i++;
+            }
             List<BsSgcYxjdDynamicCredit> creditList = new ArrayList<>();
 
-            if (byId.getRoleName().equals("企业审核员")) {
+            if (roleList.contains("企业审核员")) {
                 LambdaQueryWrapper<BsSgcYxjdDynamicCredit> queryWrapper = Wrappers.lambdaQuery(BsSgcYxjdDynamicCredit.class);
                 queryWrapper.eq(BsSgcYxjdDynamicCredit::getStatus, "1").or().eq(BsSgcYxjdDynamicCredit::getStatus, "4")
                         .orderByDesc(BsSgcYxjdDynamicCredit::getCreateTime);

jwtech-system/src/main/java/com/kms/enterprise/service/BsSgcYxjdEnterpriseInfoService.java

@@ -141,14 +141,15 @@ public class BsSgcYxjdEnterpriseInfoService extends BaseService<BsSgcYxjdEnterpr
 
     public IPage<BsSgcYxjdEnterpriseInfo> selectPage(SearchParam<BsSgcYxjdEnterpriseInfo> sp) {
         SysUser sysUser = UserUtils.getUser();
-        String deptId = sysUser.getDeptId();
 
+        String deptId = sysUser.getDeptId();
         SysDept sysDept = sysDeptService.get(deptId);
         String[] roleIds = sysUser.getRoleIds();
         BsSgcYxjdEnterpriseInfo data = sp.getData();
+
         IPage<BsSgcYxjdEnterpriseInfo> page = bsSgcYxjdEnterpriseInfoMapper.getByUser(sysUser.getId(),
                 sysUser.getUserType(), data.getProNo(), data.getProCode(),data.getEnterpriseName(),
-                sysXzqhService.getSubString(sysDept.getXzqhId()),data.getAdcd(), "create_time", new Page<>(sp.getPageNum(), sp.getPageSize()));
+                sysXzqhService.getSubString(sysDept.getXzqhId()), sysXzqhService.getSubString(data.getAdcd()), "create_time", new Page<>(sp.getPageNum(), sp.getPageSize()));
         return page;
     }
 

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

@@ -31,6 +31,7 @@ public class WarnOperate {
                 bsSgcJsjdWarnResult.preInsert();
                 bsSgcJsjdWarnResult.setCreateUid("1"); //系统账号
                 bsSgcJsjdWarnResult.setResultType("2"); //预警
+                bsSgcJsjdWarnResult.setAlertType(warnType.getAlertType());
                 bsSgcJsjdWarnResultService.save(bsSgcJsjdWarnResult);
             }else {
                 one.setWarnResult(warnResult);

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

@@ -14,22 +14,74 @@ import java.util.Map;
 public enum WarnType {
 
     //标段单次变更金额超过500万元，或单项变更金额超过标段合同价5%
-    SECTION_EXCEED("A001","001","标段单次变更金额超过500万元，或单项变更金额超过标段合同价5%",null),
-    //保证金的缴纳时间与施工令时间进行比对，大于20个工作日
-    MARGIN_PAYMENT_TIME("D001","004","保证金的缴纳时间与施工令时间进行比对，大于20个工作日",null),
-    //专用账户余额等于小于0
-    SALARY_DEPOSIT("D002","004","专用账户余额为%s",null),
+    SECTION_EXCEED("A001","001","标段单次变更金额超过500万元，或单项变更金额超过标段合同价5%","","0"),
+    //合同价1亿(含)以上的标段累计变更金额超过标段合同价5%；合同价5千万(含)到1亿的标段累计变更金额超过标段合同价8%；合同价1千万 (含)到5千万的标段累计变更金额超过标段合同价10%；合同价5百万 (含)到1千万的标段累计变更金额超过标段合同价12%；合同价5百万以下的标段累计变更金额超过标段合同价15%
+    CONTRACT_PRICE_EXCEED("A001","002","合同价1亿(含)以上的标段累计变更金额超过标段合同价5%；合同价5千万(含)到1亿的标段累计变更金额超过标段合同价8%；合同价1千万 (含)到5千万的标段累计变更金额超过标段合同价10%；合同价5百万 (含)到1千万的标段累计变更金额超过标段合同价12%；合同价5百万以下的标段累计变更金额超过标段合同价15%","","0"),
     //标段变更次数累计超过20次的，非基本建设程序项目的标段变更次数累计超过10次的
-    SECTION_CHANGES("A003","001","标段变更次数累计%s次，超过20次","基本建设程序项目的标段变更次数累计%s次，超过10次"),
+    SECTION_CHANGES("A001","003","标段变更次数累计%s次，超过20次","","0"),
+    //重大设计变更未报批
+    DESIGN_NOT_SUBMITTED("A001 ","004","重大设计变更未报批","","0"),
+    //80%>同期完成率>60%；同期完成率≤60%
+    SCHEDULE_LAG("B001","001","80%>同期完成率>60%；同期完成率≤60%","","0"),
+    //每次监督检查中出现严重问题5项以上
+    MORE_THAN_FIVE_SERIOUS("C001","001","每次监督检查中出现严重问题5项以上","","0"),
+    //每次监督检查中出现较重问题6项以上或一般问题20项以上
+    MORE_THAN_SIX_HEAVIER("C001","002","每次监督检查中出现较重问题6项以上或一般问题20项以上","","0"),
+    //市场主体同一问题(较重、严重)在5个项目中出现(按年度统计)(对市场主体预警)
+    SAME_PROBLEM_FIVE_YEAR("C001","003","市场主体同一问题(较重、严重)在5个项目中出现(按年度统计)(对市场主体预警)","","1"),
     //检测结果合格率<90%
-    DETECTION_QUALIFICATION_RATE("A001","003","检测结果合格率为%s,小于90%",null),
+    DETECTION_QUALIFICATION_RATE("C002","001","检测结果合格率为%s,小于90%","","0"),
+    //每年4月15日，年度度汛方案未备案
+    FLOOD_CONTROL("D001","001","检测结果合格率为%s,小于90%","","0"),
+    //累计工程进度款支付金额＜85%累计应付款金额
+    CUMULATIVE_ENGINEERING("E001","001","累计工程进度款支付金额＜85%累计应付款金额","","0"),
+    //每年工程进度款支付滞后超过2个月且超过2次，非基本建设程序项目工程进度款支付滞后超过3个月
+    YEAR_ENGINEERING("E002","001","每年工程进度款支付滞后超过2个月且超过2次，非基本建设程序项目工程进度款支付滞后超过3个月","","0"),
+    //累计工程进度款实际支付金额＞累计实际应付款金额
+    AMOUNT_PAID("E003","001","累计工程进度款实际支付金额＞累计实际应付款金额","","0"),
+    //开工60日内未设立农民工工资专用账户的(仅针对基本建设程序项目)
+    PEASANT_WAGES_SIXTY_DAYS("E004","001","累计工程进度款实际支付金额＞累计实际应付款金额","","0"),
+    //连续两个月未支付农民工工资，非基本建设程序项目连续一个季度未支付农民工工资
+    WAGE_ARREARS("E005","001","连续两个月未支付农民工工资，非基本建设程序项目连续一个季度未支付农民工工资","","0"),
+    //未缴纳农民工工资保证金的(仅针对基本建设程序项目)
+    NON_PAYMENT_DEPOSIT("E006","001","未缴纳农民工工资保证金的(仅针对基本建设程序项目)","","0"),
+    //合同签订时间迟于实际开工时间
+    VIOLATION_CONTRACT_EXECUTION("F001","001","%项目，合同签订时间迟于实际开工时间","","0"),
+    //合同履约评价到期未评价
+    CONTRACT_WITHOUT_EVALUATION("F002","001","%项目，合同履约评价到期未评价","","0"),
+    //发生合同提前终止的
+    EARLY_TERMINATION_CONTRACT("F003","001","%项目，发生合同提前终止的","","0"),
+    //项目负责人社会保险与所在单位不符
+    PROJECT_LEADER_UNIT_DISCREPANCY("G001","001","%项目，发生合同提前终止的","","0"),
+    //总监理工程师社会保险与所在单位不符(仅针对基本建设程序项目)
+    CHIEF_ENGINEER_UNIT_DISCREPANCY("G002","001","%项目，总监理工程师社会保险与所在单位不符(仅针对基本建设程序项目)","","0"),
+    //项目管理机构技术负责人或专职安全生产管理人员社会保险与所在单位不符
+    TECHNICAL_DIRECTOR_UNIT_DISCREPANCY("G003","001","%项目，项目管理机构技术负责人或专职安全生产管理人员社会保险与所在单位不符","","0"),
+    //项目负责人月度出勤天数小于22天
+    PROJECT_LEADER_ATTENDANCE_DAYS("G004","001","%项目，项目负责人月度出勤天数小于22天","","0"),
+    //总监理工程师月度出勤天数小于22天(仅针对基本建设程序项目)
+    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"),
+    //同时担任2个及以上项目的总监理工程师(仅针对基本建设程序项目)
+    CHIEF_ENGINEER_TWO_ITEM("G008","001","%项目，总监理工程师变更2次及以上(仅针对基本建设程序项目)","","0"),
+    //超过批准施工进度计划确定的阶段验收时间1个月(仅针对基本建设程序项目)
+    CONSTRUCTION_SCHEDULE_EXCEEDED("H001","001","%项目，超过批准施工进度计划确定的阶段验收时间1个月(仅针对基本建设程序项目)","","0"),
     //超过合同工期6个月未完成验收
-    EXCEEDING_CONTRACT_PERIOD("A001","007","超过合同工期6个月未完成验收",null);
+    EXCEEDING_CONTRACT_PERIOD("H002","001","%项目，超过合同工期6个月未完成验收","","0"),
+    //保证金的缴纳时间与施工令时间进行比对，大于20个工作日
+    MARGIN_PAYMENT_TIME("D001","004","保证金的缴纳时间与施工令时间进行比对，大于20个工作日","","0"),
+    //专用账户余额等于小于0
+    SALARY_DEPOSIT("D002","004","专用账户余额为%s","","0");
 
     private String warnType;
     private String warnSubType;
     private String warnResult;
     private String otherResult;
+    private String alertType;
+
 
     public static Map<String, WarnType> nameMap = new HashMap<String, WarnType>(
             30);

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

@@ -116,7 +116,7 @@ public class WarningJudgment<T> {
         if(StringUtils.isNotEmpty(cellProjectRate)){
             Double aDouble = Double.valueOf(cellProjectRate);
             if(aDouble<90){
-                warnOperate.sendWarn(proNo,proCode,warnType, warnType.replaceString(warnType.getOtherResult(),cellProjectRate));
+                warnOperate.sendWarn(proNo,proCode,warnType, warnType.replaceString(warnType.getWarnResult(),cellProjectRate));
             }
         }
     }

jwtech-system/src/main/resources/mapper/build/BsSgcjsjdBuiProInfoMapper.xml

@@ -518,18 +518,25 @@
             COUNT(1) num
         FROM
             bs_sgc_jsjd_bui_pro_info pi
-                LEFT JOIN bs_slgc_qqjd_spe_pro_proposal pp ON pi.PRO_NO = pp.PRO_NO
+                INNER JOIN  bs_slgc_qqjd_spe_pro_proposal pp ON pi.PRO_NO = pp.PRO_NO
                 AND pi.PRO_CODE = pp.PROJECT_CODE
+        <if test="userType==00">
+        <where>
+        1=1
+        <if test="adcd!=null and adcd !=''">
+            and pp.adcd like concat(#{adcd},'%')
+        </if>
+        </where>
+        </if>
         <if test="userType==01">
-            WHERE
-            pi.PRO_NO IN (
+            and pi.PRO_NO IN (
             SELECT
             PRO_NO
             FROM
-            sys_user_pro
+            sys_user_pro sp
             <where>
                 <if test="userId!=null and userId!=''">
-                    AND user_id=#{userId})
+                    sp.user_id=#{userId})
                 </if>
             </where>
         </if>

jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectPreDesignMapper.xml

@@ -100,31 +100,30 @@
         pp.adcd,
         pi.bind_status
         FROM
-
         bs_sgc_jsjd_bui_pro_info pi
         LEFT JOIN bs_slgc_qqjd_spe_pro_proposal pp ON pi.pro_code = pp.project_code
         AND pi.pro_no = pp.pro_no
         <where>
             1 = 1
-            <if test="adcd!=null and adcd !=''">
-                and pi.adcd like concat(#{adcd},'%')
-            </if>
+<!--            <if test="adcd!=null and adcd !=''">-->
+<!--                and pi.adcd like concat(#{adcd},'%')-->
+<!--            </if>-->
             <if test="projectName!=null and projectName!=''">
                 and pp.project_name like concat('%',#{projectName},'%')
             </if>
             <if test="bindStatus!=null and bindStatus!=''">
                 and bind_status=#{bindStatus}
             </if>
-            <if test="userId!=null and userId!=''">
-                and (pi.PRO_NO IN (
-                SELECT
-                PRO_NO
-                FROM
-                sys_user_pro
-                where
-                user_id = #{userId}) or
-                bind_status = 0)
-            </if>
+<!--            <if test="userId!=null and userId!=''">-->
+<!--                and (pi.PRO_NO IN (-->
+<!--                SELECT-->
+<!--                PRO_NO-->
+<!--                FROM-->
+<!--                sys_user_pro-->
+<!--                where-->
+<!--                user_id = #{userId}) or-->
+<!--                bind_status = 0)-->
+<!--            </if>-->
         </where>
         group by pi.pro_no
     </select>

jwtech-system/src/main/resources/mapper/enterprise/BsSgcYxjdEnterpriseInfoMapper.xml

@@ -95,9 +95,6 @@
                 <if test="enterpriseName!=null and enterpriseName!=''">
                     and enterprise_name like concat('%',#{enterpriseName},'%')
                 </if>
-                <if test=' adcd != null and adcd !=""'>
-                    and adcd like concat(#{adcd},'%')
-                </if>
                 <if test="queryAccd != null and queryAccd != ''">
                     and adcd like concat(#{queryAccd},'%')
                 </if>