归档逻辑修改

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

@@ -105,8 +105,12 @@
         id IN ( SELECT post_id FROM user_post WHERE user_id = u.id and deleted = 0 ))) AS marketDepartment
         FROM
         (select * from finance_claim where deleted = 0 and production_fund_id is not null
-        AND claim_datetime >= #{majorStat.startDate}
-        AND claim_datetime <= #{majorStat.endDate}
+            <if test="majorStat!=null and majorStat.startDate!=null">
+                AND claim_datetime &gt;= #{majorStat.startDate}
+            </if>
+            <if test="majorStat!=null and majorStat.endDate!=null">
+                AND claim_datetime &lt;= #{majorStat.endDate}
+            </if>
         ) fc
         INNER JOIN (
         SELECT
@@ -153,7 +157,7 @@
                 m.order_id like concat ('%',#{keyword},'%')
                 or f.production_no like concat ('%',#{keyword},'%')
                 or u1.name like concat ('%',#{keyword},'%')
-                or fc.claim_amount = #{keyword}
+                or fc.claim_amount like concat ('%',#{keyword},'%')
                 or u2.NAME like concat ('%',#{keyword},'%')
                 )
             </if>

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

@@ -549,13 +549,15 @@
         SELECT
         wfni.id,
         mp.id AS productionId,
+        mp1.id as productionId1,
         mp.NAME,
         mp.repertory_state,
+        mp1.name as name1,
+        mp1.repertory_state as repertory_state1,
         wtr.id AS taskId,
         wfni.id AS currentNodeId,
         wfni.business_min_id,
         wfni.business_sub_id,
-        mp.report_no,
         wfni.business_id,
         m.NAME AS orderName,
         m.order_id,
@@ -565,12 +567,11 @@
         wfni.NAME AS nodeName,
         wfni.CODE AS nodeCode,
         u.NAME AS HANDLER,
-        pf.real_amount AS realAmount,
+        off.real_amount AS realAmount,
         wtr.handler_id,
         wtr.finished AS taskFinished,
         DATE_FORMAT( m.created, '%Y-%m-%d' ) AS created,
-        wtr.created AS taskCreated,
-        mp.production
+        wtr.created AS taskCreated
         FROM
         work_task_record wtr
         LEFT JOIN work_node_task wnt ON wnt.id = wtr.task_id
@@ -599,9 +600,11 @@
         LEFT JOIN user u2 ON u2.id = m.principal_id
         LEFT JOIN department d ON d.id = m.department_id
         LEFT JOIN ( SELECT id, major_id, report_no, NAME, repertory_state, production FROM major_production WHERE deleted = 0 ) mp
-        ON ( mp.major_id = m.id AND (mp.report_no =  wfni.business_sub_id or mp.report_no = wfni.business_min_id))
-        LEFT JOIN ( SELECT business_id, production_no, real_amount FROM production_fund WHERE business_type = 'MAJOR_BUSINESS' AND deleted = 0 ) pf
-        ON ( pf.business_id = m.id AND pf.production_no = mp.report_no  )
+        ON ( mp.major_id = m.id AND (mp.report_no =  wfni.business_sub_id ))
+        LEFT JOIN ( SELECT id, major_id, report_no, NAME, repertory_state, production FROM major_production WHERE deleted = 0 ) mp1
+        ON ( mp1.major_id = m.id AND (mp1.report_no =  wfni.business_min_id ))
+        LEFT JOIN ( SELECT business_id, real_amount FROM order_fund WHERE business_type = 'MAJOR_BUSINESS' AND deleted = 0 ) off
+        ON ( off.business_id = m.id  )
         WHERE u.deleted = 0
           and  wtr.handler_id =#{todoVO.handlerId}
           AND wnt.deleted = 0
@@ -616,11 +619,8 @@
             or u2.NAME like concat('%',#{keyword},'%')
             )
         </if>
-        <if test="todoVO!=null and todoVO.production!=null and todoVO.production!=''">
-            and mp.production =#{todoVO.production}
-        </if>
         ORDER BY
-            mp.report_no ASC
+        m.order_id ASC
     </select>
 
     <update id="updateSaveFileInfo" parameterType="java.util.List">

domain/src/main/java/com/dayou/vo/TaskTodoVO.java

@@ -60,12 +60,19 @@ public class TaskTodoVO {
 
     private Long productionId;
 
+    private Long productionId1;
+
     private BigDecimal realAmount;
 
     private String name;
 
+    private String name1;
+
     private String repertoryState;
 
+    private String repertoryState1;
+
+
     private Date taskCreated;
 
     private String startDate;

service/src/main/java/com/dayou/service/impl/MajorProductionServiceImpl.java

@@ -595,11 +595,11 @@ public class MajorProductionServiceImpl extends ServiceImpl<MajorProductionMappe
         if (CollectionUtil.isNotEmpty(todoVOList)){
             try {
                 //1.完成任务记录
-                List<Long> taskIds = todoVOList.stream().map(TaskTodoVO::getTaskId).collect(Collectors.toList());
-                workTaskRecordMapper.batchFinishTask(taskIds);
+                Set<Long> taskIds = todoVOList.stream().map(TaskTodoVO::getTaskId).collect(Collectors.toSet());
+                workTaskRecordMapper.batchFinishTask(taskIds.stream().collect(Collectors.toList()));
                 //2.提交节点状态
-                List<Long> currentNodeIds = todoVOList.stream().map(TaskTodoVO::getCurrentNodeId).collect(Collectors.toList());
-                workFlowNodeInstanceMapper.batchCommitNode(currentNodeIds);
+                Set<Long> currentNodeIds = todoVOList.stream().map(TaskTodoVO::getCurrentNodeId).collect(Collectors.toSet());
+                workFlowNodeInstanceMapper.batchCommitNode(currentNodeIds.stream().collect(Collectors.toList()));
                 //3.更新产品归档信息
                 List<Long> productionIds = todoVOList.stream().map(TaskTodoVO::getProductionId).collect(Collectors.toList());
                 majorProductionMapper.updateSaveFileInfo(productionIds);