diff --git a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/service/handler/BizCaseFlowHandler.java b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/service/handler/BizCaseFlowHandler.java index c9ef85d..984e34d 100644 --- a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/service/handler/BizCaseFlowHandler.java +++ b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/service/handler/BizCaseFlowHandler.java @@ -49,6 +49,7 @@ * * @param dto */ + @Override @Transactional public void processBiz(ProcessDcmsDto dto) throws ParseException { if (states == null) { @@ -64,7 +65,6 @@ flowNodeHandler.nodeBizProcess(dto); } - //案件处置中的 状态不发生变更 延期及缓办同意发生节点时间变更 flowBizService.updateCwsNodeLimitTime(dto); diff --git a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/service/handler/BizCaseFlowHandler.java b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/service/handler/BizCaseFlowHandler.java index c9ef85d..984e34d 100644 --- a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/service/handler/BizCaseFlowHandler.java +++ b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/service/handler/BizCaseFlowHandler.java @@ -49,6 +49,7 @@ * * @param dto */ + @Override @Transactional public void processBiz(ProcessDcmsDto dto) throws ParseException { if (states == null) { @@ -64,7 +65,6 @@ flowNodeHandler.nodeBizProcess(dto); } - //案件处置中的 状态不发生变更 延期及缓办同意发生节点时间变更 flowBizService.updateCwsNodeLimitTime(dto); 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 67fa946..13c400b 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 @@ -43,6 +43,8 @@ //默认阶段时限 @Value("${casic.case.defaultLimitTime:120}") private Integer defaultLimitTime; + @Value("${casic.admin.id}") + private Long defaultAdminId; /** * 核实操作处理 @@ -78,7 +80,11 @@ public void updateCwsNodeLimitTime(ProcessDcmsDto dto) throws ParseException { //更新历史节点状态 logger.info("更新节点状态:" + dto.getCurrState() + " 案卷ID:" + dto.getBizId()); - SqlRunner.db().update("UPDATE DCM_CWS_CASE SET PRE_STATE = CASE_STATE WHERE ID = {0} ", dto.getBizId()); + Long defaultUserId = service.getCurrLoginUser().getId(); + if (defaultUserId == null) { + defaultUserId = defaultAdminId; + } + SqlRunner.db().update("UPDATE DCM_CWS_CASE SET PRE_STATE = {0},PRE_OPERATOR = {1} WHERE ID = {2} ", new Object[]{dto.getCurrState(), defaultUserId, dto.getBizId()}); DictExpand dictExpand = caseSuportService.selectDictExpandByDictCode("caseState", String.valueOf(dto.getChangeState())); Integer limitTime = defaultLimitTime; diff --git a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/service/handler/BizCaseFlowHandler.java b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/service/handler/BizCaseFlowHandler.java index c9ef85d..984e34d 100644 --- a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/service/handler/BizCaseFlowHandler.java +++ b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/service/handler/BizCaseFlowHandler.java @@ -49,6 +49,7 @@ * * @param dto */ + @Override @Transactional public void processBiz(ProcessDcmsDto dto) throws ParseException { if (states == null) { @@ -64,7 +65,6 @@ flowNodeHandler.nodeBizProcess(dto); } - //案件处置中的 状态不发生变更 延期及缓办同意发生节点时间变更 flowBizService.updateCwsNodeLimitTime(dto); 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 67fa946..13c400b 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 @@ -43,6 +43,8 @@ //默认阶段时限 @Value("${casic.case.defaultLimitTime:120}") private Integer defaultLimitTime; + @Value("${casic.admin.id}") + private Long defaultAdminId; /** * 核实操作处理 @@ -78,7 +80,11 @@ public void updateCwsNodeLimitTime(ProcessDcmsDto dto) throws ParseException { //更新历史节点状态 logger.info("更新节点状态:" + dto.getCurrState() + " 案卷ID:" + dto.getBizId()); - SqlRunner.db().update("UPDATE DCM_CWS_CASE SET PRE_STATE = CASE_STATE WHERE ID = {0} ", dto.getBizId()); + Long defaultUserId = service.getCurrLoginUser().getId(); + if (defaultUserId == null) { + defaultUserId = defaultAdminId; + } + SqlRunner.db().update("UPDATE DCM_CWS_CASE SET PRE_STATE = {0},PRE_OPERATOR = {1} WHERE ID = {2} ", new Object[]{dto.getCurrState(), defaultUserId, dto.getBizId()}); DictExpand dictExpand = caseSuportService.selectDictExpandByDictCode("caseState", String.valueOf(dto.getChangeState())); Integer limitTime = defaultLimitTime; diff --git a/casic-service-support/src/main/java/com/casic/missiles/modular/cwscase/model/CwsCase.java b/casic-service-support/src/main/java/com/casic/missiles/modular/cwscase/model/CwsCase.java index 7a45e99..06e1d5a 100644 --- a/casic-service-support/src/main/java/com/casic/missiles/modular/cwscase/model/CwsCase.java +++ b/casic-service-support/src/main/java/com/casic/missiles/modular/cwscase/model/CwsCase.java @@ -29,7 +29,7 @@ /** * 主键 */ - @TableId(value = "ID",type= IdType.ID_WORKER) + @TableId(value = "ID", type = IdType.ID_WORKER) private Long id; /** @@ -260,11 +260,19 @@ private String punishImage; @TableField("PUNISH_TIME") private Timestamp punishTime; + + /** + * 前一流程节点操作人 + */ + @TableField("PRE_OPERATOR") + private Long preOperator; + /** * 上一流程操作状态 判定节点操作是否可撤销 */ @TableField("PRE_STATE") private String preState; + @Override protected Serializable pkVal() { return this.id;