1.修复已办列表查询结果不正确的问题

2.新增查询入库统计列表

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

@@ -3,6 +3,7 @@ package com.dayou.controller;
 import com.dayou.dto.*;
 import com.dayou.vo.AssetsBusinessMember;
 import com.dayou.vo.AssetsOrderFundInvoiceVO;
+import com.dayou.vo.AssetsRepertoryVo;
 import com.dayou.vo.AssetsVO;
 import com.dayou.workflow.annotation.FinishTask;
 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -79,6 +80,17 @@ public class AssetsController extends BaseController {
     }
 
     /**
+     * 条件查询资产已终止列表
+     * @param page 分页条件
+     * @param assetsSelectDTO 查询条件
+     * @return Page<AssetsVO>
+     */
+    @GetMapping("/selectRepertoryPage")
+    public RestResponse<Page<AssetsRepertoryVo>> selectRepertoryPage(Page page, AssetsSelectDTO assetsSelectDTO) {
+        return RestResponse.data(assetsService.selectRepertoryPage(page, assetsSelectDTO));
+    }
+
+    /**
      * 资产业务订单表详情
      */
     @GetMapping("getAssetsDetailById/{id}")

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

@@ -8,6 +8,7 @@ import com.dayou.dao.CustomBaseMapper;
 import com.dayou.entity.BusinessNumber;
 import com.dayou.vo.AssetsBusinessMember;
 import com.dayou.vo.AssetsOrderFundInvoiceVO;
+import com.dayou.vo.AssetsRepertoryVo;
 import com.dayou.vo.AssetsVO;
 import org.apache.ibatis.annotations.Param;
 
@@ -55,6 +56,15 @@ public interface AssetsMapper extends CustomBaseMapper<Assets> {
      */
     Page<AssetsVO> selectTerminatedPage(@Param("page") Page page, @Param("assetsSelectDTO") AssetsSelectDTO assetsSelectDTO);
 
+
+    /**
+     * 条件查询资产入库统计列表
+     * @param page 分页条件
+     * @param assetsSelectDTO 查询条件
+     * @return Page<AssetsVO>
+     */
+    Page<AssetsRepertoryVo> selectRepertoryPage(@Param("page") Page page, @Param("assetsSelectDTO") AssetsSelectDTO assetsSelectDTO);
+
     /**
      * 根据业务id获取资产业务详情
      * @param id 业务id

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

@@ -393,6 +393,82 @@
         ORDER BY assets.created DESC
     </select>
 
+    <!--条件查询资产已终止列表-->
+    <select id="selectRepertoryPage" resultType="com.dayou.vo.AssetsRepertoryVo">
+        SELECT (@i := @i + 1) AS id,
+        assets.order_id AS orderId,
+        production_no AS reportNo,
+        name AS orderName,
+        purpose.purpose_name AS purposeName,
+        method.method_name AS methodName,
+        (SELECT instance.created
+        FROM work_flow_node_instance AS instance,
+        work_node AS node
+        WHERE instance.business_id = assets.id
+        AND instance.node_id = node.id
+        AND instance.deleted = 0
+        AND node.code = 'SPOT_RECONNAISSANCE_DETERMINE_PRICE') AS startTime,
+        (SELECT instance.created
+        FROM work_flow_node_instance AS instance,
+        work_node AS node
+        WHERE business_min_id = reportNo
+        AND instance.node_id = node.id
+        AND instance.deleted = 0
+        AND node.code = 'REPORT_OUT') AS endTime,
+        production.valuation_basis_date AS valuationBasisDate,
+        production.evaluate_amount AS evaluateAmount,
+        production.evaluate_price AS evaluatePrice,
+        assets.bailor,
+        assets.bailor_contact_tel AS bailorContactTel,
+        (SELECT user.name FROM user WHERE user.id = assets.principal_id) AS userName,
+        (SELECT user.name FROM user WHERE user.id = assets.client_manager_id) AS managerName,
+        (SELECT customer.name
+        FROM customer
+        WHERE customer.id = assets.clientele_id) AS customerName,
+        (SELECT customer_company.name
+        FROM customer_company
+        WHERE customer_company.id = clientele_sub_id) AS customerSubName,
+        production.repertory_in_time AS repertoryInTime,
+        production.repertory_out_time AS repertoryOutTime,
+        (SELECT instance.modified
+        FROM work_flow_node_instance AS instance,
+        work_node AS node
+        WHERE business_min_id = reportNo
+        AND instance.node_id = node.id
+        AND instance.deleted = 0
+        AND node.code = 'BUSINESS_ARCHIVING') AS archivedTime,
+        (SELECT department.name FROM department WHERE department.id = assets.department_id) AS evaluateDepartment,
+        (SELECT department.name
+        FROM department,
+        user,
+        user_post,
+        post
+        WHERE user.id = user_post.user_id
+        AND user_post.post_id = post.id
+        AND post.department_id = department.id
+        AND user.id = assets.client_manager_id) AS marketDepartment
+        FROM (SELECT @i := 0) AS sort,
+        assets_production AS production
+        LEFT JOIN assets ON assets.id = production.business_id
+        LEFT JOIN assets_evaluation_target AS target ON target.report_no = production.production_no
+        LEFT JOIN assets_evaluation_target_purpose AS purpose ON purpose.id = target.evaluation_purpose_id
+        LEFT JOIN assets_evaluation_method AS method ON method.id = target.choice_evaluation_method_id
+        WHERE production.deleted = 0
+        AND (production.repertory_state = 0 OR production.repertory_state = 1)
+        AND production_type != 'STATEMENT'
+        <if test="assetsSelectDTO != null and assetsSelectDTO.startTime != null and assetsSelectDTO.endTime != null ">
+            AND startTime &gt;= #{assetsSelectDTO.startTime}
+            AND endTime &lt;= #{assetsSelectDTO.endTime}
+        </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
+            production.production_no LIKE CONCAT('%',?,'%')
+            )
+        </if>
+    </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,
-        target.statement_no AS statementNo,
-        target.report_no AS reportNo,
+        instance.business_sub_id AS statementNo,
+        instance.business_min_id    AS reportNo,
         instance.state AS instanceState,
         instance.id AS instanceId,
         instance.created AS startDate
@@ -534,7 +534,6 @@
         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'

domain/src/main/java/com/dayou/dto/AssetsSelectDTO.java

@@ -4,6 +4,8 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.Date;
+
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
@@ -44,4 +46,60 @@ public class AssetsSelectDTO {
      */
     private Long handlerId;
 
+    /**
+     * 筛选开始时间
+     */
+    private Date startTime;
+
+    /**
+     * 筛选结束时间
+     */
+    private Date endTime;
+
+    /**
+     * 委托人
+     */
+    private String bailor;
+
+    /**
+     * 委托人电话
+     */
+    private String bailorContactTel;
+
+    /**
+     * 客户经理
+     */
+    private String userName;
+
+    /**
+     * 项目负责人
+     */
+    private String managerName;
+
+    /**
+     * 客户名称
+     */
+    private String customerName;
+
+    /**
+     * 业务来源
+     */
+    private String customerSubName;
+
+    /**
+     * 入库时间
+     */
+    private Date repertoryInTime;
+
+    /**
+     * 出库时间
+     */
+    private Date repertoryOutTime;
+
+    /**
+     * 归档时间
+     */
+    private Date archivedTime;
+
+    private String a;
 }

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

@@ -0,0 +1,69 @@
+package com.dayou.vo;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class AssetsRepertoryVo {
+
+    /**
+     * 项目名称
+     */
+    private String orderName;
+
+    /**
+     * 项目编号
+     */
+    private String orderId;
+
+    /**
+     * 报告号
+     */
+    private String reportNo;
+
+    /**
+     * 评估目的
+     */
+    private String purposeName;
+
+    /**
+     * 评估方法
+     */
+    private String methodName;
+
+    /**
+     * 评估作业开始日
+     */
+    private Date startTime;
+
+    /**
+     * 估价作业结束日
+     */
+    private Date endTime;
+
+    /**
+     * 估价时点
+     */
+    private Date valuationBasisDate;
+
+    /**
+     * 评估总值(万元)
+     */
+    private Double evaluateAmount;
+
+    /**
+     * 评估单价(元)
+     */
+    private Double evaluatePrice;
+
+    /**
+     * 评估部门
+     */
+    private String evaluateDepartment;
+
+    /**
+     * 市场部门
+     */
+    private String marketDepartment;
+}

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.dayou.vo.AssetsBusinessMember;
 import com.dayou.vo.AssetsOrderFundInvoiceVO;
+import com.dayou.vo.AssetsRepertoryVo;
 import com.dayou.vo.AssetsVO;
 import com.fasterxml.jackson.core.JsonProcessingException;
 
@@ -52,6 +53,15 @@ public interface IAssetsService extends IService<Assets> {
          */
         Page<AssetsVO> selectTerminatedPage(Page page, AssetsSelectDTO assetsSelectDTO);
 
+
+        /**
+         * 条件查询资产入库统计列表
+         * @param page 分页条件
+         * @param assetsSelectDTO 查询条件
+         * @return Page<AssetsVO>
+         */
+        Page<AssetsRepertoryVo> selectRepertoryPage(Page page, AssetsSelectDTO assetsSelectDTO);
+
         /**
          * 根据业务id获取资产业务详情
          * @param id 业务id

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

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