修改

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

@@ -1,5 +1,6 @@
 package com.kms.config.scheduled;
 
+import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -16,9 +17,11 @@ import com.kms.config.WaterResult;
 import com.kms.config.singleDomain.SingleOrg;
 import com.kms.config.singleDomain.SingleRole;
 import com.kms.config.singleDomain.SingleUser;
+import com.kms.system.domain.SysXzqh;
 import com.kms.system.service.SysDeptService;
 import com.kms.system.service.SysRoleService;
 import com.kms.system.service.SysUserService;
+import com.kms.system.service.SysXzqhService;
 import com.kms.web.controller.system.SysRoleController;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -48,9 +51,15 @@ public class WaterScheduled {
     SysRoleController roleController;
     @Autowired
     SysRoleService roleService;
+    @Autowired
+    SysXzqhService xzqhService;
 
 
-    private static String password = "Sgcjs@2024";
+    private final static String YW00112 = "20240322000004"; //从业单位
+    private final static String YW00106 = "20240320000001";  //省级管理员
+    private final static String YW00109 = "20240322000001";  //市级管理员
+    private final static String YW00110 = "20240322000002";  //区级管理员
+    private final static String password = "Sgcjs@2024";  //默认密码
 
     @Scheduled(cron = "0 0/1 * * * ? ")
     public void userScheduled(){
@@ -82,13 +91,45 @@ public class WaterScheduled {
                 }
             }
             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();
-                if(type.equals("GA")){
+                if(type.equals("GA")){ //政务机构
                     user.setUserType("00");
-                }else if(type.equals("SVA")){
+                    if(CollectionUtil.isEmpty(roles)){
+                        String deptId = user.getDeptId();
+                        SysDept byId = deptService.getById(deptId);
+                        if(byId!=null){
+                            String xzqhId = byId.getXzqhId();
+                            SysXzqh xzqh = xzqhService.getById(xzqhId);
+                            if(xzqh!=null){
+                                Integer layer = xzqh.getLayer();
+                                if(layer==1){
+                                    collect.add(YW00106);
+                                }else if(layer==2){
+                                    collect.add(YW00109);
+                                }else{
+                                    collect.add(YW00110);
+                                }
+                            }else {
+                                collect.add(YW00110);
+                            }
+                        }else{
+                            collect.add(YW00110);
+                        }
+                    }
+                }else if(type.equals("SVA")){  //服务机构
                     user.setUserType("01");
+                    if(CollectionUtil.isEmpty(roles)){
+                        collect.add(YW00112);
+                    }
+                }else if(type.equals("FIRM")){ //厂商
+                    user.setUserType("00");
+                    if(CollectionUtil.isEmpty(roles)){
+                        collect.add(YW00106);
+                    }
                 }
             }
             user.setPhonenumber(singleUser.getPhone());
@@ -104,7 +145,6 @@ public class WaterScheduled {
             }else {
                 user.setStatus("1");
             }
-            List<String> collect = singleUser.getRoleList().stream().map(singleRole -> singleRole.getId()).collect(Collectors.toList());
             user.setRoleIds(collect.toArray(new String[collect.size()]));
             if(flag){
                 userService.singleInsertUser(user);

jwtech-framework/src/main/java/com/jianwei/common/core/service/BaseService.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jianwei.common.core.domain.AjaxResult;
 import com.jianwei.common.core.domain.BaseEntity;
+import com.jianwei.common.core.domain.ConditionView;
 import com.jianwei.common.core.domain.SearchParam;
 import com.jianwei.common.core.redis.RedisCache;
 import com.jianwei.common.mybaitsplus.BeanToWrapper;

jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiSalaryPayableController.java

@@ -4,7 +4,9 @@ import java.util.Arrays;
 import java.util.List;
 
 import com.jianwei.common.core.controller.BaseController;
+import com.jianwei.common.core.domain.ConditionView;
 import com.jianwei.common.core.domain.SearchParam;
+import com.jianwei.common.utils.StringUtils;
 import com.jianwei.common.utils.poi.ExcelUtil;
 import com.kms.common.utils.BaseEntityUtils;
 

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

@@ -10,6 +10,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.jianwei.common.core.service.BaseService;
 
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
 
 /**
  * 资金来源Service接口
@@ -30,8 +33,12 @@ public class BsSgcJsjdBuiSourceFundsService extends BaseService<BsSgcJsjdBuiSour
         QueryWrapper<BsSgcJsjdBuiSourceFunds> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("PRO_NO", sp.getData().getProNo());
         queryWrapper.eq("PRO_CODE", sp.getData().getProCode());
+        if(sp.getData().getReleaseTime()!=null) {
+            queryWrapper.eq("date_format(release_time,'%Y-%m-%d')",sp.getData().getReleaseTime());
+        }
         Page<BsSgcJsjdBuiSourceFunds> fundsPage = bsSgcJsjdBuiSourceFundsMapper.selectPage(page, queryWrapper);
         return fundsPage;
 
     }
+
 }

jwtech-system/src/main/java/com/kms/warn/mapper/BsSgcJsjdBuiRectificationMapper.java

@@ -1,5 +1,7 @@
 package com.kms.warn.mapper;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.kms.warn.domain.dto.RectificationDto;
 import org.apache.ibatis.annotations.Select;
 import org.springframework.stereotype.Repository;
@@ -18,5 +20,5 @@ import java.util.List;
 public interface BsSgcJsjdBuiRectificationMapper extends BaseMapper<BsSgcJsjdBuiRectification> {
 
 
-    List<RectificationDto> select(String inspectionId);
+    IPage<List<RectificationDto>> select(Page page, String inspectionId);
 }

jwtech-system/src/main/java/com/kms/warn/service/BsSgcJsjdBuiRectificationService.java

@@ -1,5 +1,6 @@
 package com.kms.warn.service;
 
+import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jianwei.common.core.domain.SearchParam;
@@ -33,39 +34,35 @@ public class BsSgcJsjdBuiRectificationService extends BaseService<BsSgcJsjdBuiRe
 
     public IPage selectPage(SearchParam<BsSgcJsjdBuiRectification> sp) {
         BsSgcJsjdBuiRectification data = sp.getData();
-
-        List<RectificationDto> list = bsSgcJsjdBuiRectificationMapper.select(data.getInspectionId());
-
+        IPage page = bsSgcJsjdBuiRectificationMapper.select(new Page(sp.getPageNum(),sp.getPageSize()),data.getInspectionId());
+        List<RectificationDto> list = page.getRecords();
         for (RectificationDto rectificationDto : list) {
-            String unit = rectificationDto.getUnit();
-            if (unit != null) {
-                String[] split = unit.split(",");
-                List<BsSgcJsjdBuiEnteInfo> bsSgcJsjdBuiEnteInfos = bsSgcJsjdBuiEnteInfoService.listByIds(Arrays.asList(split));
-                List<String> stringList = bsSgcJsjdBuiEnteInfos.stream().map(BsSgcJsjdBuiEnteInfo::getEnterpriseName).collect(Collectors.toList());
-                rectificationDto.setUnitArray(stringList);
-            }
-
-            String rectificationSituation = rectificationDto.getRectificationSituation();
-            if (rectificationSituation != null) {
-                String[] split = rectificationSituation.split(",");
-                for (String s : split) {
-                    if (s.equals("0")) {
-                        rectificationDto.setIsFinish("0");
-                    }
+                if(rectificationDto==null){
+                    continue;
                 }
-
-                if (rectificationDto.getRectificationSituation() != "0") {
-                    rectificationDto.setIsFinish("1");
+                String unit = rectificationDto.getUnit();
+                if (unit != null) {
+                    String[] split = unit.split(",");
+                    List<BsSgcJsjdBuiEnteInfo> bsSgcJsjdBuiEnteInfos = bsSgcJsjdBuiEnteInfoService.listByIds(Arrays.asList(split));
+                    List<String> stringList = bsSgcJsjdBuiEnteInfos.stream().map(BsSgcJsjdBuiEnteInfo::getEnterpriseName).collect(Collectors.toList());
+                    rectificationDto.setUnitArray(stringList);
+                }
+                String rectificationSituation = rectificationDto.getRectificationSituation();
+                if (rectificationSituation != null) {
+                    String[] split = rectificationSituation.split(",");
+                    for (String s : split) {
+                        if (s.equals("0")) {
+                            rectificationDto.setIsFinish("0");
+                        }
+                    }
+                    if (rectificationDto.getRectificationSituation() != "0") {
+                        rectificationDto.setIsFinish("1");
+                    }
                 }
             }
-        }
-
         Page<RectificationDto> rectificationDtoPage = new Page<>();
-
         rectificationDtoPage.setRecords(list);
         rectificationDtoPage.setTotal(list.size());
-
-
         return rectificationDtoPage;
 
     }

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

@@ -191,6 +191,7 @@
         </if>
         <if test="userType==00">
             <where>
+                1=1
                 <if test="projectName!=null and projectName!=''">
                     and pi.project_name like concat('%',#{projectName},'%')
                 </if>

jwtech-system/src/main/resources/mapper/warn/BsSgcJsjdBuiRectificationMapper.xml

@@ -28,7 +28,23 @@
     </resultMap>
 
     <select id="select" resultMap="RectificationDto">
-        <include refid="info"></include>
-
+        SELECT
+        br.id,
+        br.issuing_unit,
+        br.document_number,
+        br.notice_begain_time,
+        br.rectification_attachment,
+        br.inspection_id,
+        bz.unit_id,
+        bz.rectification_situation
+        FROM
+        bs_sgc_jsjd_bui_rectification br
+        LEFT JOIN ( SELECT rectification_id, GROUP_CONCAT( rectification_situation ) rectification_situation, GROUP_CONCAT( unit_id ) unit_id FROM bs_sgc_jsjd_bui_zrdw GROUP BY rectification_id ) bz ON br.id = bz.rectification_id
+        <where>
+            1=1
+            <if test="inspectionId!=null and inspectionId!=''">
+               and br.inspection_id = #{inspectionId}
+            </if>
+        </where>
     </select>
 </mapper>

jwtech-system/src/main/resources/mapper/warn/BsSgcJsjdBuiRegulatoryInspectionsMapper.xml

@@ -44,6 +44,9 @@
                 <if test="projectName!=null and projectName!=''">
                     and project_name like concat('%',#{projectName},'%')
                 </if>
+                <if test="inspectionTypes!=null and inspectionTypes!=''">
+                    and inspection_types = #{inspectionTypes}
+                </if>
                 <if test="id!=null and id!=''">
                     and id=#{id}
                 </if>
@@ -59,6 +62,9 @@
                 <if test="id!=null and id!=''">
                     and id=#{id}
                 </if>
+                <if test="inspectionTypes!=null and inspectionTypes!=''">
+                    and inspection_types = #{inspectionTypes}
+                </if>
                 <include refid="com.kms.system.mapper.SysXzqhMapper.xzqhCondition"></include>
             </where>
             order by ri.${orderBy} desc LIMIT #{pageNum},#{pageSize};