1.撰写产品相关接口编写

2.取号BUG修复
3.资产产品表字段修改与新增

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

@@ -1,5 +1,6 @@
 package com.dayou.controller;
 
+import com.dayou.dto.AssetsProductionDetailDTO;
 import com.dayou.dto.TaskRecordDTO;
 import com.dayou.workflow.annotation.FinishTask;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
@@ -111,5 +112,26 @@ public class AssetsProductionController extends BaseController {
         return RestResponse.data(assetsProductionService.getProductionByBusinessId(businessId));
     }
 
+    /**
+     * 撰写资产产品信息
+     * @param taskRecordDTO 节点完成DTO
+     * @return RestResponse<Boolean>
+     */
+    @FinishTask
+    @PostMapping("/writeAssetsProduction")
+    public RestResponse<Boolean> writeAssetsProduction(TaskRecordDTO<AssetsProduction> taskRecordDTO) {
+        return RestResponse.data(assetsProductionService.writeAssetsProduction(taskRecordDTO.getTaskData()));
+    }
+
+    /**
+     * 根据业务id与产品号获取资产产品详细信息
+     * @param dto 查询dto
+     * @return AssetsProduction
+     */
+    @GetMapping("/getAssetsProductionDetail")
+    public RestResponse<AssetsProduction> getAssetsProductionDetail(AssetsProductionDetailDTO dto) {
+        return RestResponse.data(assetsProductionService.getAssetsProductionDetail(dto));
+    }
+
 }
 

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

@@ -55,4 +55,10 @@ public interface AssetsProductionMapper extends CustomBaseMapper<AssetsProductio
      */
     Boolean copyProductionInfo(@Param("businessId") Long businessId, @Param("productionType") String productionType, @Param("printCount") Integer printCount);
 
+    /**
+     * 撰写产品信息
+     * @param assetsProduction 产品信息字段
+     * @return Boolean
+     */
+    Boolean writeAssetsProduction(AssetsProduction assetsProduction);
 }

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

@@ -46,6 +46,7 @@
         check_value,
         purpose_name,
         type_name,
+        valuation_basis_date,
         (SELECT assets_evaluation_target_type.type_name FROM assets_evaluation_target_type WHERE
         assets_evaluation_target_type.id = target.evaluation_type_id) AS targetTypename,
         (SELECT assets_evaluation_target_type.type_name FROM assets_evaluation_target_type WHERE
@@ -56,9 +57,12 @@
         LEFT JOIN assets_evaluation_target_purpose AS purpose ON purpose.id = target.evaluation_purpose_id
         LEFT JOIN assets_value_type AS value_type ON value_type.id = target.assets_value_id
         WHERE target.assets_id = #{id}
-        <if test="productionNo!=null and productionNo != '' ">
+        <if test="productionNo != null and productionNo != '' ">
             AND production_no = #{productionNo}
         </if>
+        <if test="productionNo == null or productionNo == '' ">
+            AND (production_no IS NULL OR production_no = '')
+        </if>
         AND target.deleted = 0
     </select>
 

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

@@ -82,4 +82,24 @@
         VALUE (NULL, #{businessId}, #{productionType}, #{printCount})
     </insert>
 
+    <!--撰写产品信息-->
+    <update id="writeAssetsProduction">
+        UPDATE assets_production
+        SET signatory = #{signatory},
+            client_name = #{clientName},
+            client_tel = #{clientTel},
+            valuation_basis_date = #{valuationBasisDate},
+            evaluate_acreage = #{evaluateAcreage},
+            evaluate_price = #{evaluatePrice},
+            evaluate_amount = #{evaluateAmount},
+            owner = #{owner},
+            print_count = #{printCount},
+            create_production_date = #{createProductionDate},
+            comment = #{comment},
+            file_path = #{filePath}
+        WHERE production_no = #{productionNo}
+        AND business_id = #{businessId}
+    </update>
+
+
 </mapper>

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

@@ -0,0 +1,16 @@
+package com.dayou.dto;
+
+import lombok.Data;
+
+@Data
+public class AssetsProductionDetailDTO {
+    /**
+     * 资产业务id
+     */
+    private Long businessId;
+
+    /**
+     * 资产业务产品号
+     */
+    private String productionNo;
+}

domain/src/main/java/com/dayou/entity/AssetsProduction.java

@@ -144,7 +144,7 @@ public class AssetsProduction extends BaseEntity {
      * 电子文档路经
      */
     @ImportCell
-    @ExportCell(columnName = "电子文档路经")
+    @ExportCell(columnName = "资料路由信息(json)")
     private String filePath;
 
     /**
@@ -161,5 +161,15 @@ public class AssetsProduction extends BaseEntity {
     @ExportCell(columnName = "送达状态")
     private Boolean delivery;
 
+    /**
+     * 二维码路径
+     */
+    private String qrCode;
+
+    /**
+     * 项目名称
+     */
+    private String assetsName;
+
 
 }

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

@@ -1,4 +1,5 @@
 package com.dayou.service;
+import com.dayou.dto.AssetsProductionDetailDTO;
 import com.dayou.dto.TaskRecordDTO;
 import com.dayou.entity.AssetsProduction;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -50,4 +51,18 @@ public interface IAssetsProductionService extends IService<AssetsProduction> {
          */
         AssetsProduction getProductionByBusinessId(Long businessId);
 
+        /**
+         * 撰写产品信息
+         * @param assetsProduction 产品信息字段
+         * @return Boolean
+         */
+        Boolean writeAssetsProduction(AssetsProduction assetsProduction);
+
+        /**
+         * 根据业务id与产品号获取资产产品详细信息
+         * @param dto 查询dto
+         * @return AssetsProduction
+         */
+        AssetsProduction getAssetsProductionDetail(AssetsProductionDetailDTO dto);
+
 }

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

@@ -1,5 +1,6 @@
 package com.dayou.service.impl;
 
+import com.dayou.dto.AssetsProductionDetailDTO;
 import com.dayou.dto.TaskRecordDTO;
 import com.dayou.entity.AssetsProduction;
 import com.dayou.mapper.AssetsProductionMapper;
@@ -93,6 +94,7 @@ public class AssetsProductionServiceImpl extends ServiceImpl<AssetsProductionMap
 
     /**
      * 根据业务id获取已选择产品
+     *
      * @param businessId 资产业务id
      * @return AssetsProduction
      */
@@ -100,4 +102,25 @@ public class AssetsProductionServiceImpl extends ServiceImpl<AssetsProductionMap
     public AssetsProduction getProductionByBusinessId(Long businessId) {
         return assetsProductionMapper.getProductionByBusinessId(businessId);
     }
+
+    /**
+     * 撰写产品信息
+     *
+     * @param assetsProduction 产品信息字段
+     * @return Boolean
+     */
+    @Override
+    public Boolean writeAssetsProduction(AssetsProduction assetsProduction) {
+        return assetsProductionMapper.writeAssetsProduction(assetsProduction);
+    }
+
+    /**
+     * 根据业务id与产品号获取资产产品详细信息
+     * @param dto 查询dto
+     * @return AssetsProduction
+     */
+    @Override
+    public AssetsProduction getAssetsProductionDetail(AssetsProductionDetailDTO dto) {
+        return this.getOne(new LambdaQueryWrapper<AssetsProduction>().eq(AssetsProduction::getBusinessId, dto.getBusinessId()).eq(AssetsProduction::getProductionNo, dto.getProductionNo()));
+    }
 }

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

@@ -168,7 +168,7 @@ public class AssetsServiceImpl extends ServiceImpl<AssetsMapper, Assets> impleme
         for (Long id : dto.getTargetIdList()) {
             assetsEvaluationTargetMapper.updateTargetProductionNo(id, productionNo);
         }
-        return null;
+        return productionNo;
     }
 
     /**
@@ -268,7 +268,7 @@ public class AssetsServiceImpl extends ServiceImpl<AssetsMapper, Assets> impleme
 
 
         // 判断有无子号
-        if (takeAssetsProductionNoDTO.getSelectAll()) { //true 则选择了全部评估对象,仅主号无子号
+        if (ObjectUtil.isNull(productionNoList) || productionNoList.isEmpty()) { //true 则选择了全部评估对象,仅主号无子号
             return productionNo + "号";
         } else { //false 选择了部分评估对象,有子号
             return getProductionSecNum(productionNo, productionNoList);

sql/update_sql.sql

@@ -278,4 +278,12 @@ alter table major_production add COLUMN validate_code varchar(255)  comment '验
   修改人:苟耕铨
  */
 # 资产评估对象表新增字段
-ALTER TABLE `assets_evaluation_target` ADD production_no VARCHAR(128) NULL COMMENT '产品号';
+ALTER TABLE `assets_evaluation_target` ADD production_no VARCHAR(128) NULL COMMENT '产品号';
+
+/**
+  日期：2024-04-17
+  修改人:苟耕铨
+ */
+# 资产产品表file_path字段修改为json类型,新增字段assets_name
+ALTER TABLE assets_production MODIFY COLUMN file_path json NULL comment '资料路由信息(json)';
+ALTER TABLE assets_production ADD COLUMN assets_name VARCHAR(255) NULL comment '项目名称';