diff --git a/casic-service-cws/casic-cws-flow/pom.xml b/casic-service-cws/casic-cws-flow/pom.xml index 702d320..63571a1 100644 --- a/casic-service-cws/casic-cws-flow/pom.xml +++ b/casic-service-cws/casic-cws-flow/pom.xml @@ -28,6 +28,11 @@ com.casic + casic-flow-node + ${extension.version} + + + com.casic casic-admin-support ${admin.version} diff --git a/casic-service-cws/casic-cws-flow/pom.xml b/casic-service-cws/casic-cws-flow/pom.xml index 702d320..63571a1 100644 --- a/casic-service-cws/casic-cws-flow/pom.xml +++ b/casic-service-cws/casic-cws-flow/pom.xml @@ -28,6 +28,11 @@ com.casic + casic-flow-node + ${extension.version} + + + com.casic casic-admin-support ${admin.version} diff --git a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/dto/ProcessRecord.java b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/dto/ProcessRecord.java index cc05902..41d834c 100644 --- a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/dto/ProcessRecord.java +++ b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/dto/ProcessRecord.java @@ -7,7 +7,10 @@ */ @Data public class ProcessRecord { - private String operationTypeName;//操作 + /** + * 操作 + */ + private String operationTypeName; private String userName;//用户名称 private String userId;//用户ID private String remarks;//备注 diff --git a/casic-service-cws/casic-cws-flow/pom.xml b/casic-service-cws/casic-cws-flow/pom.xml index 702d320..63571a1 100644 --- a/casic-service-cws/casic-cws-flow/pom.xml +++ b/casic-service-cws/casic-cws-flow/pom.xml @@ -28,6 +28,11 @@ com.casic + casic-flow-node + ${extension.version} + + + com.casic casic-admin-support ${admin.version} diff --git a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/dto/ProcessRecord.java b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/dto/ProcessRecord.java index cc05902..41d834c 100644 --- a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/dto/ProcessRecord.java +++ b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/dto/ProcessRecord.java @@ -7,7 +7,10 @@ */ @Data public class ProcessRecord { - private String operationTypeName;//操作 + /** + * 操作 + */ + private String operationTypeName; private String userName;//用户名称 private String userId;//用户ID private String remarks;//备注 diff --git a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/controller/ProcessController.java b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/controller/ProcessController.java index 29979f0..0893be1 100644 --- a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/controller/ProcessController.java +++ b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/controller/ProcessController.java @@ -15,7 +15,7 @@ import com.casic.missiles.modular.flowable.dto.ProcessDcmsDto; import com.casic.missiles.modular.flowable.service.ICaseFlowService; import com.casic.missiles.modular.flowable.service.ICwsSuportService; -import com.casic.missiles.modular.flowable.service.IFlowNextnodeService; +import com.casic.missiles.modular.system.service.IFlowNextnodeService; import org.flowable.bpmn.model.BpmnModel; import org.flowable.engine.*; import org.flowable.engine.history.HistoricActivityInstance; diff --git a/casic-service-cws/casic-cws-flow/pom.xml b/casic-service-cws/casic-cws-flow/pom.xml index 702d320..63571a1 100644 --- a/casic-service-cws/casic-cws-flow/pom.xml +++ b/casic-service-cws/casic-cws-flow/pom.xml @@ -28,6 +28,11 @@ com.casic + casic-flow-node + ${extension.version} + + + com.casic casic-admin-support ${admin.version} diff --git a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/dto/ProcessRecord.java b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/dto/ProcessRecord.java index cc05902..41d834c 100644 --- a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/dto/ProcessRecord.java +++ b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/dto/ProcessRecord.java @@ -7,7 +7,10 @@ */ @Data public class ProcessRecord { - private String operationTypeName;//操作 + /** + * 操作 + */ + private String operationTypeName; private String userName;//用户名称 private String userId;//用户ID private String remarks;//备注 diff --git a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/controller/ProcessController.java b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/controller/ProcessController.java index 29979f0..0893be1 100644 --- a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/controller/ProcessController.java +++ b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/controller/ProcessController.java @@ -15,7 +15,7 @@ import com.casic.missiles.modular.flowable.dto.ProcessDcmsDto; import com.casic.missiles.modular.flowable.service.ICaseFlowService; import com.casic.missiles.modular.flowable.service.ICwsSuportService; -import com.casic.missiles.modular.flowable.service.IFlowNextnodeService; +import com.casic.missiles.modular.system.service.IFlowNextnodeService; import org.flowable.bpmn.model.BpmnModel; import org.flowable.engine.*; import org.flowable.engine.history.HistoricActivityInstance; diff --git a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/service/IFlowNextnodeService.java b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/service/IFlowNextnodeService.java deleted file mode 100644 index 48b9792..0000000 --- a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/service/IFlowNextnodeService.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.casic.missiles.modular.flowable.service; - -import com.casic.missiles.modular.system.model.FlowNextnode; -import com.baomidou.mybatisplus.service.IService; - -import java.io.Serializable; -import java.util.List; - -/** - *

- * 下级流程节点状态 服务类 - *

- * - * @author lwh123 - * @since 2019-10-09 - */ -public interface IFlowNextnodeService extends IService { - - /** - * 根据当前状态 获取下级节点流向 - * @param state - * @return - */ - List getFlowNextnodesByCurrState(Serializable state); - -} diff --git a/casic-service-cws/casic-cws-flow/pom.xml b/casic-service-cws/casic-cws-flow/pom.xml index 702d320..63571a1 100644 --- a/casic-service-cws/casic-cws-flow/pom.xml +++ b/casic-service-cws/casic-cws-flow/pom.xml @@ -28,6 +28,11 @@ com.casic + casic-flow-node + ${extension.version} + + + com.casic casic-admin-support ${admin.version} diff --git a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/dto/ProcessRecord.java b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/dto/ProcessRecord.java index cc05902..41d834c 100644 --- a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/dto/ProcessRecord.java +++ b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/dto/ProcessRecord.java @@ -7,7 +7,10 @@ */ @Data public class ProcessRecord { - private String operationTypeName;//操作 + /** + * 操作 + */ + private String operationTypeName; private String userName;//用户名称 private String userId;//用户ID private String remarks;//备注 diff --git a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/controller/ProcessController.java b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/controller/ProcessController.java index 29979f0..0893be1 100644 --- a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/controller/ProcessController.java +++ b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/controller/ProcessController.java @@ -15,7 +15,7 @@ import com.casic.missiles.modular.flowable.dto.ProcessDcmsDto; import com.casic.missiles.modular.flowable.service.ICaseFlowService; import com.casic.missiles.modular.flowable.service.ICwsSuportService; -import com.casic.missiles.modular.flowable.service.IFlowNextnodeService; +import com.casic.missiles.modular.system.service.IFlowNextnodeService; import org.flowable.bpmn.model.BpmnModel; import org.flowable.engine.*; import org.flowable.engine.history.HistoricActivityInstance; diff --git a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/service/IFlowNextnodeService.java b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/service/IFlowNextnodeService.java deleted file mode 100644 index 48b9792..0000000 --- a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/service/IFlowNextnodeService.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.casic.missiles.modular.flowable.service; - -import com.casic.missiles.modular.system.model.FlowNextnode; -import com.baomidou.mybatisplus.service.IService; - -import java.io.Serializable; -import java.util.List; - -/** - *

- * 下级流程节点状态 服务类 - *

- * - * @author lwh123 - * @since 2019-10-09 - */ -public interface IFlowNextnodeService extends IService { - - /** - * 根据当前状态 获取下级节点流向 - * @param state - * @return - */ - List getFlowNextnodesByCurrState(Serializable state); - -} diff --git a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/service/impl/FlowNextnodeServiceImpl.java b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/service/impl/FlowNextnodeServiceImpl.java deleted file mode 100644 index b2f8c67..0000000 --- a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/service/impl/FlowNextnodeServiceImpl.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.casic.missiles.modular.flowable.service.impl; - -import com.baomidou.mybatisplus.mapper.EntityWrapper; -import com.casic.missiles.modular.system.model.FlowNextnode; -import com.casic.missiles.modular.system.dao.FlowNextnodeMapper; -import com.casic.missiles.modular.flowable.service.IFlowNextnodeService; -import com.baomidou.mybatisplus.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; - -import java.io.Serializable; -import java.util.List; - -/** - *

- * 下级流程节点状态 服务实现类 - *

- * - * @author lwh123 - * @since 2019-10-09 - */ -@Service -public class FlowNextnodeServiceImpl extends ServiceImpl implements IFlowNextnodeService { - - @Override - public List getFlowNextnodesByCurrState(Serializable state) { - EntityWrapper query = new EntityWrapper<>(); - query.eq("STATE", state); - return this.baseMapper.selectList(query); - } -} diff --git a/casic-service-cws/casic-cws-flow/pom.xml b/casic-service-cws/casic-cws-flow/pom.xml index 702d320..63571a1 100644 --- a/casic-service-cws/casic-cws-flow/pom.xml +++ b/casic-service-cws/casic-cws-flow/pom.xml @@ -28,6 +28,11 @@ com.casic + casic-flow-node + ${extension.version} + + + com.casic casic-admin-support ${admin.version} diff --git a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/dto/ProcessRecord.java b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/dto/ProcessRecord.java index cc05902..41d834c 100644 --- a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/dto/ProcessRecord.java +++ b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/dto/ProcessRecord.java @@ -7,7 +7,10 @@ */ @Data public class ProcessRecord { - private String operationTypeName;//操作 + /** + * 操作 + */ + private String operationTypeName; private String userName;//用户名称 private String userId;//用户ID private String remarks;//备注 diff --git a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/controller/ProcessController.java b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/controller/ProcessController.java index 29979f0..0893be1 100644 --- a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/controller/ProcessController.java +++ b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/controller/ProcessController.java @@ -15,7 +15,7 @@ import com.casic.missiles.modular.flowable.dto.ProcessDcmsDto; import com.casic.missiles.modular.flowable.service.ICaseFlowService; import com.casic.missiles.modular.flowable.service.ICwsSuportService; -import com.casic.missiles.modular.flowable.service.IFlowNextnodeService; +import com.casic.missiles.modular.system.service.IFlowNextnodeService; import org.flowable.bpmn.model.BpmnModel; import org.flowable.engine.*; import org.flowable.engine.history.HistoricActivityInstance; diff --git a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/service/IFlowNextnodeService.java b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/service/IFlowNextnodeService.java deleted file mode 100644 index 48b9792..0000000 --- a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/service/IFlowNextnodeService.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.casic.missiles.modular.flowable.service; - -import com.casic.missiles.modular.system.model.FlowNextnode; -import com.baomidou.mybatisplus.service.IService; - -import java.io.Serializable; -import java.util.List; - -/** - *

- * 下级流程节点状态 服务类 - *

- * - * @author lwh123 - * @since 2019-10-09 - */ -public interface IFlowNextnodeService extends IService { - - /** - * 根据当前状态 获取下级节点流向 - * @param state - * @return - */ - List getFlowNextnodesByCurrState(Serializable state); - -} diff --git a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/service/impl/FlowNextnodeServiceImpl.java b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/service/impl/FlowNextnodeServiceImpl.java deleted file mode 100644 index b2f8c67..0000000 --- a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/service/impl/FlowNextnodeServiceImpl.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.casic.missiles.modular.flowable.service.impl; - -import com.baomidou.mybatisplus.mapper.EntityWrapper; -import com.casic.missiles.modular.system.model.FlowNextnode; -import com.casic.missiles.modular.system.dao.FlowNextnodeMapper; -import com.casic.missiles.modular.flowable.service.IFlowNextnodeService; -import com.baomidou.mybatisplus.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; - -import java.io.Serializable; -import java.util.List; - -/** - *

- * 下级流程节点状态 服务实现类 - *

- * - * @author lwh123 - * @since 2019-10-09 - */ -@Service -public class FlowNextnodeServiceImpl extends ServiceImpl implements IFlowNextnodeService { - - @Override - public List getFlowNextnodesByCurrState(Serializable state) { - EntityWrapper query = new EntityWrapper<>(); - query.eq("STATE", state); - return this.baseMapper.selectList(query); - } -} diff --git a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/util/BizFlowUtil.java b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/util/BizFlowUtil.java index be9fe8e..7eba9ed 100644 --- a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/util/BizFlowUtil.java +++ b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/util/BizFlowUtil.java @@ -2,13 +2,15 @@ import com.alibaba.fastjson.JSON; +import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.casic.missiles.core.common.exception.BizExceptionEnum; import com.casic.missiles.core.exception.GunsException; import com.casic.missiles.core.util.SpringContextHolder; import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.flowable.dto.ProcessDcmsDto; -import com.casic.missiles.modular.flowable.service.IFlowNextnodeService; +import com.casic.missiles.modular.system.constant.FlowNodeConstant; import com.casic.missiles.modular.system.model.FlowNextnode; +import com.casic.missiles.modular.system.service.IFlowNextnodeService; import org.flowable.engine.history.HistoricActivityInstance; import org.flowable.task.api.Task; @@ -42,7 +44,9 @@ IFlowNextnodeService flowNextnodeService = SpringContextHolder.getBean(IFlowNextnodeService.class); String operationType = ""; boolean isExist = false; - List flowNextnodes = flowNextnodeService.getFlowNextnodesByCurrState(dto.getCurrState()); + EntityWrapper query = new EntityWrapper<>(); + query.eq(FlowNodeConstant.STATE, dto.getCurrState()); + List flowNextnodes = flowNextnodeService.getFlowNextnodesByCurrState(query); for (FlowNextnode flowNextnode : flowNextnodes) { if (flowNextnode.getNextState().equals(dto.getChangeState())) { if (ToolUtil.isNotEmpty(dto.getApprovalResult())) { diff --git a/casic-service-cws/casic-cws-flow/pom.xml b/casic-service-cws/casic-cws-flow/pom.xml index 702d320..63571a1 100644 --- a/casic-service-cws/casic-cws-flow/pom.xml +++ b/casic-service-cws/casic-cws-flow/pom.xml @@ -28,6 +28,11 @@ com.casic + casic-flow-node + ${extension.version} + + + com.casic casic-admin-support ${admin.version} diff --git a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/dto/ProcessRecord.java b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/dto/ProcessRecord.java index cc05902..41d834c 100644 --- a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/dto/ProcessRecord.java +++ b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/dto/ProcessRecord.java @@ -7,7 +7,10 @@ */ @Data public class ProcessRecord { - private String operationTypeName;//操作 + /** + * 操作 + */ + private String operationTypeName; private String userName;//用户名称 private String userId;//用户ID private String remarks;//备注 diff --git a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/controller/ProcessController.java b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/controller/ProcessController.java index 29979f0..0893be1 100644 --- a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/controller/ProcessController.java +++ b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/controller/ProcessController.java @@ -15,7 +15,7 @@ import com.casic.missiles.modular.flowable.dto.ProcessDcmsDto; import com.casic.missiles.modular.flowable.service.ICaseFlowService; import com.casic.missiles.modular.flowable.service.ICwsSuportService; -import com.casic.missiles.modular.flowable.service.IFlowNextnodeService; +import com.casic.missiles.modular.system.service.IFlowNextnodeService; import org.flowable.bpmn.model.BpmnModel; import org.flowable.engine.*; import org.flowable.engine.history.HistoricActivityInstance; diff --git a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/service/IFlowNextnodeService.java b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/service/IFlowNextnodeService.java deleted file mode 100644 index 48b9792..0000000 --- a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/service/IFlowNextnodeService.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.casic.missiles.modular.flowable.service; - -import com.casic.missiles.modular.system.model.FlowNextnode; -import com.baomidou.mybatisplus.service.IService; - -import java.io.Serializable; -import java.util.List; - -/** - *

- * 下级流程节点状态 服务类 - *

- * - * @author lwh123 - * @since 2019-10-09 - */ -public interface IFlowNextnodeService extends IService { - - /** - * 根据当前状态 获取下级节点流向 - * @param state - * @return - */ - List getFlowNextnodesByCurrState(Serializable state); - -} diff --git a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/service/impl/FlowNextnodeServiceImpl.java b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/service/impl/FlowNextnodeServiceImpl.java deleted file mode 100644 index b2f8c67..0000000 --- a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/service/impl/FlowNextnodeServiceImpl.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.casic.missiles.modular.flowable.service.impl; - -import com.baomidou.mybatisplus.mapper.EntityWrapper; -import com.casic.missiles.modular.system.model.FlowNextnode; -import com.casic.missiles.modular.system.dao.FlowNextnodeMapper; -import com.casic.missiles.modular.flowable.service.IFlowNextnodeService; -import com.baomidou.mybatisplus.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; - -import java.io.Serializable; -import java.util.List; - -/** - *

- * 下级流程节点状态 服务实现类 - *

- * - * @author lwh123 - * @since 2019-10-09 - */ -@Service -public class FlowNextnodeServiceImpl extends ServiceImpl implements IFlowNextnodeService { - - @Override - public List getFlowNextnodesByCurrState(Serializable state) { - EntityWrapper query = new EntityWrapper<>(); - query.eq("STATE", state); - return this.baseMapper.selectList(query); - } -} diff --git a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/util/BizFlowUtil.java b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/util/BizFlowUtil.java index be9fe8e..7eba9ed 100644 --- a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/util/BizFlowUtil.java +++ b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/util/BizFlowUtil.java @@ -2,13 +2,15 @@ import com.alibaba.fastjson.JSON; +import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.casic.missiles.core.common.exception.BizExceptionEnum; import com.casic.missiles.core.exception.GunsException; import com.casic.missiles.core.util.SpringContextHolder; import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.flowable.dto.ProcessDcmsDto; -import com.casic.missiles.modular.flowable.service.IFlowNextnodeService; +import com.casic.missiles.modular.system.constant.FlowNodeConstant; import com.casic.missiles.modular.system.model.FlowNextnode; +import com.casic.missiles.modular.system.service.IFlowNextnodeService; import org.flowable.engine.history.HistoricActivityInstance; import org.flowable.task.api.Task; @@ -42,7 +44,9 @@ IFlowNextnodeService flowNextnodeService = SpringContextHolder.getBean(IFlowNextnodeService.class); String operationType = ""; boolean isExist = false; - List flowNextnodes = flowNextnodeService.getFlowNextnodesByCurrState(dto.getCurrState()); + EntityWrapper query = new EntityWrapper<>(); + query.eq(FlowNodeConstant.STATE, dto.getCurrState()); + List flowNextnodes = flowNextnodeService.getFlowNextnodesByCurrState(query); for (FlowNextnode flowNextnode : flowNextnodes) { if (flowNextnode.getNextState().equals(dto.getChangeState())) { if (ToolUtil.isNotEmpty(dto.getApprovalResult())) { diff --git a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/system/dao/FlowNextnodeMapper.java b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/system/dao/FlowNextnodeMapper.java deleted file mode 100644 index 5664ff6..0000000 --- a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/system/dao/FlowNextnodeMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.missiles.modular.system.dao; - -import com.casic.missiles.modular.system.model.FlowNextnode; -import com.baomidou.mybatisplus.mapper.BaseMapper; - -/** - *

- * 下级流程节点状态 Mapper 接口 - *

- * - * @author lwh123 - * @since 2019-10-09 - */ -public interface FlowNextnodeMapper extends BaseMapper { - -} diff --git a/casic-service-cws/casic-cws-flow/pom.xml b/casic-service-cws/casic-cws-flow/pom.xml index 702d320..63571a1 100644 --- a/casic-service-cws/casic-cws-flow/pom.xml +++ b/casic-service-cws/casic-cws-flow/pom.xml @@ -28,6 +28,11 @@ com.casic + casic-flow-node + ${extension.version} + + + com.casic casic-admin-support ${admin.version} diff --git a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/dto/ProcessRecord.java b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/dto/ProcessRecord.java index cc05902..41d834c 100644 --- a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/dto/ProcessRecord.java +++ b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/dto/ProcessRecord.java @@ -7,7 +7,10 @@ */ @Data public class ProcessRecord { - private String operationTypeName;//操作 + /** + * 操作 + */ + private String operationTypeName; private String userName;//用户名称 private String userId;//用户ID private String remarks;//备注 diff --git a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/controller/ProcessController.java b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/controller/ProcessController.java index 29979f0..0893be1 100644 --- a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/controller/ProcessController.java +++ b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/controller/ProcessController.java @@ -15,7 +15,7 @@ import com.casic.missiles.modular.flowable.dto.ProcessDcmsDto; import com.casic.missiles.modular.flowable.service.ICaseFlowService; import com.casic.missiles.modular.flowable.service.ICwsSuportService; -import com.casic.missiles.modular.flowable.service.IFlowNextnodeService; +import com.casic.missiles.modular.system.service.IFlowNextnodeService; import org.flowable.bpmn.model.BpmnModel; import org.flowable.engine.*; import org.flowable.engine.history.HistoricActivityInstance; diff --git a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/service/IFlowNextnodeService.java b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/service/IFlowNextnodeService.java deleted file mode 100644 index 48b9792..0000000 --- a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/service/IFlowNextnodeService.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.casic.missiles.modular.flowable.service; - -import com.casic.missiles.modular.system.model.FlowNextnode; -import com.baomidou.mybatisplus.service.IService; - -import java.io.Serializable; -import java.util.List; - -/** - *

- * 下级流程节点状态 服务类 - *

- * - * @author lwh123 - * @since 2019-10-09 - */ -public interface IFlowNextnodeService extends IService { - - /** - * 根据当前状态 获取下级节点流向 - * @param state - * @return - */ - List getFlowNextnodesByCurrState(Serializable state); - -} diff --git a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/service/impl/FlowNextnodeServiceImpl.java b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/service/impl/FlowNextnodeServiceImpl.java deleted file mode 100644 index b2f8c67..0000000 --- a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/service/impl/FlowNextnodeServiceImpl.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.casic.missiles.modular.flowable.service.impl; - -import com.baomidou.mybatisplus.mapper.EntityWrapper; -import com.casic.missiles.modular.system.model.FlowNextnode; -import com.casic.missiles.modular.system.dao.FlowNextnodeMapper; -import com.casic.missiles.modular.flowable.service.IFlowNextnodeService; -import com.baomidou.mybatisplus.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; - -import java.io.Serializable; -import java.util.List; - -/** - *

- * 下级流程节点状态 服务实现类 - *

- * - * @author lwh123 - * @since 2019-10-09 - */ -@Service -public class FlowNextnodeServiceImpl extends ServiceImpl implements IFlowNextnodeService { - - @Override - public List getFlowNextnodesByCurrState(Serializable state) { - EntityWrapper query = new EntityWrapper<>(); - query.eq("STATE", state); - return this.baseMapper.selectList(query); - } -} diff --git a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/util/BizFlowUtil.java b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/util/BizFlowUtil.java index be9fe8e..7eba9ed 100644 --- a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/util/BizFlowUtil.java +++ b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/util/BizFlowUtil.java @@ -2,13 +2,15 @@ import com.alibaba.fastjson.JSON; +import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.casic.missiles.core.common.exception.BizExceptionEnum; import com.casic.missiles.core.exception.GunsException; import com.casic.missiles.core.util.SpringContextHolder; import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.flowable.dto.ProcessDcmsDto; -import com.casic.missiles.modular.flowable.service.IFlowNextnodeService; +import com.casic.missiles.modular.system.constant.FlowNodeConstant; import com.casic.missiles.modular.system.model.FlowNextnode; +import com.casic.missiles.modular.system.service.IFlowNextnodeService; import org.flowable.engine.history.HistoricActivityInstance; import org.flowable.task.api.Task; @@ -42,7 +44,9 @@ IFlowNextnodeService flowNextnodeService = SpringContextHolder.getBean(IFlowNextnodeService.class); String operationType = ""; boolean isExist = false; - List flowNextnodes = flowNextnodeService.getFlowNextnodesByCurrState(dto.getCurrState()); + EntityWrapper query = new EntityWrapper<>(); + query.eq(FlowNodeConstant.STATE, dto.getCurrState()); + List flowNextnodes = flowNextnodeService.getFlowNextnodesByCurrState(query); for (FlowNextnode flowNextnode : flowNextnodes) { if (flowNextnode.getNextState().equals(dto.getChangeState())) { if (ToolUtil.isNotEmpty(dto.getApprovalResult())) { diff --git a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/system/dao/FlowNextnodeMapper.java b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/system/dao/FlowNextnodeMapper.java deleted file mode 100644 index 5664ff6..0000000 --- a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/system/dao/FlowNextnodeMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.missiles.modular.system.dao; - -import com.casic.missiles.modular.system.model.FlowNextnode; -import com.baomidou.mybatisplus.mapper.BaseMapper; - -/** - *

- * 下级流程节点状态 Mapper 接口 - *

- * - * @author lwh123 - * @since 2019-10-09 - */ -public interface FlowNextnodeMapper extends BaseMapper { - -} diff --git a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/system/dao/mapping/FlowNextnodeMapper.xml b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/system/dao/mapping/FlowNextnodeMapper.xml deleted file mode 100644 index eb8650f..0000000 --- a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/system/dao/mapping/FlowNextnodeMapper.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - ID AS id, STATE AS state, OPERATION AS operation, CURR_TASK AS currTask, NEXT_STATE AS nextState, NEXT_OPERATION AS nextOperation, APPROVAL_RESULT AS approvalResult - - - diff --git a/casic-service-cws/casic-cws-flow/pom.xml b/casic-service-cws/casic-cws-flow/pom.xml index 702d320..63571a1 100644 --- a/casic-service-cws/casic-cws-flow/pom.xml +++ b/casic-service-cws/casic-cws-flow/pom.xml @@ -28,6 +28,11 @@ com.casic + casic-flow-node + ${extension.version} + + + com.casic casic-admin-support ${admin.version} diff --git a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/dto/ProcessRecord.java b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/dto/ProcessRecord.java index cc05902..41d834c 100644 --- a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/dto/ProcessRecord.java +++ b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/dto/ProcessRecord.java @@ -7,7 +7,10 @@ */ @Data public class ProcessRecord { - private String operationTypeName;//操作 + /** + * 操作 + */ + private String operationTypeName; private String userName;//用户名称 private String userId;//用户ID private String remarks;//备注 diff --git a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/controller/ProcessController.java b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/controller/ProcessController.java index 29979f0..0893be1 100644 --- a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/controller/ProcessController.java +++ b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/controller/ProcessController.java @@ -15,7 +15,7 @@ import com.casic.missiles.modular.flowable.dto.ProcessDcmsDto; import com.casic.missiles.modular.flowable.service.ICaseFlowService; import com.casic.missiles.modular.flowable.service.ICwsSuportService; -import com.casic.missiles.modular.flowable.service.IFlowNextnodeService; +import com.casic.missiles.modular.system.service.IFlowNextnodeService; import org.flowable.bpmn.model.BpmnModel; import org.flowable.engine.*; import org.flowable.engine.history.HistoricActivityInstance; diff --git a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/service/IFlowNextnodeService.java b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/service/IFlowNextnodeService.java deleted file mode 100644 index 48b9792..0000000 --- a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/service/IFlowNextnodeService.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.casic.missiles.modular.flowable.service; - -import com.casic.missiles.modular.system.model.FlowNextnode; -import com.baomidou.mybatisplus.service.IService; - -import java.io.Serializable; -import java.util.List; - -/** - *

- * 下级流程节点状态 服务类 - *

- * - * @author lwh123 - * @since 2019-10-09 - */ -public interface IFlowNextnodeService extends IService { - - /** - * 根据当前状态 获取下级节点流向 - * @param state - * @return - */ - List getFlowNextnodesByCurrState(Serializable state); - -} diff --git a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/service/impl/FlowNextnodeServiceImpl.java b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/service/impl/FlowNextnodeServiceImpl.java deleted file mode 100644 index b2f8c67..0000000 --- a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/service/impl/FlowNextnodeServiceImpl.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.casic.missiles.modular.flowable.service.impl; - -import com.baomidou.mybatisplus.mapper.EntityWrapper; -import com.casic.missiles.modular.system.model.FlowNextnode; -import com.casic.missiles.modular.system.dao.FlowNextnodeMapper; -import com.casic.missiles.modular.flowable.service.IFlowNextnodeService; -import com.baomidou.mybatisplus.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; - -import java.io.Serializable; -import java.util.List; - -/** - *

- * 下级流程节点状态 服务实现类 - *

- * - * @author lwh123 - * @since 2019-10-09 - */ -@Service -public class FlowNextnodeServiceImpl extends ServiceImpl implements IFlowNextnodeService { - - @Override - public List getFlowNextnodesByCurrState(Serializable state) { - EntityWrapper query = new EntityWrapper<>(); - query.eq("STATE", state); - return this.baseMapper.selectList(query); - } -} diff --git a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/util/BizFlowUtil.java b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/util/BizFlowUtil.java index be9fe8e..7eba9ed 100644 --- a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/util/BizFlowUtil.java +++ b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/util/BizFlowUtil.java @@ -2,13 +2,15 @@ import com.alibaba.fastjson.JSON; +import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.casic.missiles.core.common.exception.BizExceptionEnum; import com.casic.missiles.core.exception.GunsException; import com.casic.missiles.core.util.SpringContextHolder; import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.flowable.dto.ProcessDcmsDto; -import com.casic.missiles.modular.flowable.service.IFlowNextnodeService; +import com.casic.missiles.modular.system.constant.FlowNodeConstant; import com.casic.missiles.modular.system.model.FlowNextnode; +import com.casic.missiles.modular.system.service.IFlowNextnodeService; import org.flowable.engine.history.HistoricActivityInstance; import org.flowable.task.api.Task; @@ -42,7 +44,9 @@ IFlowNextnodeService flowNextnodeService = SpringContextHolder.getBean(IFlowNextnodeService.class); String operationType = ""; boolean isExist = false; - List flowNextnodes = flowNextnodeService.getFlowNextnodesByCurrState(dto.getCurrState()); + EntityWrapper query = new EntityWrapper<>(); + query.eq(FlowNodeConstant.STATE, dto.getCurrState()); + List flowNextnodes = flowNextnodeService.getFlowNextnodesByCurrState(query); for (FlowNextnode flowNextnode : flowNextnodes) { if (flowNextnode.getNextState().equals(dto.getChangeState())) { if (ToolUtil.isNotEmpty(dto.getApprovalResult())) { diff --git a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/system/dao/FlowNextnodeMapper.java b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/system/dao/FlowNextnodeMapper.java deleted file mode 100644 index 5664ff6..0000000 --- a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/system/dao/FlowNextnodeMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.missiles.modular.system.dao; - -import com.casic.missiles.modular.system.model.FlowNextnode; -import com.baomidou.mybatisplus.mapper.BaseMapper; - -/** - *

- * 下级流程节点状态 Mapper 接口 - *

- * - * @author lwh123 - * @since 2019-10-09 - */ -public interface FlowNextnodeMapper extends BaseMapper { - -} diff --git a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/system/dao/mapping/FlowNextnodeMapper.xml b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/system/dao/mapping/FlowNextnodeMapper.xml deleted file mode 100644 index eb8650f..0000000 --- a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/system/dao/mapping/FlowNextnodeMapper.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - ID AS id, STATE AS state, OPERATION AS operation, CURR_TASK AS currTask, NEXT_STATE AS nextState, NEXT_OPERATION AS nextOperation, APPROVAL_RESULT AS approvalResult - - - diff --git a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/system/model/FlowNextnode.java b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/system/model/FlowNextnode.java deleted file mode 100644 index 9d4bfe8..0000000 --- a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/system/model/FlowNextnode.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.casic.missiles.modular.system.model; - -import com.baomidou.mybatisplus.activerecord.Model; -import com.baomidou.mybatisplus.annotations.TableField; -import com.baomidou.mybatisplus.annotations.TableId; -import com.baomidou.mybatisplus.annotations.TableName; -import com.baomidou.mybatisplus.enums.IdType; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 下级流程节点状态 - *

- * - * @author lwh123 - * @since 2019-10-09 - */ -@Data -@TableName("dcm_flow_nextnode") -public class FlowNextnode extends Model { - - private static final long serialVersionUID = 1L; - - @TableId(value = "ID", type = IdType.ID_WORKER) - private Long id; - /** - * 状态 - */ - @TableField("STATE") - private Integer state; - /** - * 操作描述 - */ - @TableField("OPERATION") - private String operation; - @TableField("CURR_TASK") - private String currTask; - /** - * 下级流程节点状态 - */ - @TableField("NEXT_STATE") - private Integer nextState; - @TableField("NEXT_OPERATION") - private String nextOperation; - /** - * 节点处理结果(1 同意0 不同意) - */ - @TableField("APPROVAL_RESULT") - private String approvalResult; - @TableField("OPERATION_KEY") - private String operationKey; - @Override - protected Serializable pkVal() { - return this.id; - } - - @Override - public String toString() { - return "FlowNextnode{" + - "id=" + id + - ", state=" + state + - ", operation=" + operation + - ", currTask=" + currTask + - ", nextState=" + nextState + - ", nextOperation=" + nextOperation + - ", approvalResult=" + approvalResult + - "}"; - } -} diff --git a/casic-service-cws/casic-cws-flow/pom.xml b/casic-service-cws/casic-cws-flow/pom.xml index 702d320..63571a1 100644 --- a/casic-service-cws/casic-cws-flow/pom.xml +++ b/casic-service-cws/casic-cws-flow/pom.xml @@ -28,6 +28,11 @@ com.casic + casic-flow-node + ${extension.version} + + + com.casic casic-admin-support ${admin.version} diff --git a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/dto/ProcessRecord.java b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/dto/ProcessRecord.java index cc05902..41d834c 100644 --- a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/dto/ProcessRecord.java +++ b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/dto/ProcessRecord.java @@ -7,7 +7,10 @@ */ @Data public class ProcessRecord { - private String operationTypeName;//操作 + /** + * 操作 + */ + private String operationTypeName; private String userName;//用户名称 private String userId;//用户ID private String remarks;//备注 diff --git a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/controller/ProcessController.java b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/controller/ProcessController.java index 29979f0..0893be1 100644 --- a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/controller/ProcessController.java +++ b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/controller/ProcessController.java @@ -15,7 +15,7 @@ import com.casic.missiles.modular.flowable.dto.ProcessDcmsDto; import com.casic.missiles.modular.flowable.service.ICaseFlowService; import com.casic.missiles.modular.flowable.service.ICwsSuportService; -import com.casic.missiles.modular.flowable.service.IFlowNextnodeService; +import com.casic.missiles.modular.system.service.IFlowNextnodeService; import org.flowable.bpmn.model.BpmnModel; import org.flowable.engine.*; import org.flowable.engine.history.HistoricActivityInstance; diff --git a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/service/IFlowNextnodeService.java b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/service/IFlowNextnodeService.java deleted file mode 100644 index 48b9792..0000000 --- a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/service/IFlowNextnodeService.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.casic.missiles.modular.flowable.service; - -import com.casic.missiles.modular.system.model.FlowNextnode; -import com.baomidou.mybatisplus.service.IService; - -import java.io.Serializable; -import java.util.List; - -/** - *

- * 下级流程节点状态 服务类 - *

- * - * @author lwh123 - * @since 2019-10-09 - */ -public interface IFlowNextnodeService extends IService { - - /** - * 根据当前状态 获取下级节点流向 - * @param state - * @return - */ - List getFlowNextnodesByCurrState(Serializable state); - -} diff --git a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/service/impl/FlowNextnodeServiceImpl.java b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/service/impl/FlowNextnodeServiceImpl.java deleted file mode 100644 index b2f8c67..0000000 --- a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/service/impl/FlowNextnodeServiceImpl.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.casic.missiles.modular.flowable.service.impl; - -import com.baomidou.mybatisplus.mapper.EntityWrapper; -import com.casic.missiles.modular.system.model.FlowNextnode; -import com.casic.missiles.modular.system.dao.FlowNextnodeMapper; -import com.casic.missiles.modular.flowable.service.IFlowNextnodeService; -import com.baomidou.mybatisplus.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; - -import java.io.Serializable; -import java.util.List; - -/** - *

- * 下级流程节点状态 服务实现类 - *

- * - * @author lwh123 - * @since 2019-10-09 - */ -@Service -public class FlowNextnodeServiceImpl extends ServiceImpl implements IFlowNextnodeService { - - @Override - public List getFlowNextnodesByCurrState(Serializable state) { - EntityWrapper query = new EntityWrapper<>(); - query.eq("STATE", state); - return this.baseMapper.selectList(query); - } -} diff --git a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/util/BizFlowUtil.java b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/util/BizFlowUtil.java index be9fe8e..7eba9ed 100644 --- a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/util/BizFlowUtil.java +++ b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/util/BizFlowUtil.java @@ -2,13 +2,15 @@ import com.alibaba.fastjson.JSON; +import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.casic.missiles.core.common.exception.BizExceptionEnum; import com.casic.missiles.core.exception.GunsException; import com.casic.missiles.core.util.SpringContextHolder; import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.flowable.dto.ProcessDcmsDto; -import com.casic.missiles.modular.flowable.service.IFlowNextnodeService; +import com.casic.missiles.modular.system.constant.FlowNodeConstant; import com.casic.missiles.modular.system.model.FlowNextnode; +import com.casic.missiles.modular.system.service.IFlowNextnodeService; import org.flowable.engine.history.HistoricActivityInstance; import org.flowable.task.api.Task; @@ -42,7 +44,9 @@ IFlowNextnodeService flowNextnodeService = SpringContextHolder.getBean(IFlowNextnodeService.class); String operationType = ""; boolean isExist = false; - List flowNextnodes = flowNextnodeService.getFlowNextnodesByCurrState(dto.getCurrState()); + EntityWrapper query = new EntityWrapper<>(); + query.eq(FlowNodeConstant.STATE, dto.getCurrState()); + List flowNextnodes = flowNextnodeService.getFlowNextnodesByCurrState(query); for (FlowNextnode flowNextnode : flowNextnodes) { if (flowNextnode.getNextState().equals(dto.getChangeState())) { if (ToolUtil.isNotEmpty(dto.getApprovalResult())) { diff --git a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/system/dao/FlowNextnodeMapper.java b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/system/dao/FlowNextnodeMapper.java deleted file mode 100644 index 5664ff6..0000000 --- a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/system/dao/FlowNextnodeMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.missiles.modular.system.dao; - -import com.casic.missiles.modular.system.model.FlowNextnode; -import com.baomidou.mybatisplus.mapper.BaseMapper; - -/** - *

- * 下级流程节点状态 Mapper 接口 - *

- * - * @author lwh123 - * @since 2019-10-09 - */ -public interface FlowNextnodeMapper extends BaseMapper { - -} diff --git a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/system/dao/mapping/FlowNextnodeMapper.xml b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/system/dao/mapping/FlowNextnodeMapper.xml deleted file mode 100644 index eb8650f..0000000 --- a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/system/dao/mapping/FlowNextnodeMapper.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - ID AS id, STATE AS state, OPERATION AS operation, CURR_TASK AS currTask, NEXT_STATE AS nextState, NEXT_OPERATION AS nextOperation, APPROVAL_RESULT AS approvalResult - - - diff --git a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/system/model/FlowNextnode.java b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/system/model/FlowNextnode.java deleted file mode 100644 index 9d4bfe8..0000000 --- a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/system/model/FlowNextnode.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.casic.missiles.modular.system.model; - -import com.baomidou.mybatisplus.activerecord.Model; -import com.baomidou.mybatisplus.annotations.TableField; -import com.baomidou.mybatisplus.annotations.TableId; -import com.baomidou.mybatisplus.annotations.TableName; -import com.baomidou.mybatisplus.enums.IdType; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 下级流程节点状态 - *

- * - * @author lwh123 - * @since 2019-10-09 - */ -@Data -@TableName("dcm_flow_nextnode") -public class FlowNextnode extends Model { - - private static final long serialVersionUID = 1L; - - @TableId(value = "ID", type = IdType.ID_WORKER) - private Long id; - /** - * 状态 - */ - @TableField("STATE") - private Integer state; - /** - * 操作描述 - */ - @TableField("OPERATION") - private String operation; - @TableField("CURR_TASK") - private String currTask; - /** - * 下级流程节点状态 - */ - @TableField("NEXT_STATE") - private Integer nextState; - @TableField("NEXT_OPERATION") - private String nextOperation; - /** - * 节点处理结果(1 同意0 不同意) - */ - @TableField("APPROVAL_RESULT") - private String approvalResult; - @TableField("OPERATION_KEY") - private String operationKey; - @Override - protected Serializable pkVal() { - return this.id; - } - - @Override - public String toString() { - return "FlowNextnode{" + - "id=" + id + - ", state=" + state + - ", operation=" + operation + - ", currTask=" + currTask + - ", nextState=" + nextState + - ", nextOperation=" + nextOperation + - ", approvalResult=" + approvalResult + - "}"; - } -} diff --git a/casic-web/pom.xml b/casic-web/pom.xml index bf1e5ce..8d8e014 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -76,6 +76,11 @@ com.casic + casic-flowable-core + ${extension.version} + + + com.casic casic-admin-core ${admin.version}