1.新增查询已终止列表接口

2.修改已办任务查询接口
3.修复部分列表相关BUG

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

@@ -68,6 +68,17 @@ public class AssetsController extends BaseController {
     }
 
     /**
+     * 条件查询资产已终止列表
+     * @param page 分页条件
+     * @param assetsSelectDTO 查询条件
+     * @return Page<AssetsVO>
+     */
+    @GetMapping("/selectTerminatedPage")
+    public RestResponse<Page<AssetsVO>> selectTerminatedPage(Page page, AssetsSelectDTO assetsSelectDTO) {
+        return RestResponse.data(assetsService.selectTerminatedPage(page, assetsSelectDTO));
+    }
+
+    /**
      * 资产业务订单表详情
      */
     @GetMapping("getAssetsDetailById/{id}")

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

@@ -48,6 +48,14 @@ public interface AssetsMapper extends CustomBaseMapper<Assets> {
     Page<AssetsVO> selectArchivedPage(@Param("page") Page page, @Param("assetsSelectDTO") AssetsSelectDTO assetsSelectDTO);
 
     /**
+     * 条件查询资产已终止列表
+     * @param page 分页条件
+     * @param assetsSelectDTO 查询条件
+     * @return Page<AssetsVO>
+     */
+    Page<AssetsVO> selectTerminatedPage(@Param("page") Page page, @Param("assetsSelectDTO") AssetsSelectDTO assetsSelectDTO);
+
+    /**
      * 根据业务id获取资产业务详情
      * @param id 业务id
      * @return AssetsVO

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

@@ -314,6 +314,85 @@
         ORDER BY assets.created DESC
     </select>
 
+    <!--条件查询资产已终止列表-->
+    <select id="selectTerminatedPage" resultType="com.dayou.vo.AssetsVO">
+        SELECT (@i := @i + 1) AS id,
+        assets.id AS assetsId,
+        assets.name,
+        assets.order_id,
+        assets_business_gener,
+        allot_type,
+        (SELECT production_no
+        FROM assets_production
+        WHERE assets_production.production_no = nodeInfo.business_sub_id) AS statementNo,
+        (SELECT production_no
+        FROM assets_production
+        WHERE assets_production.production_no = nodeInfo.business_min_id) AS reportNo,
+        clientele_id,
+        customer.name AS customerName,
+        bailor,
+        bailor_contact_name,
+        bailor_contact_tel,
+        assets.created,
+        #查询客户经理
+        (SELECT name FROM user WHERE id = assets.client_manager_id) AS clientManagerName,
+        #查询项目负责人
+        (SELECT name FROM user WHERE id = assets.principal_id) AS principalName,
+        #查询业务来源(即子级客户)
+        (SELECT customer_company.name
+        FROM customer_company
+        WHERE customer_company.id = clientele_sub_id) AS customerSubName,
+        nodeInfo.businessId,
+        nodeInfo.comment
+        FROM (SELECT @i := 0) AS sort,
+        assets
+        LEFT JOIN user ON user.id = assets.principal_id
+        LEFT JOIN customer_company AS customer ON customer.id = assets.clientele_id
+        #查询当前进行的节点信息
+        RIGHT JOIN (SELECT nodeInstance.id AS currentNodeId,
+        nodeInstance.business_id AS businessId,
+        nodeInstance.business_sub_id,
+        nodeInstance.business_min_id,
+        nodeInstance.state AS state,
+        record.id AS recordId,
+        nodeInstance.comment AS comment
+        FROM work_flow_node_instance AS nodeInstance,
+        work_task_record AS record,
+        user,
+        work_node AS node
+        WHERE nodeInstance.state = 'CLOSED'
+        AND nodeInstance.node_id = node.id
+        AND record.handler_id = user.id
+        AND nodeInstance.deleted = 0
+        AND record.instance_id = nodeInstance.id
+        AND business_type = 'ASSET_BUSINESS') AS nodeInfo ON nodeInfo.businessId = assets.id
+        WHERE assets.deleted = 0
+        AND #{assetsSelectDTO.handlerId} IN (SELECT record.handler_id
+        FROM work_flow_node_instance AS nodeInstance,
+        work_task_record AS record
+        WHERE business_id = assets.id
+        AND record.instance_id = nodeInstance.id)
+        <if test="assetsSelectDTO != null and assetsSelectDTO.assetsBusinessGener != null and assetsSelectDTO.assetsBusinessGener != '' ">
+            AND assets.assets_business_gener = #{assetsSelectDTO.assetsBusinessGener}
+        </if>
+        <if test="assetsSelectDTO != null and assetsSelectDTO.principalId != null">
+            AND assets.principal_id = #{assetsSelectDTO.principalId}
+        </if>
+        <if test="assetsSelectDTO != null and assetsSelectDTO.clientManagerId != null">
+            AND assets.client_manager_id = #{assetsSelectDTO.clientManagerId}
+        </if>
+        <if test="assetsSelectDTO != null and assetsSelectDTO.keyWord != null and assetsSelectDTO.keyWord != '' ">
+            AND (
+            assets.order_id LIKE CONCAT('%',#{assetsSelectDTO.keyWord},'%') OR
+            assets.name LIKE CONCAT('%',#{assetsSelectDTO.keyWord},'%') OR
+            nodeInfo.business_sub_id LIKE CONCAT('%',#{assetsSelectDTO.keyWord},'%') OR
+            nodeInfo.business_min_id LIKE CONCAT('%',#{assetsSelectDTO.keyWord},'%') OR
+            customer.name LIKE CONCAT('%',#{assetsSelectDTO.keyWord},'%')
+            )
+        </if>
+        ORDER BY assets.created DESC
+    </select>
+
     <!--根据业务id获取资产业务详情-->
     <select id="getAssetsDetailById" resultType="com.dayou.vo.AssetsVO">
         SELECT assets.id,

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

@@ -520,8 +520,8 @@
         node.name AS nodeName,
         node.code AS nodeCode,
         log.created AS finishTime,
-        instance.business_sub_id AS statementNo,
-        instance.business_min_id AS reportNo,
+        target.statement_no AS statementNo,
+        target.report_no AS reportNo,
         instance.state AS instanceState,
         instance.id AS instanceId,
         instance.created AS startDate
@@ -534,8 +534,8 @@
         AND work_flow_node_instance.deleted = 0) AS instance ON log.instance_id = instance.id
         LEFT JOIN (SELECT id, name, code FROM work_node WHERE deleted = 0) AS node ON node.id = instance.node_id
         LEFT JOIN (SELECT id, order_id, NAME FROM assets WHERE deleted = 0) AS assets ON assets.id = log.business_id
+        LEFT JOIN assets_evaluation_target AS target ON assets_id = assets.id
         LEFT JOIN user ON user.id = log.handler_id
-
         WHERE instance.id IS NOT NULL
         AND log.business_type = 'ASSET_BUSINESS'
         <if test="assetsSelectDTO != null and assetsSelectDTO.handlerId != null">

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

@@ -34,7 +34,7 @@ public class AssetsTaskDoneVO {
     /**
      * 意见书号
      */
-    private String statementtNo;
+    private String statementNo;
 
     /**
      * 处理人id

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

@@ -159,4 +159,9 @@ public class AssetsVO extends Assets {
      * 报告出库申请id
      */
     private Long warehouseId;
+
+    /**
+     * 审核意见
+     */
+    private String comment;
 }

service/src/main/java/com/dayou/service/IAssetsService.java

@@ -45,6 +45,14 @@ public interface IAssetsService extends IService<Assets> {
         Page<AssetsVO> selectArchivedPage(Page page, AssetsSelectDTO assetsSelectDTO);
 
         /**
+         * 条件查询资产已终止列表
+         * @param page 分页条件
+         * @param assetsSelectDTO 查询条件
+         * @return Page<AssetsVO>
+         */
+        Page<AssetsVO> selectTerminatedPage(Page page, AssetsSelectDTO assetsSelectDTO);
+
+        /**
          * 根据业务id获取资产业务详情
          * @param id 业务id
          * @return AssetsVO

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

@@ -1,5 +1,6 @@
 package com.dayou.service.impl;
 
+import com.dayou.utils.LoginContext;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import cn.hutool.core.util.ObjectUtil;
@@ -96,6 +97,18 @@ public class AssetsServiceImpl extends ServiceImpl<AssetsMapper, Assets> impleme
     }
 
     /**
+     * 条件查询资产已终止列表
+     * @param page 分页条件
+     * @param assetsSelectDTO 查询条件
+     * @return Page<AssetsVO>
+     */
+    @Override
+    public Page<AssetsVO> selectTerminatedPage(Page page, AssetsSelectDTO assetsSelectDTO) {
+        assetsSelectDTO.setHandlerId(LoginContext.getCurrentUserId());
+        return assetsMapper.selectTerminatedPage(page, assetsSelectDTO);
+    }
+
+    /**
      * 根据业务id获取资产业务详情
      *
      * @param id 业务id

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

@@ -161,7 +161,7 @@ public class WorkTaskRecordServiceImpl extends ServiceImpl<WorkTaskRecordMapper,
     public Page<AssetsTaskDoneVO> getAssetsTaskDoneList(AssetsSelectDTO assetsSelectDTO, Page page) {
         assetsSelectDTO.setHandlerId(LoginContext.getCurrentUserId());
         Page<AssetsTaskDoneVO> assetsTaskDoneVOPage = workTaskRecordMapper.getAssetsTaskDoneList(assetsSelectDTO, page);
-        assetsTaskDoneVOPage.getRecords().stream().forEach(x->{
+        assetsTaskDoneVOPage.getRecords().forEach(x->{
             x.setHandingTime(DateUtils.getTimeLong(x.getHandingTimeLong()==null?0L:x.getHandingTimeLong()));
         });
         return assetsTaskDoneVOPage;