Merge branch 'master' of http://47.107.61.133:3000/nm-project/aiccs-api

# Conflicts:
#	src/main/java/com/chinaweal/aiccs/aiccs/force/service/impl/XrForceDeregisterSpeServiceImpl.java

src/main/java/com/chinaweal/aiccs/aiccs/force/service/impl/XrForceDeregisterSpeServiceImpl.java

@@ -1,13 +1,11 @@
 package com.chinaweal.aiccs.aiccs.force.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.chinaweal.aiccs.aiccs.abnormal.entity.EBaseinfo;
 import com.chinaweal.aiccs.aiccs.abnormal.entity.TSWrit;
-import com.chinaweal.aiccs.aiccs.abnormal.entity.excel.EntExcel;
 import com.chinaweal.aiccs.aiccs.abnormal.service.EBaseinfoService;
 import com.chinaweal.aiccs.aiccs.abnormal.service.TSWritService;
 import com.chinaweal.aiccs.aiccs.business.entity.XrTaskList;
@@ -92,7 +90,7 @@ public class XrForceDeregisterSpeServiceImpl extends ServiceImpl<XrForceDeregist
         List<String> authList = new ArrayList<>();
         authList.add(user.getPrimaryKey());
         if (aicPermissions.containsKey(AuthEnum.XR_HANDLE.getCode())) {
-            authList.add(user.getRegionID() + ":" +AuthEnum.XR_HANDLE.getCode());
+            authList.add(user.getRegionID() + ":" + AuthEnum.XR_HANDLE.getCode());
         }
         ForceDeregisterSpeQueryDto entity = query.getEntity(ForceDeregisterSpeQueryDto.class);
         entity.setAuthList(authList);
@@ -102,7 +100,7 @@ public class XrForceDeregisterSpeServiceImpl extends ServiceImpl<XrForceDeregist
             entity.setBusStatus("0");
             xrForceDeregisterSpeIPage = baseMapper.selectXrForceDeregisterSpeTodo(page, entity);
         } else if (Objects.equals(entity.getBusType(), "history")) {    //记录
-            String regOrg = aicorgService.getOrgnumberByUserLevel(user,false);
+            String regOrg = aicorgService.getOrgnumberByUserLevel(user, false);
             entity.setRegOrg(regOrg);
             xrForceDeregisterSpeIPage = baseMapper.selectXrForceDeregisterSpeHistory(page, entity);
         } else {
@@ -198,7 +196,7 @@ public class XrForceDeregisterSpeServiceImpl extends ServiceImpl<XrForceDeregist
             throw new BusinessException("主体主键不能为空");
         }
         //判断是新增的业务还是在原来的业务上继续添加拟强制注销主体
-        if(StringUtils.isEmpty(bizSeqNo)){
+        if (StringUtils.isEmpty(bizSeqNo)) {
             bizSeqNo = UUID.randomUUID().toString();
             isNew = true;
         }
@@ -206,7 +204,7 @@ public class XrForceDeregisterSpeServiceImpl extends ServiceImpl<XrForceDeregist
         List<String> pripIdList = queryDto.getPripIdList();
         StringBuilder entName = new StringBuilder();
 
-        List<List<String>> newPripIdList = Lists.partition(pripIdList,400);
+        List<List<String>> newPripIdList = Lists.partition(pripIdList, 400);
         List<EBaseinfo> eBaseinfos = new ArrayList<>();
         for (List<String> list : newPripIdList) {
             eBaseinfos.addAll(iEBaseinfoService.listByIds(list));
@@ -240,7 +238,7 @@ public class XrForceDeregisterSpeServiceImpl extends ServiceImpl<XrForceDeregist
         }
         this.saveBatch(xrForceDeregisterSpeList);
 
-        if(isNew){  //若是新增的业务，需要开启新的待办
+        if (isNew) {  //若是新增的业务，需要开启新的待办
             // 开启待办
             XrTaskList xrTaskList = new XrTaskList();
             taskLikeId = UUID.randomUUID().toString();
@@ -256,7 +254,7 @@ public class XrForceDeregisterSpeServiceImpl extends ServiceImpl<XrForceDeregist
             xrTaskList.setApplyOrgId(user.getOrgID());
             xrTaskList.setWorkFlowId(FlowUtil.FORCE_DEREGISTER_WORK_FLOW);
             // 保存待办信息
-            iXrTaskListService.startWorkFlow(xrTaskList,new String[]{user.getPrimaryKey()}, null,pripIdList, user);
+            iXrTaskListService.startWorkFlow(xrTaskList, new String[]{user.getPrimaryKey()}, null, pripIdList, user);
         }
 
         return new XrTaskListVo(taskLikeId, bizSeqNo, "");
@@ -276,13 +274,13 @@ public class XrForceDeregisterSpeServiceImpl extends ServiceImpl<XrForceDeregist
         //处理公司名称字段
         //取第一家公司的名称
         String entName = speList.get(0).getEntName();
-        if(speList.size() > 1){
+        if (speList.size() > 1) {
             //取公司共计数量
             entName = entName + "等" + speList.size() + "户公司（另附附件）";
         }
         //查对应的拟强制注销登记法定事由
         String forceRraCn = "";
-        if(StringUtils.isNotEmpty(forceSaveDto.getForceRra())){
+        if (StringUtils.isNotEmpty(forceSaveDto.getForceRra())) {
             TRBaseCode xrbasecode = trBaseCodeService.getOne(new LambdaQueryWrapper<TRBaseCode>()
                     .eq(TRBaseCode::getCodeid, "C13042")
                     .eq(TRBaseCode::getCode, forceSaveDto.getForceRra()));
@@ -291,12 +289,12 @@ public class XrForceDeregisterSpeServiceImpl extends ServiceImpl<XrForceDeregist
 
         //处理时间参数
         String noticeFrom = "";
-        if(forceSaveDto.getNoticeFrom() != null){
+        if (forceSaveDto.getNoticeFrom() != null) {
             noticeFrom = DateUtils.localDateFormat(forceSaveDto.getNoticeFrom(), "yyyy年MM月dd日");
         }
         String noticeTo = "";
-        if(forceSaveDto.getNoticeTo() != null){
-            noticeTo = DateUtils.localDateFormat(forceSaveDto.getNoticeTo() , "yyyy年MM月dd日");
+        if (forceSaveDto.getNoticeTo() != null) {
+            noticeTo = DateUtils.localDateFormat(forceSaveDto.getNoticeTo(), "yyyy年MM月dd日");
         }
 
         String content = templateDB.getContent();
@@ -304,7 +302,7 @@ public class XrForceDeregisterSpeServiceImpl extends ServiceImpl<XrForceDeregist
                 .replace("{{forceResDate}}", noticeFrom)
                 .replace("{{entName}}", entName)
                 .replace("{{forceRra}}", forceRraCn)
-                .replace("本公告自{{noticeFrom}}", "\n        本公告自 "+noticeFrom)
+                .replace("本公告自{{noticeFrom}}", "\n        本公告自 " + noticeFrom)
                 .replace("{{noticeTo}}", noticeTo)
                 .replace("{{regOrg}}", user.getOrgName());
     }
@@ -392,12 +390,12 @@ public class XrForceDeregisterSpeServiceImpl extends ServiceImpl<XrForceDeregist
         }
 
         //最后生成或修改拟强制注销公告数据
-        if(xrForceDeregister != null){
+        if (xrForceDeregister != null) {
             XrForceDeregisterSpe xrForceDeregisterSpe = xrForceDeregisterSpeList.get(0);
             XrForceDeregister forceDeregister = iXrForceDeregisterService.getById(xrForceDeregisterSpe.getForceId());
             //校验是否已有公告数据
-            if(forceDeregister == null){
-                BeanUtils.copyProperties(xrForceDeregisterSpe,xrForceDeregister);
+            if (forceDeregister == null) {
+                BeanUtils.copyProperties(xrForceDeregisterSpe, xrForceDeregister);
                 iXrForceDeregisterService.saveOrUpdate(xrForceDeregister);
             }
         }
@@ -411,12 +409,12 @@ public class XrForceDeregisterSpeServiceImpl extends ServiceImpl<XrForceDeregist
      *
      * @param xrForceSpe
      */
-    public XrForceDeregisterSpe generateXrForceDeregisterRes(XrForceDeregisterSpe xrForceSpe){
+    public XrForceDeregisterSpe generateXrForceDeregisterRes(XrForceDeregisterSpe xrForceSpe) {
         //生成详细表
         EBaseinfo eBaseinfo = iEBaseinfoService.getById(xrForceSpe.getPripId());
         XrForceDeregisterRes xrForceRes = new XrForceDeregisterRes();
-        BeanUtils.copyProperties(xrForceSpe,xrForceRes);
-        if(eBaseinfo != null){
+        BeanUtils.copyProperties(xrForceSpe, xrForceRes);
+        if (eBaseinfo != null) {
             xrForceRes.setLerep(eBaseinfo.getName())
                     .setDom(eBaseinfo.getDom());
         }
@@ -436,15 +434,18 @@ public class XrForceDeregisterSpeServiceImpl extends ServiceImpl<XrForceDeregist
         //查出该公告下的所有拟强制注销业务数据，需要排除掉已经终止拟强制注销的
         List<XrForceDeregisterSpe> speList = this.list(new LambdaQueryWrapper<XrForceDeregisterSpe>()
                 .eq(XrForceDeregisterSpe::getForceId, forceId)
-                .eq(XrForceDeregisterSpe::getForceRes,"1")
+                .eq(XrForceDeregisterSpe::getForceRes, "1")
                 .eq(XrForceDeregisterSpe::getForceType, "1")
                 .ne(XrForceDeregisterSpe::getStatus, FlowConstant.LINK_STATUS_FIVE));
         String bizSeqNo = UUID.randomUUID().toString(); //业务编号用新的
         StringBuilder entName = new StringBuilder();
         List<String> pripIdList = new ArrayList<>();
-
+        LocalDate now = LocalDate.now();
         List<XrForceDeregisterSpe> forceList = new ArrayList<>();
-        for(XrForceDeregisterSpe spe : speList){
+        for (XrForceDeregisterSpe spe : speList) {
+            if (spe.getNoticeTo() != null && !now.isAfter(spe.getNoticeTo())) {
+                throw new BusinessException(spe.getEntName() + "的拟强制注销公告期未结束");
+            }
             entName.append(spe.getEntName()).append("、");
             XrForceDeregisterSpe xrForceDeregisterSpe = new XrForceDeregisterSpe();
             //直接使用原来的业务数据，类型由拟强制注销改为强制注销
@@ -476,7 +477,7 @@ public class XrForceDeregisterSpeServiceImpl extends ServiceImpl<XrForceDeregist
         xrTaskList.setApplyOrgId(user.getOrgID());
         xrTaskList.setWorkFlowId(FlowUtil.FORCE_DEREGISTER_WORK_FLOW);
         // 保存待办信息
-        iXrTaskListService.startWorkFlow(xrTaskList,new String[]{user.getPrimaryKey()}, null,pripIdList, user);
+        iXrTaskListService.startWorkFlow(xrTaskList, new String[]{user.getPrimaryKey()}, null, pripIdList, user);
 
         return new XrTaskListVo(xrTaskList.getTaskLikeId(), bizSeqNo, "");
     }
@@ -487,7 +488,7 @@ public class XrForceDeregisterSpeServiceImpl extends ServiceImpl<XrForceDeregist
         LambdaQueryWrapper<XrForceDeregisterSpe> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(XrForceDeregisterSpe::getBizSeqNo, forceSaveDto.getBizSeqNo());
         //若不是结束流程就只改强制注销业务数据，若是结束流程要把拟强制注销的也改了
-        if(!FlowConstant.LINK_TYPE_END.equals(forceSaveDto.getNextNodeID())){
+        if (!FlowConstant.LINK_TYPE_END.equals(forceSaveDto.getNextNodeID())) {
             queryWrapper.eq(XrForceDeregisterSpe::getForceType, forceSaveDto.getForceType());
         } else {
             //要把终止拟强制注销的排除掉
@@ -509,7 +510,7 @@ public class XrForceDeregisterSpeServiceImpl extends ServiceImpl<XrForceDeregist
 //            return;
 //        }
 
-        for(XrForceDeregisterSpe xrForceDeregisterSpe : xrForceDeregisterSpeList){
+        for (XrForceDeregisterSpe xrForceDeregisterSpe : xrForceDeregisterSpeList) {
             switch (forceSaveDto.getNextNodeID()) {
                 case FlowConstant.LINK_TYPE_EXAMINE:
                     // 修改拟强制注销结果
@@ -611,10 +612,10 @@ public class XrForceDeregisterSpeServiceImpl extends ServiceImpl<XrForceDeregist
         EBaseinfo eBaseinfo = iEBaseinfoService.getById(xrForceSpe.getPripId());
         String dom = StringUtils.isEmpty(eBaseinfo.getDom()) ? "" : eBaseinfo.getDom();
         String name = StringUtils.isEmpty(eBaseinfo.getName()) ? "" : eBaseinfo.getName();
-        String info = "当事人/经营主体： "+ eBaseinfo.getEntname() + "\n"
-                + "统一信用代码/证件号码： "+ eBaseinfo.getUniscid() + "\n"
-                + "住所/经营场所（住址）： "+ dom + "\n"
-                + "法定代表人（负责人、经营者）姓名： "+ name + "\n"
+        String info = "当事人/经营主体： " + eBaseinfo.getEntname() + "\n"
+                + "统一信用代码/证件号码： " + eBaseinfo.getUniscid() + "\n"
+                + "住所/经营场所（住址）： " + dom + "\n"
+                + "法定代表人（负责人、经营者）姓名： " + name + "\n"
                 + "证件号码： \n联系电话：            其他联系方式：     \n";
         content = info + content;
         return content;

src/main/java/com/chinaweal/aiccs/aiccs/seriousillegalPerson/common/emnu/AuthEnum.java

@@ -6,9 +6,12 @@ import lombok.Getter;
 @Getter
 @AllArgsConstructor
 public enum AuthEnum {
-    XR_HANDLE("xrHandle", "经办人"),
-    XR_EXAMINE("xrExamine", "审核人"),
-    XR_APPROVE("xrApprove", "审批人"),
+//    XR_HANDLE("xrHandle", "经办人"),
+//    XR_EXAMINE("xrExamine", "审核人"),
+//    XR_APPROVE("xrApprove", "审批人"),
+    XR_HANDLE("acceptSerIllegal", "经办人"),
+    XR_EXAMINE("handleSerIllegal", "审核人"),
+    XR_APPROVE("approveSerIllegal", "审批人"),
     XR_LAW("xrLaw", "执法人"),
     ;
     /**

src/main/resources/workFlow/forceDeregisterWorkFlow.xml

@@ -1,46 +1,46 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <workflow definedname="forceDeregisterWorkFlow" description="强制注销流程模板">
     <nodes>
-        <node id="handle" name="经办" description="经办" start="true"/>
+        <node id="acceptSerIllegal" name="经办" description="经办" start="true"/>
         <node id="replenish" name="材料补正" description="材料补正" />
         <node id="transfer" name="转办" description="转办" />
-        <node id="examine" name="审核" description="审核"/>
-        <node id="handleReturn" name="审核回退" description="经办"/>
-        <node id="examineReturn" name="审批回退" description="审核"/>
-        <node id="approve" name="审批" description="审批"/>
+        <node id="handleSerIllegal" name="审核" description="审核"/>
+        <node id="acceptSerIllegalReturn" name="审核回退" description="经办"/>
+        <node id="handleSerIllegalReturn" name="审批回退" description="审核"/>
+        <node id="approveSerIllegal" name="审批" description="审批"/>
         <node id="nullify" name="作废" description="作废" end="true"/>
-        <node id="examineFinish" name="结束流程" description="审核不通过" end="true" handle="false"/>
-        <node id="approveFinish" name="结束流程" description="审批不通过" end="true" handle="false"/>
+        <node id="handleSerIllegalFinish" name="结束流程" description="审核不通过" end="true" handle="false"/>
+        <node id="approveSerIllegalFinish" name="结束流程" description="审批不通过" end="true" handle="false"/>
         <node id="end" name="结束流程" description="办结" end="true" handle="false"/>
     </nodes>
 
-    <sequenceFlow id="handle_examine" name="下一步" description="经办_审核"/>
-    <sequenceFlow id="handle_nullify" name="删除业务" description="经办_线索作废"/>
-<!--    <sequenceFlow id="handle_transfer" name="线索转办" description="转办"/>-->
+    <sequenceFlow id="acceptSerIllegal_handleSerIllegal" name="下一步" description="经办_审核"/>
+    <sequenceFlow id="acceptSerIllegal_nullify" name="删除业务" description="经办_线索作废"/>
+<!--    <sequenceFlow id="acceptSerIllegal_transfer" name="线索转办" description="转办"/>-->
 
-    <sequenceFlow id="transfer_examine" name="审核" description="转办_审核"/>
+    <sequenceFlow id="transfer_handleSerIllegal" name="审核" description="转办_审核"/>
     <sequenceFlow id="transfer_nullify" name="线索作废" description="转办_线索作废"/>
 
-    <sequenceFlow id="examine_approve" name="通过" description="审核_审批"/>
-    <sequenceFlow id="examine_examineFinish" name="不通过" description="审核_不同意-结束"/>
-    <sequenceFlow id="examine_handleReturn" name="回退" description="审核_经办"/>
-    <sequenceFlow id="examine_nullify" name="删除业务" description="审核_线索作废"/>
+    <sequenceFlow id="handleSerIllegal_approveSerIllegal" name="通过" description="审核_审批"/>
+    <sequenceFlow id="handleSerIllegal_handleSerIllegalFinish" name="不通过" description="审核_不同意-结束"/>
+    <sequenceFlow id="handleSerIllegal_acceptSerIllegalReturn" name="回退" description="审核_经办"/>
+    <sequenceFlow id="handleSerIllegal_nullify" name="删除业务" description="审核_线索作废"/>
 
-    <sequenceFlow id="approve_end" name="通过" description="审批_结束"/>
-    <sequenceFlow id="approve_approveFinish" name="不通过" description="审批_不同意-结束"/>
-    <sequenceFlow id="approve_examineReturn" name="回退" description="审批_审核"/>
-    <sequenceFlow id="approve_nullify" name="删除业务" description="审批_线索作废"/>
+    <sequenceFlow id="approveSerIllegal_end" name="通过" description="审批_结束"/>
+    <sequenceFlow id="approveSerIllegal_approveSerIllegalFinish" name="不通过" description="审批_不同意-结束"/>
+    <sequenceFlow id="approveSerIllegal_handleSerIllegalReturn" name="回退" description="审批_审核"/>
+    <sequenceFlow id="approveSerIllegal_nullify" name="删除业务" description="审批_线索作废"/>
 
-    <sequenceFlow id="handleReturn_examine" name="下一步" description="经办_审核"/>
-    <sequenceFlow id="handleReturn_nullify" name="删除业务" description="经办_线索作废"/>
-    <sequenceFlow id="handleReturn_transfer" name="线索转办" description="转办"/>
+    <sequenceFlow id="acceptSerIllegalReturn_handleSerIllegal" name="下一步" description="经办_审核"/>
+    <sequenceFlow id="acceptSerIllegalReturn_nullify" name="删除业务" description="经办_线索作废"/>
+    <sequenceFlow id="acceptSerIllegalReturn_transfer" name="线索转办" description="转办"/>
 
-    <sequenceFlow id="examineReturn_approve" name="通过" description="审核_审批"/>
-    <sequenceFlow id="examineReturn_examineFinish" name="不通过" description="审核_不同意-结束"/>
-    <sequenceFlow id="examineReturn_handleReturn" name="回退" description="审核_经办"/>
-    <sequenceFlow id="examineReturn_nullify" name="删除业务" description="审核_线索作废"/>
+    <sequenceFlow id="handleSerIllegalReturn_approveSerIllegal" name="通过" description="审核_审批"/>
+    <sequenceFlow id="handleSerIllegalReturn_handleSerIllegalFinish" name="不通过" description="审核_不同意-结束"/>
+    <sequenceFlow id="handleSerIllegalReturn_acceptSerIllegalReturn" name="回退" description="审核_经办"/>
+    <sequenceFlow id="handleSerIllegalReturn_nullify" name="删除业务" description="审核_线索作废"/>
 
 <!--    结束到经办，主要用于拟强制注销变为强制注销的业务-->
-    <sequenceFlow id="end_handle" name="经办" description="结束_经办"/>
+    <sequenceFlow id="end_acceptSerIllegal" name="经办" description="结束_经办"/>
 
 </workflow>