优化

biz-base/src/test/java/TestAssets.java

@@ -1,11 +1,28 @@
-import java.lang.reflect.Field;
-
-public class TestAssets {
-
-
-
-
-    public static void main(String[] args) {
-        byte a = 5;
-    }
-}
+//import com.dayou.BaseApplication;
+//import com.dayou.service.IPersonalService;
+//import lombok.extern.slf4j.Slf4j;
+//import org.junit.Test;
+//import org.junit.runner.RunWith;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.boot.test.context.SpringBootTest;
+//import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+//
+//import java.lang.reflect.Field;
+//
+//@Slf4j
+//@SpringBootTest(classes = BaseApplication.class)
+//@RunWith(value = SpringJUnit4ClassRunner.class)
+//public class TestAssets {
+//
+//    @Autowired
+//    private IPersonalService personalService;
+//
+//
+//    @Test
+//    public void testInwardTurns(){
+//        Long inwardStaff = personalService.nextInwardStaff();
+//        System.out.println(inwardStaff);
+//    }
+//
+//
+//}

dao/src/main/java/com/dayou/mapper/WorkNodeMapper.java

@@ -21,5 +21,5 @@ public interface WorkNodeMapper extends CustomBaseMapper<WorkNode> {
 
     List<WorkNode> getNodesByMainBusiness(@Param("businessType") String businessType);
 
-    WorkNode getUniqueNodeByFlowNameAndNodeName(@Param("businessEnum")String businessEnum, @Param("nodeEnum")String nodeEnum);
+    WorkNodeDTO getUniqueNodeByFlowNameAndNodeName(@Param("businessType")String businessType, @Param("nodeEnum")String nodeEnum);
 }

dao/src/main/resources/mapper/UserMapper.xml

@@ -116,7 +116,7 @@
 
     <select id="simplePostName" parameterType="java.lang.String" resultType="com.dayou.entity.User">
         SELECT
-            u.id,u.name
+            u.id,u.name,enable
         FROM
             user_post up
                 LEFT JOIN post p ON p.id = up.post_id
@@ -127,6 +127,7 @@
           AND up.deleted = 0
           and u.deleted =0
             and resign_state = 0
+          and `enable` = 1
             order by u.id
     </select>
 

dao/src/main/resources/mapper/WorkNodeMapper.xml

@@ -56,13 +56,13 @@
         select name ,code  from work_node where flow_id = (select id from work_flow where code=#{businessType} AND deleted = 0 and state = 0) and deleted = 0
     </select>
 
-    <select id="getUniqueNodeByFlowNameAndNodeName" resultType="com.dayou.entity.WorkNode">
+    <select id="getUniqueNodeByFlowNameAndNodeName" resultMap="flowNodeMap">
         SELECT
-            *
+        <include refid="Base_Column_List" />,#{businessType} as businessType
         FROM
             work_node
         WHERE
-                flow_id = ( SELECT id FROM `work_flow` WHERE CODE = #{businessEnum} AND deleted = 0 AND state = 0 )
+                flow_id = ( SELECT id FROM `work_flow` WHERE CODE = #{businessType} AND deleted = 0 AND state = 0 )
           AND CODE = #{nodeEnum}
           AND deleted = 0
     </select>

service/src/main/java/com/dayou/service/workflow/IWorkNodeService.java

@@ -92,5 +92,5 @@ public interface IWorkNodeService extends IService<WorkNode> {
 
     void removeNodeCache(Long flowId);
 
-    WorkNode getUniqueNodeByFlowNameAndNodeName(MainBusinessEnum personalBusiness, WorkflowNodeEnum determinePrice);
+    WorkNodeDTO getUniqueNodeByFlowNameAndNodeName(MainBusinessEnum personalBusiness, WorkflowNodeEnum determinePrice);
 }

service/src/main/java/com/dayou/service/workflow/WorkNodeServiceImpl.java

@@ -361,7 +361,7 @@ public class WorkNodeServiceImpl extends ServiceImpl<WorkNodeMapper, WorkNode> i
     }
 
     @Override
-    public WorkNode getUniqueNodeByFlowNameAndNodeName(MainBusinessEnum businessEnum, WorkflowNodeEnum nodeEnum) {
+    public WorkNodeDTO getUniqueNodeByFlowNameAndNodeName(MainBusinessEnum businessEnum, WorkflowNodeEnum nodeEnum) {
         return workNodeMapper.getUniqueNodeByFlowNameAndNodeName(businessEnum.name(),nodeEnum.name());
     }
 

service/src/main/java/com/dayou/workflow/handler/PersonalNodeHandler.java

@@ -35,6 +35,7 @@ import java.util.List;
 import java.util.Map;
 
 import static com.dayou.common.Constants.PERSONAL_DEPARTMENT;
+import static com.dayou.enums.MainBusinessEnum.PERSONAL_BUSINESS;
 import static com.dayou.enums.workflow.WorkflowNodeEnum.*;
 
 /**
@@ -85,25 +86,22 @@ public class PersonalNodeHandler extends WorkNodeProcessable {
                         case CHECK_PERSONAL_PRODUCTION_TYPE:
                             //1. 获取业务上出具的产品类型。
                             //2.根据出具的产品类型 确定需要哪些节点
-                            Map<String, List<WorkflowNodeEnum>> personalNecessaryNodes = CallbackEnum.NecessaryNode.getByProduction(MainBusinessEnum.PERSONAL_BUSINESS.name(),
+                            Map<String, List<WorkflowNodeEnum>> personalNecessaryNodes = CallbackEnum.NecessaryNode.getByProduction(PERSONAL_BUSINESS.name(),
                                     production);
-                            nextWorkNode = workNodeService.getNextWorkNodeByBusiness(currentInstanceNode.getFlowId(),MainBusinessEnum.PERSONAL_BUSINESS, currentInstanceNode.getNodeCode(), personalNecessaryNodes,null);
+                            nextWorkNode = workNodeService.getNextWorkNodeByBusiness(currentInstanceNode.getFlowId(), PERSONAL_BUSINESS, currentInstanceNode.getNodeCode(), personalNecessaryNodes,null);
                             break;
                         case CHECK_FEEDBACK:
                             if (workNodeCommit.getIfFeedback()!=null && !workNodeCommit.getIfFeedback()) {
-                                Map<String, List<WorkflowNodeEnum>> xPersonalNecessaryNodes = CallbackEnum.NecessaryNode.getByProduction(MainBusinessEnum.PERSONAL_BUSINESS.name(),
+                                Map<String, List<WorkflowNodeEnum>> xPersonalNecessaryNodes = CallbackEnum.NecessaryNode.getByProduction(PERSONAL_BUSINESS.name(),
                                         production);
-                                nextWorkNode = workNodeService.getNextWorkNodeByBusiness(currentInstanceNode.getFlowId(),MainBusinessEnum.PERSONAL_BUSINESS, QUOTATION_FEEDBACK.name(), xPersonalNecessaryNodes,null);
+                                nextWorkNode = workNodeService.getNextWorkNodeByBusiness(currentInstanceNode.getFlowId(), PERSONAL_BUSINESS, QUOTATION_FEEDBACK.name(), xPersonalNecessaryNodes,null);
                             }
                             break;
                         case CHECK_PERSONAL_CLIENT_TYPE:
                             Long ccId = workNodeCommit.getCcId();
                             if (ccId !=null){
                                 if (customerCompanyService.avoidWareHouseApply(ccId)){
-                                    for (int i=0; i<2; i++){
-                                        nextWorkNode = workNodeService.getNextWorkNode(nextWorkNode.getFlowId(), nextWorkNode.getId());
-                                    }
-
+                                    nextWorkNode = workNodeService.getUniqueNodeByFlowNameAndNodeName(PERSONAL_BUSINESS,REPORT_OUT);
                                 }
                             }
                     }