diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/CwsCaseMapper.xml b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/CwsCaseMapper.xml index 6a891bb..8fbdfe3 100644 --- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/CwsCaseMapper.xml +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/CwsCaseMapper.xml @@ -461,6 +461,8 @@ a.LNG AS lng, a.LAT as lat, a.REPORT_TIME AS reportTime + a.PRE_STATE as preState, + a.PRE_OPERATOR as preOperator from completed_view a WHERE 1=1 diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/CwsCaseMapper.xml b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/CwsCaseMapper.xml index 6a891bb..8fbdfe3 100644 --- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/CwsCaseMapper.xml +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/CwsCaseMapper.xml @@ -461,6 +461,8 @@ a.LNG AS lng, a.LAT as lat, a.REPORT_TIME AS reportTime + a.PRE_STATE as preState, + a.PRE_OPERATOR as preOperator from completed_view a WHERE 1=1 diff --git a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/service/impl/IFlowBizServiceImpl.java b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/service/impl/IFlowBizServiceImpl.java index 13c400b..2832799 100644 --- a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/service/impl/IFlowBizServiceImpl.java +++ b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/service/impl/IFlowBizServiceImpl.java @@ -40,10 +40,13 @@ private IBmsSuportService caseSuportService; @Autowired private ICwsSuportService cwsSuportService; - //默认阶段时限 + + /** + * 默认阶段时限 + */ @Value("${casic.case.defaultLimitTime:120}") private Integer defaultLimitTime; - @Value("${casic.admin.id}") + @Value("${casic.admin.id:1}") private Long defaultAdminId; /**