20220916_sun修正等级评定流程

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/enums/AreaLevel.java

@@ -0,0 +1,26 @@
+package com.ruoyi.system.api.enums;
+
+
+public enum AreaLevel {
+
+    COUNTY("1", "01,02,03,04"), CITY("2", "04"), PRO("3", "05");
+
+    private final String code;
+    private final String info;
+
+    AreaLevel(String code, String info)
+    {
+        this.code = code;
+        this.info = info;
+    }
+
+    public String getCode()
+    {
+        return code;
+    }
+
+    public String getInfo()
+    {
+        return info;
+    }
+}

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java

@@ -231,4 +231,19 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
         Date resDate = Date.from(localDateTime.atZone( ZoneId.systemDefault()).toInstant());
         return resDate;
     }
+
+    public static boolean checkDateNow(Date startDate, int year){
+        boolean res = false;
+        Date now = new Date();
+        long nd = 1000 * 24 * 60 * 60;
+        // long ns = 1000;
+        // 获得两个时间的毫秒时间差异
+        long diff = now.getTime() - startDate.getTime();
+        // 计算差多少天
+        long day = diff / nd;
+        if (year > 0) {
+            res = day >= 365L * year;
+        }
+        return res;
+    }
 }

ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/SecurityUtils.java

@@ -9,6 +9,7 @@ import com.ruoyi.common.core.utils.DateUtils;
 import com.ruoyi.common.core.utils.ServletUtils;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.web.domain.BaseEntity;
+import com.ruoyi.system.api.enums.AreaLevel;
 import com.ruoyi.system.utils.Encryption;
 import com.ruoyi.system.api.model.LoginUser;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
@@ -227,4 +228,19 @@ public class SecurityUtils
         Map<String, Object> context = getPermsContext();
         context.put(key, value);
     }
+
+    public static String getDjpdSqdjLevel() {
+        if (!StringUtils.equals(getUserType(), "00")) {
+            return null;
+        }
+        String level = "";
+        if(getAreaCode().substring(2).equals("0000000000")){
+            level = AreaLevel.PRO.getInfo();
+        }else if(getAreaCode().substring(4).equals("00000000")){
+            level = AreaLevel.CITY.getInfo();
+        }else if(getAreaCode().substring(6).equals("000000")){
+            level = AreaLevel.COUNTY.getInfo();
+        }
+        return level;
+    }
 }

ruoyi-modules/mz-business-djpd/src/main/java/com/ruoyi/business/domain/DjpdSq.java

@@ -340,4 +340,7 @@ public class DjpdSq extends BaseEntity
 
     @TableField(exist = false)
     private List<HistoricActivityInstance> instanceList;
+
+    @TableField(exist = false)
+    private String sqdjs;
 }

ruoyi-modules/mz-business-djpd/src/main/java/com/ruoyi/business/mapper/DjpdSqMapper.java

@@ -36,6 +36,9 @@ public interface DjpdSqMapper extends BaseMapperPlus<DjpdSq> {
     @InterceptorIgnore(tenantLine = "true")
     public int updateCommonDjpdById(DjpdSq djpdSq);
 
+    @InterceptorIgnore(tenantLine = "true")
+    public List<DjpdSq> selectCommonDjpdSqByJgId(String id);
+
     public List<DjpdSq> selectDjpdSlList(DjpdSq djpdSq);
 
     @InterceptorIgnore(tenantLine = "true")

ruoyi-modules/mz-business-djpd/src/main/java/com/ruoyi/business/service/impl/DjpdSqServiceImpl.java

@@ -8,6 +8,7 @@ import com.ruoyi.business.service.IDjpdSqService;
 import com.ruoyi.common.core.constant.SecurityConstants;
 import com.ruoyi.common.core.context.SecurityContextHolder;
 import com.ruoyi.common.core.exception.ServiceException;
+import com.ruoyi.common.core.utils.DateUtils;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.utils.uuid.IdUtils;
 import com.ruoyi.common.security.utils.SecurityUtils;
@@ -368,20 +369,25 @@ public class DjpdSqServiceImpl implements IDjpdSqService
             DjpdGs lastGs = djpdGsMapper.selectCommonList(gsQuery).stream().max(Comparator.comparing(DjpdGs::getCreateTimeStr))
                     .orElse(null);
             if (ObjectUtils.isNotEmpty(lastGs)) {
-                if (StringUtils.equals(lastGs.getGslx(), AnnounceStatus.RES.getCode())) {
-                    Map<String, Object> dept = sysDeptJlMapper.selectDeptByParams(lastGs.getCreateUnit());
-                    if (ObjectUtils.isNotEmpty(dept)) {
-                        if (dept.containsKey(SysDeptJlStatus.ANCESTORS.getCode())) {
-                            if (Arrays.asList(dept.get(SysDeptJlStatus.ANCESTORS.getCode()).toString().split(","))
-                                    .size() >= Arrays.asList(SecurityUtils.getLoginUser().getSysUser().getDept()
-                                    .getAncestors().split(",")).size()) {
-                                r.setIsFhyq(WhetherStatus.YES.getCode());
-                            } else {
-                                r.setIsFhyq(WhetherStatus.NO.getCode());
-                            }
-                        }
-                    }
+                if (StringUtils.equals(lastGs.getCreateAreaCode(), SecurityUtils.getAreaCode())) {
+                    r.setIsFhyq(WhetherStatus.YES.getCode());
+                } else {
+                    r.setIsFhyq(WhetherStatus.NO.getCode());
                 }
+//                if (StringUtils.equals(lastGs.getGslx(), AnnounceStatus.RES.getCode())) {
+//                    Map<String, Object> dept = sysDeptJlMapper.selectDeptByParams(lastGs.getCreateUnit());
+//                    if (ObjectUtils.isNotEmpty(dept)) {
+//                        if (dept.containsKey(SysDeptJlStatus.ANCESTORS.getCode())) {
+//                            if (Arrays.asList(dept.get(SysDeptJlStatus.ANCESTORS.getCode()).toString().split(","))
+//                                    .size() >= Arrays.asList(SecurityUtils.getLoginUser().getSysUser().getDept()
+//                                    .getAncestors().split(",")).size()) {
+//                                r.setIsFhyq(WhetherStatus.YES.getCode());
+//                            } else {
+//                                r.setIsFhyq(WhetherStatus.NO.getCode());
+//                            }
+//                        }
+//                    }
+//                }
             }
         });
         return res;
@@ -531,7 +537,7 @@ public class DjpdSqServiceImpl implements IDjpdSqService
     public DjpdSq insertDjpdSq(DjpdSq djpdSq)
     {
         if (ObjectUtils.isNotEmpty(djpdSqMapper.checkExists(djpdSq))) {
-            throw new ServiceException("该机构正在评级流程，请不要重复提交");
+            throw new ServiceException("已经存在评级流程，请不要重复提交");
         }
         djpdSq.setInstanceId(IdUtils.simpleUUID());
         djpdSq.setSzxzqh(djpdSq.getSzxzqhId());
@@ -576,27 +582,42 @@ public class DjpdSqServiceImpl implements IDjpdSqService
         List<String> deptLevel = Arrays.stream(SecurityUtils.getLoginUser().getSysUser().getDept().getAncestors()
                 .split(",")).collect(Collectors.toList());
         if (StringUtils.equals(djpdSq.getSljg(), ExamineStatus.YES.getCode())) {
+            // 审核通过情况下
             if (StringUtils.equals(djpdSq.getSqzt(), ApplicationStatus.COUNTY.getCode())) {
-                djpdSq.setSqzt(ApplicationStatus.CITY.getCode());
+                //  区县审核
+                if (!StringUtils.equals(djpdSq.getPddj(), EstimationStatus.FOULEVEL.getCode())) {
+                    // 一二三级区县审核通过
+                    djpdSq.setSqzt(ApplicationStatus.EXA.getCode());
+                } else {
+                    // 四级区县审核通过，待市审核
+                    djpdSq.setSqzt(ApplicationStatus.CITY.getCode());
+                }
                 var.put("comment", ApplicationStatus.COUNTY.getCode() + ExamineStatus.YES.getCode() + djpdSq.getSljy());
             } else if (StringUtils.equals(djpdSq.getSqzt(), ApplicationStatus.CITY.getCode())) {
+                // 市审核
                 if (deptLevel.size() > 1) {
+                    // 一个简单部门等级check，非市级部门不可进行市审核
                     throw new ServiceException("越权操作！市级审核需要市级评定委员会");
                 }
-                if (StringUtils.equals(djpdSq.getSqdj(), EstimationStatus.FOULEVEL.getCode())
-                    || StringUtils.equals(djpdSq.getSqdj(), EstimationStatus.FIVLEVEL.getCode())) {
-                    djpdSq.setSqzt(ApplicationStatus.PRO.getCode());
-                } else {
+                if (StringUtils.equals(djpdSq.getPddj(), EstimationStatus.FOULEVEL.getCode())) {
+                    // 四级市审核通过
                     djpdSq.setSqzt(ApplicationStatus.EXA.getCode());
+                } else {
+                    // 五级市审核通过后省审核
+                    djpdSq.setSqzt(ApplicationStatus.PRO.getCode());
                 }
                 var.put("comment", ApplicationStatus.CITY.getCode() + ExamineStatus.YES.getCode() + djpdSq.getSljy());
             } else if (StringUtils.equals(djpdSq.getSqzt(), ApplicationStatus.PRO.getCode())) {
+                // 省审核
                 if (deptLevel.size() > 0) {
+                    // 一个简单部门等级check，非省级级部门不可进行省审核
                     throw new ServiceException("越权操作！省级审核需要省级评定委员会");
                 }
+                // 五级省审核通过
                 djpdSq.setSqzt(ApplicationStatus.EXA.getCode());
                 var.put("comment", ApplicationStatus.PRO.getCode() + ExamineStatus.YES.getCode() + djpdSq.getSljy());
             }
+            // 连接线通过
             var.put("pass", ExamineStatus.YES.getCode());
         } else {
             DjpdSq oldSq = djpdSqMapper.selectById(djpdSq.getId());
@@ -643,6 +664,13 @@ public class DjpdSqServiceImpl implements IDjpdSqService
             if (!SecurityUtils.getUserType().equals("00")) {
                 throw new ServiceException("越权操作！申请四级或五级需要市级及以上办事窗口");
             }
+            List<DjpdSq> oldList = djpdSqMapper.selectCommonDjpdSqByJgId(djpdSq.getJgId());
+            if (oldList.stream().noneMatch(o -> DateUtils.checkDateNow(DateUtils.dateTime(DateUtils.YYYYMMDDHHMMSS, o.getCreateTimeStr()), 1))) {
+                throw new ServiceException("申请四级及以上需要保持三级评定至少一年时间");
+            }
+            if (!SecurityUtils.getUserType().equals("00")) {
+                throw new ServiceException("越权操作！申请四级或五级需要市级及以上办事窗口");
+            }
         }
         if (ObjectUtils.isNotEmpty(djpdSq)) {
             ProcessInstance processInstance = runtimeService.startProcessInstanceByKey("djpd_sq", id);

ruoyi-modules/mz-business-djpd/src/main/resources/mapper/business/DjpdGsMapper.xml

@@ -29,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <select id="selectCommonList" parameterType="DjpdGs" resultMap="DjpdGsResult">
-        select id, jg_id, gslx, ksrq, jsrq, gszt, zzrq, sq_id, create_time_str, create_unit from zwyw_djpd_gs
+        select id, jg_id, gslx, ksrq, jsrq, gszt, zzrq, sq_id, create_time_str, create_unit, create_area_code from zwyw_djpd_gs
         <where>
             <if test="sqId != null and sqId != ''"> and sq_id = #{sqId}</if>
             <if test="state != null and state != ''"> and state = #{state}</if>

ruoyi-modules/mz-business-djpd/src/main/resources/mapper/business/DjpdSqMapper.xml

@@ -157,6 +157,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             id = #{id}
     </select>
 
+    <select id="selectCommonDjpdSqByJgId" parameterType="String" resultMap="DjpdSqResult">
+        SELECT
+            *
+        FROM
+            zwyw_djpd_sq
+        WHERE
+            jg_id = #{id} and sqdj &gt;= 3
+    </select>
+
     <select id="checkExists" parameterType="DjpdSq" resultMap="DjpdSqResult">
         SELECT
             id
@@ -190,6 +199,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <foreach collection="instanceIds" item="item" open="(" separator="," close=")">
                 #{item}
             </foreach>) OR (sqzt != '00'))
+            <if test="sqdjs != null and sqdjs != ''"> and find_in_set(sqdj, #{sqdjs})</if>
             <if test="xydm != null  and xydm != ''"> and xydm = #{xydm}</if>
             <if test="dwmc != null  and dwmc != ''"> and dwmc like concat('%', #{dwmc}, '%')</if>
             <if test="dwssxzqhId != null  and dwssxzqhId != ''"> and dwssxzqh_id = #{dwssxzqhId}</if>
@@ -222,6 +232,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <foreach collection="instanceIds" item="item" open="(" separator="," close=")">
                 #{item}
             </foreach>) OR (sqzt IN ('07', '08', '09', '10')))
+            <if test="sqdjs != null and sqdjs != ''"> and find_in_set(sqdj, #{sqdjs})</if>
             <if test="xydm != null  and xydm != ''"> and xydm = #{xydm}</if>
             <if test="dwmc != null  and dwmc != ''"> and dwmc like concat('%', #{dwmc}, '%')</if>
             <if test="sqzt != null  and sqzt != ''"> and sqzt = #{sqzt}</if>
@@ -252,6 +263,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <foreach collection="instanceIds" item="item" open="(" separator="," close=")">
                 #{item}
             </foreach>) OR (sqzt = '05'))
+            <if test="sqdjs != null and sqdjs != ''"> and find_in_set(sqdj, #{sqdjs})</if>
             <if test="xydm != null  and xydm != ''"> and xydm = #{xydm}</if>
             <if test="dwmc != null  and dwmc != ''"> and dwmc like concat('%', #{dwmc}, '%')</if>
             <if test="sqzt != null  and sqzt != ''"> and sqzt = #{sqzt}</if>
@@ -281,6 +293,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <foreach collection="instanceIds" item="item" open="(" separator="," close=")">
                 #{item}
             </foreach>) OR (sqzt = '03'))
+            <if test="sqdjs != null and sqdjs != ''"> and find_in_set(sqdj, #{sqdjs})</if>
             <if test="xydm != null  and xydm != ''"> and xydm = #{xydm}</if>
             <if test="dwmc != null  and dwmc != ''"> and dwmc like concat('%', #{dwmc}, '%')</if>
             <if test="sqzt != null  and sqzt != ''"> and sqzt = #{sqzt}</if>

ruoyi-modules/mz-business/src/main/java/com/ruoyi/business/controller/DjpdGsController.java

@@ -13,6 +13,7 @@ import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.security.annotation.Logical;
 import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.ruoyi.common.security.utils.SecurityUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -44,6 +45,7 @@ public class DjpdGsController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(DjpdSq djpdSq)
     {
+        djpdSq.setSqdjs(SecurityUtils.getDjpdSqdjLevel());
         TaskVo task = djpdSqService.getInsIds("Activity_13vnhkr");
         djpdSq.setInstanceIds(task.getInsIds());
         startPage();

ruoyi-modules/mz-business/src/main/java/com/ruoyi/business/controller/DjpdSqController.java

@@ -104,6 +104,7 @@ public class DjpdSqController extends BaseController
     @GetMapping("/sl/list")
     public TableDataInfo slList(DjpdSq djpdSq)
     {
+        djpdSq.setSqdjs(SecurityUtils.getDjpdSqdjLevel());
         TaskVo task = djpdSqService.getInsIds("Activity_0k09ysz");
         djpdSq.setInstanceIds(task.getInsIds());
         startPage();
@@ -119,6 +120,7 @@ public class DjpdSqController extends BaseController
     @GetMapping("/sh/list")
     public TableDataInfo shList(DjpdSq djpdSq)
     {
+        djpdSq.setSqdjs(SecurityUtils.getDjpdSqdjLevel());
         TaskVo task = djpdSqService.getInsIds("Activity_1uweoge,Activity_1q5t91h,Activity_11sqbhi,Activity_0cnvg0t,Activity_01mvae0");
         djpdSq.setInstanceIds(task.getInsIds());
         djpdSq.setSzxzqh(SubCodeUtil.getSubCode(SecurityUtils.getAreaCode()).get("code"));
@@ -135,6 +137,7 @@ public class DjpdSqController extends BaseController
     @GetMapping("/cq/list")
     public TableDataInfo cqList(DjpdSq djpdSq)
     {
+        djpdSq.setSqdjs(SecurityUtils.getDjpdSqdjLevel());
         TaskVo task = djpdSqService.getInsIds("Activity_0lx37ql");
         djpdSq.setInstanceIds(task.getInsIds());
         startPage();

ruoyi-ui/src/views/business/fwjggl/djpd/djzspb/index.vue

@@ -724,6 +724,7 @@ export default {
                       sqzt: sqzt
                     }
                     this.$set(this.djzspbList, this.index, data)
+                    his.getList();
                     // this.djzspbList = this.dataReplacement(
                     //   this.djzspbList,
                     //   this.form.id,
@@ -764,6 +765,7 @@ export default {
                     sqzt: '13'
                   }
                   this.$set(this.djzspbList, this.index, data)
+                  his.getList();
                 }).catch(res => {
                 this.beforeSubmit = true
               })

sql/activiti7delete.sql

@@ -46,7 +46,7 @@ DELETE  FROM  `zwyw_pdzj_cyjl`;
 
 DELETE  FROM  `zwyw_djpd_jbpd`;
 
-DELETE  FROM  `zwyw_xq_pz`;
+DELETE  FROM  `zwyw_xzpd_jg`;
 
 DELETE  FROM  `zwyw_yljg_sxxx`;