添加权属证书接口

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

@@ -0,0 +1,33 @@
+package com.dayou.controller;
+
+import com.dayou.entity.CertificateFixedAssets;
+import com.dayou.result.Result;
+import com.dayou.service.CertificateFixedAssetsService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 不动产证控制器
+ */
+@RestController
+@RequestMapping("certificateFixedAssets")
+@Slf4j
+public class CertificateFixedAssetsController {
+
+    @Autowired
+    private CertificateFixedAssetsService certificateFixedAssetsService;
+
+    @PostMapping("")
+    public Result<Boolean> add(@RequestBody CertificateFixedAssets certificateFixedAssets){
+        return Result.build(certificateFixedAssetsService.add(certificateFixedAssets));
+    }
+
+    @GetMapping("/list")
+    public Result<List<CertificateFixedAssets>> getByBusinessIdAndTargetId(Long businessId, String targetId){
+        List<CertificateFixedAssets> list = certificateFixedAssetsService.getByBusinessIdAndTargetId(businessId,targetId);
+        return Result.build(list);
+    }
+}

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

@@ -0,0 +1,35 @@
+package com.dayou.controller;
+
+import com.dayou.entity.CertificateFixedAssets;
+import com.dayou.entity.CertificateHouseOwn;
+import com.dayou.result.Result;
+import com.dayou.service.CertificateFixedAssetsService;
+import com.dayou.service.CertificateHouseOwnService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 房地产证控制器
+ */
+@RestController
+@RequestMapping("certificateHouseOwn")
+@Slf4j
+public class CertificateHouseOwnController {
+
+    @Autowired
+    private CertificateHouseOwnService certificateHouseOwnService;
+
+    @PostMapping("")
+    public Result<Boolean> add(@RequestBody CertificateHouseOwn certificateHouseOwn){
+        return Result.build(certificateHouseOwnService.add(certificateHouseOwn));
+    }
+
+    @GetMapping("/list")
+    public Result<List<CertificateHouseOwn>> getByBusinessIdAndTargetId(Long businessId, String targetId){
+        List<CertificateHouseOwn> list = certificateHouseOwnService.getByBusinessIdAndTargetId(businessId,targetId);
+        return Result.build(list);
+    }
+}

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

@@ -0,0 +1,35 @@
+package com.dayou.controller;
+
+import com.dayou.entity.CertificateHouseOwn;
+import com.dayou.entity.CertificateLandUse;
+import com.dayou.result.Result;
+import com.dayou.service.CertificateHouseOwnService;
+import com.dayou.service.CertificateLandUseService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 土地使权用证控制器
+ */
+@RestController
+@RequestMapping("certificateLandUse")
+@Slf4j
+public class CertificateLandUseController {
+
+    @Autowired
+    private CertificateLandUseService certificateLandUseService;
+
+    @PostMapping("")
+    public Result<Boolean> add(@RequestBody CertificateLandUse certificateLandUse){
+        return Result.build(certificateLandUseService.add(certificateLandUse));
+    }
+
+    @GetMapping("/list")
+    public Result<List<CertificateLandUse>> getByBusinessIdAndTargetId(Long businessId, String targetId){
+        List<CertificateLandUse> list = certificateLandUseService.getByBusinessIdAndTargetId(businessId,targetId);
+        return Result.build(list);
+    }
+}

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

@@ -19,9 +19,9 @@ public class HouseGuarantyTargetController {
     private HouseGuarantyTargetService houseGuarantyTargetService;
 
     @PostMapping()
-    public Result<Boolean> save(@RequestBody HouseGuarantyTarget houseGuarantyTarget) {
-        boolean save = houseGuarantyTargetService.save(houseGuarantyTarget);
-        return Result.build(save);
+    public Result<Long> save(@RequestBody HouseGuarantyTarget houseGuarantyTarget) {
+        houseGuarantyTargetService.saveOrUpdate(houseGuarantyTarget);
+        return Result.build(houseGuarantyTarget.getId());
     }
 
     @GetMapping()

biz-base/src/test/java/com/dayou/ConditionDocumentTest.java

@@ -73,11 +73,11 @@ public class ConditionDocumentTest {
     @Test
     public void testYBJS() {
         List<HouseGuarantyTarget> targets = houseGuarantyTargetService.list(new LambdaQueryWrapper<HouseGuarantyTarget>().eq(HouseGuarantyTarget::getDocId, 15));
-        //String ybjsResult = tmplHouseParagraphService.findYBJSResult(targets, YES, YES);
+        String ybjsResult = tmplHouseParagraphService.findYBJSResult(targets, YES, YES);
         //String wdsxjsResult = tmplHouseParagraphService.findWDSXJSResult(targets, IMMOVABLE, "233");
-        String bxyzjsResult = tmplHouseParagraphService.findBXYZJSResult(targets, IMMOVABLE, "2024年2月23日");
-        String yjbujsResult = tmplHouseParagraphService.findYJBUJSResult(targets, IMMOVABLE, "收益法");
-        System.out.println(yjbujsResult);
+//        String bxyzjsResult = tmplHouseParagraphService.findBXYZJSResult(targets, IMMOVABLE, "2024年2月23日");
+//        String yjbujsResult = tmplHouseParagraphService.findYJBUJSResult(targets, IMMOVABLE, "收益法");
+        System.out.println(ybjsResult);
 
     }
 }

common/src/main/java/com/dayou/utils/HouseDocumentUtil.java

@@ -8,7 +8,6 @@ import com.dayou.dto.HouseGuarantyTargetDTO;
 import com.dayou.entity.HouseGuarantyTarget;
 import com.dayou.entity.TmplHouseParagraph;
 import com.dayou.enums.HouseTargetTableColumn;
-import com.dayou.exception.BusinessException;
 import com.dayou.exception.ErrorCode;
 
 import java.lang.reflect.Field;
@@ -131,7 +130,7 @@ public class HouseDocumentUtil {
             addressList = addressList.subList(0, 8);
             result =  CollectionUtil.formatSplitAndRemoveMiddle(mergeAddress(addressList)) + "等"+addressList.size();
         }else {
-            result =  CollectionUtil.formatSplitAndRemoveMiddle(mergeAddress(addressList)) + "，共计"+ addressList.size();
+            result =  CollectionUtil.formatSplitAndRemoveMiddle(mergeAddress(addressList)) + "共计"+ addressList.size();
         }
         return result +"处估价对象" + getUseTo(array) +"用房地产抵押价值评估";
     }
@@ -239,6 +238,29 @@ public class HouseDocumentUtil {
     }
 
     /**
+     * 组合估价对象描述，添加序号
+     * @param collect
+     * @return
+     */
+    public static String combinationTargetDescription(Map<Object, List<Object>> collect){
+        String actDesc = "";
+        int index = 1;
+        int mapSize = collect.size();
+        for (Map.Entry<Object, List<Object>> entry : collect.entrySet()) {
+            List<Object> value = entry.getValue();
+            JSONArray xArray = new JSONArray(value);
+            String actAddress = HouseDocumentUtil.getTargetDescription(xArray);
+            //添加换行符
+            if (index != mapSize){
+                actAddress +=  "\n";
+            }
+            actDesc += actAddress;
+            index ++;
+        }
+        return actDesc;
+    }
+
+    /**
      * List<Object>求和
      * @param list
      * @return
@@ -618,7 +640,7 @@ public class HouseDocumentUtil {
      * @param hasImmovableCertificate
      * @return
      */
-    public static String isDivideMethod1(List<HouseGuarantyTarget> targets, TmplHouseParagraph tmplHouseParagraph, String hasImmovableCertificate,String acreage) {
+    public static String isDivideMethod1(List<HouseGuarantyTarget> targets, TmplHouseParagraph tmplHouseParagraph, String hasImmovableCertificate) {
         StringBuilder result = new StringBuilder();
         String paragraph = tmplHouseParagraph.getParagraph();
         if (CollectionUtil.isNotEmpty(targets)){
@@ -627,6 +649,12 @@ public class HouseDocumentUtil {
             if (CollectionUtil.isNotEmpty(collect)){
                 for (HouseGuarantyTarget target : collect) {
                     String tId = target.getTId();
+                    List<HouseGuarantyTargetDTO> targetDTOS = JSON.parseArray(target.getBaseInfo(), HouseGuarantyTargetDTO.class);
+                    List<String> acreageStr = targetDTOS.stream().filter(x -> StrUtil.isNotBlank(x.getAcreage())).map(HouseGuarantyTargetDTO::getAcreage).collect(Collectors.toList());
+                    BigDecimal acreage = BigDecimal.ZERO;
+                    for (String acreageStr1 : acreageStr) {
+                        acreage = acreage.add(new BigDecimal(acreageStr1));
+                    }
                     StringBuilder floorAcreageDesc = new StringBuilder();
                     String floor1Acreage = target.getFloor1Acreage();
                     String floor2Acreage = target.getFloor2Acreage();
@@ -646,7 +674,7 @@ public class HouseDocumentUtil {
                     }else {
                         floorAcreageDesc.append("；");
                     }
-                    paragraph = paragraph.replace("{immovable}", hasImmovableCertificate).replace("{tId}", tId).replace("{acreage}", acreage);
+                    paragraph = paragraph.replace("{immovable}", hasImmovableCertificate).replace("{tId}", tId).replace("{acreage}", acreage.toPlainString());
                     paragraph = paragraph.replace("{floorAcreageDesc}", floorAcreageDesc.toString());
                     result.append(paragraph).append("\n");
                 }
@@ -662,7 +690,7 @@ public class HouseDocumentUtil {
      * @param hasImmovableCertificate
      * @return
      */
-    public static String isDivideMethod2(List<HouseGuarantyTarget> targets, TmplHouseParagraph tmplHouseParagraph, String hasImmovableCertificate, String acreage) {
+    public static String isDivideMethod2(List<HouseGuarantyTarget> targets, TmplHouseParagraph tmplHouseParagraph, String hasImmovableCertificate) {
         StringBuilder result = new StringBuilder();
         String paragraph = tmplHouseParagraph.getParagraph();
         if (CollectionUtil.isNotEmpty(targets)){
@@ -671,6 +699,12 @@ public class HouseDocumentUtil {
             if (CollectionUtil.isNotEmpty(collect)){
                 for (HouseGuarantyTarget target : collect) {
                     String tId = target.getTId();
+                    List<HouseGuarantyTargetDTO> targetDTOS = JSON.parseArray(target.getBaseInfo(), HouseGuarantyTargetDTO.class);
+                    List<String> acreageStr = targetDTOS.stream().filter(x -> StrUtil.isNotBlank(x.getAcreage())).map(HouseGuarantyTargetDTO::getAcreage).collect(Collectors.toList());
+                    BigDecimal acreage = BigDecimal.ZERO;
+                    for (String acreageStr1 : acreageStr) {
+                        acreage = acreage.add(new BigDecimal(acreageStr1));
+                    }
                     StringBuilder floorAcreageDesc = new StringBuilder();
                     String floor1Acreage = target.getFloor1Acreage();
                     String floor2Acreage = target.getFloor2Acreage();
@@ -690,7 +724,7 @@ public class HouseDocumentUtil {
                     }else {
                         floorAcreageDesc.append("；");
                     }
-                    paragraph = paragraph.replace("{immovable}", hasImmovableCertificate).replace("{tId}", tId).replace("{acreage}", acreage);
+                    paragraph = paragraph.replace("{immovable}", hasImmovableCertificate).replace("{tId}", tId).replace("{acreage}", acreage.toPlainString());
                     paragraph = paragraph.replace("{floorAcreageDesc}", floorAcreageDesc.toString());
                     result.append(paragraph).append("\n");
                 }

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

@@ -0,0 +1,8 @@
+package com.dayou.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dayou.entity.CertificateFixedAssets;
+import com.dayou.entity.HouseGuarantyTarget;
+
+public interface CertificateFixedAssetsMapper extends BaseMapper<CertificateFixedAssets> {
+}

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

@@ -0,0 +1,8 @@
+package com.dayou.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dayou.entity.CertificateFixedAssets;
+import com.dayou.entity.CertificateHouseOwn;
+
+public interface CertificateHouseOwnMapper extends BaseMapper<CertificateHouseOwn> {
+}

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

@@ -0,0 +1,8 @@
+package com.dayou.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dayou.entity.CertificateHouseOwn;
+import com.dayou.entity.CertificateLandUse;
+
+public interface CertificateLandUseMapper extends BaseMapper<CertificateLandUse> {
+}

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

@@ -0,0 +1,6 @@
+<?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.CertificateFixedAssetsMapper">
+
+
+</mapper>

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

@@ -0,0 +1,6 @@
+<?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.CertificateHouseOwnMapper">
+
+
+</mapper>

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

@@ -0,0 +1,6 @@
+<?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.CertificateLandUseMapper">
+
+
+</mapper>

domain/src/main/java/com/dayou/doc/house/ConsignorLetterDO.java

@@ -10,32 +10,74 @@ import lombok.Data;
 @Data
 public class ConsignorLetterDO {
 
+    /**
+     * 估价项目名称
+     */
     private String projectName;
 
+    /**
+     * 委托人
+     */
     private String consignor;
 
+    /**
+     * 权利
+     */
     private String ownship;
 
+    /**
+     * 权利人
+     */
     private String ownshipUser;
 
+    /**
+     * 估价师1
+     */
     private String appraiser1;
 
+    /**
+     * 估价师2
+     */
     private String appraiser2;
 
+    /**
+     * 估价师1注册号
+     */
     private String appraNo1;
 
+    /**
+     * 估价师2注册号
+     */
     private String appraNo2;
 
+    /**
+     * 出具报告日期
+     */
     private String docDate;
 
+    /**
+     * 报告号
+     */
     private String docNo;
 
+    /**
+     * 实勘日期
+     */
     private String actDesc;
 
+    /**
+     * 权利人是否为空
+     */
     private String ownshipBlank;
 
+    /**
+     * 价值时点
+     */
     private String valueTiming;
 
+    /**
+     * 评估方法
+     */
     private String methods;
 
     /**
@@ -68,4 +110,29 @@ public class ConsignorLetterDO {
      */
     private String isDeductSellAmount;
 
+    /**
+     * 划拨用地是否扣除出让金
+     */
+    private String consignorType;
+
+    /**
+     * 委托人住所
+     */
+    private String consignorAddress;
+
+    /**
+     * 法定代表人
+     */
+    private String consignorPerson;
+
+    /**
+     * 委托人注册资本
+     */
+    private String consignorMoney;
+
+    /**
+     * 统一社会信用代码
+     */
+    private String creditCode;
+
 }

domain/src/main/java/com/dayou/doc/house/GuarantyResultDO.java

@@ -0,0 +1,46 @@
+package com.dayou.doc.house;
+
+import lombok.Data;
+
+@Data
+public class GuarantyResultDO {
+
+    /**
+     * 委托人
+     */
+    private String consignor;
+
+    /**
+     * 划拨用地是否扣除出让金
+     */
+    private String consignorType;
+
+    /**
+     * 委托人住所
+     */
+    private String consignorAddress;
+
+    /**
+     * 法定代表人
+     */
+    private String consignorPerson;
+
+    /**
+     * 委托人注册资本
+     */
+    private String consignorMoney;
+
+    /**
+     * 统一社会信用代码
+     */
+    private String creditCode;
+
+    /**
+     * 估价对象及范围
+     */
+    private String targetScope;
+
+    private String buildingInfo;
+
+
+}

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

@@ -2,6 +2,8 @@ package com.dayou.dto;
 
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 @Data
 public class HouseGuarantyTargetDTO {
 

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

@@ -0,0 +1,27 @@
+package com.dayou.entity;
+
+import com.dayou.common.BaseEntity;
+import lombok.Data;
+
+@Data
+public class CertificateFixedAssets extends BaseEntity {
+
+    private String businessType;
+    private Long businessId;
+    private String tid;
+    private String tno;
+    private String certificateNo;
+    private String ownShipUser;
+    private String ownShipInfo;
+    private String location;
+    private String unitNo;
+    private String ownShipType;
+    private String ownShipNature;
+    private String useTo;
+    private String acreageDesc;
+    private String expireDateDesc;
+    private String ownShipOtherInfo;
+    private String attachInfo;
+    private Long createUserId;
+
+}

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

@@ -0,0 +1,33 @@
+package com.dayou.entity;
+
+import com.dayou.common.BaseEntity;
+import lombok.Data;
+
+@Data
+public class CertificateHouseOwn extends BaseEntity {
+
+    private String businessType;
+    private Long businessId;
+    private String tid;
+    private String tno;
+    private Boolean isNew;
+    private String certificateNo;
+    private String ownShipUser;
+    private String ownShipInfo;
+    private String location;
+    private String registerDate;
+    private String houseNature;
+    private String useTo;
+    private String allFloor;
+    private String acreage;
+    private String innerAcreage;
+    private String attachInfo;
+    private String areaNo;
+    private String ownShipType;
+    private String buildingNo;
+    private String houseNo;
+    private String structure;
+    private String atFloor;
+    private Long createUserId;
+
+}

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

@@ -0,0 +1,30 @@
+package com.dayou.entity;
+
+import com.dayou.common.BaseEntity;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class CertificateLandUse extends BaseEntity {
+
+    private String businessType;
+    private Long businessId;
+    private String tid;
+    private String tno;
+    private Boolean isNew;
+    private String certificateNo;
+    private String landUseUser;
+    private String location;
+    private String landNo;
+    private String imageNo;
+    private String useTo;
+    private String takePrice;
+    private String useType;
+    private String expireDate;
+    private String acreage;
+    private String outterAcreage;
+    private String attachInfo;
+    private String landLevel;
+    private Long createUserId;
+}

domain/src/main/java/com/dayou/enums/BusinessEnum.java

@@ -66,7 +66,7 @@ public enum BusinessEnum implements CodeMsgEnumInterface<String,String>{
 
         STATEMENT_CONDITIONS_EXPLAIN("STATEMENT_CONDITIONS_EXPLAIN","《假设和限制条件及使用报告说明》","conditions"),
 
-
+        GUARANTY_RESULT_REPORT("GUARANTY_RESULT_REPORT","《房地产抵押估价结果报告》","guarantyResult"),
 
         ;
 

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

@@ -0,0 +1,13 @@
+package com.dayou.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.dayou.entity.CertificateFixedAssets;
+
+import java.util.List;
+
+public interface CertificateFixedAssetsService extends IService<CertificateFixedAssets> {
+
+    Boolean add(CertificateFixedAssets certificateFixedAssets);
+
+    List<CertificateFixedAssets> getByBusinessIdAndTargetId(Long businessId, String targetId);
+}

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

@@ -0,0 +1,14 @@
+package com.dayou.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.dayou.entity.CertificateFixedAssets;
+import com.dayou.entity.CertificateHouseOwn;
+
+import java.util.List;
+
+public interface CertificateHouseOwnService extends IService<CertificateHouseOwn> {
+
+    Boolean add(CertificateHouseOwn certificateHouseOwn);
+
+    List<CertificateHouseOwn> getByBusinessIdAndTargetId(Long businessId, String targetId);
+}

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

@@ -0,0 +1,14 @@
+package com.dayou.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.dayou.entity.CertificateFixedAssets;
+import com.dayou.entity.CertificateLandUse;
+
+import java.util.List;
+
+public interface CertificateLandUseService extends IService<CertificateLandUse> {
+
+    Boolean add(CertificateLandUse certificateLandUse);
+
+    List<CertificateLandUse> getByBusinessIdAndTargetId(Long businessId, String targetId);
+}

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

@@ -0,0 +1,25 @@
+package com.dayou.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dayou.entity.CertificateFixedAssets;
+import com.dayou.mapper.CertificateFixedAssetsMapper;
+import com.dayou.service.CertificateFixedAssetsService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class CertificateFixedAssetsServiceImpl extends ServiceImpl<CertificateFixedAssetsMapper, CertificateFixedAssets> implements CertificateFixedAssetsService {
+
+    @Override
+    public Boolean add(CertificateFixedAssets certificateFixedAssets) {
+        return this.save(certificateFixedAssets);
+    }
+
+    @Override
+    public List<CertificateFixedAssets> getByBusinessIdAndTargetId(Long businessId, String targetId) {
+        return this.list(new LambdaQueryWrapper<CertificateFixedAssets>().eq(CertificateFixedAssets::getBusinessId,businessId)
+                .eq(CertificateFixedAssets::getTid,targetId));
+    }
+}

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

@@ -0,0 +1,26 @@
+package com.dayou.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dayou.entity.CertificateHouseOwn;
+import com.dayou.mapper.CertificateHouseOwnMapper;
+import com.dayou.service.CertificateHouseOwnService;
+import org.springframework.stereotype.Service;
+
+import java.util.Collections;
+import java.util.List;
+
+@Service
+public class CertificateHouseOwnServiceImpl extends ServiceImpl<CertificateHouseOwnMapper, CertificateHouseOwn> implements CertificateHouseOwnService {
+
+    @Override
+    public Boolean add(CertificateHouseOwn certificateHouseOwn) {
+        return this.save(certificateHouseOwn);
+    }
+
+    @Override
+    public List<CertificateHouseOwn> getByBusinessIdAndTargetId(Long businessId, String targetId) {
+        return this.list(new LambdaQueryWrapper<CertificateHouseOwn>().eq(CertificateHouseOwn::getBusinessId,businessId)
+                .eq(CertificateHouseOwn::getTid,targetId));
+    }
+}

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

@@ -0,0 +1,29 @@
+package com.dayou.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dayou.entity.CertificateFixedAssets;
+import com.dayou.entity.CertificateLandUse;
+import com.dayou.mapper.CertificateFixedAssetsMapper;
+import com.dayou.mapper.CertificateLandUseMapper;
+import com.dayou.service.CertificateFixedAssetsService;
+import com.dayou.service.CertificateLandUseService;
+import org.springframework.stereotype.Service;
+
+import java.util.Collections;
+import java.util.List;
+
+@Service
+public class CertificateLandUseServiceImpl extends ServiceImpl<CertificateLandUseMapper, CertificateLandUse> implements CertificateLandUseService {
+
+    @Override
+    public Boolean add(CertificateLandUse certificateLandUse) {
+        return this.save(certificateLandUse);
+    }
+
+    @Override
+    public List<CertificateLandUse> getByBusinessIdAndTargetId(Long businessId, String targetId) {
+        return this.list(new LambdaQueryWrapper<CertificateLandUse>().eq(CertificateLandUse::getBusinessId,businessId)
+                .eq(CertificateLandUse::getTid,targetId));
+    }
+}

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

@@ -143,20 +143,7 @@ public class HouseGuarantyServiceImpl implements HouseGuarantyService {
 
             clDO.setProjectName(projectName);
             Map<Object, List<Object>> collect = array.stream().collect(Collectors.groupingBy(x -> ((JSONObject) x).get(ID.getZhName())));
-            String actDesc = "";
-            int index = 1;
-            int mapSize = collect.size();
-            for (Map.Entry<Object, List<Object>> entry : collect.entrySet()) {
-                List<Object> value = entry.getValue();
-                JSONArray xArray = new JSONArray(value);
-                String actAddress = HouseDocumentUtil.getTargetDescription(xArray);
-                //添加换行符
-                if (index != mapSize){
-                    actAddress +=  "\n";
-                }
-                actDesc += actAddress;
-                index ++;
-            }
+            String actDesc = HouseDocumentUtil.combinationTargetDescription(collect);
             clDO.setActDesc(actDesc);
             String ownShipUser = HouseDocumentUtil.getOwnShipUser(array);
 

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

@@ -119,14 +119,14 @@ public class TmplHouseParagraphServiceImpl extends ServiceImpl<TmplHouseParagrap
                     }
                 }
                 if (IS_DIVIDE_METHOD1.getCode().equals(rule)){
-                    String divideMethod1 = HouseDocumentUtil.isDivideMethod1(targets,paragraph,hasImmovableCertificate,acreage);
+                    String divideMethod1 = HouseDocumentUtil.isDivideMethod1(targets,paragraph,hasImmovableCertificate);
                     if (StrUtil.isNotBlank(divideMethod1)){
                         result.append(i).append(". ").append(divideMethod1);
                         i++;
                     }
                 }
                 if (IS_DIVIDE_METHOD2.getCode().equals(rule)){
-                    String divideMethod2 = HouseDocumentUtil.isDivideMethod2(targets,paragraph,hasImmovableCertificate,acreage);
+                    String divideMethod2 = HouseDocumentUtil.isDivideMethod2(targets,paragraph,hasImmovableCertificate);
                     if (StrUtil.isNotBlank(divideMethod2)){
                         result.append(i).append(". ").append(divideMethod2);
                         i++;