强制注销业务调整
This commit is contained in:
parent
1016fc5d08
commit
569be2b630
|
|
@ -1,13 +1,11 @@
|
||||||
package com.chinaweal.aiccs.aiccs.force.service.impl;
|
package com.chinaweal.aiccs.aiccs.force.service.impl;
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
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.core.metadata.IPage;
|
||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
import com.chinaweal.aiccs.aiccs.abnormal.entity.EBaseinfo;
|
import com.chinaweal.aiccs.aiccs.abnormal.entity.EBaseinfo;
|
||||||
import com.chinaweal.aiccs.aiccs.abnormal.entity.TSWrit;
|
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.EBaseinfoService;
|
||||||
import com.chinaweal.aiccs.aiccs.abnormal.service.TSWritService;
|
import com.chinaweal.aiccs.aiccs.abnormal.service.TSWritService;
|
||||||
import com.chinaweal.aiccs.aiccs.business.entity.XrTaskList;
|
import com.chinaweal.aiccs.aiccs.business.entity.XrTaskList;
|
||||||
|
|
@ -421,9 +419,12 @@ public class XrForceDeregisterSpeServiceImpl extends ServiceImpl<XrForceDeregist
|
||||||
String bizSeqNo = UUID.randomUUID().toString(); //业务编号用新的
|
String bizSeqNo = UUID.randomUUID().toString(); //业务编号用新的
|
||||||
StringBuilder entName = new StringBuilder();
|
StringBuilder entName = new StringBuilder();
|
||||||
List<String> pripIdList = new ArrayList<>();
|
List<String> pripIdList = new ArrayList<>();
|
||||||
|
LocalDate now = LocalDate.now();
|
||||||
List<XrForceDeregisterSpe> forceList = new ArrayList<>();
|
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("、");
|
entName.append(spe.getEntName()).append("、");
|
||||||
XrForceDeregisterSpe xrForceDeregisterSpe = new XrForceDeregisterSpe();
|
XrForceDeregisterSpe xrForceDeregisterSpe = new XrForceDeregisterSpe();
|
||||||
//直接使用原来的业务数据,类型由拟强制注销改为强制注销
|
//直接使用原来的业务数据,类型由拟强制注销改为强制注销
|
||||||
|
|
|
||||||
|
|
@ -6,9 +6,12 @@ import lombok.Getter;
|
||||||
@Getter
|
@Getter
|
||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
public enum AuthEnum {
|
public enum AuthEnum {
|
||||||
XR_HANDLE("xrHandle", "经办人"),
|
// XR_HANDLE("xrHandle", "经办人"),
|
||||||
XR_EXAMINE("xrExamine", "审核人"),
|
// XR_EXAMINE("xrExamine", "审核人"),
|
||||||
XR_APPROVE("xrApprove", "审批人"),
|
// XR_APPROVE("xrApprove", "审批人"),
|
||||||
|
XR_HANDLE("acceptSerIllegal", "经办人"),
|
||||||
|
XR_EXAMINE("handleSerIllegal", "审核人"),
|
||||||
|
XR_APPROVE("approveSerIllegal", "审批人"),
|
||||||
XR_LAW("xrLaw", "执法人"),
|
XR_LAW("xrLaw", "执法人"),
|
||||||
;
|
;
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
|
|
@ -1,46 +1,46 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<workflow definedname="forceDeregisterWorkFlow" description="强制注销流程模板">
|
<workflow definedname="forceDeregisterWorkFlow" description="强制注销流程模板">
|
||||||
<nodes>
|
<nodes>
|
||||||
<node id="handle" name="经办" description="经办" start="true"/>
|
<node id="acceptSerIllegal" name="经办" description="经办" start="true"/>
|
||||||
<node id="replenish" name="材料补正" description="材料补正" />
|
<node id="replenish" name="材料补正" description="材料补正" />
|
||||||
<node id="transfer" name="转办" description="转办" />
|
<node id="transfer" name="转办" description="转办" />
|
||||||
<node id="examine" name="审核" description="审核"/>
|
<node id="handleSerIllegal" name="审核" description="审核"/>
|
||||||
<node id="handleReturn" name="审核回退" description="经办"/>
|
<node id="acceptSerIllegalReturn" name="审核回退" description="经办"/>
|
||||||
<node id="examineReturn" name="审批回退" description="审核"/>
|
<node id="handleSerIllegalReturn" name="审批回退" description="审核"/>
|
||||||
<node id="approve" name="审批" description="审批"/>
|
<node id="approveSerIllegal" name="审批" description="审批"/>
|
||||||
<node id="nullify" name="作废" description="作废" end="true"/>
|
<node id="nullify" name="作废" description="作废" end="true"/>
|
||||||
<node id="examineFinish" name="结束流程" description="审核不通过" end="true" handle="false"/>
|
<node id="handleSerIllegalFinish" name="结束流程" description="审核不通过" end="true" handle="false"/>
|
||||||
<node id="approveFinish" name="结束流程" description="审批不通过" end="true" handle="false"/>
|
<node id="approveSerIllegalFinish" name="结束流程" description="审批不通过" end="true" handle="false"/>
|
||||||
<node id="end" name="结束流程" description="办结" end="true" handle="false"/>
|
<node id="end" name="结束流程" description="办结" end="true" handle="false"/>
|
||||||
</nodes>
|
</nodes>
|
||||||
|
|
||||||
<sequenceFlow id="handle_examine" name="下一步" description="经办_审核"/>
|
<sequenceFlow id="acceptSerIllegal_handleSerIllegal" name="下一步" description="经办_审核"/>
|
||||||
<sequenceFlow id="handle_nullify" name="删除业务" description="经办_线索作废"/>
|
<sequenceFlow id="acceptSerIllegal_nullify" name="删除业务" description="经办_线索作废"/>
|
||||||
<!-- <sequenceFlow id="handle_transfer" 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="transfer_nullify" name="线索作废" description="转办_线索作废"/>
|
||||||
|
|
||||||
<sequenceFlow id="examine_approve" name="通过" description="审核_审批"/>
|
<sequenceFlow id="handleSerIllegal_approveSerIllegal" name="通过" description="审核_审批"/>
|
||||||
<sequenceFlow id="examine_examineFinish" name="不通过" description="审核_不同意-结束"/>
|
<sequenceFlow id="handleSerIllegal_handleSerIllegalFinish" name="不通过" description="审核_不同意-结束"/>
|
||||||
<sequenceFlow id="examine_handleReturn" name="回退" description="审核_经办"/>
|
<sequenceFlow id="handleSerIllegal_acceptSerIllegalReturn" name="回退" description="审核_经办"/>
|
||||||
<sequenceFlow id="examine_nullify" name="删除业务" description="审核_线索作废"/>
|
<sequenceFlow id="handleSerIllegal_nullify" name="删除业务" description="审核_线索作废"/>
|
||||||
|
|
||||||
<sequenceFlow id="approve_end" name="通过" description="审批_结束"/>
|
<sequenceFlow id="approveSerIllegal_end" name="通过" description="审批_结束"/>
|
||||||
<sequenceFlow id="approve_approveFinish" name="不通过" description="审批_不同意-结束"/>
|
<sequenceFlow id="approveSerIllegal_approveSerIllegalFinish" name="不通过" description="审批_不同意-结束"/>
|
||||||
<sequenceFlow id="approve_examineReturn" name="回退" description="审批_审核"/>
|
<sequenceFlow id="approveSerIllegal_handleSerIllegalReturn" name="回退" description="审批_审核"/>
|
||||||
<sequenceFlow id="approve_nullify" name="删除业务" description="审批_线索作废"/>
|
<sequenceFlow id="approveSerIllegal_nullify" name="删除业务" description="审批_线索作废"/>
|
||||||
|
|
||||||
<sequenceFlow id="handleReturn_examine" name="下一步" description="经办_审核"/>
|
<sequenceFlow id="acceptSerIllegalReturn_handleSerIllegal" name="下一步" description="经办_审核"/>
|
||||||
<sequenceFlow id="handleReturn_nullify" name="删除业务" description="经办_线索作废"/>
|
<sequenceFlow id="acceptSerIllegalReturn_nullify" name="删除业务" description="经办_线索作废"/>
|
||||||
<sequenceFlow id="handleReturn_transfer" name="线索转办" description="转办"/>
|
<sequenceFlow id="acceptSerIllegalReturn_transfer" name="线索转办" description="转办"/>
|
||||||
|
|
||||||
<sequenceFlow id="examineReturn_approve" name="通过" description="审核_审批"/>
|
<sequenceFlow id="handleSerIllegalReturn_approveSerIllegal" name="通过" description="审核_审批"/>
|
||||||
<sequenceFlow id="examineReturn_examineFinish" name="不通过" description="审核_不同意-结束"/>
|
<sequenceFlow id="handleSerIllegalReturn_handleSerIllegalFinish" name="不通过" description="审核_不同意-结束"/>
|
||||||
<sequenceFlow id="examineReturn_handleReturn" name="回退" description="审核_经办"/>
|
<sequenceFlow id="handleSerIllegalReturn_acceptSerIllegalReturn" name="回退" description="审核_经办"/>
|
||||||
<sequenceFlow id="examineReturn_nullify" name="删除业务" description="审核_线索作废"/>
|
<sequenceFlow id="handleSerIllegalReturn_nullify" name="删除业务" description="审核_线索作废"/>
|
||||||
|
|
||||||
<!-- 结束到经办,主要用于拟强制注销变为强制注销的业务-->
|
<!-- 结束到经办,主要用于拟强制注销变为强制注销的业务-->
|
||||||
<sequenceFlow id="end_handle" name="经办" description="结束_经办"/>
|
<sequenceFlow id="end_acceptSerIllegal" name="经办" description="结束_经办"/>
|
||||||
|
|
||||||
</workflow>
|
</workflow>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue