修改一些已知问题

biz-base/src/main/java/com/dayou/controller/DyoaController.java

@@ -145,4 +145,11 @@ public class DyoaController {
         Boolean ret = dyoaHistoryService.majorProductionTime();
         return RestResponse.data(ret);
     }
+
+    @IgnoreAuth
+    @GetMapping("/update/assetsMarketDepartment")
+    public RestResponse<Boolean> assetsMarketDepartment(){
+        Boolean ret = dyoaHistoryService.assetsMarketDepartment();
+        return RestResponse.data(ret);
+    }
 }

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

@@ -276,7 +276,7 @@
         m.deleted = 0
         AND m.principal_id =#{evaluateUserId}
         ) major
-        INNER JOIN ( SELECT id, ifnull( production_id, business_id ) AS xId, commission_rate_id,declare_result FROM commission_declare
+        left JOIN ( SELECT id, ifnull( production_id, business_id ) AS xId, commission_rate_id,declare_result FROM commission_declare
         WHERE deleted = 0
 
         AND business_type = 'COMMISSION_DECLARE_MAJOR_EVALUATE'

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

@@ -104,7 +104,12 @@
         <if test="vo!=null and vo.aEndDate!=null and vo.aEndDate!=''">
             and fi.created &lt;= #{vo.aEndDate}
         </if>
-        order by fi.created DESC
+        <if test="vo!=null and vo.state!=null and vo.state!='' and vo.state!='审核中' ">
+            order by fi.modified DESC
+        </if>
+        <if test="vo!=null and vo.state!=null and vo.state!='' and vo.state=='审核中' ">
+            order by fi.created DESC
+        </if>
     </sql>
 
     <!--开票分页查询-->

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

@@ -124,6 +124,7 @@
           AND p.deleted = 0
           AND up.deleted = 0
           and u.deleted =0
+          order by p.department_id asc
     </select>
 
     <select id="simplePostName" parameterType="java.lang.String" resultType="com.dayou.entity.User">

service/src/main/java/com/dayou/dyoa/DyoaHistoryServiceImpl.java

@@ -2076,6 +2076,19 @@ public class DyoaHistoryServiceImpl implements IDyoaHistoryService{
         return true;
     }
 
+    @Override
+    public Boolean assetsMarketDepartment() {
+        List<Assets> list = assetsService.list(new LambdaQueryWrapper<Assets>().isNull(Assets::getMarketDepartmentId).select(Assets::getClientManagerId, BaseEntity::getId));
+        for (Assets assets : list){
+            Long clientManagerId = assets.getClientManagerId();
+            Set<Long> departmentIdByUserId = userService.getDepartmentIdByUserId(clientManagerId);
+            Long departmentId = departmentIdByUserId.stream().collect(Collectors.toList()).get(0);
+            assetsService.update(new LambdaUpdateWrapper<Assets>().set(Assets::getMarketDepartmentId,departmentId)
+                    .eq(BaseEntity::getId,assets.getId()));
+        }
+        return null;
+    }
+
 
     @Override
     public Boolean updateProductionFund() {

service/src/main/java/com/dayou/dyoa/IDyoaHistoryService.java

@@ -57,4 +57,6 @@ public interface IDyoaHistoryService {
     Boolean majorMarketDepartmentId();
 
     Boolean majorProductionTime();
+
+    Boolean assetsMarketDepartment();
 }

service/src/main/java/com/dayou/workflow/config/WorkNodeProcessable.java

@@ -120,13 +120,13 @@ public class WorkNodeProcessable {
                 ErrorCode.throwBusinessException(ErrorCode.TASK_NOT_FINISHED);
             }
         }
-        //不需要检查任务完成状态
-        if (commit.getState().equals(PASS) && !commit.getIfCheckTask()){
-            //将当前节点状态变更成已完成
-            workFlowNodeInstanceService.update(new LambdaUpdateWrapper<WorkFlowNodeInstance>().set(WorkFlowNodeInstance::getState,NodeStateEnum.FINISHED)
-                    .set(WorkFlowNodeInstance::getComment,commit.getComments()).eq(BaseEntity::getId,currentInstanceNode.getId()));
-            addWorkflowLog(commit,currentInstanceNode);
-        }
+        //不需要检查任务完成状态(不能解除封印)
+//        if (commit.getState().equals(PASS) && !commit.getIfCheckTask()){
+//            //将当前节点状态变更成已完成
+//            workFlowNodeInstanceService.update(new LambdaUpdateWrapper<WorkFlowNodeInstance>().set(WorkFlowNodeInstance::getState,NodeStateEnum.FINISHED)
+//                    .set(WorkFlowNodeInstance::getComment,commit.getComments()).eq(BaseEntity::getId,currentInstanceNode.getId()));
+//            addWorkflowLog(commit,currentInstanceNode);
+//        }
 
         //寻找下一个节点，有可能下一个节点并非流程配置的节点，需根据业务数据变动
         WorkNodeDTO nextWorkNode = workNodeService.getNextWorkNode(currentInstanceNode.getFlowId(), currentInstanceNode.getNodeId());

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

@@ -82,6 +82,7 @@ public class MajorNodeHandler extends WorkNodeProcessable {
     @Override
     public boolean forward(WorkNodeCommit workNodeCommit) {
         WorkFlowNodeInstance currentInstanceNode = workFlowNodeInstanceMapper.getById(workNodeCommit.getInstanceNodeId());
+        //todo 如果currentInstanceNode 是分管领导分单。则需要将instance的state改为FINISHED
         WorkNodeDTO nextWorkNode = beforeForward(workNodeCommit,currentInstanceNode);
         if (nextWorkNode==null && workNodeCommit.getNodeCode().equals(LEADER_ALLOCATION.name())){
             nextWorkNode = workNodeService.doCreatedDepartmentAllocationNode();