优化

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantemplate/LoanTemplateService.java

@@ -6,6 +6,10 @@ import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import com.yxt.anrui.base.api.basetrailermodel.BaseTrailerModelDetailsVo;
+import com.yxt.anrui.base.api.basetrailermodel.BaseTrailerModelFeign;
+import com.yxt.anrui.base.api.basevehinstallmodel.BaseVehinstallmodelDetailsVo;
+import com.yxt.anrui.base.api.basevehinstallmodel.BaseVehinstallmodelFeign;
 import com.yxt.anrui.flowable.api.flow.FlowableFeign;
 import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
 import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
@@ -26,10 +30,13 @@ import com.yxt.anrui.riskcenter.api.loantemplate.flowable.TemplateApplyNodeVo;
 import com.yxt.anrui.riskcenter.api.loantemplate.flowable.TemplateApplyTaskQuery;
 import com.yxt.anrui.riskcenter.api.loantemplateinstall.LoanTemplateInstall;
 import com.yxt.anrui.riskcenter.api.loantemplateinstall.LoanTemplateInstallDto;
+import com.yxt.anrui.riskcenter.api.loantemplateinstall.LoanTemplateInstallVo;
 import com.yxt.anrui.riskcenter.api.loantemplatetrailer.LoanTemplateTrailer;
 import com.yxt.anrui.riskcenter.api.loantemplatetrailer.LoanTemplateTrailerDto;
+import com.yxt.anrui.riskcenter.api.loantemplatetrailer.LoanTemplateTrailerVo;
 import com.yxt.anrui.riskcenter.biz.loantemplateinstall.LoanTemplateInstallService;
 import com.yxt.anrui.riskcenter.biz.loantemplatetrailer.LoanTemplateTrailerService;
+import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.base.utils.StringUtils;
@@ -74,6 +81,13 @@ public class LoanTemplateService extends MybatisBaseService<LoanTemplateMapper,
     @Autowired
     private LoanTemplateTrailerService loanTemplateTrailerService;
 
+    @Autowired
+    private BaseTrailerModelFeign baseTrailerModelFeign;
+    @Autowired
+    private BaseVehinstallmodelFeign baseVehinstallmodelFeign;
+    @Autowired
+    private FileUploadComponent fileUploadComponent;
+
 
     public PagerVo<LoanTemplateVo> listPageVo(PagerQuery<LoanTemplateQuery> pq) {
         LoanTemplateQuery query = pq.getParams();
@@ -178,6 +192,13 @@ public class LoanTemplateService extends MybatisBaseService<LoanTemplateMapper,
             LoanTemplateTrailer loanTemplateTrailer = new LoanTemplateTrailer();
             BeanUtil.copyProperties(loanTemplateTrailerDto, loanTemplateTrailer, "sid");
             loanTemplateTrailer.setTemplateSid(sid);
+            List<String> fileList = loanTemplateTrailerDto.getVehTrailerCertificateFile();
+            fileList.removeAll(Collections.singleton(null));
+            if (!fileList.isEmpty()) {
+                fileList = fileList.stream().map(v -> v.replaceAll(fileUploadComponent.getUrlPrefix(), "")).collect(Collectors.toList());
+                String files = String.join(",", fileList);
+                loanTemplateTrailer.setVehTrailerCertificateFile(files);
+            }
             loanTemplateTrailerService.insert(loanTemplateTrailer);
         }
     }
@@ -512,8 +533,46 @@ public class LoanTemplateService extends MybatisBaseService<LoanTemplateMapper,
     public ResultBean<LoanTemplateDetailsVo> details(String sid) {
         ResultBean<LoanTemplateDetailsVo> rb = ResultBean.fireFail();
         LoanTemplateDetailsVo loanTemplateDetailsVo = new LoanTemplateDetailsVo();
+        LoanTemplate loanTemplate = fetchBySid(sid);
+        if (loanTemplate != null) {
+            return rb.setMsg("该申请不存在");
+        }
+        BeanUtil.copyProperties(loanTemplate, loanTemplateDetailsVo, "sid");
+        LoanTemplateInstall loanTemplateInstall = loanTemplateInstallService.selectByMainSid(sid);
+        if (loanTemplateInstall != null) {
+            loanTemplateDetailsVo.setInstall(true);
+            //根据上装配置sid查询上装配置信息
+            String installSid = loanTemplateInstall.getVehInstallModelSid();
+            ResultBean<BaseVehinstallmodelDetailsVo> installModelDetailsVoResultBean = baseVehinstallmodelFeign.fetchDetailsBySid(installSid);
+            if (installModelDetailsVoResultBean.getData() != null) {
+                LoanTemplateInstallVo loanTemplateInstallVo = new LoanTemplateInstallVo();
+                BeanUtil.copyProperties(installModelDetailsVoResultBean.getData(), loanTemplateInstallVo, "sid");
+                BeanUtil.copyProperties(loanTemplateInstall, loanTemplateInstallVo);
+                loanTemplateDetailsVo.setLoanTemplateInstall(loanTemplateInstallVo);
+            }
 
-        return null;
+        }
+        LoanTemplateTrailer loanTemplateTrailer = loanTemplateTrailerService.selectByMainSid(sid);
+        if (loanTemplateTrailer != null) {
+            loanTemplateDetailsVo.setTrailer(true);
+            //根据挂车配置sid查询挂车的配置信息
+            String trailerSid = loanTemplateTrailer.getVehTrailerModelSid();
+            ResultBean<BaseTrailerModelDetailsVo> trailerModelDetailsVoResultBean = baseTrailerModelFeign.fetchDetailsBySid(trailerSid);
+            if (trailerModelDetailsVoResultBean.getData() != null) {
+                LoanTemplateTrailerVo loanTemplateTrailerVo = new LoanTemplateTrailerVo();
+                BeanUtil.copyProperties(trailerModelDetailsVoResultBean.getData(), loanTemplateTrailerVo, "sid");
+                BeanUtil.copyProperties(loanTemplateTrailer, loanTemplateTrailerVo);
+                String files = loanTemplateTrailer.getVehTrailerCertificateFile();
+                if (StringUtils.isNotBlank(files)) {
+                    List<String> fileList = Arrays.asList(files.split(","));
+                    //拼接前缀
+                    fileList = fileList.stream().map(v -> fileUploadComponent.getUrlPrefix() + v).collect(Collectors.toList());
+                    loanTemplateTrailerVo.setVehTrailerCertificateFile(fileList);
+                }
+                loanTemplateDetailsVo.setLoanTemplateTrailer(loanTemplateTrailerVo);
+            }
+        }
+        return rb.success().setData(loanTemplateDetailsVo);
     }
 
     @Transactional(rollbackFor = Exception.class)

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantemplateinstall/LoanTemplateInstallMapper.java

@@ -12,4 +12,6 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface LoanTemplateInstallMapper extends BaseMapper<LoanTemplateInstall> {
     int deleteByMainSid(String s);
+
+    LoanTemplateInstall selectByMainSid(String sid);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantemplateinstall/LoanTemplateInstallMapper.xml

@@ -6,4 +6,10 @@
         from loan_template_install
         where templateSid = #{s}
     </delete>
+
+    <select id="selectByMainSid" resultType="com.yxt.anrui.riskcenter.api.loantemplateinstall.LoanTemplateInstall">
+        select *
+        from loan_template_install
+        where templateSid = #{sid}
+    </select>
 </mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantemplateinstall/LoanTemplateInstallService.java

@@ -24,4 +24,8 @@ public class LoanTemplateInstallService extends MybatisBaseService<LoanTemplateI
     public void deleteByMainSid(String sid) {
         baseMapper.deleteByMainSid(sid);
     }
+
+    public LoanTemplateInstall selectByMainSid(String sid) {
+        return baseMapper.selectByMainSid(sid);
+    }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantemplatetrailer/LoanTemplateTrailerMapper.java

@@ -12,4 +12,6 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface LoanTemplateTrailerMapper extends BaseMapper<LoanTemplateTrailer> {
     int deleteByMainSid(String s);
+
+    LoanTemplateTrailer selectByMainSid(String sid);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantemplatetrailer/LoanTemplateTrailerMapper.xml

@@ -6,4 +6,10 @@
         from loan_template_trailer
         where templateSid = #{s}
     </delete>
+
+    <select id="selectByMainSid" resultType="com.yxt.anrui.riskcenter.api.loantemplatetrailer.LoanTemplateTrailer">
+        select *
+        from loan_template_trailer
+        where templateSid = #{sid}
+    </select>
 </mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantemplatetrailer/LoanTemplateTrailerService.java

@@ -24,4 +24,8 @@ public class LoanTemplateTrailerService extends MybatisBaseService<LoanTemplateT
     public void deleteByMainSid(String sid) {
         baseMapper.deleteByMainSid(sid);
     }
+
+    public LoanTemplateTrailer selectByMainSid(String sid) {
+        return baseMapper.selectByMainSid(sid);
+    }
 }