大中型报告生成新版改动1

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

@@ -1,6 +1,5 @@
 package com.dayou.controller;
 
-import com.dayou.entity.HouseGuarantyBase;
 import com.dayou.result.Result;
 import com.dayou.service.HouseExcelDataService;
 import com.dayou.vo.HouseGuarantyBaseVO;

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

@@ -1,41 +0,0 @@
-package com.dayou.controller;
-
-import com.dayou.entity.HouseGuarantyBase;
-import com.dayou.result.Result;
-import com.dayou.service.HouseGuarantyBaseService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * 房地产抵押基本信息
- */
-@RestController
-@RequestMapping("houseGuarantyBase")
-@Slf4j
-public class HouseGuarantyBaseController {
-
-    @Autowired
-    private HouseGuarantyBaseService houseGuarantyBaseService;
-
-    /**
-     * 基本信息保存
-     * @param base
-     * @return
-     */
-    @PostMapping("")
-    public Result<Long> add(@RequestBody  HouseGuarantyBase base){
-        return Result.build(houseGuarantyBaseService.add(base));
-    }
-
-    /**
-     * 根据id查询
-     * @param docId
-     * @return
-     */
-    @GetMapping("/{docId}")
-    public Result<HouseGuarantyBase> getByDocId(@PathVariable("docId") Long docId){
-        return Result.build(houseGuarantyBaseService.getByDocId(docId));
-    }
-
-}

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

@@ -2,11 +2,12 @@ package com.dayou.controller;
 
 
 import com.dayou.dto.HouseGuarantyTableDTO;
+import com.dayou.entity.DocumentProduction;
 import com.dayou.entity.HouseGuarantyProcess;
 import com.dayou.result.Result;
+import com.dayou.service.DocumentProductionService;
 import com.dayou.service.HouseGuarantyProcessService;
 import com.dayou.service.HouseGuarantyService;
-import com.dayou.vo.HouseTargetVO;
 import com.dayou.vo.ProcessVO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -29,6 +30,9 @@ public class HouseGuarantyDocController {
     @Autowired
     private HouseGuarantyProcessService houseGuarantyProcessService;
 
+    @Autowired
+    private DocumentProductionService documentProductionService;
+
     /**
      * 生成估价结果一览表的word文件
      * @return 过程表id
@@ -38,16 +42,6 @@ public class HouseGuarantyDocController {
         return Result.build(houseGuarantyService.createTableWord(houseGuarantyTableDTO));
     }
 
-    /**
-     * 解析表单中的估价对象
-     * @param processId
-     * @return
-     */
-    @Deprecated
-    @GetMapping("/collect1/{processId}")
-    public Result<Long> analysisCollect1(@PathVariable("processId") Long processId) throws Exception {
-        return Result.build(houseGuarantyService.analysisCollect1(processId));
-    }
 
     /**
      * 生成致委托人函word
@@ -81,15 +75,6 @@ public class HouseGuarantyDocController {
         return Result.build(list);
     }
 
-    /**
-     * 获取估价对象
-     * @param id
-     * @return
-     */
-    @GetMapping("/targets/{id}")
-    public Result<List<HouseTargetVO>> getTargetsById(@PathVariable Long id){
-        return Result.build(houseGuarantyService.getTargetsById(id));
-    }
 
     /**
      * 生成《估价的假设和限制条件及使用报告说明》
@@ -116,4 +101,26 @@ public class HouseGuarantyDocController {
         return Result.build(houseGuarantyService.getCertificatesHtml(businessId));
     }
 
+
+    /**
+     * 合并文档成完整报告
+     * id = parentId
+     * @return
+     */
+    @GetMapping("/merge")
+    public Result<Boolean> houseGuarantyMerge(Long id) throws Exception {
+        Boolean ret = houseGuarantyProcessService.houseGuarantyMerge(id);
+        return Result.build(ret);
+    }
+
+    /**
+     * 完整报告信息
+     * @return
+     */
+    @GetMapping("/final/{id}")
+    public Result<DocumentProduction> finalDoc(@PathVariable("id") Long id) throws Exception {
+        DocumentProduction dp = documentProductionService.getById(id);
+        return Result.build(dp);
+    }
+
 }

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

@@ -1,42 +0,0 @@
-package com.dayou.controller;
-
-import com.dayou.entity.HouseGuarantyAim;
-import com.dayou.entity.HouseGuarantyTarget;
-import com.dayou.result.Result;
-import com.dayou.service.HouseGuarantyAimService;
-import com.dayou.service.HouseGuarantyTargetService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * 房地产抵押类估价对象信息
- */
-@RestController
-@RequestMapping("house/guaranty/target")
-@Slf4j
-public class HouseGuarantyTargetController {
-
-    @Autowired
-    private HouseGuarantyTargetService houseGuarantyTargetService;
-
-    @Autowired
-    private HouseGuarantyAimService houseGuarantyAimService;
-
-    @PostMapping()
-    public Result<Long> save(@RequestBody HouseGuarantyTarget houseGuarantyTarget) {
-        List<HouseGuarantyAim> aims = houseGuarantyTarget.getAims();
-        houseGuarantyAimService.saveOrUpdateBatch(aims);
-        houseGuarantyTargetService.saveOrUpdate(houseGuarantyTarget);
-        return Result.build(houseGuarantyTarget.getId());
-    }
-
-    @GetMapping()
-    public Result<HouseGuarantyTarget> getTarget(Long docId, String tId) {
-        HouseGuarantyTarget target = houseGuarantyTargetService.getTarget(docId,tId);
-        return Result.build(target);
-    }
-
-}

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

@@ -1,66 +0,0 @@
-package com.dayou.controller;
-
-import com.dayou.entity.HouseTargetEntity;
-import com.dayou.result.Result;
-import com.dayou.service.HouseTargetEntityService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-
-/**
- * 房地产实物状况控制器
- */
-@RestController
-@RequestMapping("houseTargetEntity")
-@Slf4j
-public class HouseTargetEntityController {
-
-    @Autowired
-    private HouseTargetEntityService houseTargetEntityService;
-
-    /**
-     * 保存实物状况信息
-     * @param houseTargetEntity
-     * @return
-     */
-    @PostMapping("")
-    public Result<Long> addHouseTargetEntity(@RequestBody HouseTargetEntity houseTargetEntity) {
-        Long ret = houseTargetEntityService.addHouseTargetEntity(houseTargetEntity);
-        return Result.build(ret);
-    }
-
-    /**
-     * 查询单个标的物实物状况
-     * @param businessId
-     * @param tid
-     * @param tno
-     * @return
-     */
-    @GetMapping("")
-    public Result<HouseTargetEntity> getHouseTargetEntityById(Long businessId,String tid,String tno) {
-        HouseTargetEntity ret = houseTargetEntityService.getHouseTargetEntityById(businessId,tid,tno);
-        return Result.build(ret);
-    }
-
-    /**
-     * 删除实物状况信息
-     * @param id
-     * @return
-     */
-    @DeleteMapping("/{id}")
-    public Result<Boolean> removeHouseTargetEntityById(@PathVariable("id") Long id) {
-        return Result.build(houseTargetEntityService.removeById(id));
-    }
-
-    /**
-     * 复制到其他实物状况
-     * @param id
-     * @return
-     */
-    @GetMapping("/copy/{id}")
-    public Result<Boolean> copyHouseTargetEntity(@PathVariable("id") Long id){
-        Boolean ret = houseTargetEntityService.copyHouseTargetEntity(id);
-        return Result.build(ret);
-    }
-}

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

@@ -1,35 +0,0 @@
-package com.dayou.controller;
-
-
-import com.dayou.entity.TmplHouseParagraph;
-import com.dayou.result.Result;
-import com.dayou.service.TmplHouseParagraphService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-@RestController
-@RequestMapping("/tmplHouseParagraph")
-@Slf4j
-public class TmplHouseParagraphController {
-
-    @Autowired
-    private TmplHouseParagraphService tmplHouseParagraphService;
-
-    /**
-     * 查询章节内可用段落
-     * @param tmplHouseParagraph
-     * @return
-     */
-    @PostMapping("/get")
-    public Result<List<TmplHouseParagraph>> findByMoldAndChapter(@RequestBody TmplHouseParagraph tmplHouseParagraph) {
-        List<TmplHouseParagraph> list = tmplHouseParagraphService.findByMoldAndChapter(tmplHouseParagraph);
-        return Result.build(list);
-    }
-
-}

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

@@ -7,14 +7,12 @@ import cn.hutool.json.JSONUtil;
 import com.dayou.dto.Address;
 import com.dayou.utils.AddressUtil;
 import com.dayou.utils.CollectionUtil;
-import com.dayou.utils.HouseDocumentUtil;
 
 import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
 import static com.dayou.enums.HouseTargetTableColumn.LOCATION;
-import static com.dayou.utils.HouseDocumentUtil.mergeAddress;
 
 public class AddressParser {
 

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

@@ -1,48 +1,11 @@
 package com.dayou;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.dayou.entity.HouseGuarantyTarget;
-import com.dayou.service.CertificateLandUseService;
-import com.dayou.service.HouseGuarantyTargetService;
-import com.dayou.service.TmplHouseParagraphService;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 
-import java.util.Arrays;
-import java.util.List;
-
-import static com.dayou.constants.HouseGuarantyDoc.NO;
 
 @SpringBootTest
 public class ConditionDocumentTest {
 
 
 
-    @Autowired
-    private TmplHouseParagraphService tmplHouseParagraphService;
-
-    @Autowired
-    private HouseGuarantyTargetService houseGuarantyTargetService;
-
-    @Autowired
-    private CertificateLandUseService certificateLandUseService;
-
-    /**
-     * 一般假设测试类
-     */
-    @Test
-    public void testYBJS() {
-        String cers [] = {"《不动产权证书》","《房屋所有权利证书》","《国有土地证书》"};
-        List<String> cersList = Arrays.asList(cers);
-        List<HouseGuarantyTarget> targets = houseGuarantyTargetService.list(new LambdaQueryWrapper<HouseGuarantyTarget>().eq(HouseGuarantyTarget::getDocId, 42));
-        //String ybjsResult = tmplHouseParagraphService.findYBJSResult(targets, NO, cersList);
-        //List<CertificateLandUse> landCerts = certificateLandUseService.list(new LambdaQueryWrapper<CertificateLandUse>().eq(CertificateLandUse::getBusinessId, 42));
-
-        //String wdsxjsResult = tmplHouseParagraphService.findWDSXJSResult(targets, landCerts);
-       //String bxyzjsResult = tmplHouseParagraphService.findBXYZJSResult(targets, cersList, "2024年2月23日");
-        String yjbujsResult = tmplHouseParagraphService.findYJBUJSResult(targets, cersList, false,"收益法");
-        System.out.println(yjbujsResult);
-
-    }
 }

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

@@ -2,7 +2,6 @@ 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/HouseGuarantyAimMapper.java

@@ -1,10 +0,0 @@
-package com.dayou.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.dayou.entity.HouseGuarantyAim;
-
-import java.util.List;
-
-public interface HouseGuarantyAimMapper extends BaseMapper<HouseGuarantyAim> {
-
-}

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

@@ -1,10 +0,0 @@
-package com.dayou.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.dayou.entity.HouseGuarantyBase;
-import org.apache.ibatis.annotations.Param;
-
-public interface HouseGuarantyBaseMapper extends BaseMapper<HouseGuarantyBase> {
-
-    HouseGuarantyBase getByDocId(@Param("docId") Long docId);
-}

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

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.dayou.entity.HouseGuarantyProcess;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * 房地产抵押过程表 Mapper 接口
@@ -15,4 +17,6 @@ import org.apache.ibatis.annotations.Param;
 public interface HouseGuarantyProcessMapper extends BaseMapper<HouseGuarantyProcess> {
 
     HouseGuarantyProcess getProcessByDocId(@Param("docId") Long docId);
+
+    List<HouseGuarantyProcess> queryMaxCreateTimeDoc(@Param("home") String home);
 }

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

@@ -1,12 +0,0 @@
-package com.dayou.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.dayou.entity.HouseGuarantyTarget;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-public interface HouseGuarantyTargetMapper extends BaseMapper<HouseGuarantyTarget> {
-
-    List<HouseGuarantyTarget> getList(@Param("docId") Long docId);
-}

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

@@ -1,15 +0,0 @@
-package com.dayou.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.dayou.dto.HouseRightsDTO;
-import com.dayou.entity.HouseTargetEntity;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-public interface HouseTargetEntityMapper extends BaseMapper<HouseTargetEntity> {
-
-    List<HouseTargetEntity> getListById(@Param("docId") Long docId);
-
-    List<HouseRightsDTO> getHouseRightsDTOList(@Param("docId")Long docId);
-}

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

@@ -73,7 +73,7 @@
             work_purpose,
             target_scope,
             building_info,
-            land_info,
+            trim(land_info),
             guaranty_info,
             rem_info,
             rent_info,

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

@@ -6,4 +6,17 @@
         select * from house_guaranty_process where excel_id = (select business_id from document_production where id = #{docId})
     </select>
 
+    <select id="queryMaxCreateTimeDoc" parameterType="java.lang.String" resultType="com.dayou.entity.HouseGuarantyProcess">
+        SELECT
+            hgp.id,
+            hgp.doc_url,
+            hgp.process_name,
+            hgp.create_time
+        FROM
+            ( SELECT process_name, max( create_time ) AS ct FROM house_guaranty_process WHERE home = #{home} GROUP BY process_name ) mx
+                LEFT JOIN house_guaranty_process hgp ON (
+                mx.process_name = hgp.process_name
+                    AND mx.ct = hgp.create_time)
+    </select>
+
 </mapper>

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

@@ -1,44 +0,0 @@
-package com.dayou.entity;
-
-import com.dayou.common.BaseEntity;
-import lombok.Data;
-
-
-@Data
-public class HouseGuarantyAim extends BaseEntity {
-
-    private Long docId;
-
-    private String tid;
-
-    private String tno;
-
-    private String certificateNo;
-
-    private String ownShipUser;
-
-    private String location;
-
-    private String atFloor;
-
-    private String structure;
-
-    private String useTo;
-
-    private String outerAcreage;
-
-    private String acreage;
-
-    private String price;
-
-    private String amount;
-
-    private String landCertificateNo;
-
-    private String landType;
-
-    private String actAddress;
-
-    private String lngLat;
-
-}

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

@@ -1,170 +0,0 @@
-package com.dayou.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.dayou.common.BaseEntity;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * 致委托人函 文档对象
- */
-@Data
-public class HouseGuarantyBase extends BaseEntity {
-
-    /**
-     * 估价项目名称
-     */
-    private String projectName;
-
-    /**
-     * 委托人
-     */
-    private String consignor;
-
-
-
-    /**
-     * 估价师1
-     */
-    private String appraiser1;
-
-    /**
-     * 估价师2
-     */
-    private String appraiser2;
-
-    /**
-     * 估价师1注册号
-     */
-    private String appraNo1;
-
-    /**
-     * 估价师2注册号
-     */
-    private String appraNo2;
-
-    /**
-     * 出具报告日期
-     */
-    private String docDate;
-
-    /**
-     * 报告号
-     */
-    private String docNo;
-
-    /**
-     * 价值时点
-     */
-    private String valueTiming;
-
-    /**
-     * 评估方法
-     */
-    private String methods;
-
-
-
-
-    /**
-     * 是否提供技术报告
-     */
-    private Boolean hasTechReport;
-
-    /**
-     * 是否是农商银行
-     */
-    private Boolean isNsBank;
-
-    /**
-     * 是否审核权属原件
-     */
-    private Boolean isCheckOriginCertificate;
-
-
-    /**
-     * 委托人类型
-     */
-    private String consignorType;
-
-    /**
-     * 委托人住所
-     */
-    private String consignorAddress;
-
-    /**
-     * 法定代表人
-     */
-    private String consignorPerson;
-
-    /**
-     * 委托人注册资本
-     */
-    private String consignorMoney;
-
-    /**
-     * 统一社会信用代码
-     */
-    private String creditCode;
-
-    private Boolean hasPledge;
-
-    private String pledgeUser;
-
-    private String pledgeType;
-
-    private String pledgeValue;
-
-    private Boolean samePledgeContinue;
-
-    private String newPledgeUser;
-
-    private Boolean highPledgeNotExpire;
-
-    private Boolean samePledgeHigh;
-
-    private String firstMoney;
-
-    private String debtMoney;
-
-    private Boolean isTakeOutFirstMoney;
-
-    private String landUseType;
-
-
-
-
-    /**
-     * 权利
-     */
-    @TableField(exist = false)
-    private String ownship;
-
-
-    /**
-     * 权利人是否为空
-     */
-    @TableField(exist = false)
-    private String ownshipBlank;
-
-    /**
-     * 地址描述
-     */
-    @TableField(exist = false)
-    private String actDesc;
-
-    /**
-     * 权利人
-     */
-    @TableField(exist = false)
-    private String ownshipUser;
-
-
-    @TableField(exist = false)
-    private List<String> methodList;
-
-    @TableField(exist = false)
-    private Long processId;
-
-}

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

@@ -1,110 +0,0 @@
-package com.dayou.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.dayou.common.BaseEntity;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.List;
-
-@Data
-public class HouseGuarantyTarget extends BaseEntity implements Serializable {
-
-    private static final long serialVersionUID=1L;
-
-    private Long docId;
-
-    private String tid;
-
-    private String isPart;
-
-    private Boolean hasBuildingYear;
-
-    private String buildingYear;
-
-    private String landCertificateType;
-
-    private String landUseTo;
-
-    private String landExpireDate;
-
-    private String shareAcreage1;
-
-    private Boolean isLayer;
-
-    private Boolean hasLayerImage;
-
-    private String floor1Acreage;
-
-    private String floor2Acreage;
-
-    private String floor3Acreage;
-
-    private Boolean isAddressSame;
-
-    private Boolean isDateTimeSame;
-
-    private Boolean isAddressCertificate;
-
-    private Boolean isBuildingReduceValue;
-
-    private Boolean hasOriginCertificate;
-
-    private Boolean isPromise;
-
-    private Boolean hasLandUseRightContract;
-
-    private Boolean isRentOut;
-
-    private Boolean hasRentOutContract;
-
-    private Boolean isRentLimit;
-
-    private String notRentLimitReason;
-
-    private String rentLimitReason;
-
-    private String rentStartDate;
-
-    private String rentEndDate;
-
-    private String rentMoney;
-
-    private String rentUser;
-
-    private Boolean noBuildingHouseNos;
-
-    private String exploreDate;
-
-    private Boolean landYearLowerHouseYear;
-
-    private Boolean isPromiseFile;
-
-    private Boolean isInChengDu;
-
-    private Boolean houseGetLandInfo;
-
-    private String landUseType;
-
-    private Boolean hasLandUseRight;
-
-    private Boolean hasLivingRight;
-
-    private String landUseRightFrom;
-
-    private String landUseRightTo;
-
-    private Boolean isCostingShareMethod;
-
-    private String evaluateMethod;
-
-    private String useTo;
-
-    private String commonLevel;
-
-    private String independence;
-
-    @TableField(exist = false)
-    private List<HouseGuarantyAim> aims;
-
-}

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

@@ -1,96 +0,0 @@
-package com.dayou.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.dayou.common.BaseEntity;
-import lombok.Data;
-
-@Data
-public class HouseTargetEntity extends BaseEntity {
-
-    private Long docId;
-    private String tid;
-    private String tno;
-    private String communityName;
-    private String buildingNo;
-    private String houseAge;
-    private String useInfo;
-    private String useTo;
-    private String buildingOut;
-    private String atFloor;
-    private String floor;
-    private Integer elevator;
-    private Boolean centerAirConditioning;
-    private Boolean autoSpray;
-    private Boolean smogEmergency;
-    private Boolean fireHydrant;
-    private Boolean netLine;
-    private Boolean visualSys;
-    private String buildingStructure;
-    private Boolean officeSmartSys;
-    private String baseFacility;
-    private String roomType;
-    private String roomHigh;
-    private String newPercentage;
-    private String livingroomGround;
-    private String livingroomTop;
-    private String livingroomWall;
-    private String livingroomOther;
-    private String bedroomGround;
-    private String bedroomTop;
-    private String bedroomWall;
-    private String bedroomOther;
-    private String bathroomGround;
-    private String bathroomTop;
-    private String bathroomWall;
-    private String bathroomOther;
-    private String landDeep;
-    private Integer certCombination;
-    private String eastWay;
-    private String westWay;
-    private String southWay;
-    private String northWay;
-
-    /**
-     * 国土证
-     */
-    @TableField(exist = false)
-    private String landCertificateNo;
-    @TableField(exist = false)
-    private String landLocation;
-    @TableField(exist = false)
-    private String landUseTo;
-    @TableField(exist = false)
-    private String landAcreage;
-    @TableField(exist = false)
-    private String landUseType;
-    @TableField(exist = false)
-    private String landExpireDate;
-
-
-    /**
-     * 不动产权利证书
-     */
-    @TableField(exist = false)
-    private String AssetsCertificateNo;
-    @TableField(exist = false)
-    private String AssetsLocation;
-    @TableField(exist = false)
-    private String AssetsUseTo;
-    @TableField(exist = false)
-    private String AssetsAcreage;
-    @TableField(exist = false)
-    private String AssetsUseType;
-    @TableField(exist = false)
-    private String AssetsExpireDate;
-
-    @TableField(exist = false)
-    private String targetLandUseTo;
-    @TableField(exist = false)
-    private String targetLandUseType;
-    @TableField(exist = false)
-    private Long xId;
-    @TableField(exist = false)
-    private String xTid;
-    @TableField(exist = false)
-    private String xTno;
-}

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

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

domain/src/main/java/com/dayou/vo/HouseTargetVO.java

@@ -1,14 +0,0 @@
-package com.dayou.vo;
-
-import com.dayou.entity.HouseGuarantyAim;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class HouseTargetVO {
-
-    private String tId;
-
-    private List<HouseGuarantyAim> aims;
-}

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

@@ -1,13 +1,14 @@
 package com.dayou.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.dayou.doc.house.BaseInfoDO;
 import com.dayou.doc.house.ConditionDO;
 import com.dayou.doc.house.GuarantyResultDO;
-import com.dayou.entity.HouseGuarantyBase;
+import com.dayou.entity.HouseExcelData;
 import com.dayou.vo.HouseGuarantyBaseVO;
 import org.springframework.web.multipart.MultipartFile;
 
-public interface HouseExcelDataService {
+public interface HouseExcelDataService extends IService<HouseExcelData> {
 
     /**
      * 解析原始excel文件

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

@@ -1,7 +0,0 @@
-package com.dayou.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.dayou.entity.HouseGuarantyAim;
-
-public interface HouseGuarantyAimService extends IService<HouseGuarantyAim> {
-}

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

@@ -1,12 +0,0 @@
-package com.dayou.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.dayou.entity.HouseGuarantyBase;
-
-public interface HouseGuarantyBaseService extends IService<HouseGuarantyBase> {
-
-    Long add(HouseGuarantyBase base);
-
-    HouseGuarantyBase getByDocId(Long docId);
-
-}

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

@@ -1,6 +1,7 @@
 package com.dayou.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.dayou.entity.DocumentProduction;
 import com.dayou.entity.HouseGuarantyProcess;
 import com.dayou.vo.ProcessVO;
 
@@ -20,4 +21,5 @@ public interface HouseGuarantyProcessService extends IService<HouseGuarantyProce
 
     List<ProcessVO> getHouseGuarantyProcesses(Long id);
 
+    Boolean houseGuarantyMerge(Long id) throws Exception;
 }

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

@@ -2,9 +2,7 @@ package com.dayou.service;
 
 
 import com.dayou.dto.HouseGuarantyTableDTO;
-import com.dayou.entity.HouseGuarantyBase;
 import com.dayou.entity.HouseGuarantyProcess;
-import com.dayou.vo.HouseTargetVO;
 
 import java.io.IOException;
 import java.util.List;
@@ -21,25 +19,13 @@ public interface HouseGuarantyService {
     Long createTableWord(HouseGuarantyTableDTO houseGuarantyTableDTO);
 
     /**
-     * 解析表单1
-     * @param processId
-     * @return
-     */
-    Long analysisCollect1(Long processId) throws Exception;
-
-    /**
      * 生成致委托人函
      * @param excelId
      * @return
      */
     Boolean genConsignorLetter(Long excelId,Long processId) throws Exception;
 
-    /**
-     * 获取估价对象
-     * @param id
-     * @return
-     */
-    List<HouseTargetVO> getTargetsById(Long id);
+
 
     /**
      * 生成《估价的假设和限制条件及使用报告说明》

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

@@ -1,9 +0,0 @@
-package com.dayou.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.dayou.entity.HouseGuarantyTarget;
-
-public interface HouseGuarantyTargetService extends IService<HouseGuarantyTarget>  {
-
-    HouseGuarantyTarget getTarget(Long docId, String tId);
-}

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

@@ -1,20 +0,0 @@
-package com.dayou.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.dayou.dto.HouseRightsDTO;
-import com.dayou.entity.HouseTargetEntity;
-
-import java.util.List;
-
-public interface HouseTargetEntityService extends IService<HouseTargetEntity> {
-
-    Long addHouseTargetEntity(HouseTargetEntity houseTargetEntity);
-
-    HouseTargetEntity getHouseTargetEntityById(Long businessId, String tid, String tno);
-
-    Boolean copyHouseTargetEntity(Long id);
-
-    List<HouseRightsDTO> getHouseRightsDTOList(Long businessId);
-
-    List<HouseTargetEntity> getListById(Long id);
-}

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

@@ -1,63 +0,0 @@
-package com.dayou.service;
-
-import cn.hutool.json.JSONObject;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.dayou.entity.CertificateLandUse;
-import com.dayou.entity.HouseGuarantyBase;
-import com.dayou.entity.HouseGuarantyTarget;
-import com.dayou.entity.TmplHouseParagraph;
-
-import java.util.List;
-
-public interface TmplHouseParagraphService extends IService<TmplHouseParagraph> {
-
-    List<TmplHouseParagraph> findByMoldAndChapter(TmplHouseParagraph tmplHouseParagraph);
-
-    /**
-     * 生成一般假设最终结果
-     */
-    String findYBJSResult(List<HouseGuarantyTarget> targets,Boolean isCheckOriginCertificate, List<String> certificates);
-
-    /**
-     * 生成未定事项假设最终结果
-     * @param targets
-     */
-    String findWDSXJSResult(List<HouseGuarantyTarget> targets, List<CertificateLandUse> landCerts );
-
-    /**
-     * 生成不相一致假设结果
-     * @param targets
-     * @param certificates
-     * @param valueTiming
-     * @return
-     */
-    String findBXYZJSResult(List<HouseGuarantyTarget> targets, List<String> certificates, String valueTiming);
-
-    /**
-     * 生成依据不足假设结果
-     * @param targets
-     * @return
-     */
-    String findYJBUJSResult(List<HouseGuarantyTarget> targets,List<String> certificates,Boolean isCheckOriginCertificate,String methods);
-
-    /**
-     * 生成限制条件结果
-     * @param targets
-     * @return
-     */
-    String findLimitConditionResult(List<HouseGuarantyTarget> targets, HouseGuarantyBase base, List<String> certificates);
-
-    /**
-     * 生成使用报告说明
-     * @param targets
-     * @return
-     */
-    String findUseReportExplain(List<HouseGuarantyTarget> targets);
-
-    /**
-     * 生成 估价中的特殊处理事项
-     * @param targets
-     * @return
-     */
-    String findSpecialHandle(List<HouseGuarantyTarget> targets,HouseGuarantyBase base);
-}

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

@@ -5,11 +5,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.dayou.entity.CertificateHouseOwn;
 import com.dayou.mapper.CertificateHouseOwnMapper;
 import com.dayou.service.CertificateHouseOwnService;
-import com.dayou.service.HouseGuarantyService;
-import com.dayou.service.HouseTargetEntityService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Collections;
 import java.util.List;

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

@@ -154,6 +154,20 @@ public class HouseExcelDataServiceImpl extends ServiceImpl<HouseExcelDataMapper,
                 .append(hed.getValueMeaning3()).append("\n")
                 .append(hed.getValueMeaning4());
         guarantyResultDO.setValueMeaning(valueMeanings.toString());
+
+        //获取估价对象区位状况描述
+        List<HouseGuarantyArea> areas = houseGuarantyAreaService.list(new LambdaQueryWrapper<HouseGuarantyArea>().eq(HouseGuarantyArea::getExcelId, businessId)
+                .select(HouseGuarantyArea::getDocContent).eq(BaseEntity::getDeleteStatus, false).orderByAsc(HouseGuarantyArea::getId));
+        StringBuffer docContent = new StringBuffer();
+        for (int i = 0; i < areas.size(); i++) {
+            if (i!= areas.size()-1){
+                docContent.append("\t").append(areas.get(i).getDocContent()).append("\n");
+            }else {
+                docContent.append("\t").append(areas.get(i).getDocContent());
+            }
+
+        }
+        guarantyResultDO.setAreaInfo(docContent.toString());
         return guarantyResultDO;
     }
 

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

@@ -1,11 +0,0 @@
-package com.dayou.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.dayou.entity.HouseGuarantyAim;
-import com.dayou.mapper.HouseGuarantyAimMapper;
-import com.dayou.service.HouseGuarantyAimService;
-import org.springframework.stereotype.Service;
-
-@Service
-public class HouseGuarantyAimServiceImpl extends ServiceImpl<HouseGuarantyAimMapper, HouseGuarantyAim> implements HouseGuarantyAimService {
-}

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

@@ -1,37 +0,0 @@
-package com.dayou.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.dayou.common.BaseEntity;
-import com.dayou.entity.HouseGuarantyBase;
-import com.dayou.entity.HouseGuarantyProcess;
-import com.dayou.mapper.HouseGuarantyBaseMapper;
-import com.dayou.service.HouseGuarantyBaseService;
-import com.dayou.service.HouseGuarantyProcessService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-@Service
-public class HouseGuarantyBaseServiceImpl extends ServiceImpl<HouseGuarantyBaseMapper, HouseGuarantyBase> implements HouseGuarantyBaseService {
-
-    @Autowired
-    private HouseGuarantyProcessService houseGuarantyProcessService;
-
-    @Autowired
-    private HouseGuarantyBaseMapper houseGuarantyBaseMapper;
-
-    @Override
-    public Long add(HouseGuarantyBase base) {
-        this.saveOrUpdate(base);
-        if (base.getProcessId() != null) {
-            houseGuarantyProcessService.update(new LambdaUpdateWrapper<HouseGuarantyProcess>()
-                    .eq(BaseEntity::getId,base.getProcessId()).set(HouseGuarantyProcess::getExcelId,base.getId()));
-        }
-        return base.getId();
-    }
-
-    @Override
-    public HouseGuarantyBase getByDocId(Long docId) {
-        return houseGuarantyBaseMapper.getByDocId(docId);
-    }
-}

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

@@ -1,13 +1,16 @@
 package com.dayou.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
+import com.aspose.words.Document;
+import com.aspose.words.ImportFormatMode;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.dayou.common.BaseEntity;
+import com.dayou.config.FileNetConfig;
 import com.dayou.entity.DocumentProduction;
 import com.dayou.entity.HouseGuarantyProcess;
 import com.dayou.enums.BusinessEnum;
-import com.dayou.mapper.DocumentProductionMapper;
 import com.dayou.mapper.HouseGuarantyProcessMapper;
 import com.dayou.service.DocumentProductionService;
 import com.dayou.service.HouseGuarantyProcessService;
@@ -16,16 +19,26 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import static com.dayou.enums.BusinessEnum.HouseGuarantyProcess.*;
+
 @Service
 public class HouseGuarantyProcessServiceImpl extends ServiceImpl<HouseGuarantyProcessMapper, HouseGuarantyProcess> implements HouseGuarantyProcessService {
 
     @Autowired
     private HouseGuarantyProcessMapper houseGuarantyProcessMapper;
 
+    @Autowired
+    private FileNetConfig fileNetConfig;
+
+    @Autowired
+    private DocumentProductionService documentProductionService;
+
+
     @Override
     public HouseGuarantyProcess getHouseGuarantyProcess(Long id) {
         HouseGuarantyProcess process = houseGuarantyProcessMapper.getProcessByDocId(id);
@@ -37,10 +50,11 @@ public class HouseGuarantyProcessServiceImpl extends ServiceImpl<HouseGuarantyPr
         List<BusinessEnum.HouseGuarantyProcess> aProcesses = Arrays.stream(BusinessEnum.HouseGuarantyProcess.values()).collect(Collectors.toList());
 
         if (id != null){
-            HouseGuarantyProcess parent = this.getOne(new LambdaQueryWrapper<HouseGuarantyProcess>().eq(BaseEntity::getId, id).select(HouseGuarantyProcess::getHome));
+            HouseGuarantyProcess parent = this.getOne(new LambdaQueryWrapper<HouseGuarantyProcess>().eq(BaseEntity::getId, id).select(HouseGuarantyProcess::getHome,HouseGuarantyProcess::getExcelId));
             Map<String, List<HouseGuarantyProcess>> collect = this.list(new LambdaQueryWrapper<HouseGuarantyProcess>().select(BaseEntity::getId, HouseGuarantyProcess::getHome,
                             BaseEntity::getUpdateTime, HouseGuarantyProcess::getProcessName,HouseGuarantyProcess::getDocUrl)
                     .eq(HouseGuarantyProcess::getHome, parent.getHome()).orderByDesc(BaseEntity::getCreateTime)).stream().collect(Collectors.groupingBy(HouseGuarantyProcess::getProcessName));
+
             List<ProcessVO> list = aProcesses.stream().map(x -> {
                 ProcessVO processVO = new ProcessVO();
                 processVO.setName(x.getMsg());
@@ -68,4 +82,33 @@ public class HouseGuarantyProcessServiceImpl extends ServiceImpl<HouseGuarantyPr
         return list;
     }
 
+    @Override
+    public Boolean houseGuarantyMerge(Long id) throws Exception {
+        HouseGuarantyProcess parent = this.getOne(new LambdaQueryWrapper<HouseGuarantyProcess>().eq(BaseEntity::getId, id).select(HouseGuarantyProcess::getHome,BaseEntity::getId,HouseGuarantyProcess::getExcelId));
+        String baseDir = fileNetConfig.getBaseDir();
+        String home = parent.getHome();
+        List<HouseGuarantyProcess> docs = houseGuarantyProcessMapper.queryMaxCreateTimeDoc(home);
+        HouseGuarantyProcess consignorLetter = docs.stream().filter(x -> CONSIGNOR_LETTER.getMsg().equals(x.getProcessName())).findFirst().get();
+        HouseGuarantyProcess explain = docs.stream().filter(x -> STATEMENT_CONDITIONS_EXPLAIN.getMsg().equals(x.getProcessName())).findFirst().get();
+        HouseGuarantyProcess resultReport = docs.stream().filter(x -> GUARANTY_RESULT_REPORT.getMsg().equals(x.getProcessName())).findFirst().get();
+        Document cosignorDocument = new Document(baseDir+consignorLetter.getDocUrl());
+        Document explainDocument = new Document(baseDir+explain.getDocUrl());
+        Document resultDocument = new Document(baseDir+resultReport.getDocUrl());
+        cosignorDocument.appendDocument(explainDocument, ImportFormatMode.KEEP_SOURCE_FORMATTING);
+        cosignorDocument.appendDocument(resultDocument,ImportFormatMode.KEEP_SOURCE_FORMATTING);
+        String subUrl = home +"FINAL_REPORT"+System.currentTimeMillis() + ".docx";
+        String guarantyResultName = baseDir + subUrl;
+        cosignorDocument.save(guarantyResultName);
+
+        DocumentProduction dp = documentProductionService.getOne(new LambdaQueryWrapper<DocumentProduction>().select(DocumentProduction::getDocVersion).eq(DocumentProduction::getBusinessId, parent.getExcelId()));
+
+        //更新document_production
+        return documentProductionService.update(new LambdaUpdateWrapper<DocumentProduction>()
+                .set(DocumentProduction::getDocUrl,subUrl)
+                .set(BaseEntity::getUpdateTime,new Date())
+                .set(DocumentProduction::getDocVersion,dp.getDocVersion()+1)
+                .eq(DocumentProduction::getBusinessId,parent.getExcelId()));
+
+    }
+
 }

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

@@ -11,22 +11,17 @@ import com.dayou.common.BaseEntity;
 import com.dayou.config.FileNetConfig;
 import com.dayou.doc.house.BaseInfoDO;
 import com.dayou.doc.house.ConditionDO;
-import com.dayou.entity.HouseGuarantyBase;
 import com.dayou.doc.house.GuarantyResultDO;
 import com.dayou.dto.HouseGuarantyTableDTO;
-import com.dayou.entity.HouseGuarantyAim;
 import com.dayou.dto.HouseRightsDTO;
 import com.dayou.entity.*;
 import com.dayou.enums.DocumentType;
 import com.dayou.enums.BusinessEnum;
 import com.dayou.exception.ErrorCode;
-import com.dayou.mapper.HouseGuarantyTargetMapper;
-import com.dayou.mapper.HouseTargetEntityMapper;
 import com.dayou.service.*;
 import com.dayou.table.HouseEntityTable;
 import com.dayou.utils.*;
 import com.dayou.utils.table.WordTableHelper;
-import com.dayou.vo.HouseTargetVO;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -73,12 +68,6 @@ public class HouseGuarantyServiceImpl implements HouseGuarantyService {
     private CertificateLandUseService certificateLandUseService;
 
     @Autowired
-    private HouseGuarantyAimService houseGuarantyAimService;
-
-    @Autowired
-    private HouseGuarantyBaseService houseGuarantyBaseService;
-
-    @Autowired
     private HouseExcelDataService houseExcelDataService;
 
     @Override
@@ -102,38 +91,7 @@ public class HouseGuarantyServiceImpl implements HouseGuarantyService {
         return hgp.getId();
     }
 
-    @Override
-    public Long analysisCollect1(Long processId) throws Exception {
-        HouseGuarantyProcess process = houseGuarantyProcessService.getById(processId);
-        String home = fileNetConfig.getBaseDir() + process.getHome();
-        Workbook workbook = new Workbook( home + COLLECT1_XLSX);
-        workbook.save(home+ COLLECT1_JSON, SaveFormat.JSON);
-
-
-        //解析估价对象json（估价对象一览表）
-        JSONArray array = JsonUtil.file2JsonArray(home + COLLECT1_JSON);
-        JSONArray xArray = HouseDocumentUtil.houseTargetsFormat(array);
-        List<HouseGuarantyAim> houseGuarantyAims = HouseDocumentUtil.houseTargetsFormatDTO(xArray);
-        //获取项目名称
-        String projectName = HouseDocumentUtil.getProjectName(houseGuarantyAims);
-
-        HouseGuarantyBase base = houseGuarantyBaseService.getById(process.getExcelId());
-        if (base==null || StrUtil.isBlank(base.getConsignor())){
-            ErrorCode.throwBusinessException(ErrorCode.CUSTOM_ERROR,"请先完善基本信息");
-        }
-        DocumentProduction dp = buildDocumentProduction(processId, projectName, base.getDocNo(), base.getConsignor());
-        documentProductionService.save(dp);
-
-        Long docId = dp.getId();
 
-        houseGuarantyAims.stream().forEach(x->{
-            x.setDocId(docId);
-        });
-        houseGuarantyAimService.saveBatch(houseGuarantyAims);
-
-        return docId;
-
-    }
 
     @Override
     public Boolean genConsignorLetter(Long excelId,Long processId) throws Exception {
@@ -159,25 +117,7 @@ public class HouseGuarantyServiceImpl implements HouseGuarantyService {
 
     }
 
-    @Override
-    public List<HouseTargetVO> getTargetsById(Long id) {
-        try {
-            //解析估价对象json
-            List<HouseTargetVO> houseTargetVOList = new ArrayList<>();
-            List<HouseGuarantyAim> aims = houseGuarantyAimService.list(new LambdaQueryWrapper<HouseGuarantyAim>().eq(HouseGuarantyAim::getDocId,id));
-            Map<String, List<HouseGuarantyAim>> collect = aims.stream().collect(Collectors.groupingBy(HouseGuarantyAim::getTid));
-            for (Map.Entry<String, List<HouseGuarantyAim>> entry : collect.entrySet()) {
-                HouseTargetVO houseTargetVO = new HouseTargetVO();
-                houseTargetVO.setTId(entry.getKey());
-                houseTargetVO.setAims(entry.getValue());
-                houseTargetVOList.add(houseTargetVO);
-            }
-            return houseTargetVOList;
-        } catch (Exception e) {
-            ErrorCode.throwBusinessException(ErrorCode.CUSTOM_ERROR,"文件读取错误");
-        }
-        return Collections.emptyList();
-    }
+
 
     @Override
     public String genConditionLetter(Long id) {

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

@@ -1,18 +0,0 @@
-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.HouseGuarantyTarget;
-import com.dayou.mapper.HouseGuarantyTargetMapper;
-import com.dayou.service.HouseGuarantyTargetService;
-import org.springframework.stereotype.Service;
-
-@Service
-public class HouseGuarantyTargetServiceImpl extends ServiceImpl<HouseGuarantyTargetMapper, HouseGuarantyTarget> implements HouseGuarantyTargetService {
-
-    @Override
-    public HouseGuarantyTarget getTarget(Long docId, String tId) {
-        return this.getOne(new LambdaQueryWrapper<HouseGuarantyTarget>().eq(HouseGuarantyTarget::getDocId, docId)
-                .eq(HouseGuarantyTarget::getTid, tId));
-    }
-}

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

@@ -1,141 +0,0 @@
-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.HouseGuarantyAim;
-import com.dayou.dto.HouseRightsDTO;
-import com.dayou.entity.*;
-import com.dayou.exception.ErrorCode;
-import com.dayou.mapper.HouseTargetEntityMapper;
-import com.dayou.service.*;
-import com.dayou.utils.CollectionUtil;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import static com.dayou.enums.BusinessEnum.HouseSubBusiness.GUARANTY;
-
-@Service
-public class HouseTargetEntityServiceImpl extends ServiceImpl<HouseTargetEntityMapper, HouseTargetEntity> implements HouseTargetEntityService {
-
-    @Autowired
-    private HouseGuarantyService houseGuarantyService;
-
-    @Autowired
-    private HouseTargetEntityMapper houseTargetEntityMapper;
-
-    @Autowired
-    private CertificateFixedAssetsService fixedAssetsService;
-
-    @Autowired
-    private CertificateHouseOwnService houseOwnService;
-
-    @Autowired
-    private CertificateLandUseService landUseService;
-    @Autowired
-
-    private HouseGuarantyAimService houseGuarantyAimService;
-
-    @Override
-    public Long addHouseTargetEntity(HouseTargetEntity houseTargetEntity) {
-        Integer certificateCombination = houseGuarantyService.getCertificateCombination(houseTargetEntity.getDocId(), houseTargetEntity.getTid(), houseTargetEntity.getTno());
-        houseTargetEntity.setCertCombination(certificateCombination);
-        this.saveOrUpdate(houseTargetEntity);
-        return houseTargetEntity.getId();
-    }
-
-    @Override
-    public HouseTargetEntity getHouseTargetEntityById(Long businessId, String tid, String tno) {
-        return this.getOne(new LambdaQueryWrapper<HouseTargetEntity>()
-                .eq(HouseTargetEntity::getDocId, businessId)
-                .eq(HouseTargetEntity::getTid, tid).eq(HouseTargetEntity::getTno, tno));
-    }
-
-    @Override
-    public Boolean copyHouseTargetEntity(Long id) {
-        HouseTargetEntity originEntity = this.getById(id);
-
-        List<HouseGuarantyAim> aims = houseGuarantyAimService.list(new LambdaQueryWrapper<HouseGuarantyAim>().eq(HouseGuarantyAim::getDocId, id));
-
-        List<HouseTargetEntity> targetEntities = new ArrayList<>();
-
-        for (HouseGuarantyAim aim : aims) {
-                if (aim.getTno().equals(originEntity.getTno())
-                        && aim.getTid().equals(originEntity.getTid())){
-                }else {
-                    HouseTargetEntity targetEntity = this.getOne(new LambdaQueryWrapper<HouseTargetEntity>()
-                            .eq(HouseTargetEntity::getDocId, originEntity.getDocId())
-                            .eq(HouseTargetEntity::getTid, aim.getTid())
-                            .eq(HouseTargetEntity::getTno, aim.getTno()));
-                    if (targetEntity == null){
-                        targetEntity = new HouseTargetEntity();
-                    }
-                    BeanUtils.copyProperties(originEntity,targetEntity);
-                    targetEntity.setId(null);
-                    targetEntity.setTid(aim.getTid());
-                    targetEntity.setTno(aim.getTno());
-                    targetEntity.setCertCombination(houseGuarantyService.getCertificateCombination(originEntity.getDocId(), aim.getTid(), aim.getTno()));
-                    targetEntities.add(targetEntity);
-                }
-            }
-
-        return this.saveOrUpdateBatch(targetEntities);
-    }
-
-    @Override
-    public List<HouseRightsDTO> getHouseRightsDTOList(Long businessId) {
-        List<HouseRightsDTO> rights = houseTargetEntityMapper.getHouseRightsDTOList(businessId);
-        //完善权属证件信息
-        for (HouseRightsDTO rightsDTO : rights) {
-            if (rightsDTO.getCertType()==0){
-                //只有不动产证
-                CertificateFixedAssets fixedAssets = fixedAssetsService.getOne(new LambdaQueryWrapper<CertificateFixedAssets>()
-                        .eq(CertificateFixedAssets::getBusinessId, businessId)
-                        .eq(CertificateFixedAssets::getTid, rightsDTO.getTid())
-                        .eq(CertificateFixedAssets::getTno, rightsDTO.getTno())
-                        .eq(CertificateFixedAssets::getBusinessType, GUARANTY.name()));
-                rightsDTO.setAssetsCert(fixedAssets);
-            } else if (rightsDTO.getCertType()==5 || rightsDTO.getCertType()==6){
-                //只有房地产证
-                CertificateHouseOwn houseOwn = houseOwnService.getOne(new LambdaQueryWrapper<CertificateHouseOwn>()
-                        .eq(CertificateHouseOwn::getBusinessId, businessId)
-                        .eq(CertificateHouseOwn::getTid, rightsDTO.getTid())
-                        .eq(CertificateHouseOwn::getTno, rightsDTO.getTno())
-                        .eq(CertificateHouseOwn::getBusinessType, GUARANTY.name()));
-                rightsDTO.setHouseOwnCert(houseOwn);
-            } else {
-                //房地产证
-                CertificateHouseOwn houseOwn = houseOwnService.getOne(new LambdaQueryWrapper<CertificateHouseOwn>()
-                        .eq(CertificateHouseOwn::getBusinessId, businessId)
-                        .eq(CertificateHouseOwn::getTid, rightsDTO.getTid())
-                        .eq(CertificateHouseOwn::getTno, rightsDTO.getTno())
-                        .eq(CertificateHouseOwn::getBusinessType, GUARANTY.name()));
-                rightsDTO.setHouseOwnCert(houseOwn);
-                //土地证
-                CertificateLandUse landUse = landUseService.getOne(new LambdaQueryWrapper<CertificateLandUse>()
-                        .eq(CertificateLandUse::getBusinessId, businessId)
-                        .eq(CertificateLandUse::getTid, rightsDTO.getTid())
-                        .eq(CertificateLandUse::getTno, rightsDTO.getTno())
-                        .eq(CertificateLandUse::getBusinessType, GUARANTY.name()));
-                rightsDTO.setLandUseCert(landUse);
-            }
-        }
-        return rights;
-    }
-
-    @Override
-    public List<HouseTargetEntity> getListById(Long id) {
-        List<HouseTargetEntity> entities = houseTargetEntityMapper.getListById(id);
-        List<HouseTargetEntity> collect = entities.stream().filter(x -> x.getId() == null).collect(Collectors.toList());
-        if (CollectionUtil.isNotEmpty(collect)){
-            ErrorCode.throwBusinessException(ErrorCode.CUSTOM_ERROR,
-                    "估价对象"+collect.get(0).getXTid()+"序号"+collect.get(0).getXTno()+"实物状况信息缺失。");
-        }
-        return entities;
-    }
-}

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

@@ -1,455 +0,0 @@
-package com.dayou.service.impl;
-
-import cn.hutool.core.util.StrUtil;
-import cn.hutool.json.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.dayou.entity.CertificateLandUse;
-import com.dayou.entity.HouseGuarantyBase;
-import com.dayou.entity.HouseGuarantyTarget;
-import com.dayou.entity.TmplHouseParagraph;
-import com.dayou.mapper.TmplHouseParagraphMapper;
-import com.dayou.service.CertificateLandUseService;
-import com.dayou.service.TmplHouseParagraphService;
-import com.dayou.utils.HouseDocumentUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import static com.dayou.enums.BusinessEnum.HouseGuarantyChapter.*;
-import static com.dayou.enums.BusinessEnum.HouseGuarantyRules.*;
-import static com.dayou.enums.BusinessEnum.HouseSubBusiness.GUARANTY;
-
-@Service
-public class TmplHouseParagraphServiceImpl extends ServiceImpl<TmplHouseParagraphMapper, TmplHouseParagraph> implements TmplHouseParagraphService {
-
-    @Autowired
-    private TmplHouseParagraphMapper tmplHouseParagraphMapper;
-
-    @Autowired
-    private CertificateLandUseService certificateLandUseService;
-
-    @Override
-    public List<TmplHouseParagraph> findByMoldAndChapter(TmplHouseParagraph tmplHouseParagraph) {
-        return tmplHouseParagraphMapper.findByMoldAndChapter(tmplHouseParagraph);
-    }
-
-    @Override
-    public String findYBJSResult(List<HouseGuarantyTarget> targets, Boolean isCheckOriginCertificate, List<String> certificates) {
-        List<TmplHouseParagraph> paragraphTemps = this.list(new LambdaQueryWrapper<TmplHouseParagraph>()
-                .eq(TmplHouseParagraph::getDocMold, GUARANTY).eq(TmplHouseParagraph::getChapter, ORDINARY_ASSUMPTION).orderByAsc(TmplHouseParagraph::getSort));
-        Map<Integer, List<TmplHouseParagraph>> collect = paragraphTemps.stream().collect(Collectors.groupingBy(TmplHouseParagraph::getSort));
-        StringBuilder normalCondition = new StringBuilder();
-        int i = 1;
-        for(Map.Entry<Integer, List<TmplHouseParagraph>> entry : collect.entrySet()) {
-            List<TmplHouseParagraph> paragraphs = entry.getValue();
-            for (TmplHouseParagraph  paragraph : paragraphs){
-                String rule = paragraph.getRule();
-                if (StrUtil.isNotBlank(rule)){
-                    if (IS_CHECK_ORIGIN_CERTIFICATE.getCode().equals(rule)){
-                        String checkOriginCertificate = HouseDocumentUtil.getCheckOriginCertificate(isCheckOriginCertificate,
-                                certificates, paragraph);
-
-                        if (StrUtil.isNotBlank(checkOriginCertificate)){
-                            normalCondition.append(i).append(". ");
-                            normalCondition.append(checkOriginCertificate);
-                            i++;
-                        }
-                    }
-                    if (IS_CHECK_ORIGIN_CERTIFICATE_XX.getCode().equals(rule)){
-                        String checkOriginCertificateXX = HouseDocumentUtil.getCheckOriginCertificateXX(certificates,paragraph);
-
-                        if (StrUtil.isNotBlank(checkOriginCertificateXX)){
-                            normalCondition.append(i).append(". ");
-                            normalCondition.append(checkOriginCertificateXX);
-                            i++;
-                        }
-                    }
-                    if (IS_BUILDING_PART.getCode().equals(rule)){
-                        String isBuildingPart = HouseDocumentUtil.getIsBuildingPart(targets,paragraph);
-                        if (StrUtil.isNotBlank(isBuildingPart)){
-                            normalCondition.append(i).append(". ");
-                            normalCondition.append(isBuildingPart);
-                            i++;
-                        }
-                    }
-                    if (IS_HOTEL_PART.getCode().equals(rule)){
-                        String isHotelPart = HouseDocumentUtil.getIsHotelPart(targets,paragraph);
-                        if (StrUtil.isNotBlank(isHotelPart)){
-                            normalCondition.append(i).append(". ");
-                            normalCondition.append(isHotelPart);
-                            i++;
-                        }
-                    }
-                }else{
-                    normalCondition.append(i).append(". ");
-                    normalCondition.append(paragraph.getParagraph());
-                    i++;
-                }
-            }
-
-
-        }
-        return normalCondition.toString();
-    }
-
-    @Override
-    public String findWDSXJSResult(List<HouseGuarantyTarget> targets, List<CertificateLandUse> landCerts ) {
-
-        List<TmplHouseParagraph> paragraphTemps = this.list(new LambdaQueryWrapper<TmplHouseParagraph>()
-                .eq(TmplHouseParagraph::getDocMold, GUARANTY).eq(TmplHouseParagraph::getChapter, UNDEFINED_ASSUMPTION).orderByAsc(TmplHouseParagraph::getSort));
-        StringBuilder result = new StringBuilder();
-        int i = 1;
-        for (TmplHouseParagraph paragraph : paragraphTemps){
-            String rule = paragraph.getRule();
-            if (StrUtil.isNotBlank(rule)){
-                if (IS_REGISTER_BUILDING_YEAR.getCode().equals(rule)){
-                    String buildingYear = HouseDocumentUtil.buildingYear(targets, paragraph);
-                    if (StrUtil.isNotBlank(buildingYear)){
-                        result.append(i).append(". ").append(buildingYear);
-                        i++;
-                    }
-                }
-                if (IS_USE_DIFFERENT.getCode().equals(rule)){
-                    String useDiff = HouseDocumentUtil.isUseDiff(targets,paragraph);
-                    if (StrUtil.isNotBlank(useDiff)){
-                        result.append(i).append(". ").append(useDiff);
-                        i++;
-                    }
-                }
-//                if (IS_PROVIDE_LAND_BIG_CERTIFICATE.getCode().equals(rule)){
-//                    String provideLandBigCertificate = HouseDocumentUtil.isProvideLandBigCertificate(targets,paragraph);
-//                    if (StrUtil.isNotBlank(provideLandBigCertificate)){
-//                        result.append(i).append(". ").append(provideLandBigCertificate);
-//                        i++;
-//                    }
-//                }
-                if (IS_PROVIDE_LAND_BIG_CERTIFICATE_SHARE.getCode().equals(rule)){
-                    String provideLandBigCertificateShare = HouseDocumentUtil.isProvideLandBigCertificateShare(targets,paragraph,landCerts);
-                    if (StrUtil.isNotBlank(provideLandBigCertificateShare)){
-                        result.append(i).append(". ").append(provideLandBigCertificateShare);
-                        i++;
-                    }
-                }
-                if (IS_DIVIDE_METHOD1.getCode().equals(rule)){
-                    String divideMethod1 = HouseDocumentUtil.isDivideMethod1(targets,paragraph);
-                    if (StrUtil.isNotBlank(divideMethod1)){
-                        result.append(i).append(". ").append(divideMethod1);
-                        i++;
-                    }
-                }
-                if (IS_DIVIDE_METHOD2.getCode().equals(rule)){
-                    String divideMethod2 = HouseDocumentUtil.isDivideMethod2(targets,paragraph);
-                    if (StrUtil.isNotBlank(divideMethod2)){
-                        result.append(i).append(". ").append(divideMethod2);
-                        i++;
-                    }
-                }
-            }
-            else{
-                result.append(i).append(". ");
-                result.append(paragraph.getParagraph());
-                i++;
-            }
-        }
-        return result.toString();
-    }
-
-    @Override
-    public String findBXYZJSResult(List<HouseGuarantyTarget> targets, List<String> certificates, String valueTiming) {
-        List<TmplHouseParagraph> paragraphTemps = this.list(new LambdaQueryWrapper<TmplHouseParagraph>()
-                .eq(TmplHouseParagraph::getDocMold, GUARANTY).eq(TmplHouseParagraph::getChapter, UNCONFORMITY_ASSUMPTION).orderByAsc(TmplHouseParagraph::getSort));
-        StringBuilder result = new StringBuilder();
-        int i = 1;
-        for (TmplHouseParagraph paragraph : paragraphTemps){
-            String rule = paragraph.getRule();
-            if (StrUtil.isNotBlank(rule)){
-                if (IS_ADDRESS_DIFF_CERTIFICATE.getCode().equals(rule)){
-                    String addressDiffCertificate = HouseDocumentUtil.isAddressDiffCertificate(targets, certificates, paragraph);
-                    if (StrUtil.isNotBlank(addressDiffCertificate)){
-                        result.append(i).append(". ").append(addressDiffCertificate);
-                        i++;
-                    }
-                }
-                if (IS_ADDRESS_DIFF_NO_CERTIFICATE.getCode().equals(rule)){
-                    String addressDiffNoCertificate = HouseDocumentUtil.isAddressDiffNoCertificate(targets, certificates, paragraph);
-                    if (StrUtil.isNotBlank(addressDiffNoCertificate)){
-                        result.append(i).append(". ").append(addressDiffNoCertificate);
-                        i++;
-                    }
-                }
-                if (IS_DATE_DIFF.getCode().equals(rule)){
-                    String dateDiff = HouseDocumentUtil.isDateDiff(targets, paragraph, valueTiming);
-                    if (StrUtil.isNotBlank(dateDiff)){
-                        result.append(i).append(". ").append(dateDiff);
-                        i++;
-                    }
-                }
-            }
-            else{
-                result.append(i).append(". ");
-                result.append(paragraph.getParagraph());
-                i++;
-            }
-        }
-        return result.toString();
-    }
-
-    @Override
-    public String findYJBUJSResult(List<HouseGuarantyTarget> targets,List<String> certificates,Boolean isCheckOriginCertificate,String methods) {
-        List<TmplHouseParagraph> paragraphTemps = this.list(new LambdaQueryWrapper<TmplHouseParagraph>()
-                .eq(TmplHouseParagraph::getDocMold, GUARANTY).eq(TmplHouseParagraph::getChapter, DEFICIENCY_ASSUMPTION).orderByAsc(TmplHouseParagraph::getSort));
-        StringBuilder result = new StringBuilder();
-        int i = 1;
-        for (TmplHouseParagraph paragraph : paragraphTemps){
-            String rule = paragraph.getRule();
-            if (StrUtil.isNotBlank(rule)){
-                if (IS_BIG_CERTIFICATE_ONLY_HOUSE.getCode().equals(rule)){
-                    String bigCertificateOnlyHouse = HouseDocumentUtil.isBigCertificateOnlyHouse(targets,paragraph,isCheckOriginCertificate);
-                    if (StrUtil.isNotBlank(bigCertificateOnlyHouse)){
-                        result.append(i).append(". ").append(bigCertificateOnlyHouse);
-                        i++;
-                    }
-                }
-                if (IS_NOT_ORIGIN_CERTIFICATE_AND_PROMISE_SAME.getCode().equals(rule)){
-                    String notOriginCertificateOnlyHouse = HouseDocumentUtil.isNotOriginCertificateOnlyHouse(targets,paragraph,isCheckOriginCertificate,certificates);
-                    if (StrUtil.isNotBlank(notOriginCertificateOnlyHouse)){
-                        result.append(i).append(". ").append(notOriginCertificateOnlyHouse);
-                        i++;
-                    }
-                }
-                if (IS_NOT_ORIGIN_FILES_IN_CHENGDU.getCode().equals(rule)){
-                    String bigCertificateOnlyHouse = HouseDocumentUtil.isNotOriginFileInChengDu(targets,paragraph,isCheckOriginCertificate,certificates);
-                    if (StrUtil.isNotBlank(bigCertificateOnlyHouse)){
-                        result.append(i).append(". ").append(bigCertificateOnlyHouse);
-                        i++;
-                    }
-                }
-                if (IS_NOT_ORIGIN_FILES_OUT_CHENGDU.getCode().equals(rule)){
-                    String notOriginFileOutChengDu = HouseDocumentUtil.isNotOriginFileOutChengDu(targets,paragraph,isCheckOriginCertificate,certificates);
-                    if (StrUtil.isNotBlank(notOriginFileOutChengDu)){
-                        result.append(i).append(". ").append(notOriginFileOutChengDu);
-                        i++;
-                    }
-                }
-                if (IS_RENT_OUT_NOT_CONTRACT_NO_AFFECT.getCode().equals(rule)){
-                    String rentOutNotContractNoAffect = HouseDocumentUtil.isRentOutNotContractNoAffect(targets,paragraph);
-                    if (StrUtil.isNotBlank(rentOutNotContractNoAffect)){
-                        result.append(i).append(". ").append(rentOutNotContractNoAffect);
-                        i++;
-                    }
-                }
-                if (IS_NOT_CONTRACT_LAND_LOWER_HOUSE_SY.getCode().equals(rule)){
-                    String notContractLandLowerHouseSY = HouseDocumentUtil.isNotContractLandLowerHouseSY(targets,paragraph,methods);
-                    if (StrUtil.isNotBlank(notContractLandLowerHouseSY)){
-                        result.append(i).append(". ").append(notContractLandLowerHouseSY);
-                        i++;
-                    }
-                }
-                if (IS_NOT_CONTRACT_LAND_LOWER_HOUSE_CB.getCode().equals(rule)){
-                    String notContractLandLowerHouseCB = HouseDocumentUtil.isNotContractLandLowerHouseCB(targets,paragraph,methods);
-                    if (StrUtil.isNotBlank(notContractLandLowerHouseCB)){
-                        result.append(i).append(". ").append(notContractLandLowerHouseCB);
-                        i++;
-                    }
-                }
-            }
-            else{
-                result.append(i).append(". ");
-                result.append(paragraph.getParagraph());
-                i++;
-            }
-        }
-        return result.toString();
-    }
-
-    @Override
-    public String findLimitConditionResult(List<HouseGuarantyTarget> targets, HouseGuarantyBase base, List<String> certificates) {
-        List<TmplHouseParagraph> paragraphTemps = this.list(new LambdaQueryWrapper<TmplHouseParagraph>()
-                .eq(TmplHouseParagraph::getDocMold, GUARANTY).eq(TmplHouseParagraph::getChapter, LIMIT_CONDITION).orderByAsc(TmplHouseParagraph::getSort));
-        StringBuilder result = new StringBuilder();
-        int i = 1;
-        for (TmplHouseParagraph paragraph : paragraphTemps){
-            String rule = paragraph.getRule();
-            if (StrUtil.isNotBlank(rule)){
-                if (IS_NOT_PLEDGE.getCode().equals(rule)){
-                    //todo
-                    String notPledge = HouseDocumentUtil.isNotPledge(paragraph,base.getHasPledge());
-                    if (StrUtil.isNotBlank(notPledge)){
-                        result.append(i).append(". ").append(notPledge);
-                        i++;
-                    }
-
-                }
-                if (IS_OLD_PLEDGE_TO_NEW_PLEDGE.getCode().equals(rule)){
-                    String oldPledgeToNewPledge = HouseDocumentUtil.isOldPledgeToNewPledge(paragraph,base);
-                    if (StrUtil.isNotBlank(oldPledgeToNewPledge)){
-                        result.append(i).append(". ").append(oldPledgeToNewPledge);
-                        i++;
-                    }
-                }
-                if (IS_OLD_PLEDGE_TO_OLD_PLEDGE.getCode().equals(rule)){
-                    String oldPledgeToOldPledge = HouseDocumentUtil.isOldPledgeToOldPledge(paragraph,base);
-                    if (StrUtil.isNotBlank(oldPledgeToOldPledge)){
-                        result.append(i).append(". ").append(oldPledgeToOldPledge);
-                        i++;
-                    }
-                }
-                if (IS_TRANSFER_NOT_DEDUCT_SELL_MONEY.getCode().equals(rule)){
-                    //todo
-                    String transferOutDeductSellMoney = HouseDocumentUtil.isTransferNotDeductSellMoney(targets,paragraph, "是");
-                    if (StrUtil.isNotBlank(transferOutDeductSellMoney)){
-                        result.append(i).append(". ").append(transferOutDeductSellMoney);
-                        i++;
-                    }
-                }
-                if (IS_TRANSFER_DEDUCT_SELL_MONEY.getCode().equals(rule)){
-                    //todo
-                    String transferDeductSellMoney = HouseDocumentUtil.isTransferDeductSellMoney(targets,paragraph,"是");
-                    if (StrUtil.isNotBlank(transferDeductSellMoney)){
-                        result.append(i).append(". ").append(transferDeductSellMoney);
-                        i++;
-                    }
-                }
-                if (IS_PROVIDE_TECH_REPORT.getCode().equals(rule)){
-                    String provideTechReport = HouseDocumentUtil.isProvideTechReport(paragraph,base.getHasTechReport());
-                    if (StrUtil.isNotBlank(provideTechReport)){
-                        result.append(i).append(". ").append(provideTechReport);
-                        i++;
-                    }
-                }
-                if (IS_NS_BANK.getCode().equals(rule)){
-                    String nsBank = HouseDocumentUtil.isNSBank(paragraph,base.getIsNsBank());
-                    if (StrUtil.isNotBlank(nsBank)){
-                        result.append(i).append(". ").append(nsBank);
-                        i++;
-                    }
-                }
-                if (IS_NORMAL_BANK.getCode().equals(rule)){
-                    String normalBank = HouseDocumentUtil.isNormalBank(paragraph,base.getIsNsBank());
-                    if (StrUtil.isNotBlank(normalBank)){
-                        result.append(i).append(". ").append(normalBank);
-                        i++;
-                    }
-                }
-                if (IS_HAS_IMMOVABLE_CERTIFICATE.getCode().equals(rule)){
-                    String hasImmovableCertificate1 = HouseDocumentUtil.isHasImmovableCertificate(targets,paragraph,certificates);
-                    if (StrUtil.isNotBlank(hasImmovableCertificate1)){
-                        result.append(i).append(". ").append(hasImmovableCertificate1);
-                        i++;
-                    }
-                }
-            }else{
-                result.append(i).append(". ");
-                result.append(paragraph.getParagraph());
-                i++;
-            }
-        }
-        return result.toString();
-    }
-
-    @Override
-    public String findUseReportExplain(List<HouseGuarantyTarget> targets) {
-        List<TmplHouseParagraph> paragraphTemps = this.list(new LambdaQueryWrapper<TmplHouseParagraph>()
-                .eq(TmplHouseParagraph::getDocMold, GUARANTY).eq(TmplHouseParagraph::getChapter, USE_REPORT_EXPLAIN).orderByAsc(TmplHouseParagraph::getSort));
-        StringBuilder result = new StringBuilder();
-        int i = 1;
-        for (TmplHouseParagraph paragraph : paragraphTemps){
-            String rule = paragraph.getRule();
-            if (StrUtil.isNotBlank(rule)){
-                //未定义
-            }else {
-                result.append(i).append(". ");
-                result.append(paragraph.getParagraph());
-                i++;
-            }
-        }
-        return result.toString();
-    }
-
-    @Override
-    public String findSpecialHandle(List<HouseGuarantyTarget> targets,HouseGuarantyBase base) {
-        List<TmplHouseParagraph> paragraphTemps = this.list(new LambdaQueryWrapper<TmplHouseParagraph>()
-                .eq(TmplHouseParagraph::getDocMold, GUARANTY).eq(TmplHouseParagraph::getChapter, SPECIAL_HANDLE).orderByAsc(TmplHouseParagraph::getSort));
-        StringBuilder result = new StringBuilder();
-        int i = 1;
-        for (TmplHouseParagraph paragraph : paragraphTemps){
-            String rule = paragraph.getRule();
-            if (StrUtil.isNotBlank(rule)){
-                if (IS_NO_FIRST_MONEY.getCode().equals(rule)){
-                    String noFirstMoney = HouseDocumentUtil.isNoFirstMoney(paragraph,base);
-                    if (StrUtil.isNotBlank(noFirstMoney)){
-                        result.append(i).append(". ").append(noFirstMoney);
-                        i++;
-                    }
-                }
-                if (IS_SAME_PLEDGE_USER_CONTINUE.getCode().equals(rule)){
-                    String samePledgeUserContinue = HouseDocumentUtil.isSamePledgeUserContinue(paragraph,base);
-                    if (StrUtil.isNotBlank(samePledgeUserContinue)){
-                        result.append(i).append(". ").append(samePledgeUserContinue);
-                        i++;
-                    }
-                }
-                if (IS_OLD_PLEDGE_TO_NEW_PLEDGE_SPECIAL.getCode().equals(rule)){
-                    String oldPledgeToNewPledgeSpecial = HouseDocumentUtil.isOldPledgeToNewPledgeSpecial(paragraph,base);
-                    if (StrUtil.isNotBlank(oldPledgeToNewPledgeSpecial)){
-                        result.append(i).append(". ").append(oldPledgeToNewPledgeSpecial);
-                        i++;
-                    }
-                }
-                if (IS_NORMAL_PLEDGE_TO_HIGH_PLEDGE.getCode().equals(rule)){
-                    String normalPledgeToHighPledge = HouseDocumentUtil.isNormalPledgeToHighPledge(paragraph,base);
-                    if (StrUtil.isNotBlank(normalPledgeToHighPledge)){
-                        result.append(i).append(". ").append(normalPledgeToHighPledge);
-                        i++;
-                    }
-                }
-                if (IS_HIGH_PLEDGE_NOT_EXPIRE.getCode().equals(rule)){
-                    String highPledgeNotExpire = HouseDocumentUtil.isHighPledgeNotExpire(paragraph,base);
-                    if (StrUtil.isNotBlank(highPledgeNotExpire)){
-                        result.append(i).append(". ").append(highPledgeNotExpire);
-                        i++;
-                    }
-                }
-                if (IS_NOT_RENT_OUT.getCode().equals(rule)){
-                    String notRentOut = HouseDocumentUtil.isNotRentOut(targets,paragraph);
-                    if (StrUtil.isNotBlank(notRentOut)){
-                        result.append(i).append(". ").append(notRentOut);
-                        i++;
-                    }
-                }
-                if (IS_RENT_OUT_NOT_AFFECT_HIGH.getCode().equals(rule)){
-                    String rentOutNotAffectHigh = HouseDocumentUtil.isRentOutNotAffectHigh(targets,paragraph);
-                    if (StrUtil.isNotBlank(rentOutNotAffectHigh)){
-                        result.append(i).append(". ").append(rentOutNotAffectHigh);
-                        i++;
-                    }
-                }
-                if (IS_RENT_OUT_NOT_AFFECT_NORMAL.getCode().equals(rule)){
-                    String rentOutNotAffectNormal = HouseDocumentUtil.isRentOutNotAffectNormal(targets,paragraph);
-                    if (StrUtil.isNotBlank(rentOutNotAffectNormal)){
-                        result.append(i).append(". ").append(rentOutNotAffectNormal);
-                        i++;
-                    }
-                }
-                if (IS_RENT_OUT_AFFECT_LOW.getCode().equals(rule)){
-                    String rentOutAffectLow = HouseDocumentUtil.isRentOutAffectLow(targets,paragraph);
-                    if (StrUtil.isNotBlank(rentOutAffectLow)){
-                        result.append(i).append(". ").append(rentOutAffectLow);
-                        i++;
-                    }
-                }
-            }else {
-                result.append(i).append(". ");
-                result.append(paragraph.getParagraph());
-                i++;
-            }
-        }
-        return result.toString();
-    }
-}
-
-

sql/update_sql.sql

@@ -1033,4 +1033,134 @@ ALTER TABLE tmpl_asset_report_section MODIFY COLUMN tmpl_code VARCHAR(100) NULL
 ALTER TABLE assets_calculate_eqpt_data MODIFY COLUMN evaluate_original_value DECIMAL ( 20, 2 ) NULL COMMENT '评估原值';
 ALTER TABLE assets_calculate_eqpt_data MODIFY COLUMN evaluate_net_value DECIMAL(20,2) NULL COMMENT '评估净值';
 ALTER TABLE assets_calculate_eqpt_data MODIFY COLUMN book_original_value DECIMAL(20,2) NOT NULL COMMENT '账面原值';
-ALTER TABLE assets_calculate_eqpt_data MODIFY COLUMN book_net_value DECIMAL(20,2) NULL COMMENT '账面净值';
+ALTER TABLE assets_calculate_eqpt_data MODIFY COLUMN book_net_value DECIMAL(20,2) NULL COMMENT '账面净值';
+
+/**
+    日期：2025-06-16
+    修改人:吴长林
+    未更新到test-env
+ */
+ALTER TABLE house_guaranty_process CHANGE base_id excel_id bigint NULL COMMENT 'excelId';
+ALTER TABLE house_guaranty_process ADD COLUMN certificates_html longtext NULL COMMENT '权属信息表代码';
+DROP TABLE house_guaranty_aim;
+DROP TABLE house_guaranty_base;
+DROP TABLE house_guaranty_target;
+DROP TABLE house_target_entity;
+CREATE TABLE `productivity-platform`.`house_excel_data`  (
+                                                   `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键id',
+                                                   `business_type` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '报告业务类型',
+                                                   `doc_no` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '报告编号',
+                                                   `doc_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '报告项目名称',
+                                                   `consignor` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '委托人',
+                                                   `owner` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '不动产权利人',
+                                                   `appraiser1` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '估价师1',
+                                                   `appraiser2` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '估价师2',
+                                                   `appra_no1` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '估价师1注册号',
+                                                   `appra_no2` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '估价师2注册号',
+                                                   `doc_date` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '出具报告日期',
+                                                   `value_timing` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '价值时点',
+                                                   `work_method` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '评估方法',
+                                                   `summary1` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '估价对象描述1',
+                                                   `summary2` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '估价对象描述2',
+                                                   `work_purpose` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '至函-估价目的',
+                                                   `value_type` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '价值类型',
+                                                   `expe_tip1` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '特别提示1',
+                                                   `expe_tip2` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '特别提示2',
+                                                   `expe_tip3` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '特别提示3',
+                                                   `expe_tip4` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '特别提示4',
+                                                   `expe_tip5` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '特别提示5',
+                                                   `affix1` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '附件1名称',
+                                                   `affix2` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '附件2名称',
+                                                   `affix3` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '附件3名称',
+                                                   `affix4` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '附件4名称',
+                                                   `affix5` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '附件5名称',
+                                                   `affix6` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '附件6名称',
+                                                   `affix7` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '附件7名称',
+                                                   `affix8` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '附件8名称',
+                                                   `statement1` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '声明1',
+                                                   `statement2` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '声明2',
+                                                   `statement3` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '声明3',
+                                                   `statement4` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '声明4',
+                                                   `statement5` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '声明5',
+                                                   `normal_assumption1` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '一般假设1',
+                                                   `normal_assumption2` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '一般假设2',
+                                                   `normal_assumption3` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '一般假设3',
+                                                   `normal_assumption4` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '一般假设4',
+                                                   `normal_assumption5` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '一般假设5',
+                                                   `normal_assumption6` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '一般假设6',
+                                                   `normal_assumption7` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '一般假设7',
+                                                   `normal_assumption8` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '一般假设8',
+                                                   `normal_assumption9` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '一般假设9',
+                                                   `normal_assumption10` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '一般假设10',
+                                                   `undefined_assumption1` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '未定事项假设1',
+                                                   `undefined_assumption2` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '未定事项假设2',
+                                                   `undefined_assumption3` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '未定事项假设3',
+                                                   `undefined_assumption4` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '未定事项假设4',
+                                                   `undefined_assumption5` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '未定事项假设5',
+                                                   `undefined_assumption6` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '未定事项假设6',
+                                                   `different_assumption1` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '不相一致假设1',
+                                                   `different_assumption2` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '不相一致假设2',
+                                                   `deficiency_assumption1` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '依据不足假设1',
+                                                   `deficiency_assumption2` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '依据不足假设2',
+                                                   `deficiency_assumption3` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '依据不足假设3',
+                                                   `deficiency_assumption4` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '依据不足假设4',
+                                                   `deficiency_assumption5` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '依据不足假设5',
+                                                   `limit_condition1` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '限制条件1',
+                                                   `limit_condition2` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '限制条件2',
+                                                   `limit_condition3` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '限制条件3',
+                                                   `limit_condition4` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '限制条件4',
+                                                   `limit_condition5` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '限制条件5',
+                                                   `limit_condition6` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '限制条件6',
+                                                   `limit_condition7` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '限制条件7',
+                                                   `limit_condition8` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '限制条件8',
+                                                   `normal_explain1` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '使用本报告的一般说明1',
+                                                   `normal_explain2` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '使用本报告的一般说明2',
+                                                   `normal_explain3` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '使用本报告的一般说明3',
+                                                   `normal_explain4` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '使用本报告的一般说明4',
+                                                   `normal_explain5` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '使用本报告的一般说明5',
+                                                   `normal_explain6` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '使用本报告的一般说明6',
+                                                   `normal_explain7` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '使用本报告的一般说明7',
+                                                   `normal_explain8` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '使用本报告的一般说明8',
+                                                   `normal_explain9` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '使用本报告的一般说明9',
+                                                   `expe_handle1` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '估价中的特殊处理事项1',
+                                                   `expe_handle2` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '估价中的特殊处理事项2',
+                                                   `expe_handle3` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '估价中的特殊处理事项3',
+                                                   `expe_handle4` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '估价中的特殊处理事项4',
+                                                   `consignor_type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '委托人类型',
+                                                   `consignor_address` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '委托人住所',
+                                                   `consignor_person` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '法定代表人',
+                                                   `consignor_money` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '注册资本',
+                                                   `credit_code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '统一社会信用代码',
+                                                   `target_scope` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '估价对象及范围',
+                                                   `building_info` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '建筑物实物状况',
+                                                   `land_info` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '土地实物状况',
+                                                   `guaranty_info` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '担保物权状况',
+                                                   `rem_info` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '用益物权状况',
+                                                   `rent_info` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '租赁或占用情况',
+                                                   `area_info` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '估价对象区位状况',
+                                                   `value_timing_info` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '价值时点描述',
+                                                   `value_meaning1` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '价值内涵1',
+                                                   `value_meaning2` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '价值内涵2',
+                                                   `value_meaning3` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '价值内涵3',
+                                                   `value_meaning4` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '价值内涵4',
+                                                   `gist1` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '估价依据1',
+                                                   `gist2` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '估价依据2',
+                                                   `gist3` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '估价依据3',
+                                                   `gist4` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '估价依据4',
+                                                   `principle` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '估价原则',
+                                                   `result1` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '估价结果1',
+                                                   `result3` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '估价结果3',
+                                                   `result4` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '估价结果4',
+                                                   `scene_date` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '实地查勘期',
+                                                   `work_date` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '估价作业期',
+                                                   `pledge_value` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '已抵押担保的债权数额',
+                                                   `debt_money` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '拖欠的建设工程价款',
+                                                   `first_money` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '其他法定优先受偿款',
+                                                   `total_money` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '合计（万元）',
+                                                   `upload_user_id` bigint NOT NULL COMMENT '上传人id',
+                                                   `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+                                                   `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间',
+                                                   `delete_status` bit(1) NOT NULL DEFAULT b'0' COMMENT '删除状态',
+                                                   `excel_uri` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '原始excel保存路径',
+                                                   PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 110 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '房地产EXCEL原始数据' ROW_FORMAT = Dynamic;