diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsCaseServiceImpl.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsCaseServiceImpl.java index 68a58df..e877290 100644 --- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsCaseServiceImpl.java +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsCaseServiceImpl.java @@ -1,12 +1,11 @@ package com.casic.missiles.modular.cwscase.service.impl; import com.baomidou.mybatisplus.plugins.Page; -import com.casic.missiles.core.base.response.ResponseData; +import com.baomidou.mybatisplus.service.impl.ServiceImpl; import com.casic.missiles.core.common.service.ICommonPermissionService; import com.casic.missiles.core.common.service.IExpandComponentService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.shiro.ShiroUser; -import com.casic.missiles.core.util.SpringContextHolder; import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.casetype.model.CaseType; import com.casic.missiles.modular.casetype.model.CaseTypeDetail; @@ -17,27 +16,24 @@ import com.casic.missiles.modular.cwscase.model.*; import com.casic.missiles.modular.cwscase.service.ICasedetailService; import com.casic.missiles.modular.cwscase.service.ICwsCaseService; -import com.baomidou.mybatisplus.service.impl.ServiceImpl; import com.casic.missiles.modular.cwscase.service.IProcessDetailService; import com.casic.missiles.modular.cwscase.service.IStatusService; -import com.casic.missiles.modular.dictexpand.model.DictExpand; import com.casic.missiles.modular.dictexpand.service.IDictExpandService; import com.casic.missiles.modular.enums.CaseStateEnum; import com.casic.missiles.modular.enums.SourceEnum; import com.casic.missiles.modular.flowable.dto.ProcessDto; import com.casic.missiles.modular.flowable.service.ICaseFlowService; import com.casic.missiles.modular.system.model.Area; -import com.casic.missiles.modular.system.model.Dict; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import sun.rmi.runtime.Log; -import java.io.Console; import java.math.BigDecimal; import java.text.DecimalFormat; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.Date; +import java.util.List; +import java.util.Map; /** *
diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsCaseServiceImpl.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsCaseServiceImpl.java index 68a58df..e877290 100644 --- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsCaseServiceImpl.java +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsCaseServiceImpl.java @@ -1,12 +1,11 @@ package com.casic.missiles.modular.cwscase.service.impl; import com.baomidou.mybatisplus.plugins.Page; -import com.casic.missiles.core.base.response.ResponseData; +import com.baomidou.mybatisplus.service.impl.ServiceImpl; import com.casic.missiles.core.common.service.ICommonPermissionService; import com.casic.missiles.core.common.service.IExpandComponentService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.shiro.ShiroUser; -import com.casic.missiles.core.util.SpringContextHolder; import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.casetype.model.CaseType; import com.casic.missiles.modular.casetype.model.CaseTypeDetail; @@ -17,27 +16,24 @@ import com.casic.missiles.modular.cwscase.model.*; import com.casic.missiles.modular.cwscase.service.ICasedetailService; import com.casic.missiles.modular.cwscase.service.ICwsCaseService; -import com.baomidou.mybatisplus.service.impl.ServiceImpl; import com.casic.missiles.modular.cwscase.service.IProcessDetailService; import com.casic.missiles.modular.cwscase.service.IStatusService; -import com.casic.missiles.modular.dictexpand.model.DictExpand; import com.casic.missiles.modular.dictexpand.service.IDictExpandService; import com.casic.missiles.modular.enums.CaseStateEnum; import com.casic.missiles.modular.enums.SourceEnum; import com.casic.missiles.modular.flowable.dto.ProcessDto; import com.casic.missiles.modular.flowable.service.ICaseFlowService; import com.casic.missiles.modular.system.model.Area; -import com.casic.missiles.modular.system.model.Dict; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import sun.rmi.runtime.Log; -import java.io.Console; import java.math.BigDecimal; import java.text.DecimalFormat; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.Date; +import java.util.List; +import java.util.Map; /** *
diff --git a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/service/impl/CaseFlowServiceImpl.java b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/service/impl/CaseFlowServiceImpl.java index 133727f..91e9e89 100644 --- a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/service/impl/CaseFlowServiceImpl.java +++ b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/service/impl/CaseFlowServiceImpl.java @@ -10,7 +10,6 @@ import com.casic.missiles.modular.flowable.dto.ProcessDto; import com.casic.missiles.modular.flowable.service.IBmsSuportService; import com.casic.missiles.modular.flowable.service.ICaseFlowService; -import com.casic.missiles.modular.flowable.service.handler.BizCaseFlowHandler; import com.casic.missiles.modular.flowable.util.BizFlowUtil; import com.casic.missiles.modular.flowable.util.FlowUserFactory; import org.slf4j.Logger; @@ -41,8 +40,11 @@ @Autowired private IBmsSuportService caseSuportService; + /** + * 默认阶段时限 + */ @Value("${casic.case.defaultLimitTime:120}") - private Integer defaultLimitTime;//默认阶段时限 + private Integer defaultLimitTime; /** * 启动案卷流程 diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsCaseServiceImpl.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsCaseServiceImpl.java index 68a58df..e877290 100644 --- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsCaseServiceImpl.java +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsCaseServiceImpl.java @@ -1,12 +1,11 @@ package com.casic.missiles.modular.cwscase.service.impl; import com.baomidou.mybatisplus.plugins.Page; -import com.casic.missiles.core.base.response.ResponseData; +import com.baomidou.mybatisplus.service.impl.ServiceImpl; import com.casic.missiles.core.common.service.ICommonPermissionService; import com.casic.missiles.core.common.service.IExpandComponentService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.shiro.ShiroUser; -import com.casic.missiles.core.util.SpringContextHolder; import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.casetype.model.CaseType; import com.casic.missiles.modular.casetype.model.CaseTypeDetail; @@ -17,27 +16,24 @@ import com.casic.missiles.modular.cwscase.model.*; import com.casic.missiles.modular.cwscase.service.ICasedetailService; import com.casic.missiles.modular.cwscase.service.ICwsCaseService; -import com.baomidou.mybatisplus.service.impl.ServiceImpl; import com.casic.missiles.modular.cwscase.service.IProcessDetailService; import com.casic.missiles.modular.cwscase.service.IStatusService; -import com.casic.missiles.modular.dictexpand.model.DictExpand; import com.casic.missiles.modular.dictexpand.service.IDictExpandService; import com.casic.missiles.modular.enums.CaseStateEnum; import com.casic.missiles.modular.enums.SourceEnum; import com.casic.missiles.modular.flowable.dto.ProcessDto; import com.casic.missiles.modular.flowable.service.ICaseFlowService; import com.casic.missiles.modular.system.model.Area; -import com.casic.missiles.modular.system.model.Dict; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import sun.rmi.runtime.Log; -import java.io.Console; import java.math.BigDecimal; import java.text.DecimalFormat; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.Date; +import java.util.List; +import java.util.Map; /** *
diff --git a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/service/impl/CaseFlowServiceImpl.java b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/service/impl/CaseFlowServiceImpl.java
index 133727f..91e9e89 100644
--- a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/service/impl/CaseFlowServiceImpl.java
+++ b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/service/impl/CaseFlowServiceImpl.java
@@ -10,7 +10,6 @@
import com.casic.missiles.modular.flowable.dto.ProcessDto;
import com.casic.missiles.modular.flowable.service.IBmsSuportService;
import com.casic.missiles.modular.flowable.service.ICaseFlowService;
-import com.casic.missiles.modular.flowable.service.handler.BizCaseFlowHandler;
import com.casic.missiles.modular.flowable.util.BizFlowUtil;
import com.casic.missiles.modular.flowable.util.FlowUserFactory;
import org.slf4j.Logger;
@@ -41,8 +40,11 @@
@Autowired
private IBmsSuportService caseSuportService;
+ /**
+ * 默认阶段时限
+ */
@Value("${casic.case.defaultLimitTime:120}")
- private Integer defaultLimitTime;//默认阶段时限
+ private Integer defaultLimitTime;
/**
* 启动案卷流程
diff --git a/casic-service-cws/pom.xml b/casic-service-cws/pom.xml
index fa94be4..d071b3e 100644
--- a/casic-service-cws/pom.xml
+++ b/casic-service-cws/pom.xml
@@ -72,7 +72,6 @@