1.修改资产业务查询详情相关接口SQL

2.新增两个字段

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.dayou.dto.AssetsSelectDTO;
 import com.dayou.entity.Assets;
 import com.dayou.dao.CustomBaseMapper;
+import com.dayou.entity.User;
 import com.dayou.vo.AssetsVO;
 import org.apache.ibatis.annotations.Param;
 
@@ -39,4 +40,11 @@ public interface AssetsMapper extends CustomBaseMapper<Assets> {
      * @return AssetsVO
      */
     AssetsVO getAssetsDetailById(@Param("id") Long id);
+
+    /**
+     * 获取项目参与人
+     * @param userId 用户id
+     * @return User
+     */
+    User getmembersDetail(@Param("userId") Long userId);
 }

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

@@ -192,50 +192,63 @@
     <!--根据业务id获取资产业务详情-->
     <select id="getAssetsDetailById" resultType="com.dayou.vo.AssetsVO">
         SELECT assets.id,
-               #查询客户经理
-               (SELECT name FROM user WHERE id = assets.client_manager_id) AS clientManagerName,
-               user.name AS principalName,
-               assets.department_id,
-               department.name,
-               assets.order_id,
-               assets.name,
-               assets.assets_business_gener,
-               assets.entrust_again,
-               assets.clientele_type,
-               customer.id AS customerId,
-               customer.name AS customerName,
-               linkman.id,
-               linkman.name,
-               linkman.department,
-               linkman.duty,
-               linkman.mobile,
-               assets.security,
-               assets.significant_assets_reorganization,
-               assets.state_assets,
-               assets.foreign_assets_involved,
-               assets.dispense_benefit,
-               assets.bailor,
-               assets.bailor_address,
-               assets.bailor_contact_name,
-               assets.bailor_contact_tel,
-               assets.terminal_clientele_id,
-               assets.remark,
-               tLinkman.id AS tLinkmanId,
-               tLinkman.name AS tLinkmanName,
-               tLinkman.mobile AS tLinkmanMobile,
-               assets.members AS members,
-               #查询终端客户名称
-               (SELECT customer_company.name FROM customer_company WHERE customer_company.id = assets.terminal_clientele_id) AS terminalClienteleName,
-               #查询业务来源(即子级客户)
-               (SELECT customer_company.name
-                FROM customer_company
-                WHERE customer_company.id = clientele_sub_id) AS customerSubName
+        #查询客户经理
+        (SELECT name FROM user WHERE id = assets.client_manager_id) AS clientManagerName,
+        user.name AS principalName,
+        allot_type,
+        assets.department_id,
+        department.name,
+        assets.order_id,
+        assets.name,
+        assets.assets_business_gener,
+        assets.entrust_again,
+        assets.clientele_type,
+        customer.id AS clienteleId,
+        customer.name AS customerName,
+        linkman.id AS clienteleContactId,
+        linkman.name AS linkmanName,
+        linkman.department AS linkmanDepartment,
+        linkman.duty AS linkmanDuty,
+        linkman.mobile AS linkmanMobile,
+        assets.security,
+        assets.significant_assets_reorganization,
+        assets.state_assets,
+        assets.foreign_assets_involved,
+        assets.dispense_benefit,
+        assets.bailor,
+        assets.bailor_address,
+        assets.bailor_contact_name,
+        assets.bailor_contact_tel,
+        assets.terminal_clientele_id,
+        assets.terminal_clientele_type,
+        assets.remark,
+        tLinkman.id AS tLinkmanId,
+        tLinkman.name AS tLinkmanName,
+        tLinkman.mobile AS tLinkmanMobile,
+        assets.members AS members,
+        #查询终端客户名称
+        (SELECT customer_company.name FROM customer_company WHERE customer_company.id = assets.terminal_clientele_id) AS
+        terminalClienteleName,
+        assets.clientele_sub_id
         FROM assets
         LEFT JOIN user ON user.id = assets.principal_id
         LEFT JOIN department ON department.id = assets.department_id
         LEFT JOIN customer_company AS customer ON customer.id = assets.clientele_id
         LEFT JOIN customer_linkman AS linkman ON linkman.id = assets.clientele_contact_id
-        LEFT JOIN (SELECT tLinkman.id, tLinkman.name, tLinkman.mobile FROM customer_linkman AS tLinkman) AS tLinkman ON tLinkman.id = assets.terminal_clientele_contact_id
+        LEFT JOIN (SELECT tLinkman.id, tLinkman.name, tLinkman.mobile FROM customer_linkman AS tLinkman) AS tLinkman ON
+        tLinkman.id = assets.terminal_clientele_contact_id
+        <where>
+            <if test="id != null">
+                AND assets.id = #{id}
+            </if>
+        </where>
+    </select>
+
+    <!--获取项目参与人-->
+    <select id="getmembersDetail" resultType="com.dayou.entity.User">
+        SELECT id, name
+        FROM user
+        WHERE id = #{userId}
     </select>
 
 </mapper>

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

@@ -91,6 +91,26 @@ public class AssetsVO extends Assets {
     private Double invoiceRealAmount;
 
     /**
+     * 客户联系人名
+     */
+    private String linkmanName;
+
+    /**
+     * 客户联系人部门
+     */
+    private String linkmanDepartment;
+
+    /**
+     * 客户联系人岗位
+     */
+    private String linkmanDuty;
+
+    /**
+     * 客户联系人联系方式
+     */
+    private String linkmanMobile;
+
+    /**
      * 终端客户联系人id
      */
     private Long tLinkmanId;

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

@@ -1,11 +1,13 @@
 package com.dayou.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONArray;
 import com.dayou.dto.AssetsSelectDTO;
 import com.dayou.dto.WorkNodeCommit;
 import com.dayou.entity.Assets;
+import com.dayou.entity.User;
 import com.dayou.enums.MainBusinessEnum;
 import com.dayou.mapper.AssetsMapper;
 import com.dayou.service.IAssetsService;
@@ -84,8 +86,15 @@ public class AssetsServiceImpl extends ServiceImpl<AssetsMapper, Assets> impleme
     @Override
     public AssetsVO getAssetsDetailById(Long id) {
         AssetsVO assetsVO = assetsMapper.getAssetsDetailById(id);
-        //Json字符串转Long集合
-        JSONObject.parseArray(assetsVO.getMembers()).toJavaList(Long.class);
+        //项目参与人id不为空尝试获取项目参与人
+        if (ObjectUtil.isNotNull(assetsVO.getMembers()) && ObjectUtil.isNotEmpty(assetsVO.getMembers())){
+            //Json字符串转Long集合
+            List<Long> memberList = JSONObject.parseArray(assetsVO.getMembers()).toJavaList(Long.class);
+            //id查询项目参与人
+            for (Long userId : memberList){
+                assetsVO.getMembersDetail().add(assetsMapper.getmembersDetail(userId));
+            }
+        }
         return assetsVO;
     }
 

sql/update_sql.sql

@@ -212,4 +212,11 @@ ALTER TABLE `assets_evaluation_target` ADD assets_id BIGINT(20)  NOT NULL COMMEN
  # 删除字段financial
 ALTER TABLE `assets` DROP COLUMN financial;
 
+/**
+  日期：2024-04-03
+ */
+ # 新增字段qr_code
+ALTER TABLE `assets_production` ADD qr_code varchar(255) NULL COMMENT '二维码路径';
 
+# 新增字段check_value
+ALTER TABLE `assets_evaluation_target` ADD check_value decimal(16,4) NULL COMMENT '审核价格';