Просмотр исходного кода

1.新增资产业务评估对象相关接口若干

GouGengquan 1 год назад
Родитель
Сommit
0e76c4b2ed
32 измененных файлов с 1019 добавлено и 54 удалено
  1. 13 8
      biz-base/src/main/java/com/dayou/controller/AssetsController.java
  2. 92 0
      biz-base/src/main/java/com/dayou/controller/AssetsEvaluationMethodController.java
  3. 3 2
      biz-base/src/main/java/com/dayou/controller/AssetsEvaluationTargetController.java
  4. 92 0
      biz-base/src/main/java/com/dayou/controller/AssetsEvaluationTargetPurposeController.java
  5. 8 3
      biz-base/src/main/java/com/dayou/controller/AssetsEvaluationTargetTypeController.java
  6. 92 0
      biz-base/src/main/java/com/dayou/controller/AssetsValueTypeController.java
  7. 24 0
      dao/src/main/java/com/dayou/mapper/AssetsEvaluationMethodMapper.java
  8. 11 0
      dao/src/main/java/com/dayou/mapper/AssetsEvaluationTargetMapper.java
  9. 24 0
      dao/src/main/java/com/dayou/mapper/AssetsEvaluationTargetPurposeMapper.java
  10. 23 0
      dao/src/main/java/com/dayou/mapper/AssetsValueTypeMapper.java
  11. 29 0
      dao/src/main/resources/mapper/AssetsEvaluationMethodMapper.xml
  12. 19 0
      dao/src/main/resources/mapper/AssetsEvaluationTargetMapper.xml
  13. 29 0
      dao/src/main/resources/mapper/AssetsEvaluationTargetPurposeMapper.xml
  14. 0 1
      dao/src/main/resources/mapper/AssetsMapper.xml
  15. 29 0
      dao/src/main/resources/mapper/AssetsValueTypeMapper.xml
  16. 22 0
      domain/src/main/java/com/dayou/dto/AssetsPrincipalMembersDTO.java
  17. 31 0
      domain/src/main/java/com/dayou/entity/AssetsEvaluationMethod.java
  18. 31 0
      domain/src/main/java/com/dayou/entity/AssetsEvaluationTargetPurpose.java
  19. 31 0
      domain/src/main/java/com/dayou/entity/AssetsValueType.java
  20. 28 0
      domain/src/main/java/com/dayou/vo/AssetsEvaluationTargetVO.java
  21. 38 0
      service/src/main/java/com/dayou/service/IAssetsEvaluationMethodService.java
  22. 37 0
      service/src/main/java/com/dayou/service/IAssetsEvaluationTargetPurposeService.java
  23. 2 1
      service/src/main/java/com/dayou/service/IAssetsEvaluationTargetService.java
  24. 2 2
      service/src/main/java/com/dayou/service/IAssetsEvaluationTargetTypeService.java
  25. 9 3
      service/src/main/java/com/dayou/service/IAssetsService.java
  26. 37 0
      service/src/main/java/com/dayou/service/IAssetsValueTypeService.java
  27. 78 0
      service/src/main/java/com/dayou/service/impl/AssetsEvaluationMethodServiceImpl.java
  28. 78 0
      service/src/main/java/com/dayou/service/impl/AssetsEvaluationTargetPurposeServiceImpl.java
  29. 9 5
      service/src/main/java/com/dayou/service/impl/AssetsEvaluationTargetServiceImpl.java
  30. 3 9
      service/src/main/java/com/dayou/service/impl/AssetsEvaluationTargetTypeServiceImpl.java
  31. 17 20
      service/src/main/java/com/dayou/service/impl/AssetsServiceImpl.java
  32. 78 0
      service/src/main/java/com/dayou/service/impl/AssetsValueTypeServiceImpl.java

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

@@ -1,29 +1,24 @@
 package com.dayou.controller;
 
+import com.dayou.dto.AssetsPrincipalMembersDTO;
 import com.dayou.dto.AssetsSelectDTO;
 import com.dayou.dto.WorkNodeCommit;
 import com.dayou.vo.AssetsVO;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springframework.web.bind.annotation.RestController;
-import com.dayou.controller.BaseController;
 import com.dayou.service.IAssetsService;
 import com.dayou.entity.Assets;
 import com.dayou.common.RestResponse;
 import org.springframework.web.bind.annotation.*;
 import com.dayou.common.PullDownModel;
 import com.dayou.utils.ConvertUtil;
-import com.dayou.utils.HttpKit;
-import com.dayou.exception.ErrorCode;
-import java.util.Date;
+
 import java.util.List;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import org.springframework.http.MediaType;
-import org.springframework.web.multipart.MultipartFile;
+
 /**
  * 资产业务订单表
  *
@@ -106,5 +101,15 @@ public class AssetsController extends BaseController {
         List<PullDownModel> ret=ConvertUtil.copyList(list, PullDownModel.class);
         return RestResponse.data(ret);
     }
+
+    /**
+     * 修改资产业务订单项目负责人与项目成员
+     * @param assetsPrincipalMembersDTO 修改dto
+     * @return RestResponse<Boolean>
+     */
+    @PutMapping("/updatePrincipalAndMembers")
+    public RestResponse<Boolean> updatePrincipalAndMembers(@RequestBody AssetsPrincipalMembersDTO assetsPrincipalMembersDTO) {
+        return RestResponse.data(assetsService.updatePrincipalAndMembers(assetsPrincipalMembersDTO));
+    }
 }
 

+ 92 - 0
biz-base/src/main/java/com/dayou/controller/AssetsEvaluationMethodController.java

@@ -0,0 +1,92 @@
+package com.dayou.controller;
+
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springframework.web.bind.annotation.RestController;
+import com.dayou.controller.BaseController;
+import com.dayou.service.IAssetsEvaluationMethodService;
+import com.dayou.entity.AssetsEvaluationMethod;
+import com.dayou.common.RestResponse;
+import org.springframework.web.bind.annotation.*;
+import com.dayou.utils.ConvertUtil;
+import com.dayou.utils.HttpKit;
+import com.dayou.exception.ErrorCode;
+import java.util.Date;
+import java.util.List;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import org.springframework.http.MediaType;
+import org.springframework.web.multipart.MultipartFile;
+/**
+ * 资产评估方法表
+ *
+ * @author GouGengquan
+ * @since 2024-04-07
+ */
+@RestController
+@RequestMapping("assetsEvaluationMethod")
+@Slf4j
+public class AssetsEvaluationMethodController extends BaseController {
+    @Autowired
+    private IAssetsEvaluationMethodService assetsEvaluationMethodService;
+
+    /**
+     * 获取所有评估方法集合
+     * @return RestResponse<List<AssetsEvaluationMethod>>
+     */
+    @GetMapping("/getAssetsEvaluationMethod")
+    public RestResponse<List<AssetsEvaluationMethod>> getAssetsEvaluationMethod() {
+        return RestResponse.data(assetsEvaluationMethodService.getAssetsEvaluationMethod());
+    }
+
+    /**
+    * 资产评估方法表列表
+    */
+    @GetMapping("")
+    public RestResponse<Page<AssetsEvaluationMethod>> page(AssetsEvaluationMethod assetsEvaluationMethod, Page page){
+        Page<AssetsEvaluationMethod> pages=assetsEvaluationMethodService.selectPage(page,assetsEvaluationMethod);
+        return RestResponse.data(pages);
+    }
+
+    /**
+     * 资产评估方法表详情
+     */
+    @GetMapping("/{id}")
+    public RestResponse<AssetsEvaluationMethod> detail(@PathVariable Long id){
+        AssetsEvaluationMethod xAssetsEvaluationMethod =assetsEvaluationMethodService.detail(id);
+        return RestResponse.data(xAssetsEvaluationMethod);
+     }
+
+    /**
+     * 资产评估方法表新增
+     */
+    @PostMapping("")
+    public RestResponse<Boolean> save(@RequestBody AssetsEvaluationMethod assetsEvaluationMethod) {
+        Boolean ret = assetsEvaluationMethodService.add(assetsEvaluationMethod);
+        return RestResponse.data(ret);
+    }
+
+    /**
+     * 资产评估方法表更新
+     */
+    @PutMapping("")
+    public RestResponse<Boolean> update(@RequestBody AssetsEvaluationMethod assetsEvaluationMethod) {
+        Boolean ret = assetsEvaluationMethodService.update(assetsEvaluationMethod);
+        return RestResponse.data(ret);
+    }
+
+    /**
+     * 资产评估方法表删除
+     */
+    @DeleteMapping("/{id}")
+    public RestResponse<Boolean> delete(@PathVariable Long id) {
+        Boolean ret = assetsEvaluationMethodService.delete(id);
+        return RestResponse.data(ret);
+    }
+
+
+}
+

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

@@ -1,5 +1,6 @@
 package com.dayou.controller;
 
+import com.dayou.vo.AssetsEvaluationTargetVO;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -36,10 +37,10 @@ public class AssetsEvaluationTargetController extends BaseController {
     /**
      * 根据资产业务id获取资产业务评估对象集合
      * @param id 资产业务id
-     * @return RestResponse<List<AssetsEvaluationTarget>>
+     * @return RestResponse<List<AssetsEvaluationTargetVO>>
      */
     @GetMapping("/getAETargetListByAssetsId/{id}")
-    public RestResponse<List<AssetsEvaluationTarget>> getAETargetListByAssetsId(@PathVariable Long id) {
+    public RestResponse<List<AssetsEvaluationTargetVO>> getAETargetListByAssetsId(@PathVariable Long id) {
         return RestResponse.data(assetsEvaluationTargetService.getAETargetListByAssetsId(id));
     }
 

+ 92 - 0
biz-base/src/main/java/com/dayou/controller/AssetsEvaluationTargetPurposeController.java

@@ -0,0 +1,92 @@
+package com.dayou.controller;
+
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springframework.web.bind.annotation.RestController;
+import com.dayou.controller.BaseController;
+import com.dayou.service.IAssetsEvaluationTargetPurposeService;
+import com.dayou.entity.AssetsEvaluationTargetPurpose;
+import com.dayou.common.RestResponse;
+import org.springframework.web.bind.annotation.*;
+import com.dayou.utils.ConvertUtil;
+import com.dayou.utils.HttpKit;
+import com.dayou.exception.ErrorCode;
+import java.util.Date;
+import java.util.List;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import org.springframework.http.MediaType;
+import org.springframework.web.multipart.MultipartFile;
+/**
+ * 资产评估对象评估目的表
+ *
+ * @author GouGengquan
+ * @since 2024-04-07
+ */
+@RestController
+@RequestMapping("assetsEvaluationTargetPurpose")
+@Slf4j
+public class AssetsEvaluationTargetPurposeController extends BaseController {
+    @Autowired
+    private IAssetsEvaluationTargetPurposeService assetsEvaluationTargetPurposeService;
+
+    /**
+     * 获取所有资产评估目的集合
+     * @return RestResponse<List<AssetsEvaluationTargetPurpose>>
+     */
+    @GetMapping("/getPurpose")
+    public RestResponse<List<AssetsEvaluationTargetPurpose>> getPurpose() {
+        return RestResponse.data(assetsEvaluationTargetPurposeService.getPurpose());
+    }
+
+    /**
+    * 资产评估对象评估目的表列表
+    */
+    @GetMapping("")
+    public RestResponse<Page<AssetsEvaluationTargetPurpose>> page(AssetsEvaluationTargetPurpose assetsEvaluationTargetPurpose, Page page){
+        Page<AssetsEvaluationTargetPurpose> pages=assetsEvaluationTargetPurposeService.selectPage(page,assetsEvaluationTargetPurpose);
+        return RestResponse.data(pages);
+    }
+
+    /**
+     * 资产评估对象评估目的表详情
+     */
+    @GetMapping("/{id}")
+    public RestResponse<AssetsEvaluationTargetPurpose> detail(@PathVariable Long id){
+        AssetsEvaluationTargetPurpose xAssetsEvaluationTargetPurpose =assetsEvaluationTargetPurposeService.detail(id);
+        return RestResponse.data(xAssetsEvaluationTargetPurpose);
+     }
+
+    /**
+     * 资产评估对象评估目的表新增
+     */
+    @PostMapping("")
+    public RestResponse<Boolean> save(@RequestBody AssetsEvaluationTargetPurpose assetsEvaluationTargetPurpose) {
+        Boolean ret = assetsEvaluationTargetPurposeService.add(assetsEvaluationTargetPurpose);
+        return RestResponse.data(ret);
+    }
+
+    /**
+     * 资产评估对象评估目的表更新
+     */
+    @PutMapping("")
+    public RestResponse<Boolean> update(@RequestBody AssetsEvaluationTargetPurpose assetsEvaluationTargetPurpose) {
+        Boolean ret = assetsEvaluationTargetPurposeService.update(assetsEvaluationTargetPurpose);
+        return RestResponse.data(ret);
+    }
+
+    /**
+     * 资产评估对象评估目的表删除
+     */
+    @DeleteMapping("/{id}")
+    public RestResponse<Boolean> delete(@PathVariable Long id) {
+        Boolean ret = assetsEvaluationTargetPurposeService.delete(id);
+        return RestResponse.data(ret);
+    }
+
+
+}
+

+ 8 - 3
biz-base/src/main/java/com/dayou/controller/AssetsEvaluationTargetTypeController.java

@@ -34,9 +34,14 @@ public class AssetsEvaluationTargetTypeController extends BaseController {
     @Autowired
     private IAssetsEvaluationTargetTypeService assetsEvaluationTargetTypeService;
 
-    @GetMapping("getTypeList")
-    public RestResponse<List<AssetsEvaluationTargetType>> getTypeList(@RequestBody AssetsEvaluationTargetType type){
-        return RestResponse.data(assetsEvaluationTargetTypeService.getTypeList(type));
+    /**
+     * 根据父级id获取资产评估对象类型
+     * @param parentId 父级id
+     * @return RestResponse<List<AssetsEvaluationTargetType>>
+     */
+    @GetMapping("/getTypeList/{parentId}")
+    public RestResponse<List<AssetsEvaluationTargetType>> getTypeList(@PathVariable Long parentId){
+        return RestResponse.data(assetsEvaluationTargetTypeService.getTypeList(parentId));
     }
 
     /**

+ 92 - 0
biz-base/src/main/java/com/dayou/controller/AssetsValueTypeController.java

@@ -0,0 +1,92 @@
+package com.dayou.controller;
+
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springframework.web.bind.annotation.RestController;
+import com.dayou.controller.BaseController;
+import com.dayou.service.IAssetsValueTypeService;
+import com.dayou.entity.AssetsValueType;
+import com.dayou.common.RestResponse;
+import org.springframework.web.bind.annotation.*;
+import com.dayou.utils.ConvertUtil;
+import com.dayou.utils.HttpKit;
+import com.dayou.exception.ErrorCode;
+import java.util.Date;
+import java.util.List;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import org.springframework.http.MediaType;
+import org.springframework.web.multipart.MultipartFile;
+/**
+ * 价值类型表
+ *
+ * @author GouGengquan
+ * @since 2024-04-07
+ */
+@RestController
+@RequestMapping("assetsValueType")
+@Slf4j
+public class AssetsValueTypeController extends BaseController {
+    @Autowired
+    private IAssetsValueTypeService assetsValueTypeService;
+
+    /**
+     * 获取所有资产价值类型
+     * @return List<AssetsValueType>
+     */
+    @GetMapping("/getAssetsValueType")
+    public RestResponse<List<AssetsValueType>> getAssetsValueType() {
+        return RestResponse.data(assetsValueTypeService.getAssetsValueType());
+    }
+
+    /**
+    * 价值类型表列表
+    */
+    @GetMapping("")
+    public RestResponse<Page<AssetsValueType>> page(AssetsValueType assetsValueType, Page page){
+        Page<AssetsValueType> pages=assetsValueTypeService.selectPage(page,assetsValueType);
+        return RestResponse.data(pages);
+    }
+
+    /**
+     * 价值类型表详情
+     */
+    @GetMapping("/{id}")
+    public RestResponse<AssetsValueType> detail(@PathVariable Long id){
+        AssetsValueType xAssetsValueType =assetsValueTypeService.detail(id);
+        return RestResponse.data(xAssetsValueType);
+     }
+
+    /**
+     * 价值类型表新增
+     */
+    @PostMapping("")
+    public RestResponse<Boolean> save(@RequestBody AssetsValueType assetsValueType) {
+        Boolean ret = assetsValueTypeService.add(assetsValueType);
+        return RestResponse.data(ret);
+    }
+
+    /**
+     * 价值类型表更新
+     */
+    @PutMapping("")
+    public RestResponse<Boolean> update(@RequestBody AssetsValueType assetsValueType) {
+        Boolean ret = assetsValueTypeService.update(assetsValueType);
+        return RestResponse.data(ret);
+    }
+
+    /**
+     * 价值类型表删除
+     */
+    @DeleteMapping("/{id}")
+    public RestResponse<Boolean> delete(@PathVariable Long id) {
+        Boolean ret = assetsValueTypeService.delete(id);
+        return RestResponse.data(ret);
+    }
+
+
+}
+

+ 24 - 0
dao/src/main/java/com/dayou/mapper/AssetsEvaluationMethodMapper.java

@@ -0,0 +1,24 @@
+package com.dayou.mapper;
+
+import com.dayou.entity.AssetsEvaluationMethod;
+import com.dayou.dao.CustomBaseMapper;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 资产评估方法表 Mapper 接口
+ * </p>
+ *
+ * @author GouGengquan
+ * @since 2024-04-07
+ */
+public interface AssetsEvaluationMethodMapper extends CustomBaseMapper<AssetsEvaluationMethod> {
+
+    /**
+     * 获取所有评估方法集合
+     * @return List<AssetsEvaluationMethod>
+     */
+    List<AssetsEvaluationMethod> getAssetsEvaluationMethod();
+
+}

+ 11 - 0
dao/src/main/java/com/dayou/mapper/AssetsEvaluationTargetMapper.java

@@ -2,6 +2,10 @@ package com.dayou.mapper;
 
 import com.dayou.entity.AssetsEvaluationTarget;
 import com.dayou.dao.CustomBaseMapper;
+import com.dayou.vo.AssetsEvaluationTargetVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +17,11 @@ import com.dayou.dao.CustomBaseMapper;
  */
 public interface AssetsEvaluationTargetMapper extends CustomBaseMapper<AssetsEvaluationTarget> {
 
+    /**
+     * 根据资产业务订单id获取评估对象信息
+     * @param id 资产订单id
+     * @return List<AssetsEvaluationTargetVO>
+     */
+    List<AssetsEvaluationTargetVO> getAETargetListByAssetsId(@Param("id") Long id);
+
 }

+ 24 - 0
dao/src/main/java/com/dayou/mapper/AssetsEvaluationTargetPurposeMapper.java

@@ -0,0 +1,24 @@
+package com.dayou.mapper;
+
+import com.dayou.entity.AssetsEvaluationTargetPurpose;
+import com.dayou.dao.CustomBaseMapper;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 资产评估对象评估目的表 Mapper 接口
+ * </p>
+ *
+ * @author GouGengquan
+ * @since 2024-04-07
+ */
+public interface AssetsEvaluationTargetPurposeMapper extends CustomBaseMapper<AssetsEvaluationTargetPurpose> {
+
+    /**
+     * 获取所有资产评估目的集合
+     * @return List<AssetsEvaluationTargetPurpose>
+     */
+    List<AssetsEvaluationTargetPurpose> getPurpose();
+
+}

+ 23 - 0
dao/src/main/java/com/dayou/mapper/AssetsValueTypeMapper.java

@@ -0,0 +1,23 @@
+package com.dayou.mapper;
+
+import com.dayou.entity.AssetsValueType;
+import com.dayou.dao.CustomBaseMapper;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 价值类型表 Mapper 接口
+ * </p>
+ *
+ * @author GouGengquan
+ * @since 2024-04-07
+ */
+public interface AssetsValueTypeMapper extends CustomBaseMapper<AssetsValueType> {
+
+    /**
+     * 获取所有资产价值类型
+     * @return List<AssetsValueType>
+     */
+    List<AssetsValueType> getAssetsValueType();
+}

+ 29 - 0
dao/src/main/resources/mapper/AssetsEvaluationMethodMapper.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dayou.mapper.AssetsEvaluationMethodMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.dayou.entity.AssetsEvaluationMethod">
+        <result column="id" property="id" />
+        <result column="deleted" property="deleted" />
+        <result column="created" property="created" />
+        <result column="modified" property="modified" />
+        <result column="method_name" property="methodName" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id,
+        deleted,
+        created,
+        modified,
+        method_name
+    </sql>
+
+    <!--获取所有评估方法集合-->
+    <select id="getAssetsEvaluationMethod" resultType="com.dayou.entity.AssetsEvaluationMethod">
+        SELECT id, method_name
+        FROM assets_evaluation_method
+    </select>
+
+</mapper>

+ 19 - 0
dao/src/main/resources/mapper/AssetsEvaluationTargetMapper.xml

@@ -35,4 +35,23 @@
         evaluation_purpose_id, evaluation_type_id, evaluation_type_sec_id, the_holder, assets_value_id, principal_id, site_ids, valuation_basis_date, evaluation_method_id, choice_evaluation_method_id, total_asset_carrying_amount, total_liabilities_carrying_amount, carrying_amount_of_net_assets, estimated_value, remark, file_path
     </sql>
 
+    <!--根据资产业务订单id获取评估对象信息-->
+    <select id="getAETargetListByAssetsId" resultType="com.dayou.vo.AssetsEvaluationTargetVO">
+        SELECT target.id,
+               the_holder,
+               total_asset_carrying_amount,
+               total_liabilities_carrying_amount,
+               carrying_amount_of_net_assets,
+               estimated_value,
+               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
+        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}
+    </select>
+
 </mapper>

+ 29 - 0
dao/src/main/resources/mapper/AssetsEvaluationTargetPurposeMapper.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dayou.mapper.AssetsEvaluationTargetPurposeMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.dayou.entity.AssetsEvaluationTargetPurpose">
+        <result column="id" property="id" />
+        <result column="deleted" property="deleted" />
+        <result column="created" property="created" />
+        <result column="modified" property="modified" />
+        <result column="purpose_name" property="purposeName" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id,
+        deleted,
+        created,
+        modified,
+        purpose_name
+    </sql>
+
+    <!--获取所有资产评估目的集合-->
+    <select id="getPurpose" resultType="com.dayou.entity.AssetsEvaluationTargetPurpose">
+        SELECT id, purpose_name
+        FROM assets_evaluation_target_purpose
+    </select>
+
+</mapper>

+ 0 - 1
dao/src/main/resources/mapper/AssetsMapper.xml

@@ -197,7 +197,6 @@
         user.name AS principalName,
         allot_type,
         assets.department_id,
-        department.name,
         assets.order_id,
         assets.name,
         assets.assets_business_gener,

+ 29 - 0
dao/src/main/resources/mapper/AssetsValueTypeMapper.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dayou.mapper.AssetsValueTypeMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.dayou.entity.AssetsValueType">
+        <result column="id" property="id" />
+        <result column="deleted" property="deleted" />
+        <result column="created" property="created" />
+        <result column="modified" property="modified" />
+        <result column="type_name" property="typeName" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id,
+        deleted,
+        created,
+        modified,
+        type_name
+    </sql>
+
+    <!--获取所有资产价值类型-->
+    <select id="getAssetsValueType" resultType="com.dayou.entity.AssetsValueType">
+        SELECT id, type_name
+        FROM assets_value_type
+    </select>
+
+</mapper>

+ 22 - 0
domain/src/main/java/com/dayou/dto/AssetsPrincipalMembersDTO.java

@@ -0,0 +1,22 @@
+package com.dayou.dto;
+
+import com.dayou.annotation.ExportCell;
+import com.dayou.annotation.ImportCell;
+import com.dayou.common.BaseEntity;
+import lombok.Data;
+
+@Data
+public class AssetsPrincipalMembersDTO extends BaseEntity {
+
+    /**
+     * 项目负责人id(user_id)
+     */
+    private Long principalId;
+
+    /**
+     * 项目参与人(json格式,存用户表id)
+     */
+    @ImportCell
+    @ExportCell(columnName = "项目参与人(json格式,存用户表id)")
+    private String members;
+}

+ 31 - 0
domain/src/main/java/com/dayou/entity/AssetsEvaluationMethod.java

@@ -0,0 +1,31 @@
+package com.dayou.entity;
+import com.dayou.common.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import com.dayou.annotation.ExcelSheet;
+import com.dayou.annotation.ExportCell;
+import com.dayou.annotation.ImportCell;
+/**
+ * <p>
+ * 资产评估方法表
+ * </p>
+ *
+ * @author GouGengquan
+ * @since 2024-04-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ExcelSheet(sheetName = "资产评估方法表")
+public class AssetsEvaluationMethod extends BaseEntity {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 资产评估方法名
+     */
+    @ImportCell
+    @ExportCell(columnName = "资产评估方法名")
+    private String methodName;
+
+
+}

+ 31 - 0
domain/src/main/java/com/dayou/entity/AssetsEvaluationTargetPurpose.java

@@ -0,0 +1,31 @@
+package com.dayou.entity;
+import com.dayou.common.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import com.dayou.annotation.ExcelSheet;
+import com.dayou.annotation.ExportCell;
+import com.dayou.annotation.ImportCell;
+/**
+ * <p>
+ * 资产评估对象评估目的表
+ * </p>
+ *
+ * @author GouGengquan
+ * @since 2024-04-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ExcelSheet(sheetName = "资产评估对象评估目的表")
+public class AssetsEvaluationTargetPurpose extends BaseEntity {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 目的名
+     */
+    @ImportCell
+    @ExportCell(columnName = "目的名")
+    private String purposeName;
+
+
+}

+ 31 - 0
domain/src/main/java/com/dayou/entity/AssetsValueType.java

@@ -0,0 +1,31 @@
+package com.dayou.entity;
+import com.dayou.common.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import com.dayou.annotation.ExcelSheet;
+import com.dayou.annotation.ExportCell;
+import com.dayou.annotation.ImportCell;
+/**
+ * <p>
+ * 价值类型表
+ * </p>
+ *
+ * @author GouGengquan
+ * @since 2024-04-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ExcelSheet(sheetName = "价值类型表")
+public class AssetsValueType extends BaseEntity {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 价值类型名
+     */
+    @ImportCell
+    @ExportCell(columnName = "价值类型名")
+    private String typeName;
+
+
+}

+ 28 - 0
domain/src/main/java/com/dayou/vo/AssetsEvaluationTargetVO.java

@@ -0,0 +1,28 @@
+package com.dayou.vo;
+
+import com.dayou.entity.AssetsEvaluationTarget;
+import lombok.Data;
+
+@Data
+public class AssetsEvaluationTargetVO extends AssetsEvaluationTarget {
+
+    /**
+     * 评估对象评估目的
+     */
+    private String purposeName;
+
+    /**
+     * 评估对象价值类型
+     */
+    private String valueTypeName;
+
+    /**
+     * 一级评估对象
+     */
+    private String targetTypename;
+
+    /**
+     * 二级评估对象
+     */
+    private String secTargetTypaName;
+}

+ 38 - 0
service/src/main/java/com/dayou/service/IAssetsEvaluationMethodService.java

@@ -0,0 +1,38 @@
+package com.dayou.service;
+import com.dayou.entity.AssetsEvaluationMethod;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 资产评估方法表 服务类
+ * </p>
+ *
+ * @author GouGengquan
+ * @since 2024-04-07
+ */
+public interface IAssetsEvaluationMethodService extends IService<AssetsEvaluationMethod> {
+
+
+        /**
+         * 获取所有评估方法集合
+         * @return List<AssetsEvaluationMethod>
+         */
+        List<AssetsEvaluationMethod> getAssetsEvaluationMethod();
+
+        Page<AssetsEvaluationMethod> selectPage(Page page,AssetsEvaluationMethod assetsEvaluationMethod);
+
+        AssetsEvaluationMethod detail(Long id);
+
+        Boolean add(AssetsEvaluationMethod assetsEvaluationMethod);
+
+        Boolean update(AssetsEvaluationMethod assetsEvaluationMethod);
+
+        Boolean delete(Long id);
+
+}

+ 37 - 0
service/src/main/java/com/dayou/service/IAssetsEvaluationTargetPurposeService.java

@@ -0,0 +1,37 @@
+package com.dayou.service;
+import com.dayou.entity.AssetsEvaluationTargetPurpose;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 资产评估对象评估目的表 服务类
+ * </p>
+ *
+ * @author GouGengquan
+ * @since 2024-04-07
+ */
+public interface IAssetsEvaluationTargetPurposeService extends IService<AssetsEvaluationTargetPurpose> {
+
+        /**
+         * 获取所有资产评估目的集合
+         * @return List<AssetsEvaluationTargetPurpose>
+         */
+        List<AssetsEvaluationTargetPurpose> getPurpose();
+
+        Page<AssetsEvaluationTargetPurpose> selectPage(Page page,AssetsEvaluationTargetPurpose assetsEvaluationTargetPurpose);
+
+        AssetsEvaluationTargetPurpose detail(Long id);
+
+        Boolean add(AssetsEvaluationTargetPurpose assetsEvaluationTargetPurpose);
+
+        Boolean update(AssetsEvaluationTargetPurpose assetsEvaluationTargetPurpose);
+
+        Boolean delete(Long id);
+
+}

+ 2 - 1
service/src/main/java/com/dayou/service/IAssetsEvaluationTargetService.java

@@ -3,6 +3,7 @@ import com.dayou.entity.AssetsEvaluationTarget;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.dayou.vo.AssetsEvaluationTargetVO;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -23,7 +24,7 @@ public interface IAssetsEvaluationTargetService extends IService<AssetsEvaluatio
          * @param id 资产业务id
          * @return List<AssetsEvaluationTarget>
          */
-        List<AssetsEvaluationTarget> getAETargetListByAssetsId(Long id);
+        List<AssetsEvaluationTargetVO> getAETargetListByAssetsId(Long id);
 
         Page<AssetsEvaluationTarget> selectPage(Page page,AssetsEvaluationTarget assetsEvaluationTarget);
 

+ 2 - 2
service/src/main/java/com/dayou/service/IAssetsEvaluationTargetTypeService.java

@@ -20,10 +20,10 @@ public interface IAssetsEvaluationTargetTypeService extends IService<AssetsEvalu
 
         /**
          * 根据父级id获取资产评估对象类型
-         * @param type 查询条件
+         * @param parentId 查询条件
          * @return List<AssetsEvaluationTargetType>
          */
-        List<AssetsEvaluationTargetType> getTypeList(AssetsEvaluationTargetType type);
+        List<AssetsEvaluationTargetType> getTypeList(Long parentId);
 
         /**
          * 新增资产评估对象类型

+ 9 - 3
service/src/main/java/com/dayou/service/IAssetsService.java

@@ -1,13 +1,12 @@
 package com.dayou.service;
+import com.dayou.dto.AssetsPrincipalMembersDTO;
 import com.dayou.dto.AssetsSelectDTO;
 import com.dayou.dto.WorkNodeCommit;
 import com.dayou.entity.Assets;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.dayou.vo.AssetsVO;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.springframework.web.multipart.MultipartFile;
+
 /**
  * <p>
  * 资产业务订单表 服务类
@@ -48,6 +47,13 @@ public interface IAssetsService extends IService<Assets> {
          */
         WorkNodeCommit add(Assets assets);
 
+        /**
+         * 修改资产业务订单项目负责人与项目成员
+         * @param assetsPrincipalMembersDTO 修改dto
+         * @return Boolean
+         */
+        Boolean updatePrincipalAndMembers(AssetsPrincipalMembersDTO assetsPrincipalMembersDTO);
+
         Boolean update(Assets assets);
 
         Boolean delete(Long id);

+ 37 - 0
service/src/main/java/com/dayou/service/IAssetsValueTypeService.java

@@ -0,0 +1,37 @@
+package com.dayou.service;
+import com.dayou.entity.AssetsValueType;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 价值类型表 服务类
+ * </p>
+ *
+ * @author GouGengquan
+ * @since 2024-04-07
+ */
+public interface IAssetsValueTypeService extends IService<AssetsValueType> {
+
+        /**
+         * 获取所有资产价值类型
+         * @return List<AssetsValueType>
+         */
+        List<AssetsValueType> getAssetsValueType();
+
+        Page<AssetsValueType> selectPage(Page page,AssetsValueType assetsValueType);
+
+        AssetsValueType detail(Long id);
+
+        Boolean add(AssetsValueType assetsValueType);
+
+        Boolean update(AssetsValueType assetsValueType);
+
+        Boolean delete(Long id);
+
+}

+ 78 - 0
service/src/main/java/com/dayou/service/impl/AssetsEvaluationMethodServiceImpl.java

@@ -0,0 +1,78 @@
+package com.dayou.service.impl;
+
+import com.dayou.entity.AssetsEvaluationMethod;
+import com.dayou.mapper.AssetsEvaluationMethodMapper;
+import com.dayou.service.IAssetsEvaluationMethodService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.dayou.utils.ExcelUtil;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.CellStyle;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.springframework.web.multipart.MultipartFile;
+import java.util.List;
+import java.util.ArrayList;
+import org.springframework.transaction.annotation.Transactional;
+import com.dayou.enums.BatchTaskTypeEnum;
+
+/**
+ * <p>
+ * 资产评估方法表 服务实现类
+ * </p>
+ *
+ * @author GouGengquan
+ * @since 2024-04-07
+ */
+@Service
+public class AssetsEvaluationMethodServiceImpl extends ServiceImpl<AssetsEvaluationMethodMapper, AssetsEvaluationMethod> implements IAssetsEvaluationMethodService {
+
+    @Autowired
+    private AssetsEvaluationMethodMapper assetsEvaluationMethodMapper;
+
+    /**
+     * 获取所有评估方法集合
+     * @return List<AssetsEvaluationMethod>
+     */
+    @Override
+    public List<AssetsEvaluationMethod> getAssetsEvaluationMethod() {
+        return assetsEvaluationMethodMapper.getAssetsEvaluationMethod();
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public Page<AssetsEvaluationMethod> selectPage(Page page,AssetsEvaluationMethod assetsEvaluationMethod){
+        return this.page(page, new QueryWrapper<AssetsEvaluationMethod>(assetsEvaluationMethod));
+    }
+
+
+    @Override
+    public AssetsEvaluationMethod detail(Long id){
+        return this.getById(id);
+    }
+
+    @Override
+    public Boolean add(AssetsEvaluationMethod assetsEvaluationMethod){
+        return  this.save(assetsEvaluationMethod);
+    }
+
+    @Override
+    public Boolean update(AssetsEvaluationMethod assetsEvaluationMethod){
+        return  this.updateById(assetsEvaluationMethod);
+    }
+
+    @Override
+    public Boolean delete(Long id){
+        //逻辑删除
+        return this.removeById(id);
+    }
+}

+ 78 - 0
service/src/main/java/com/dayou/service/impl/AssetsEvaluationTargetPurposeServiceImpl.java

@@ -0,0 +1,78 @@
+package com.dayou.service.impl;
+
+import com.dayou.entity.AssetsEvaluationTargetPurpose;
+import com.dayou.mapper.AssetsEvaluationTargetPurposeMapper;
+import com.dayou.service.IAssetsEvaluationTargetPurposeService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.dayou.utils.ExcelUtil;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.CellStyle;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.springframework.web.multipart.MultipartFile;
+import java.util.List;
+import java.util.ArrayList;
+import org.springframework.transaction.annotation.Transactional;
+import com.dayou.enums.BatchTaskTypeEnum;
+
+/**
+ * <p>
+ * 资产评估对象评估目的表 服务实现类
+ * </p>
+ *
+ * @author GouGengquan
+ * @since 2024-04-07
+ */
+@Service
+public class AssetsEvaluationTargetPurposeServiceImpl extends ServiceImpl<AssetsEvaluationTargetPurposeMapper, AssetsEvaluationTargetPurpose> implements IAssetsEvaluationTargetPurposeService {
+
+    @Autowired
+    AssetsEvaluationTargetPurposeMapper assetsEvaluationTargetPurposeMapper;
+
+    /**
+     * 获取所有资产评估目的集合
+     * @return List<AssetsEvaluationTargetPurpose>
+     */
+    @Override
+    public List<AssetsEvaluationTargetPurpose> getPurpose() {
+        return assetsEvaluationTargetPurposeMapper.getPurpose();
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public Page<AssetsEvaluationTargetPurpose> selectPage(Page page,AssetsEvaluationTargetPurpose assetsEvaluationTargetPurpose){
+        return this.page(page, new QueryWrapper<AssetsEvaluationTargetPurpose>(assetsEvaluationTargetPurpose));
+    }
+
+
+    @Override
+    public AssetsEvaluationTargetPurpose detail(Long id){
+        return this.getById(id);
+    }
+
+    @Override
+    public Boolean add(AssetsEvaluationTargetPurpose assetsEvaluationTargetPurpose){
+        return  this.save(assetsEvaluationTargetPurpose);
+    }
+
+    @Override
+    public Boolean update(AssetsEvaluationTargetPurpose assetsEvaluationTargetPurpose){
+        return  this.updateById(assetsEvaluationTargetPurpose);
+    }
+
+    @Override
+    public Boolean delete(Long id){
+        //逻辑删除
+        return this.removeById(id);
+    }
+}

+ 9 - 5
service/src/main/java/com/dayou/service/impl/AssetsEvaluationTargetServiceImpl.java

@@ -5,6 +5,8 @@ import com.dayou.entity.AssetsEvaluationTarget;
 import com.dayou.mapper.AssetsEvaluationTargetMapper;
 import com.dayou.service.IAssetsEvaluationTargetService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dayou.vo.AssetsEvaluationTargetVO;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -22,15 +24,17 @@ import java.util.List;
 @Service
 public class AssetsEvaluationTargetServiceImpl extends ServiceImpl<AssetsEvaluationTargetMapper, AssetsEvaluationTarget> implements IAssetsEvaluationTargetService {
 
+    @Autowired
+    private AssetsEvaluationTargetMapper assetsEvaluationTargetMapper;
 
     /**
-     * 根据资产业务id获取资产业务评估对象集合
-     * @param id 资产业务id
-     * @return List<AssetsEvaluationTarget>
+     * 根据资产业务订单id获取评估对象信息
+     * @param id 资产订单id
+     * @return List<AssetsEvaluationTargetVO>
      */
     @Override
-    public List<AssetsEvaluationTarget> getAETargetListByAssetsId(Long id) {
-        return this.list((new LambdaQueryWrapper<AssetsEvaluationTarget>().eq(AssetsEvaluationTarget::getAssetsId,id)).orderByDesc(BaseEntity::getCreated));
+    public List<AssetsEvaluationTargetVO> getAETargetListByAssetsId(Long id) {
+        return assetsEvaluationTargetMapper.getAETargetListByAssetsId(id);
     }
 
     @Override

+ 3 - 9
service/src/main/java/com/dayou/service/impl/AssetsEvaluationTargetTypeServiceImpl.java

@@ -40,21 +40,15 @@ public class AssetsEvaluationTargetTypeServiceImpl extends ServiceImpl<AssetsEva
 
     /**
      * 根据父级id获取资产评估对象类型
-     * @param type 查询条件
+     * @param parentId 查询条件
      * @return List<AssetsEvaluationTargetType>
      */
     @Override
-    public List<AssetsEvaluationTargetType> getTypeList(AssetsEvaluationTargetType type) {
-
-        //parentId为空给默认值0
-        if (ObjectUtil.isNull(type.getParentId()) || ObjectUtil.isEmpty(type.getParentId())){
-            type.setParentId(0L);
-        }
-
+    public List<AssetsEvaluationTargetType> getTypeList(Long parentId) {
         //根据父级id查询类型列表
         Wrapper<AssetsEvaluationTargetType> wrapper = Wrappers
                 .<AssetsEvaluationTargetType>lambdaQuery()
-                .eq(AssetsEvaluationTargetType::getParentId, type.getParentId());
+                .eq(AssetsEvaluationTargetType::getParentId, parentId);
         return this.list(wrapper);
     }
 

+ 17 - 20
service/src/main/java/com/dayou/service/impl/AssetsServiceImpl.java

@@ -1,14 +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.common.BaseEntity;
+import com.dayou.dto.AssetsPrincipalMembersDTO;
 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.exception.ErrorCode;
 import com.dayou.mapper.AssetsMapper;
 import com.dayou.service.IAssetsService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -17,24 +16,8 @@ import com.dayou.service.workflow.IWorkFlowService;
 import com.dayou.vo.AssetsVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.dayou.utils.ExcelUtil;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellStyle;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.springframework.web.multipart.MultipartFile;
-import java.util.List;
-import java.util.ArrayList;
-import org.springframework.transaction.annotation.Transactional;
-import com.dayou.enums.BatchTaskTypeEnum;
 
 /**
  * <p>
@@ -105,6 +88,20 @@ public class AssetsServiceImpl extends ServiceImpl<AssetsMapper, Assets> impleme
         return workFlowService.openingOrder(MainBusinessEnum.ASSET_BUSINESS,assets.getId(),assets.getOrderId(),assets.getRemark());
     }
 
+    /**
+     * 修改资产业务订单项目负责人与项目成员
+     * @param assetsPrincipalMembersDTO 修改dto
+     * @return Boolean
+     */
+    @Override
+    public Boolean updatePrincipalAndMembers(AssetsPrincipalMembersDTO assetsPrincipalMembersDTO) {
+        if (ObjectUtil.isNull(assetsPrincipalMembersDTO.getPrincipalId()) && ObjectUtil.isNull(assetsPrincipalMembersDTO.getMembers())){
+            ErrorCode.throwBusinessException(ErrorCode.CUSTOM_ERROR,"项目负责人和项目参与人员不能为空。");
+        }
+        return this.update(new LambdaUpdateWrapper<Assets>().set(Assets::getMembers, assetsPrincipalMembersDTO.getMembers()).set(Assets::getPrincipalId, assetsPrincipalMembersDTO.getPrincipalId())
+                .eq(BaseEntity::getId, assetsPrincipalMembersDTO.getId()));
+    }
+
     @Override
     public Boolean update(Assets assets){
         return  this.updateById(assets);

+ 78 - 0
service/src/main/java/com/dayou/service/impl/AssetsValueTypeServiceImpl.java

@@ -0,0 +1,78 @@
+package com.dayou.service.impl;
+
+import com.dayou.entity.AssetsValueType;
+import com.dayou.mapper.AssetsValueTypeMapper;
+import com.dayou.service.IAssetsValueTypeService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.dayou.utils.ExcelUtil;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.CellStyle;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.springframework.web.multipart.MultipartFile;
+import java.util.List;
+import java.util.ArrayList;
+import org.springframework.transaction.annotation.Transactional;
+import com.dayou.enums.BatchTaskTypeEnum;
+
+/**
+ * <p>
+ * 价值类型表 服务实现类
+ * </p>
+ *
+ * @author GouGengquan
+ * @since 2024-04-07
+ */
+@Service
+public class AssetsValueTypeServiceImpl extends ServiceImpl<AssetsValueTypeMapper, AssetsValueType> implements IAssetsValueTypeService {
+
+    @Autowired
+    AssetsValueTypeMapper assetsValueTypeMapper;
+
+    /**
+     * 获取所有资产价值类型
+     * @return List<AssetsValueType>
+     */
+    @Override
+    public List<AssetsValueType> getAssetsValueType() {
+        return assetsValueTypeMapper.getAssetsValueType();
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public Page<AssetsValueType> selectPage(Page page,AssetsValueType assetsValueType){
+        return this.page(page, new QueryWrapper<AssetsValueType>(assetsValueType));
+    }
+
+
+    @Override
+    public AssetsValueType detail(Long id){
+        return this.getById(id);
+    }
+
+    @Override
+    public Boolean add(AssetsValueType assetsValueType){
+        return  this.save(assetsValueType);
+    }
+
+    @Override
+    public Boolean update(AssetsValueType assetsValueType){
+        return  this.updateById(assetsValueType);
+    }
+
+    @Override
+    public Boolean delete(Long id){
+        //逻辑删除
+        return this.removeById(id);
+    }
+}