Merge branch 'master' of http://47.108.172.52:3000/dayou/productivity-platform

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

@@ -3,8 +3,6 @@ package com.dayou.controller;
 
 import com.dayou.dto.HouseGuarantyTableDTO;
 import com.dayou.entity.HouseGuarantyProcess;
-import com.dayou.enums.BusinessEnum;
-import com.dayou.enums.CodeMsgEnumInterface;
 import com.dayou.result.Result;
 import com.dayou.service.HouseGuarantyProcessService;
 import com.dayou.service.HouseGuarantyService;
@@ -13,9 +11,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.Arrays;
 import java.util.List;
-import java.util.stream.Collectors;
 
 
 /**
@@ -76,8 +72,8 @@ public class HouseGuarantyDocController {
      * id = parentId
      * @return
      */
-    @GetMapping("/process/{id}")
-    public Result<List<ProcessVO>> getHouseGuarantyProcesses(@PathVariable("id") Long id){
+    @GetMapping("/process")
+    public Result<List<ProcessVO>> getHouseGuarantyProcesses(Long id){
         List<ProcessVO> list = houseGuarantyProcessService.getHouseGuarantyProcesses(id);
         return Result.build(list);
     }

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

@@ -0,0 +1,35 @@
+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);
+    }
+
+}

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

@@ -0,0 +1,19 @@
+package com.dayou.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dayou.entity.HouseGuarantyProcess;
+import com.dayou.entity.TmplHouseParagraph;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 房地产段落模版 Mapper 接口
+ * </p>
+ *
+ */
+public interface TmplHouseParagraphMapper extends BaseMapper<TmplHouseParagraph> {
+
+    List<TmplHouseParagraph> findByMoldAndChapter(@Param("tmpl") TmplHouseParagraph tmpl);
+}

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

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dayou.mapper.TmplHouseParagraphMapper">
+
+    <select id="findByMoldAndChapter" parameterType="com.dayou.entity.TmplHouseParagraph" resultType="com.dayou.entity.TmplHouseParagraph">
+        select id,doc_mold,chapter,sort,
+               REPLACE(paragraph,'\n',char(10)) as paragraph,
+               solt_mark from tmpl_house_paragraph where
+            doc_mold = #{tmpl.docMold} and chapter = #{tmpl.chapter} order by sort
+    </select>
+
+</mapper>

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

@@ -0,0 +1,41 @@
+package com.dayou.entity;
+
+
+import com.dayou.common.BaseEntity;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class TmplHouseParagraph extends BaseEntity {
+
+    /**
+     * 文档业务类型（抵押、咨询、司法等）
+     */
+    private String docMold;
+
+    /**
+     * 章节
+     */
+    private String chapter;
+
+    /**
+     * 章节内顺序
+     */
+    private Integer sort;
+
+    /**
+     * 段落内容
+     */
+    private String paragraph;
+
+    /**
+     * 段落中变量
+     */
+    private String variates;
+
+    /**
+     * 同组标识
+     */
+    private String soltMark;
+}

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

@@ -62,9 +62,11 @@ public enum BusinessEnum implements CodeMsgEnumInterface<String,String>{
 
     public enum HouseGuarantyProcess implements CodeMsgEnumInterface<String,String>{
 
-        CONSIGNOR_LETTER("CONSIGNOR_LETTER","致委托人函"),
+        CONSIGNOR_LETTER("CONSIGNOR_LETTER","致委托人函","consignor"),
+
+        STATEMENT_CONDITIONS_EXPLAIN("STATEMENT_CONDITIONS_EXPLAIN","假设限制条件及使用说明","conditions"),
+
 
-        STATEMENT_CONDITIONS_EXPLAIN("STATEMENT_CONDITIONS_EXPLAIN","假设限制条件及使用说明")
 
         ;
 
@@ -72,9 +74,13 @@ public enum BusinessEnum implements CodeMsgEnumInterface<String,String>{
 
         private String msg;
 
-        HouseGuarantyProcess(String code, String msg){
+        private String router;
+
+
+        HouseGuarantyProcess(String code, String msg,String router){
             this.code = code;
             this.msg = msg;
+            this.router = router;
         }
 
         @Override
@@ -86,5 +92,42 @@ public enum BusinessEnum implements CodeMsgEnumInterface<String,String>{
         public String getMsg() {
             return msg;
         }
+
+        public String getRouter() {
+            return router;
+        }
+    }
+
+    public enum HouseGuarantyChapter implements CodeMsgEnumInterface<String,String>{
+
+        ORDINARY_ASSUMPTION("ORDINARY_ASSUMPTION","一般假设"),
+
+        UNDEFINED_ASSUMPTION("UNDEFINED_ASSUMPTION","未定事项假设"),
+
+        VIOLATE_ASSUMPTION("VIOLATE_ASSUMPTION","背离事实假设"),
+
+        UNCONFORMITY_ASSUMPTION("UNCONFORMITY_ASSUMPTION","不相一致假设"),
+
+        DEFICIENCY_ASSUMPTION("DEFICIENCY_ASSUMPTION","依据不足假设")
+        ;
+
+        HouseGuarantyChapter(String code, String msg) {
+            this.code = code;
+            this.msg = msg;
+        }
+
+        private String code;
+
+        private String msg;
+
+        @Override
+        public String getCode() {
+            return "";
+        }
+
+        @Override
+        public String getMsg() {
+            return "";
+        }
     }
 }

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

@@ -25,4 +25,7 @@ public class ProcessVO {
     private String creator;
 
     private String docUrl;
+
+    private String router;
+
 }

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

@@ -0,0 +1,11 @@
+package com.dayou.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.dayou.entity.TmplHouseParagraph;
+
+import java.util.List;
+
+public interface TmplHouseParagraphService extends IService<TmplHouseParagraph> {
+
+    List<TmplHouseParagraph> findByMoldAndChapter(TmplHouseParagraph tmplHouseParagraph);
+}

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

@@ -35,25 +35,35 @@ public class HouseGuarantyProcessServiceImpl extends ServiceImpl<HouseGuarantyPr
 
     @Override
     public List<ProcessVO> getHouseGuarantyProcesses(Long id) {
-        List<String> aProcesses = Arrays.stream(BusinessEnum.HouseGuarantyProcess.values()).map(BusinessEnum.HouseGuarantyProcess::getMsg).collect(Collectors.toList());
-        HouseGuarantyProcess parent = this.getOne(new LambdaQueryWrapper<HouseGuarantyProcess>().eq(BaseEntity::getId, id).select(HouseGuarantyProcess::getHome));
-        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())).stream().collect(Collectors.groupingBy(HouseGuarantyProcess::getProcessName));
+        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));
+            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())).stream().collect(Collectors.groupingBy(HouseGuarantyProcess::getProcessName));
+            List<ProcessVO> list = aProcesses.stream().map(x -> {
+                ProcessVO processVO = new ProcessVO();
+                processVO.setName(x.getMsg());
+                processVO.setRouter(x.getRouter());
+                List<HouseGuarantyProcess> houseGuarantyProcesses = collect.get(x.getMsg());
+                if (CollectionUtil.isNotEmpty(houseGuarantyProcesses)){
+                    HouseGuarantyProcess process = houseGuarantyProcesses.get(0);
+                    if (process != null) {
+                        processVO.setId(process.getId());
+                        processVO.setUpdateDate(process.getUpdateTime());
+                        processVO.setState(Boolean.TRUE);
+                        processVO.setDocUrl(process.getDocUrl());
+                    }
+                }
+                return processVO;
+            }).collect(Collectors.toList());
+            return list;
+        }
         List<ProcessVO> list = aProcesses.stream().map(x -> {
             ProcessVO processVO = new ProcessVO();
-            processVO.setName(x);
-            List<HouseGuarantyProcess> houseGuarantyProcesses = collect.get(x);
-            if (CollectionUtil.isNotEmpty(houseGuarantyProcesses)){
-                HouseGuarantyProcess process = houseGuarantyProcesses.get(0);
-                if (process != null) {
-                    processVO.setId(process.getId());
-                    processVO.setUpdateDate(process.getUpdateTime());
-                    processVO.setState(Boolean.TRUE);
-                    processVO.setDocUrl(process.getDocUrl());
-                }
-            }
+            processVO.setName(x.getMsg());
+            processVO.setRouter(x.getRouter());
             return processVO;
         }).collect(Collectors.toList());
         return list;

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

@@ -0,0 +1,29 @@
+package com.dayou.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dayou.common.BaseEntity;
+import com.dayou.entity.TmplHouseParagraph;
+import com.dayou.mapper.TmplHouseParagraphMapper;
+import com.dayou.service.TmplHouseParagraphService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class TmplHouseParagraphServiceImpl extends ServiceImpl<TmplHouseParagraphMapper, TmplHouseParagraph> implements TmplHouseParagraphService {
+
+    @Autowired
+    private TmplHouseParagraphMapper tmplHouseParagraphMapper;
+
+    @Override
+    public List<TmplHouseParagraph> findByMoldAndChapter(TmplHouseParagraph tmplHouseParagraph) {
+//        return this.list(new LambdaQueryWrapper<TmplHouseParagraph>().select(TmplHouseParagraph::getParagraph,TmplHouseParagraph::getSoltMark
+//                        , TmplHouseParagraph::getChapter, TmplHouseParagraph::getDocMold).eq(BaseEntity::getDeleteStatus, Boolean.FALSE)
+//                .orderByAsc(TmplHouseParagraph::getSort));
+        return tmplHouseParagraphMapper.findByMoldAndChapter(tmplHouseParagraph);
+    }
+}
+
+