1.资产业务评估对象

2.表修改

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

@@ -1,6 +1,8 @@
 package com.dayou.controller;
 
 import com.dayou.vo.AssetsEvaluationTargetVO;
+import org.apache.commons.lang3.StringEscapeUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -56,7 +58,7 @@ public class AssetsEvaluationTargetController extends BaseController {
     /**
      * 资产评估对象表详情
      */
-    @GetMapping("/{id}")
+    @GetMapping("detail/{id}")
     public RestResponse<AssetsEvaluationTarget> detail(@PathVariable Long id){
         AssetsEvaluationTarget xAssetsEvaluationTarget =assetsEvaluationTargetService.detail(id);
         return RestResponse.data(xAssetsEvaluationTarget);
@@ -65,7 +67,7 @@ public class AssetsEvaluationTargetController extends BaseController {
     /**
      * 资产评估对象表新增
      */
-    @PostMapping("")
+    @PostMapping("/save")
     public RestResponse<Boolean> save(@RequestBody AssetsEvaluationTarget assetsEvaluationTarget) {
         Boolean ret = assetsEvaluationTargetService.add(assetsEvaluationTarget);
         return RestResponse.data(ret);
@@ -74,7 +76,7 @@ public class AssetsEvaluationTargetController extends BaseController {
     /**
      * 资产评估对象表更新
      */
-    @PutMapping("")
+    @PutMapping("/update")
     public RestResponse<Boolean> update(@RequestBody AssetsEvaluationTarget assetsEvaluationTarget) {
         Boolean ret = assetsEvaluationTargetService.update(assetsEvaluationTarget);
         return RestResponse.data(ret);
@@ -83,7 +85,7 @@ public class AssetsEvaluationTargetController extends BaseController {
     /**
      * 资产评估对象表删除
      */
-    @DeleteMapping("/{id}")
+    @DeleteMapping("delete/{id}")
     public RestResponse<Boolean> delete(@PathVariable Long id) {
         Boolean ret = assetsEvaluationTargetService.delete(id);
         return RestResponse.data(ret);

biz-base/src/main/resources/application-local.yml

@@ -19,10 +19,10 @@ spring:
 
 
 dfs:
-  path: G:\upload
-  domain: G:\upload
+  path: E:\local-upload
+  domain: E:\local-upload
   domainName: https://kps.scdayou.com/dfs
-  code: G:\code
+  code: E:\local-upload\code
 
 advice:
   file:

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

@@ -46,12 +46,14 @@
                check_value,
                purpose_name,
                type_name,
-               (SELECT assets_evaluation_target_type.type_name FROM assets_evaluation_target_type WHERE target.evaluation_type_id) AS targetTypename,
-               (SELECT assets_evaluation_target_type.type_name FROM assets_evaluation_target_type WHERE target.evaluation_type_sec_id) AS secTargetTypaName
+               (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 assets_evaluation_target_type.id = target.evaluation_type_sec_id) AS secTargetTypaName,
+               value_type.type_name AS valueTypeName
         FROM assets_evaluation_target AS target
         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}
+        AND target.deleted = 0
     </select>
 
 </mapper>

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

@@ -202,6 +202,7 @@
         assets.assets_business_gener,
         assets.entrust_again,
         assets.clientele_type,
+        assets.principal_id,
         customer.id AS clienteleId,
         customer.name AS customerName,
         linkman.id AS clienteleContactId,

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

@@ -1,5 +1,7 @@
 package com.dayou.entity;
 import java.math.BigDecimal;
+
+import com.alibaba.fastjson.annotation.JSONField;
 import com.dayou.common.BaseEntity;
 import java.time.LocalDate;
 import lombok.Data;

sql/update_sql.sql

@@ -231,3 +231,8 @@ ALTER TABLE production_out_warehouse add COLUMN order_id bigint(32) DEFAULT NULL
 ALTER TABLE production_out_warehouse MODIFY COLUMN production_id bigint(20) comment '产品id（大中型）';
 ALTER TABLE production_out_warehouse add COLUMN order_fund_id bigint(32) DEFAULT NULL comment '订单应收款id（个贷）';
 ALTER TABLE production_out_warehouse MODIFY COLUMN production_fund_id bigint(20) comment '产品应收款id(大中型)';
+
+/**
+  日期：2024-04-08
+ */
+ALTER TABLE assets_evaluation_target MODIFY COLUMN file_path json NOT NULL comment '资料路由信息(json)';