Merge remote-tracking branch 'origin/master' into dev

common/src/main/java/com/dayou/constants/HouseGuarantyDoc.java

@@ -8,7 +8,7 @@ public class HouseGuarantyDoc {
     /**
      * 表单1
      */
-    public static final String COLLECT1_XLSX = "collect1.xlsx";
+    public static final String COLLECT1_XLSX = "估价对象一览表_模版.xlsx";
 
     /**
      * 估价结果一览表sheet转的json文件

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

@@ -1,6 +1,7 @@
 package com.dayou.utils;
 
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.dayou.dto.Address;
 
 import java.util.Arrays;
@@ -75,6 +76,7 @@ public class AddressUtil {
         return result;
     }
 
+
     public static List<Address> parseAddress(List<String> addresses) {
         return addresses.stream().map(addr -> {
             return parseAddress(addr);

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

@@ -84,4 +84,17 @@ public class CollectionUtil {
     public static Boolean isNotEmpty(Collection<?> collection){
         return cn.hutool.core.collection.CollectionUtil.isNotEmpty(collection);
     }
+
+    /**
+     * 字符串去掉中括号和双引号改英文逗号为中文顿号
+     * @param string
+     * @return
+     */
+    public static String formatQuoteAndRemoveMiddle(String string){
+       return formatRemoveMiddle(string).replaceAll("\"","").replaceAll(EN_DOT,ZH_STOP).replaceAll(" ","");
+    }
+
+    public static void main(String[] args) {
+        System.out.println(formatQuoteAndRemoveMiddle("[\"成本法\",\"收益法\"]"));
+    }
 }

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

@@ -988,14 +988,13 @@ public class HouseDocumentUtil {
 
     /**
      * 限制条件 适用于原设立抵押权未注销，向新的抵押权人申请贷款
-     * @param targets
      * @param tmplParagraph
      * @return
      */
     public static String isOldPledgeToNewPledge(TmplHouseParagraph tmplParagraph,HouseGuarantyBase base) {
         StringBuilder result = new StringBuilder();
         String paragraph = tmplParagraph.getParagraph();
-        if (base.getHasPledge()){
+        if (base.getHasPledge() && !base.getSamePledgeContinue() && base.getNewPledgeUser()!=null){
 //            List<HouseGuarantyTarget> collect = targets.stream().filter(x -> (x.getHasPledge()!=null &&
 //                    x.getHasPledge() && StrUtil.isNotBlank(x.getPledgeType())
 //                    && StrUtil.isNotBlank(x.getPledgeUser()) && StrUtil.isNotBlank(x.getPledgeValue())
@@ -1127,7 +1126,6 @@ public class HouseDocumentUtil {
 
     /**
      * 估价中的特殊处理事项 适用于同一抵押权人续贷
-     * @param targets
      * @param tmplParagraph
      * @return
      */
@@ -1141,7 +1139,6 @@ public class HouseDocumentUtil {
 
     /**
      * 估价中的特殊处理事项 适用于原设立抵押权未注销，向新的抵押权人申请贷款
-     * @param targets
      * @param tmplParagraph
      * @return
      */
@@ -1440,13 +1437,13 @@ public class HouseDocumentUtil {
      * @param rights
      * @return
      */
-     public static void getRightsDesc(Document doc,List<HouseRightsDTO> rights,Boolean checkOriginCerts) throws Exception {
+     public static void getRightsDesc(Document doc,List<HouseRightsDTO> rights,HouseGuarantyBase baseInfo) throws Exception {
          //构造 builder
          DocumentBuilder builder = new DocumentBuilder(doc);
          //将 光标移动到指定书签处，准备创作
          builder.moveToBookmark("rightsInfo", true, false);
 
-         String copys = checkOriginCerts?"":"（复印件）";
+         String copys = baseInfo.getIsCheckOriginCertificate()?"":"（复印件）";
 
          Map<String, List<HouseRightsDTO>> rightsMap = rights.stream().collect(Collectors.groupingBy(HouseRightsDTO::getTid));
 
@@ -1493,7 +1490,7 @@ public class HouseDocumentUtil {
 
                  builder.writeln(j+"．担保物权状况");
                  //是否设置抵押权
-                 Boolean hasPledge = right.getHasPledge();
+                 Boolean hasPledge = baseInfo.getHasPledge();
 
                  if (hasPledge != null && !hasPledge){
                      builder.writeln("根据估价对象权利人提供的《房地产评估委托、确认书》《估价对象权利状况、法定优先受偿款调查说明及承诺书》，经注册房地产估价师实地查勘，至价值时点，估价对象未设定抵押等他项权利。");
@@ -1502,7 +1499,7 @@ public class HouseDocumentUtil {
 
                  if (hasPledge != null && hasPledge){
                      builder.writeln("根据估价对象权利人介绍和提供的“房地产评估委托、确认书”、“估价对象权利状况、法定优先受偿款调查说明及承诺书”，经注册房地产估价师实地查勘，至价值时点，估价对象已设立了"
-                             +right.getPledgeType()+"，"+(right.getPledgeType().equals("一般抵押权")?"抵押权利价值为":"最高债权额为")+right.getPledgeValue()+"万元，抵押权人为"+right.getPledgeUser()+"。");
+                             +baseInfo.getPledgeType()+"，"+(baseInfo.getPledgeType().equals("一般抵押权")?"抵押权利价值为":"最高债权额为")+baseInfo.getPledgeValue()+"万元，抵押权人为"+baseInfo.getPledgeUser()+"。");
                      j++;
                  }
 
@@ -1543,7 +1540,7 @@ public class HouseDocumentUtil {
 
                  builder.writeln(j+"．租赁或占用情况");
 
-                 if (hasPledge != null && !hasPledge){
+                 if (hasPledge != null && !hasPledge && !right.getIsRentOut()){
                      builder.writeln("根据估价对象权利人介绍和提供的“估价对象权利状况、法定优先受偿款调查说明及承诺书”、“估价对象权利状况说明及承诺书”，经注册房地产估价师实地查勘，至价值时点，估价对象未出租，目前为"+right.getUseInfo()+"。");
                  }
 

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

@@ -17,4 +17,6 @@ public interface DocumentProductionMapper extends BaseMapper<DocumentProduction>
      * @return DocumentProduction
      */
     DocumentProduction getDocProdByBusinessId(@Param("businessId") Long businessId, @Param("businessSubId") Long businessSubId);
+
+    Page<DocumentProduction> houseDocumentProduction(Page page, @Param("dto")DocumentProductionQueryDTO dto);
 }

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

@@ -20,7 +20,6 @@
         FROM
             document_production
         WHERE business_type != 'ASSETS'
-            AND DATE(create_time) = #{dto.createDate}
             <if test="dto != null and dto.docName != null ">
                 AND doc_name LIKE CONCAT('%', #{dto.docName}, '%')
             </if>
@@ -38,4 +37,28 @@
         </if>
     </select>
 
+    <select id="houseDocumentProduction" parameterType="com.dayou.entity.DocumentProduction" resultType="com.dayou.entity.DocumentProduction">
+        SELECT
+        id,
+        business_type,
+        business_cate,
+        business_id,
+        doc_type,
+        doc_no,
+        doc_name,
+        doc_url,
+        doc_version,
+        is_active,
+        create_time,
+        update_time,
+        consignor
+        FROM
+        document_production
+        WHERE business_type = 'HOUSE_BUSINESS'
+        <if test="dto != null and dto.docName != null ">
+            AND doc_name LIKE CONCAT('%', #{dto.docName}, '%')
+        </if>
+        AND delete_status = 0 ORDER by update_time DESC
+    </select>
+
 </mapper>

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

@@ -24,4 +24,6 @@ public interface DocumentProductionService extends IService<DocumentProduction>
      * @return DocumentProduction
      */
     DocumentProduction getDocProdByBusinessId(Long businessId, Long businessSubId);
+
+    Page<DocumentProduction> houseDocumentProduction(DocumentProductionQueryDTO dto, Page page);
 }

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

@@ -46,4 +46,9 @@ public class DocumentProductionServiceImpl extends ServiceImpl<DocumentProductio
     public DocumentProduction getDocProdByBusinessId(Long businessId, Long businessSubId) {
         return documentProductionMapper.getDocProdByBusinessId(businessId, businessSubId);
     }
+
+    @Override
+    public Page<DocumentProduction> houseDocumentProduction(DocumentProductionQueryDTO dto, Page page) {
+        return documentProductionMapper.houseDocumentProduction(page,dto);
+    }
 }

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

@@ -44,7 +44,6 @@ import static com.dayou.constants.HouseGuarantyDoc.*;
 import static com.dayou.enums.BusinessEnum.HouseGuarantyProcess.GUARANTY_RESULT_REPORT;
 import static com.dayou.enums.BusinessEnum.HouseGuarantyProcess.STATEMENT_CONDITIONS_EXPLAIN;
 import static com.dayou.enums.BusinessEnum.HouseSubBusiness.GUARANTY;
-import static java.lang.Thread.sleep;
 
 @Service
 public class HouseGuarantyServiceImpl implements HouseGuarantyService {
@@ -78,9 +77,6 @@ public class HouseGuarantyServiceImpl implements HouseGuarantyService {
     private HouseTargetEntityService houseTargetEntityService;
 
     @Autowired
-    private HouseTargetEntityMapper houseTargetEntityMapper;
-
-    @Autowired
     private HouseGuarantyAimService houseGuarantyAimService;
 
     @Autowired
@@ -154,6 +150,7 @@ public class HouseGuarantyServiceImpl implements HouseGuarantyService {
 
             //读取基本信息
             HouseGuarantyBase base = houseGuarantyBaseService.getById(process.getBaseId());
+            base.setMethods(CollectionUtil.formatQuoteAndRemoveMiddle(base.getMethods()));
             String projectName = HouseDocumentUtil.getProjectName(aims);
             base.setProjectName(projectName);
             Map<String, List<HouseGuarantyAim>> collect = aims.stream().collect(Collectors.groupingBy(HouseGuarantyAim::getTid));
@@ -358,7 +355,7 @@ public class HouseGuarantyServiceImpl implements HouseGuarantyService {
             Document doc = new Document(baseDir + guarantyResultName);
             //创作权属信息段落
             HouseDocumentUtil.getRightsDesc(doc,houseRightsDTOList,
-                    base.getIsCheckOriginCertificate());
+                    base);
             //创作区位信息段落
             HouseDocumentUtil.getAreaDesc(doc,areas);
             //建筑物实物状况表格
@@ -464,7 +461,7 @@ public class HouseGuarantyServiceImpl implements HouseGuarantyService {
 
     private DocumentProduction buildDocumentProduction(Long id,String docName,String docNo,String consignor){
         DocumentProduction dp = new DocumentProduction();
-        dp.setBusinessType(BusinessEnum.HOUSE_BUSINESS.getMsg());
+        dp.setBusinessType(BusinessEnum.HOUSE_BUSINESS.name());
         dp.setBusinessCate(GUARANTY.getMsg());
         dp.setBusinessId(id);
         dp.setDocName(docName);