Bläddra i källkod

1.新增一张表SQL语句
2.新增资产业务相关代码结构,资产相关接口x2

GouGengquan 1 år sedan
förälder
incheckning
21b851ca63
26 ändrade filer med 1559 tillägg och 1 borttagningar
  1. 96 0
      biz-base/src/main/java/com/dayou/controller/AssetsController.java
  2. 83 0
      biz-base/src/main/java/com/dayou/controller/AssetsEvaluationTargetController.java
  3. 62 0
      biz-base/src/main/java/com/dayou/controller/AssetsEvaluationTargetTypeController.java
  4. 83 0
      biz-base/src/main/java/com/dayou/controller/AssetsProductionController.java
  5. 16 0
      dao/src/main/java/com/dayou/mapper/AssetsEvaluationTargetMapper.java
  6. 16 0
      dao/src/main/java/com/dayou/mapper/AssetsEvaluationTargetTypeMapper.java
  7. 16 0
      dao/src/main/java/com/dayou/mapper/AssetsMapper.java
  8. 16 0
      dao/src/main/java/com/dayou/mapper/AssetsProductionMapper.java
  9. 38 0
      dao/src/main/resources/mapper/AssetsEvaluationTargetMapper.xml
  10. 24 0
      dao/src/main/resources/mapper/AssetsEvaluationTargetTypeMapper.xml
  11. 49 0
      dao/src/main/resources/mapper/AssetsMapper.xml
  12. 42 0
      dao/src/main/resources/mapper/AssetsProductionMapper.xml
  13. 190 0
      domain/src/main/java/com/dayou/entity/Assets.java
  14. 124 0
      domain/src/main/java/com/dayou/entity/AssetsEvaluationTarget.java
  15. 36 0
      domain/src/main/java/com/dayou/entity/AssetsEvaluationTargetType.java
  16. 165 0
      domain/src/main/java/com/dayou/entity/AssetsProduction.java
  17. 10 0
      domain/src/main/java/com/dayou/vo/AssetsVO.java
  18. 28 0
      service/src/main/java/com/dayou/service/IAssetsEvaluationTargetService.java
  19. 42 0
      service/src/main/java/com/dayou/service/IAssetsEvaluationTargetTypeService.java
  20. 28 0
      service/src/main/java/com/dayou/service/IAssetsProductionService.java
  21. 34 0
      service/src/main/java/com/dayou/service/IAssetsService.java
  22. 66 0
      service/src/main/java/com/dayou/service/impl/AssetsEvaluationTargetServiceImpl.java
  23. 81 0
      service/src/main/java/com/dayou/service/impl/AssetsEvaluationTargetTypeServiceImpl.java
  24. 66 0
      service/src/main/java/com/dayou/service/impl/AssetsProductionServiceImpl.java
  25. 86 0
      service/src/main/java/com/dayou/service/impl/AssetsServiceImpl.java
  26. 62 1
      sql/update_sql.sql

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

@@ -0,0 +1,96 @@
+package com.dayou.controller;
+
+import com.dayou.dto.WorkNodeCommit;
+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;
+/**
+ * 资产业务订单表
+ *
+ * @author GouGengquan
+ * @since 2024-03-28
+ */
+@RestController
+@RequestMapping("assets")
+@Slf4j
+public class AssetsController extends BaseController {
+    @Autowired
+    private IAssetsService assetsService;
+
+    /**
+    * 资产业务订单表列表
+    */
+    @GetMapping("")
+    public RestResponse<Page<Assets>> page(Assets assets, Page page){
+        Page<Assets> pages=assetsService.selectPage(page,assets);
+        return RestResponse.data(pages);
+    }
+
+    /**
+     * 资产业务订单表详情
+     */
+    @GetMapping("/{id}")
+    public RestResponse<Assets> detail(@PathVariable Long id){
+        Assets xAssets =assetsService.detail(id);
+        return RestResponse.data(xAssets);
+     }
+
+    /**
+     * 资产业务订单新增
+     */
+    @PostMapping("/add")
+    public RestResponse<WorkNodeCommit> save(@RequestBody Assets assets) {
+        return RestResponse.data(assetsService.add(assets));
+    }
+
+    /**
+     * 资产业务订单表更新
+     */
+    @PutMapping("")
+    public RestResponse<Boolean> update(@RequestBody Assets assets) {
+        Boolean ret = assetsService.update(assets);
+        return RestResponse.data(ret);
+    }
+
+    /**
+     * 资产业务订单表删除
+     */
+    @DeleteMapping("/{id}")
+    public RestResponse<Boolean> delete(@PathVariable Long id) {
+        Boolean ret = assetsService.delete(id);
+        return RestResponse.data(ret);
+    }
+
+
+    /**
+     * 资产业务订单表下拉列表
+     */
+    @GetMapping("/simpleAll")
+    public RestResponse<List<PullDownModel>> simpleAll(){
+        LambdaQueryWrapper<Assets> lambdaQueryWrapper = new LambdaQueryWrapper<Assets>()
+        .select(Assets::getId,Assets::getName)
+        .eq(Assets::getDeleted,false);
+        List<Assets> list= assetsService.list(lambdaQueryWrapper);
+        List<PullDownModel> ret=ConvertUtil.copyList(list, PullDownModel.class);
+        return RestResponse.data(ret);
+    }
+}
+

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

@@ -0,0 +1,83 @@
+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.IAssetsEvaluationTargetService;
+import com.dayou.entity.AssetsEvaluationTarget;
+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-03-28
+ */
+@RestController
+@RequestMapping("assetsEvaluationTarget")
+@Slf4j
+public class AssetsEvaluationTargetController extends BaseController {
+    @Autowired
+    private IAssetsEvaluationTargetService assetsEvaluationTargetService;
+
+    /**
+    * 资产评估对象表列表
+    */
+    @GetMapping("")
+    public RestResponse<Page<AssetsEvaluationTarget>> page(AssetsEvaluationTarget assetsEvaluationTarget, Page page){
+        Page<AssetsEvaluationTarget> pages=assetsEvaluationTargetService.selectPage(page,assetsEvaluationTarget);
+        return RestResponse.data(pages);
+    }
+
+    /**
+     * 资产评估对象表详情
+     */
+    @GetMapping("/{id}")
+    public RestResponse<AssetsEvaluationTarget> detail(@PathVariable Long id){
+        AssetsEvaluationTarget xAssetsEvaluationTarget =assetsEvaluationTargetService.detail(id);
+        return RestResponse.data(xAssetsEvaluationTarget);
+     }
+
+    /**
+     * 资产评估对象表新增
+     */
+    @PostMapping("")
+    public RestResponse<Boolean> save(@RequestBody AssetsEvaluationTarget assetsEvaluationTarget) {
+        Boolean ret = assetsEvaluationTargetService.add(assetsEvaluationTarget);
+        return RestResponse.data(ret);
+    }
+
+    /**
+     * 资产评估对象表更新
+     */
+    @PutMapping("")
+    public RestResponse<Boolean> update(@RequestBody AssetsEvaluationTarget assetsEvaluationTarget) {
+        Boolean ret = assetsEvaluationTargetService.update(assetsEvaluationTarget);
+        return RestResponse.data(ret);
+    }
+
+    /**
+     * 资产评估对象表删除
+     */
+    @DeleteMapping("/{id}")
+    public RestResponse<Boolean> delete(@PathVariable Long id) {
+        Boolean ret = assetsEvaluationTargetService.delete(id);
+        return RestResponse.data(ret);
+    }
+
+
+}
+

+ 62 - 0
biz-base/src/main/java/com/dayou/controller/AssetsEvaluationTargetTypeController.java

@@ -0,0 +1,62 @@
+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.IAssetsEvaluationTargetTypeService;
+import com.dayou.entity.AssetsEvaluationTargetType;
+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-03-28
+ */
+@RestController
+@RequestMapping("assetsEvaluationTargetType")
+@Slf4j
+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));
+    }
+
+    /**
+     * 资产评估对象类型表新增
+     */
+    @PostMapping("")
+    public RestResponse<Boolean> save(@RequestBody AssetsEvaluationTargetType assetsEvaluationTargetType) {
+        Boolean ret = assetsEvaluationTargetTypeService.add(assetsEvaluationTargetType);
+        return RestResponse.data(ret);
+    }
+
+    /**
+     * 资产评估对象类型表更新
+     */
+    @PutMapping("")
+    public RestResponse<Boolean> update(@RequestBody AssetsEvaluationTargetType assetsEvaluationTargetType) {
+        Boolean ret = assetsEvaluationTargetTypeService.update(assetsEvaluationTargetType);
+        return RestResponse.data(ret);
+    }
+
+
+}
+

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

@@ -0,0 +1,83 @@
+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.IAssetsProductionService;
+import com.dayou.entity.AssetsProduction;
+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-03-28
+ */
+@RestController
+@RequestMapping("assetsProduction")
+@Slf4j
+public class AssetsProductionController extends BaseController {
+    @Autowired
+    private IAssetsProductionService assetsProductionService;
+
+    /**
+    * 资产产品表列表
+    */
+    @GetMapping("")
+    public RestResponse<Page<AssetsProduction>> page(AssetsProduction assetsProduction, Page page){
+        Page<AssetsProduction> pages=assetsProductionService.selectPage(page,assetsProduction);
+        return RestResponse.data(pages);
+    }
+
+    /**
+     * 资产产品表详情
+     */
+    @GetMapping("/{id}")
+    public RestResponse<AssetsProduction> detail(@PathVariable Long id){
+        AssetsProduction xAssetsProduction =assetsProductionService.detail(id);
+        return RestResponse.data(xAssetsProduction);
+     }
+
+    /**
+     * 资产产品表新增
+     */
+    @PostMapping("")
+    public RestResponse<Boolean> save(@RequestBody AssetsProduction assetsProduction) {
+        Boolean ret = assetsProductionService.add(assetsProduction);
+        return RestResponse.data(ret);
+    }
+
+    /**
+     * 资产产品表更新
+     */
+    @PutMapping("")
+    public RestResponse<Boolean> update(@RequestBody AssetsProduction assetsProduction) {
+        Boolean ret = assetsProductionService.update(assetsProduction);
+        return RestResponse.data(ret);
+    }
+
+    /**
+     * 资产产品表删除
+     */
+    @DeleteMapping("/{id}")
+    public RestResponse<Boolean> delete(@PathVariable Long id) {
+        Boolean ret = assetsProductionService.delete(id);
+        return RestResponse.data(ret);
+    }
+
+
+}
+

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

@@ -0,0 +1,16 @@
+package com.dayou.mapper;
+
+import com.dayou.entity.AssetsEvaluationTarget;
+import com.dayou.dao.CustomBaseMapper;
+
+/**
+ * <p>
+ * 资产评估对象表 Mapper 接口
+ * </p>
+ *
+ * @author GouGengquan
+ * @since 2024-03-28
+ */
+public interface AssetsEvaluationTargetMapper extends CustomBaseMapper<AssetsEvaluationTarget> {
+
+}

+ 16 - 0
dao/src/main/java/com/dayou/mapper/AssetsEvaluationTargetTypeMapper.java

@@ -0,0 +1,16 @@
+package com.dayou.mapper;
+
+import com.dayou.entity.AssetsEvaluationTargetType;
+import com.dayou.dao.CustomBaseMapper;
+
+/**
+ * <p>
+ * 资产评估对象类型表 Mapper 接口
+ * </p>
+ *
+ * @author GouGengquan
+ * @since 2024-03-28
+ */
+public interface AssetsEvaluationTargetTypeMapper extends CustomBaseMapper<AssetsEvaluationTargetType> {
+
+}

+ 16 - 0
dao/src/main/java/com/dayou/mapper/AssetsMapper.java

@@ -0,0 +1,16 @@
+package com.dayou.mapper;
+
+import com.dayou.entity.Assets;
+import com.dayou.dao.CustomBaseMapper;
+
+/**
+ * <p>
+ * 资产业务订单表 Mapper 接口
+ * </p>
+ *
+ * @author GouGengquan
+ * @since 2024-03-28
+ */
+public interface AssetsMapper extends CustomBaseMapper<Assets> {
+
+}

+ 16 - 0
dao/src/main/java/com/dayou/mapper/AssetsProductionMapper.java

@@ -0,0 +1,16 @@
+package com.dayou.mapper;
+
+import com.dayou.entity.AssetsProduction;
+import com.dayou.dao.CustomBaseMapper;
+
+/**
+ * <p>
+ * 资产产品表 Mapper 接口
+ * </p>
+ *
+ * @author GouGengquan
+ * @since 2024-03-28
+ */
+public interface AssetsProductionMapper extends CustomBaseMapper<AssetsProduction> {
+
+}

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

@@ -0,0 +1,38 @@
+<?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.AssetsEvaluationTargetMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.dayou.entity.AssetsEvaluationTarget">
+        <result column="id" property="id" />
+        <result column="deleted" property="deleted" />
+        <result column="created" property="created" />
+        <result column="modified" property="modified" />
+        <result column="evaluation_purpose_id" property="evaluationPurposeId" />
+        <result column="evaluation_type_id" property="evaluationTypeId" />
+        <result column="evaluation_type_sec_id" property="evaluationTypeSecId" />
+        <result column="the_holder" property="theHolder" />
+        <result column="assets_value_id" property="assetsValueId" />
+        <result column="principal_id" property="principalId" />
+        <result column="site_ids" property="siteIds" />
+        <result column="valuation_basis_date" property="valuationBasisDate" />
+        <result column="evaluation_method_id" property="evaluationMethodId" />
+        <result column="choice_evaluation_method_id" property="choiceEvaluationMethodId" />
+        <result column="total_asset_carrying_amount" property="totalAssetCarryingAmount" />
+        <result column="total_liabilities_carrying_amount" property="totalLiabilitiesCarryingAmount" />
+        <result column="carrying_amount_of_net_assets" property="carryingAmountOfNetAssets" />
+        <result column="estimated_value" property="estimatedValue" />
+        <result column="remark" property="remark" />
+        <result column="file_path" property="filePath" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id,
+        deleted,
+        created,
+        modified,
+        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>
+
+</mapper>

+ 24 - 0
dao/src/main/resources/mapper/AssetsEvaluationTargetTypeMapper.xml

@@ -0,0 +1,24 @@
+<?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.AssetsEvaluationTargetTypeMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.dayou.entity.AssetsEvaluationTargetType">
+        <result column="id" property="id" />
+        <result column="deleted" property="deleted" />
+        <result column="created" property="created" />
+        <result column="modified" property="modified" />
+        <result column="parent_id" property="parentId" />
+        <result column="type_name" property="typeName" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id,
+        deleted,
+        created,
+        modified,
+        parent_id, type_name
+    </sql>
+
+</mapper>

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

@@ -0,0 +1,49 @@
+<?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.AssetsMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.dayou.entity.Assets">
+        <result column="id" property="id" />
+        <result column="deleted" property="deleted" />
+        <result column="created" property="created" />
+        <result column="modified" property="modified" />
+        <result column="name" property="name" />
+        <result column="order_id" property="orderId" />
+        <result column="financial" property="financial" />
+        <result column="allot_type" property="allotType" />
+        <result column="client_manager_id" property="clientManagerId" />
+        <result column="principal_id" property="principalId" />
+        <result column="department_id" property="departmentId" />
+        <result column="assets_business_gener" property="assetsBusinessGener" />
+        <result column="entrust_again" property="entrustAgain" />
+        <result column="clientele_type" property="clienteleType" />
+        <result column="clientele_id" property="clienteleId" />
+        <result column="clientele_sub_id" property="clienteleSubId" />
+        <result column="clientele_contact_id" property="clienteleContactId" />
+        <result column="security" property="security" />
+        <result column="significant_assets_reorganization" property="significantAssetsReorganization" />
+        <result column="state_assets" property="stateAssets" />
+        <result column="foreign_assets_involved" property="foreignAssetsInvolved" />
+        <result column="dispense_benefit" property="dispenseBenefit" />
+        <result column="bailor" property="bailor" />
+        <result column="bailor_address" property="bailorAddress" />
+        <result column="bailor_contact_name" property="bailorContactName" />
+        <result column="bailor_contact_tel" property="bailorContactTel" />
+        <result column="terminal_clientele_id" property="terminalClienteleId" />
+        <result column="terminal_clientele_type" property="terminalClienteleType" />
+        <result column="terminal_clientele_contact_id" property="terminalClienteleContactId" />
+        <result column="members" property="members" />
+        <result column="remark" property="remark" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id,
+        deleted,
+        created,
+        modified,
+        name, order_id, financial, allot_type, client_manager_id, principal_id, department_id, assets_business_gener, entrust_again, clientele_type, clientele_id, clientele_sub_id, clientele_contact_id, security, significant_assets_reorganization, state_assets, foreign_assets_involved, dispense_benefit, bailor, bailor_address, bailor_contact_name, bailor_contact_tel, terminal_clientele_id, terminal_clientele_type, terminal_clientele_contact_id, members, remark
+    </sql>
+
+</mapper>

+ 42 - 0
dao/src/main/resources/mapper/AssetsProductionMapper.xml

@@ -0,0 +1,42 @@
+<?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.AssetsProductionMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.dayou.entity.AssetsProduction">
+        <result column="id" property="id" />
+        <result column="deleted" property="deleted" />
+        <result column="created" property="created" />
+        <result column="modified" property="modified" />
+        <result column="business_id" property="businessId" />
+        <result column="production_no" property="productionNo" />
+        <result column="production_type" property="productionType" />
+        <result column="signatory" property="signatory" />
+        <result column="client_name" property="clientName" />
+        <result column="client_tel" property="clientTel" />
+        <result column="valuation_basis_date" property="valuationBasisDate" />
+        <result column="evaluate_acreage" property="evaluateAcreage" />
+        <result column="evaluate_amount" property="evaluateAmount" />
+        <result column="evaluate_price" property="evaluatePrice" />
+        <result column="owner" property="owner" />
+        <result column="print_count" property="printCount" />
+        <result column="create_production_date" property="createProductionDate" />
+        <result column="comment" property="comment" />
+        <result column="repertory_state" property="repertoryState" />
+        <result column="repertory_in_time" property="repertoryInTime" />
+        <result column="repertory_out_time" property="repertoryOutTime" />
+        <result column="file_path" property="filePath" />
+        <result column="save_file_date" property="saveFileDate" />
+        <result column="delivery" property="delivery" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id,
+        deleted,
+        created,
+        modified,
+        business_id, production_no, production_type, signatory, client_name, client_tel, valuation_basis_date, evaluate_acreage, evaluate_amount, evaluate_price, owner, print_count, create_production_date, comment, repertory_state, repertory_in_time, repertory_out_time, file_path, save_file_date, delivery
+    </sql>
+
+</mapper>

+ 190 - 0
domain/src/main/java/com/dayou/entity/Assets.java

@@ -0,0 +1,190 @@
+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-03-28
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ExcelSheet(sheetName = "资产业务订单表")
+public class Assets extends BaseEntity {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 项目名称
+     */
+    @ImportCell
+    @ExportCell(columnName = "项目名称")
+    private String name;
+
+    /**
+     * 项目编号
+     */
+    @ImportCell
+    @ExportCell(columnName = "项目编号")
+    private String orderId;
+
+    /**
+     * 分单类型
+     */
+    @ImportCell
+    @ExportCell(columnName = "分单类型")
+    private String allotType;
+
+    /**
+     * 客户经理id(user_id)
+     */
+    private Long clientManagerId;
+
+    /**
+     * 项目负责人id(user_id)
+     */
+    private Long principalId;
+
+    /**
+     * 接单部门id
+     */
+    private Long departmentId;
+
+    /**
+     * 资产业务类型
+     */
+    @ImportCell
+    @ExportCell(columnName = "资产业务类型")
+    private String assetsBusinessGener;
+
+    /**
+     * 客户再次委托
+     */
+    @ImportCell
+    @ExportCell(columnName = "客户再次委托")
+    private Boolean entrustAgain;
+
+    /**
+     * 客户类型(企业,个人)
+     */
+    @ImportCell
+    @ExportCell(columnName = "客户类型(企业,个人)")
+    private String clienteleType;
+
+    /**
+     * 客户id
+     */
+    private Long clienteleId;
+
+    /**
+     * 业务来源(下级客户id)
+     */
+    private Long clienteleSubId;
+
+    /**
+     * 客户联系人id
+     */
+    private Long clienteleContactId;
+
+    /**
+     * 是否证券项目(0:Y 1:N)
+     */
+    @ImportCell
+    @ExportCell(columnName = "是否证券项目(0:Y 1:N)")
+    private Boolean security;
+
+    /**
+     * 是否资产重组项目(0:Y 1:N)
+     */
+    @ImportCell
+    @ExportCell(columnName = "是否资产重组项目(0:Y 1:N)")
+    private Boolean significantAssetsReorganization;
+
+    /**
+     * 是否国资项目(0:Y 1:N)
+     */
+    @ImportCell
+    @ExportCell(columnName = "是否国资项目(0:Y 1:N)")
+    private Boolean stateAssets;
+
+    /**
+     * 是否涉及境外资产(0:Y 1:N)
+     */
+    @ImportCell
+    @ExportCell(columnName = "是否涉及境外资产(0:Y 1:N)")
+    private Boolean foreignAssetsInvolved;
+
+    /**
+     * 是否分配产值
+     */
+    @ImportCell
+    @ExportCell(columnName = "是否分配产值")
+    private Boolean dispenseBenefit;
+
+    /**
+     * 委托人
+     */
+    @ImportCell
+    @ExportCell(columnName = "委托人")
+    private String bailor;
+
+    /**
+     * 委托人地址
+     */
+    @ImportCell
+    @ExportCell(columnName = "委托人地址")
+    private String bailorAddress;
+
+    /**
+     * 委托联系人姓名
+     */
+    @ImportCell
+    @ExportCell(columnName = "委托联系人姓名")
+    private String bailorContactName;
+
+    /**
+     * 委托人联系人电话
+     */
+    @ImportCell
+    @ExportCell(columnName = "委托人联系人电话")
+    private String bailorContactTel;
+
+    /**
+     * 终端客户id
+     */
+    private Long terminalClienteleId;
+
+    /**
+     * 终端客户类型(企业,个人)
+     */
+    @ImportCell
+    @ExportCell(columnName = "终端客户类型(企业,个人)")
+    private String terminalClienteleType;
+
+    /**
+     * 终端联系人
+     */
+    private Long terminalClienteleContactId;
+
+    /**
+     * 项目参与人(json格式,存用户表id)
+     */
+    @ImportCell
+    @ExportCell(columnName = "项目参与人(json格式,存用户表id)")
+    private String members;
+
+    /**
+     * 备注
+     */
+    @ImportCell
+    @ExportCell(columnName = "备注")
+    private String remark;
+
+
+}

+ 124 - 0
domain/src/main/java/com/dayou/entity/AssetsEvaluationTarget.java

@@ -0,0 +1,124 @@
+package com.dayou.entity;
+import java.math.BigDecimal;
+import com.dayou.common.BaseEntity;
+import java.time.LocalDate;
+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-03-28
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ExcelSheet(sheetName = "资产评估对象表")
+public class AssetsEvaluationTarget extends BaseEntity {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 资产评估目的id
+     */
+    private Long evaluationPurposeId;
+
+    /**
+     * 资产评估对象类型一级id
+     */
+    private Long evaluationTypeId;
+
+    /**
+     * 资产评估对象类型二级id
+     */
+    private Long evaluationTypeSecId;
+
+    /**
+     * 产权持有人
+     */
+    @ImportCell
+    @ExportCell(columnName = "产权持有人")
+    private String theHolder;
+
+    /**
+     * 资产价值类型id
+     */
+    private Long assetsValueId;
+
+    /**
+     * 项目负责人id (user_id)
+     */
+    private Long principalId;
+
+    /**
+     * 实勘人id (json 可多个)
+     */
+    @ImportCell
+    @ExportCell(columnName = "实勘人id (json 可多个)")
+    private String siteIds;
+
+    /**
+     * 估价基准日
+     */
+    @ImportCell
+    @ExportCell(columnName = "估价基准日")
+    private LocalDate valuationBasisDate;
+
+    /**
+     * 评估方法id
+     */
+    private Long evaluationMethodId;
+
+    /**
+     * 最终选择的评估方法id
+     */
+    private Long choiceEvaluationMethodId;
+
+    /**
+     * 总资产账面值(万)
+     */
+    @ImportCell
+    @ExportCell(columnName = "总资产账面值(万)")
+    private BigDecimal totalAssetCarryingAmount;
+
+    /**
+     * 总负债账面值(万)
+     */
+    @ImportCell
+    @ExportCell(columnName = "总负债账面值(万)")
+    private BigDecimal totalLiabilitiesCarryingAmount;
+
+    /**
+     * 净资产账面值(万)
+     */
+    @ImportCell
+    @ExportCell(columnName = "净资产账面值(万)")
+    private BigDecimal carryingAmountOfNetAssets;
+
+    /**
+     * 评估结论对应的评估值(万)
+     */
+    @ImportCell
+    @ExportCell(columnName = "评估结论对应的评估值(万)")
+    private BigDecimal estimatedValue;
+
+    /**
+     * 备注
+     */
+    @ImportCell
+    @ExportCell(columnName = "备注")
+    private String remark;
+
+    /**
+     * 资料路由信息
+     */
+    @ImportCell
+    @ExportCell(columnName = "资料路由信息")
+    private String filePath;
+
+
+}

+ 36 - 0
domain/src/main/java/com/dayou/entity/AssetsEvaluationTargetType.java

@@ -0,0 +1,36 @@
+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-03-28
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ExcelSheet(sheetName = "资产评估对象类型表")
+public class AssetsEvaluationTargetType extends BaseEntity {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 父级id(0代表没有父级)
+     */
+    private Long parentId;
+
+    /**
+     * 资产评估对象类型名
+     */
+    @ImportCell
+    @ExportCell(columnName = "资产评估对象类型名")
+    private String typeName;
+
+
+}

+ 165 - 0
domain/src/main/java/com/dayou/entity/AssetsProduction.java

@@ -0,0 +1,165 @@
+package com.dayou.entity;
+import java.math.BigDecimal;
+import com.dayou.common.BaseEntity;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+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-03-28
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ExcelSheet(sheetName = "资产产品表")
+public class AssetsProduction extends BaseEntity {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 业务id(资产id)
+     */
+    private Long businessId;
+
+    /**
+     * 产品号
+     */
+    @ImportCell
+    @ExportCell(columnName = "产品号")
+    private String productionNo;
+
+    /**
+     * 产品类型(意见书,报告)
+     */
+    @ImportCell
+    @ExportCell(columnName = "产品类型(意见书,报告)")
+    private String productionType;
+
+    /**
+     * 签字人(产品类型为报告时,签字人必填)
+     */
+    @ImportCell
+    @ExportCell(columnName = "签字人(产品类型为报告时,签字人必填)")
+    private String signatory;
+
+    /**
+     * 委托方名称
+     */
+    @ImportCell
+    @ExportCell(columnName = "委托方名称")
+    private String clientName;
+
+    /**
+     * 委托方电话
+     */
+    @ImportCell
+    @ExportCell(columnName = "委托方电话")
+    private String clientTel;
+
+    /**
+     * 评估基准日
+     */
+    @ImportCell
+    @ExportCell(columnName = "评估基准日")
+    private LocalDate valuationBasisDate;
+
+    /**
+     * 评估面积
+     */
+    @ImportCell
+    @ExportCell(columnName = "评估面积")
+    private BigDecimal evaluateAcreage;
+
+    /**
+     * 评估总价
+     */
+    @ImportCell
+    @ExportCell(columnName = "评估总价")
+    private BigDecimal evaluateAmount;
+
+    /**
+     * 评估单价
+     */
+    @ImportCell
+    @ExportCell(columnName = "评估单价")
+    private BigDecimal evaluatePrice;
+
+    /**
+     * 产权人
+     */
+    @ImportCell
+    @ExportCell(columnName = "产权人")
+    private String owner;
+
+    /**
+     * 产品打印数量
+     */
+    @ImportCell
+    @ExportCell(columnName = "产品打印数量")
+    private Integer printCount;
+
+    /**
+     * 产品出具日期
+     */
+    @ImportCell
+    @ExportCell(columnName = "产品出具日期")
+    private LocalDate createProductionDate;
+
+    /**
+     * 特殊情况说明
+     */
+    @ImportCell
+    @ExportCell(columnName = "特殊情况说明")
+    private String comment;
+
+    /**
+     * 库存状态(0:已入库  1:已出库)
+     */
+    @ImportCell
+    @ExportCell(columnName = "库存状态(0:已入库  1:已出库)")
+    private Boolean repertoryState;
+
+    /**
+     * 入库时间
+     */
+    @ImportCell
+    @ExportCell(columnName = "入库时间")
+    private LocalDateTime repertoryInTime;
+
+    /**
+     * 出库时间
+     */
+    @ImportCell
+    @ExportCell(columnName = "出库时间")
+    private LocalDateTime repertoryOutTime;
+
+    /**
+     * 电子文档路经
+     */
+    @ImportCell
+    @ExportCell(columnName = "电子文档路经")
+    private String filePath;
+
+    /**
+     * 归档日期
+     */
+    @ImportCell
+    @ExportCell(columnName = "归档日期")
+    private LocalDateTime saveFileDate;
+
+    /**
+     * 送达状态
+     */
+    @ImportCell
+    @ExportCell(columnName = "送达状态")
+    private Boolean delivery;
+
+
+}

+ 10 - 0
domain/src/main/java/com/dayou/vo/AssetsVO.java

@@ -0,0 +1,10 @@
+package com.dayou.vo;
+
+import com.dayou.entity.Assets;
+import lombok.Data;
+
+@Data
+public class AssetsVO extends Assets {
+
+    
+}

+ 28 - 0
service/src/main/java/com/dayou/service/IAssetsEvaluationTargetService.java

@@ -0,0 +1,28 @@
+package com.dayou.service;
+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 org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.springframework.web.multipart.MultipartFile;
+/**
+ * <p>
+ * 资产评估对象表 服务类
+ * </p>
+ *
+ * @author GouGengquan
+ * @since 2024-03-28
+ */
+public interface IAssetsEvaluationTargetService extends IService<AssetsEvaluationTarget> {
+
+        Page<AssetsEvaluationTarget> selectPage(Page page,AssetsEvaluationTarget assetsEvaluationTarget);
+
+        AssetsEvaluationTarget detail(Long id);
+
+        Boolean add(AssetsEvaluationTarget assetsEvaluationTarget);
+
+        Boolean update(AssetsEvaluationTarget assetsEvaluationTarget);
+
+        Boolean delete(Long id);
+
+}

+ 42 - 0
service/src/main/java/com/dayou/service/IAssetsEvaluationTargetTypeService.java

@@ -0,0 +1,42 @@
+package com.dayou.service;
+import com.dayou.entity.AssetsEvaluationTargetType;
+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-03-28
+ */
+public interface IAssetsEvaluationTargetTypeService extends IService<AssetsEvaluationTargetType> {
+
+        /**
+         * 根据父级id获取资产评估对象类型
+         * @param type 查询条件
+         * @return List<AssetsEvaluationTargetType>
+         */
+        List<AssetsEvaluationTargetType> getTypeList(AssetsEvaluationTargetType type);
+
+        /**
+         * 新增资产评估对象类型
+         * @param assetsEvaluationTargetType 资产评估对象类型
+         * @return Boolean
+         */
+        Boolean add(AssetsEvaluationTargetType assetsEvaluationTargetType);
+
+        /**
+         * 修改资产评估对象类型
+         * @param assetsEvaluationTargetType 资产评估对象类型
+         * @return Boolean
+         */
+        Boolean update(AssetsEvaluationTargetType assetsEvaluationTargetType);
+
+}

+ 28 - 0
service/src/main/java/com/dayou/service/IAssetsProductionService.java

@@ -0,0 +1,28 @@
+package com.dayou.service;
+import com.dayou.entity.AssetsProduction;
+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;
+/**
+ * <p>
+ * 资产产品表 服务类
+ * </p>
+ *
+ * @author GouGengquan
+ * @since 2024-03-28
+ */
+public interface IAssetsProductionService extends IService<AssetsProduction> {
+
+        Page<AssetsProduction> selectPage(Page page,AssetsProduction assetsProduction);
+
+        AssetsProduction detail(Long id);
+
+        Boolean add(AssetsProduction assetsProduction);
+
+        Boolean update(AssetsProduction assetsProduction);
+
+        Boolean delete(Long id);
+
+}

+ 34 - 0
service/src/main/java/com/dayou/service/IAssetsService.java

@@ -0,0 +1,34 @@
+package com.dayou.service;
+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 org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.springframework.web.multipart.MultipartFile;
+/**
+ * <p>
+ * 资产业务订单表 服务类
+ * </p>
+ *
+ * @author GouGengquan
+ * @since 2024-03-28
+ */
+public interface IAssetsService extends IService<Assets> {
+
+        Page<Assets> selectPage(Page page,Assets assets);
+
+        Assets detail(Long id);
+
+        /**
+         * 新增资产业务订单
+         * @param assets 资产订单信息
+         * @return Boolean
+         */
+        WorkNodeCommit add(Assets assets);
+
+        Boolean update(Assets assets);
+
+        Boolean delete(Long id);
+
+}

+ 66 - 0
service/src/main/java/com/dayou/service/impl/AssetsEvaluationTargetServiceImpl.java

@@ -0,0 +1,66 @@
+package com.dayou.service.impl;
+
+import com.dayou.entity.AssetsEvaluationTarget;
+import com.dayou.mapper.AssetsEvaluationTargetMapper;
+import com.dayou.service.IAssetsEvaluationTargetService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+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-03-28
+ */
+@Service
+public class AssetsEvaluationTargetServiceImpl extends ServiceImpl<AssetsEvaluationTargetMapper, AssetsEvaluationTarget> implements IAssetsEvaluationTargetService {
+
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public Page<AssetsEvaluationTarget> selectPage(Page page,AssetsEvaluationTarget assetsEvaluationTarget){
+        return this.page(page, new QueryWrapper<AssetsEvaluationTarget>(assetsEvaluationTarget));
+    }
+
+
+    @Override
+    public AssetsEvaluationTarget detail(Long id){
+        return this.getById(id);
+    }
+
+    @Override
+    public Boolean add(AssetsEvaluationTarget assetsEvaluationTarget){
+        return  this.save(assetsEvaluationTarget);
+    }
+
+    @Override
+    public Boolean update(AssetsEvaluationTarget assetsEvaluationTarget){
+        return  this.updateById(assetsEvaluationTarget);
+    }
+
+    @Override
+    public Boolean delete(Long id){
+        //逻辑删除
+        return this.removeById(id);
+    }
+}

+ 81 - 0
service/src/main/java/com/dayou/service/impl/AssetsEvaluationTargetTypeServiceImpl.java

@@ -0,0 +1,81 @@
+package com.dayou.service.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.dayou.entity.AssetsEvaluationTargetType;
+import com.dayou.mapper.AssetsEvaluationTargetTypeMapper;
+import com.dayou.service.IAssetsEvaluationTargetTypeService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+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-03-28
+ */
+@Service
+public class AssetsEvaluationTargetTypeServiceImpl extends ServiceImpl<AssetsEvaluationTargetTypeMapper, AssetsEvaluationTargetType> implements IAssetsEvaluationTargetTypeService {
+
+    /**
+     * 根据父级id获取资产评估对象类型
+     * @param type 查询条件
+     * @return List<AssetsEvaluationTargetType>
+     */
+    @Override
+    public List<AssetsEvaluationTargetType> getTypeList(AssetsEvaluationTargetType type) {
+
+        //parentId为空给默认值0
+        if (ObjectUtil.isNull(type.getParentId()) || ObjectUtil.isEmpty(type.getParentId())){
+            type.setParentId(0L);
+        }
+
+        //根据父级id查询类型列表
+        Wrapper<AssetsEvaluationTargetType> wrapper = Wrappers
+                .<AssetsEvaluationTargetType>lambdaQuery()
+                .eq(AssetsEvaluationTargetType::getParentId, type.getParentId());
+        return this.list(wrapper);
+    }
+
+    /**
+     * 新增资产评估对象类型
+     * @param assetsEvaluationTargetType 资产评估对象类型
+     * @return Boolean
+     */
+    @Override
+    public Boolean add(AssetsEvaluationTargetType assetsEvaluationTargetType){
+        return  this.save(assetsEvaluationTargetType);
+    }
+
+    /**
+     * 修改资产评估对象类型
+     * @param assetsEvaluationTargetType 资产评估对象类型
+     * @return Boolean
+     */
+    @Override
+    public Boolean update(AssetsEvaluationTargetType assetsEvaluationTargetType){
+        return  this.updateById(assetsEvaluationTargetType);
+    }
+
+}

+ 66 - 0
service/src/main/java/com/dayou/service/impl/AssetsProductionServiceImpl.java

@@ -0,0 +1,66 @@
+package com.dayou.service.impl;
+
+import com.dayou.entity.AssetsProduction;
+import com.dayou.mapper.AssetsProductionMapper;
+import com.dayou.service.IAssetsProductionService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+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-03-28
+ */
+@Service
+public class AssetsProductionServiceImpl extends ServiceImpl<AssetsProductionMapper, AssetsProduction> implements IAssetsProductionService {
+
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public Page<AssetsProduction> selectPage(Page page,AssetsProduction assetsProduction){
+        return this.page(page, new QueryWrapper<AssetsProduction>(assetsProduction));
+    }
+
+
+    @Override
+    public AssetsProduction detail(Long id){
+        return this.getById(id);
+    }
+
+    @Override
+    public Boolean add(AssetsProduction assetsProduction){
+        return  this.save(assetsProduction);
+    }
+
+    @Override
+    public Boolean update(AssetsProduction assetsProduction){
+        return  this.updateById(assetsProduction);
+    }
+
+    @Override
+    public Boolean delete(Long id){
+        //逻辑删除
+        return this.removeById(id);
+    }
+}

+ 86 - 0
service/src/main/java/com/dayou/service/impl/AssetsServiceImpl.java

@@ -0,0 +1,86 @@
+package com.dayou.service.impl;
+
+import com.dayou.dto.WorkNodeCommit;
+import com.dayou.entity.Assets;
+import com.dayou.enums.MainBusinessEnum;
+import com.dayou.mapper.AssetsMapper;
+import com.dayou.service.IAssetsService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dayou.service.IBusinessNumberService;
+import com.dayou.service.workflow.IWorkFlowService;
+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-03-28
+ */
+@Service
+public class AssetsServiceImpl extends ServiceImpl<AssetsMapper, Assets> implements IAssetsService {
+
+    @Autowired
+    private IBusinessNumberService businessNumberService;
+
+    @Autowired
+    private IWorkFlowService workFlowService;
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public Page<Assets> selectPage(Page page,Assets assets){
+        return this.page(page, new QueryWrapper<Assets>(assets));
+    }
+
+
+    @Override
+    public Assets detail(Long id){
+        return this.getById(id);
+    }
+
+    /**
+     * 新增资产业务订单
+     * @param assets 资产订单信息
+     * @return Boolean
+     */
+    @Override
+    public WorkNodeCommit add(Assets assets){
+        //获取项目编号
+        assets.setOrderId(businessNumberService.takeOrderNumber());
+        //新增订单信息
+        this.save(assets);
+        //发起流程
+        return workFlowService.openingOrder(MainBusinessEnum.ASSET_BUSINESS,assets.getId(),assets.getOrderId(),assets.getRemark());
+    }
+
+    @Override
+    public Boolean update(Assets assets){
+        return  this.updateById(assets);
+    }
+
+    @Override
+    public Boolean delete(Long id){
+        //逻辑删除
+        return this.removeById(id);
+    }
+}

+ 62 - 1
sql/update_sql.sql

@@ -139,4 +139,65 @@ CREATE TABLE `assets_value_type`
   COLLATE = latin1_swedish_ci COMMENT = '价值类型表'
   ROW_FORMAT = Dynamic;
 
-SET FOREIGN_KEY_CHECKS = 1;
+SET FOREIGN_KEY_CHECKS = 1;
+
+
+/**
+  日期:2024-03-28
+ */
+
+# 删除 assets 表 financial 字段
+ALTER TABLE assets DROP financial;
+
+# 部分字段字符集问题修正
+alter table assets_evaluation_method change method_name method_name varchar(255) character set utf8 collate utf8_unicode_ci not null default '';
+alter table assets_evaluation_target_type change type_name type_name varchar(255) character set utf8 collate utf8_unicode_ci not null default '';
+alter table assets_evaluation_target change the_holder the_holder varchar(255) character set utf8 collate utf8_unicode_ci not null default '';
+alter table assets_evaluation_target change file_path file_path varchar(255) character set utf8 collate utf8_unicode_ci not null default '';
+alter table assets_value_type change type_name type_name varchar(255) character set utf8 collate utf8_unicode_ci not null default '';
+
+# 追加自增
+alter table assets modify id int auto_increment;
+alter table assets_evaluation_method modify id int auto_increment;
+alter table assets_evaluation_target_type modify id int auto_increment;
+alter table assets_evaluation_target modify id int auto_increment;
+alter table assets_value_type modify id int auto_increment;
+
+# 资产产品表
+DROP TABLE IF EXISTS `assets_production`;
+CREATE TABLE `assets_production`
+(
+    `id`                     bigint(20)                                                    NOT NULL AUTO_INCREMENT COMMENT '资产产品主键id',
+    `business_id`            bigint(20)                                                    NOT NULL COMMENT '业务id(资产id)',
+    `production_no`          varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '产品号',
+    `production_type`        varchar(64) CHARACTER SET utf8 COLLATE utf8_unicode_ci        NOT NULL COMMENT '产品类型(意见书,报告)',
+    `signatory`              json                                                          NULL COMMENT '签字人(产品类型为报告时,签字人必填)',
+    `client_name`            varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci       NULL     DEFAULT NULL COMMENT '委托方名称',
+    `client_tel`             varchar(64) CHARACTER SET utf8 COLLATE utf8_unicode_ci        NULL     DEFAULT NULL COMMENT '委托方电话',
+    `valuation_basis_date`   date                                                          NOT NULL COMMENT '评估基准日',
+    `evaluate_acreage`       decimal(16, 2)                                                NULL     DEFAULT NULL COMMENT '评估面积',
+    `evaluate_amount`        decimal(16, 2)                                                NULL     DEFAULT NULL COMMENT '评估总价',
+    `evaluate_price`         decimal(16, 2)                                                NULL     DEFAULT NULL COMMENT '评估单价',
+    `owner`                  varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci       NULL     DEFAULT NULL COMMENT '产权人',
+    `print_count`            int(11)                                                       NOT NULL COMMENT '产品打印数量',
+    `create_production_date` date                                                          NOT NULL COMMENT '产品出具日期',
+    `comment`                text CHARACTER SET utf8 COLLATE utf8_unicode_ci               NULL COMMENT '特殊情况说明',
+    `repertory_state`        bit(1)                                                        NULL     DEFAULT NULL COMMENT '库存状态(0:已入库  1:已出库)',
+    `repertory_in_time`      datetime(0)                                                   NULL     DEFAULT NULL COMMENT '入库时间',
+    `repertory_out_time`     datetime(0)                                                   NULL     DEFAULT NULL COMMENT '出库时间',
+    `file_path`              varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci       NULL     DEFAULT NULL COMMENT '电子文档路经',
+    `save_file_date`         datetime(0)                                                   NULL     DEFAULT NULL COMMENT '归档日期',
+    `delivery`               bit(1)                                                        NOT NULL DEFAULT b'0' COMMENT '送达状态',
+    `deleted`                bit(1)                                                        NOT NULL DEFAULT b'0' COMMENT '逻辑删除标识:1:删除 0:未删除',
+    `created`                datetime(0)                                                   NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '创建时间',
+    `modified`               timestamp(6)                                                  NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6) COMMENT '修改时间',
+    PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 1
+  CHARACTER SET = utf8mb4
+  COLLATE = utf8mb4_general_ci COMMENT = '资产产品表'
+  ROW_FORMAT = Dynamic;
+
+SET FOREIGN_KEY_CHECKS = 1;
+
+