优化

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancapitalcreditresult/LoanCapitalCreditResultFeign.java

@@ -61,12 +61,12 @@ public interface LoanCapitalCreditResultFeign {
     @ResponseBody
     public ResultBean<PagerVo<LoanCapitalCreditResultVo>> listPage(@RequestBody PagerQuery<LoanCapitalCreditResultQuery> pq);
 
-    @ApiOperation("保存附件")
+    @ApiOperation("保存附件---作废")
     @PostMapping("/saveImages")
     @ResponseBody
     public ResultBean saveImages(@RequestBody List<String> images, @RequestParam("sid") String sid);
 
-    @ApiOperation("查看附件")
+    @ApiOperation("查看附件---作废")
     @PostMapping("/selectImages")
     @ResponseBody
     public ResultBean<List<String>> selectImages(@RequestParam("sid") String sid);

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancapitalcreditresult/LoanCapitalCreditResultVo.java

@@ -32,6 +32,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * Project: anrui-riskcenter(资方信审终审结果反馈) <br/>
  * File: LoanCapitalCreditResultVo.java <br/>
@@ -77,4 +79,6 @@ public class LoanCapitalCreditResultVo implements Vo {
     private String bankContractNo;
     @ApiModelProperty("销售订单消贷合同sid")
     private String loanContractSid;
+    @ApiModelProperty("信审附件")
+    private List<String> xsImages;
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitappeal/LoanHomevisitAppealDto.java

@@ -54,12 +54,12 @@ public class LoanHomevisitAppealDto implements Dto {
 
     private String sid;
 
-	@ApiModelProperty("家访考察意见")
-    private String homeVisOpinion;
 	@ApiModelProperty("申诉原因")
     private String appealReason;
 	@ApiModelProperty("家访考察sid")
-    private String homeVisitSid;
+    private String kcSid;
+    private String orgPath;
+    private String userSid;
 	@ApiModelProperty("申请编号")
     private String billNo;
     @ApiModelProperty("申诉附件")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitappeal/LoanHomevisitAppealVo.java

@@ -71,6 +71,8 @@ public class LoanHomevisitAppealVo implements Vo {
     private String borrowerName;
     @ApiModelProperty("手机号码")
     private String mobile;
+    @ApiModelProperty("资方")
+    private String bankName;
     @ApiModelProperty("金融产品名称")
     private String policyName;
     @ApiModelProperty("家访专员姓名")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomeVisitInvestigateReservationDto.java

@@ -9,6 +9,8 @@ public class LoanHomeVisitInvestigateReservationDto implements Dto {
 
     @ApiModelProperty("sid")
     private String sid;
+    @ApiModelProperty("用户sid")
+    private String userSid;
     @ApiModelProperty("预约时间")
     private String times;
     @ApiModelProperty("预约地址")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeign.java

@@ -195,7 +195,7 @@ public interface LoanHomevisitInvestigateFeign {
     @ApiOperation("家访考察是否通过")
     @PostMapping("/saveReportInfo")
     @ResponseBody
-    public ResultBean saveReportInfo(@RequestParam("comment") String comment, @RequestParam("agree") Boolean agree, @RequestParam("sid") String sid);
+    public ResultBean saveReportInfo(@RequestParam("comment") String comment, @RequestParam("agree") Boolean agree, @RequestParam("sid") String sid, @RequestParam("userSid") String userSid);
 
     @ApiOperation("家访考察详情")
     @GetMapping("/details")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeignFallback.java

@@ -187,7 +187,7 @@ public class LoanHomevisitInvestigateFeignFallback implements LoanHomevisitInves
 	}
 
 	@Override
-	public ResultBean saveReportInfo(String comment, Boolean agree, String sid) {
+	public ResultBean saveReportInfo(String comment, Boolean agree, String sid, String userSid) {
 		return null;
 	}
 

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancapitalcreditresult/LoanCapitalCreditResultService.java

@@ -156,6 +156,16 @@ public class LoanCapitalCreditResultService extends MybatisBaseService<LoanCapit
         }
         IPage<LoanCapitalCreditResult> page = PagerUtil.queryToPage(pq);
         IPage<LoanCapitalCreditResultVo> pagging = baseMapper.selectPageVo(page, qw);
+        for (LoanCapitalCreditResultVo record : pagging.getRecords()) {
+            List<LoanHomevisitInvestigateFileDetailsVo> xsfjFileVos = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(record.getSid(), LoanAttachTypeEnum.XSFJ.getAttachType());
+            List<String> xsfjImages = new ArrayList<>();
+            if (xsfjFileVos != null && xsfjFileVos.size() > 0) {
+                for (LoanHomevisitInvestigateFileDetailsVo xsfjFileVo : xsfjFileVos) {
+                    xsfjImages.add(xsfjFileVo.getFileUrl());
+                }
+            }
+            record.setXsImages(xsfjImages);
+        }
         PagerVo<LoanCapitalCreditResultVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitappeal/LoanHomevisitAppealMapper.java

@@ -69,4 +69,6 @@ public interface LoanHomevisitAppealMapper extends BaseMapper<LoanHomevisitAppea
 	String selectNum(String billNo);
 
 	int updateFlowFiled(Map<String, Object> map);
+
+	int selectKcSid(String kcSid);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitappeal/LoanHomevisitAppealMapper.xml

@@ -16,6 +16,7 @@
         bo.`contractNo`,
         bb.`borrowerName`,
         bb.`mobile`,
+        bb.bankName,
         bb.`policyName`,
         li.`homeVisStaffName`,
         li.investigateValue
@@ -45,7 +46,7 @@
     </select>
 
     <select id="selectNum" resultType="java.lang.String">
-        select RIGHT(billNo, 4)
+        select RIGHT (billNo, 4)
         from loan_homevisit_appeal
         where billNo LIKE concat(#{billNo}, '%')
         order by billNo desc
@@ -66,4 +67,12 @@
         </if>
         WHERE sid=#{sid}
     </update>
+
+    <select id="selectKcSid" resultType="int">
+        SELECT COUNT(*)
+        FROM loan_homevisit_appeal
+        WHERE homeVisitSid = #{kcSid}
+        AND nodeState != '待提交'
+        AND nodeState != '终止'
+    </select>
 </mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitappeal/LoanHomevisitAppealService.java

@@ -123,12 +123,11 @@ public class LoanHomevisitAppealService extends MybatisBaseService<LoanHomevisit
 		LoanHomevisitAppealQuery query = pq.getParams();
 		QueryWrapper<LoanHomevisitAppeal> qw = new QueryWrapper<>();
 		qw.eq("li.state", 2);
-		qw.eq("bb.busNo", 302);
 		if (StringUtils.isNotBlank(query.getMenuSid())) {
 			//=======================
 			PrivilegeQuery privilegeQuery = new PrivilegeQuery();
 			privilegeQuery.setOrgPath(query.getOrgSidPath());
-			privilegeQuery.setMenuUrl(query.getMenuSid());
+			privilegeQuery.setMenuSid(query.getMenuSid());
 			privilegeQuery.setUserSid(query.getUserSid());
 			ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
 			if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
@@ -210,7 +209,7 @@ public class LoanHomevisitAppealService extends MybatisBaseService<LoanHomevisit
 			//生成单据编号
 			String billNo = "";
 			//查询家访考察信息
-			LoanHomevisitInvestigate loanHomevisitInvestigate = loanHomevisitInvestigateService.fetchBySid(dto.getHomeVisitSid());
+			LoanHomevisitInvestigate loanHomevisitInvestigate = loanHomevisitInvestigateService.fetchBySid(dto.getKcSid());
 			//查询销售订单信息
 			AppOrderDetailsVo data = busSalesOrderFeign.getSaleOrderDetails(loanHomevisitInvestigate.getSaleOrderSid()).getData();
 			SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(data.getUseOrgSid()).getData();
@@ -255,6 +254,7 @@ public class LoanHomevisitAppealService extends MybatisBaseService<LoanHomevisit
 		LoanHomevisitAppeal entity = new LoanHomevisitAppeal();
 		BeanUtil.copyProperties(dto, entity, "id", "sid");
 		entity.setNodeState("待提交");
+		entity.setHomeVisitSid(dto.getKcSid());
 		baseMapper.insert(entity);
 		return entity.getSid();
 	}
@@ -309,6 +309,11 @@ public class LoanHomevisitAppealService extends MybatisBaseService<LoanHomevisit
 
 	public ResultBean submitHomeAppeal(SubmitHomeAppealDto dto) {
 		ResultBean rb = ResultBean.fireFail();
+		int i = baseMapper.selectKcSid(dto.getKcSid());
+		if (i > 0){
+			return rb.setMsg("该家访考察申诉已存在");
+		}
+		dto.getKcSid();
 		LoanHomevisitAppeal loanHomevisitAppeal = fetchBySid(dto.getSid());
 		int r = submitBusinessData(dto, loanHomevisitAppeal);
 		if (r == 3) {
@@ -337,7 +342,8 @@ public class LoanHomevisitAppealService extends MybatisBaseService<LoanHomevisit
 		//若app移动端有此功能，则传递appMap参数
 		Map<String, Object> appMap = new HashMap<>();
 		//需和移动端沟通业务sid保存的属性具体值：appMap中sid不是固定的。移动端提供具体字段。
-		appMap.put("sid", businessSid);
+		appMap.put("kcSid", loanHomevisitAppeal.getHomeVisitSid());
+		appMap.put("ssSid", loanHomevisitAppeal.getSid());
 		variables.put("app", appMap);
 		//流程定义id
 		bv.setModelId(ProcDefEnum.LOANHOMEVISITAPPEALAPPLY.getProDefId());

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateMapper.java

@@ -68,11 +68,11 @@ public interface LoanHomevisitInvestigateMapper extends BaseMapper<LoanHomevisit
     @Update("update loan_homevisit_investigate set state = '2',investigateKey = #{investigateKey},investigateValue = #{investigateValue} where sid = #{sid}")
     void isPassThrough(@Param("sid") String sid, @Param("investigateKey") String investigateKey, @Param("investigateValue") String investigateValue);
 
-    @Update("update loan_homevisit_investigate set resHomeVisDate = #{times},homeVisAddress = #{address} where sid = #{sid}")
-    void saveAppointmentInfo(@Param("sid") String sid, @Param("times") String times, @Param("address") String address);
+    @Update("update loan_homevisit_investigate set resHomeVisDate = #{times},homeVisAddress = #{address},homeVisUserSid = #{userSid},homeVisStaffName = #{userName} where sid = #{sid}")
+    void saveAppointmentInfo(@Param("sid") String sid, @Param("times") String times, @Param("address") String address, @Param("userSid") String userSid, @Param("userName") String userName);
 
     LoanHomeVisitInvestigateInitCustomerVo getHomeVisitCustomerInfo(String sid);
 
-    @Update("update loan_homevisit_investigate set state = '2',remarks = #{comment},investigateValue = #{jg} where sid = #{sid}")
-    void saveReportInfo(@Param("comment") String comment,@Param("jg") String jg,@Param("sid") String sid);
+    @Update("update loan_homevisit_investigate set state = '2',remarks = #{comment},investigateValue = #{jg},homeVisUserSid = #{userSid},homeVisStaffName = #{userName} where sid = #{sid}")
+    void saveReportInfo(@Param("comment") String comment, @Param("jg") String jg, @Param("sid") String sid, @Param("userSid") String userSid, @Param("userName") String userName);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateRest.java

@@ -210,8 +210,8 @@ public class LoanHomevisitInvestigateRest implements LoanHomevisitInvestigateFei
     }
 
     @Override
-    public ResultBean saveReportInfo(String comment, Boolean agree, String sid) {
-        return loanHomevisitInvestigateService.saveReportInfo(comment, agree, sid);
+    public ResultBean saveReportInfo(String comment, Boolean agree, String sid, String userSid) {
+        return loanHomevisitInvestigateService.saveReportInfo(comment, agree, sid, userSid);
     }
 
     @Override

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java

@@ -35,6 +35,7 @@ import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo;
 import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
+import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.*;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatecustomer.LoanHomeVisitInvestigateInitCustomerVo;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatecustomer.LoanHomeVisitInvestigateSaveCustomerDto;
@@ -331,7 +332,9 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
 
     public ResultBean saveAppointmentInfo(LoanHomeVisitInvestigateReservationDto dto) {
         ResultBean rb = ResultBean.fireFail();
-        baseMapper.saveAppointmentInfo(dto.getSid(), dto.getTimes(), dto.getAddress());
+        String userSid = dto.getUserSid();
+        SysUserVo sysUserVo = sysUserFeign.fetchBySid(userSid).getData();
+        baseMapper.saveAppointmentInfo(dto.getSid(), dto.getTimes(), dto.getAddress(), userSid, sysUserVo.getName());
         return rb.success();
     }
 
@@ -1129,7 +1132,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
         return rb.success();
     }
 
-    public ResultBean saveReportInfo(String comment, Boolean agree, String sid) {
+    public ResultBean saveReportInfo(String comment, Boolean agree, String sid, String userSid) {
         ResultBean rb = ResultBean.fireFail();
         LoanHomeVisitInvestigateInitReportStateVo loanHomeVisitInvestigateInitReportStateVo = getHomeVisitReportInfo(sid).getData();
         LoanHomeVisitInvestigateInitInformationStateVo loanHomeVisitInvestigateInitInformationStateVo = getHomeVisitDataInfo(sid).getData();
@@ -1144,7 +1147,8 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
         if (agree) {
             jg = "通过";
         }
-        baseMapper.saveReportInfo(comment, jg, sid);
+        SysUserVo sysUserVo = sysUserFeign.fetchBySid(userSid).getData();
+        baseMapper.saveReportInfo(comment, jg, sid, userSid, sysUserVo.getName());
         return rb.success();
     }
 

anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/application-devv.yml

@@ -24,4 +24,7 @@ image:
   upload:
     path: D:\\anrui\\upload\\
   url:
-    prefix: http://192.168.1.104:8111/upload/
+    prefix: http://192.168.1.104:8111/upload/
+templateUrl:
+  uploadUrl: D:\anrui\upload\template\
+  prefixUrl: http://120.46.172.184/api/upload/template/

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateReservationDto.java

@@ -9,6 +9,8 @@ public class AppLoanHomeVisitInvestigateReservationDto implements Dto {
 
     @ApiModelProperty("sid")
     private String sid;
+    @ApiModelProperty("用户sid")
+    private String userSid;
     @ApiModelProperty("预约时间")
     private String times;
     @ApiModelProperty("预约地址")

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomevisitAppealDto.java

@@ -56,7 +56,9 @@ public class AppLoanHomevisitAppealDto implements Dto {
 	@ApiModelProperty("申诉原因")
     private String appealReason;
 	@ApiModelProperty("家访考察sid")
-    private String homeVisitSid;
+    private String kcSid;
+    private String orgPath;
+    private String userSid;
     @ApiModelProperty("申诉附件")
     private List<String> ssImages = new ArrayList<>();
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateFeign.java

@@ -42,7 +42,7 @@ public interface LoanHomeVisitInvestigateFeign {
     @ApiOperation("家访考察是否通过")
     @PostMapping("/saveReportInfo")
     @ResponseBody
-    public ResultBean saveReportInfo(@RequestParam("comment") String comment, @RequestParam("agree") Boolean agree, @RequestParam("sid") String sid);
+    public ResultBean saveReportInfo(@RequestParam("comment") String comment, @RequestParam("agree") Boolean agree, @RequestParam("sid") String sid, @RequestParam("userSid") String userSid);
 
     @ApiOperation("家访考察详情")
     @GetMapping("/details")

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateRest.java

@@ -55,8 +55,8 @@ public class LoanHomeVisitInvestigateRest implements LoanHomeVisitInvestigateFei
     }
 
     @Override
-    public ResultBean saveReportInfo(String comment, Boolean agree, String sid) {
-        return loanHomeVisitInvestigateService.saveReportInfo(comment, agree, sid);
+    public ResultBean saveReportInfo(String comment, Boolean agree, String sid, String userSid) {
+        return loanHomeVisitInvestigateService.saveReportInfo(comment, agree, sid, userSid);
     }
 
     @Override
@@ -166,7 +166,7 @@ public class LoanHomeVisitInvestigateRest implements LoanHomeVisitInvestigateFei
 
     @Override
     public ResultBean<AppLoanHomeVisitInitAppealVo> getHomeVisitAppealInfo(String kcSid, String ssSid) {
-        return loanHomeVisitInvestigateService.getHomeVisitAppealInfo(kcSid,ssSid);
+        return loanHomeVisitInvestigateService.getHomeVisitAppealInfo(kcSid, ssSid);
     }
 
     @Override

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateService.java

@@ -35,6 +35,7 @@ import com.yxt.anrui.riskcenter.api.loancreditappealapply.flowable.LoanCreditApp
 import com.yxt.anrui.riskcenter.api.loancreditappealapply.flowable.LoanCreditApplyNodeVo;
 import com.yxt.anrui.riskcenter.api.loancreditappealapply.flowable.LoanCreditApplyTaskQuery;
 import com.yxt.anrui.riskcenter.api.loancreditappealpeo.LoanCreditAppealPeoDto;
+import com.yxt.anrui.riskcenter.api.loanhomevisitappeal.LoanHomeVisitInitAppealVo;
 import com.yxt.anrui.riskcenter.api.loanhomevisitappeal.LoanHomevisitAppealFeign;
 import com.yxt.anrui.riskcenter.api.loanhomevisitappeal.LoanHomevisitAppealQuery;
 import com.yxt.anrui.riskcenter.api.loanhomevisitappeal.LoanHomevisitAppealVo;
@@ -132,9 +133,9 @@ public class LoanHomeVisitInvestigateService {
         return rb.success();
     }
 
-    public ResultBean saveReportInfo(String comment, Boolean agree, String sid) {
+    public ResultBean saveReportInfo(String comment, Boolean agree, String sid, String userSid) {
         ResultBean rb = ResultBean.fireFail();
-        ResultBean resultBean = loanHomevisitInvestigateFeign.saveReportInfo(comment, agree, sid);
+        ResultBean resultBean = loanHomevisitInvestigateFeign.saveReportInfo(comment, agree, sid, userSid);
         if (!resultBean.getSuccess()) {
             return rb.setMsg(resultBean.getMsg());
         }
@@ -352,6 +353,9 @@ public class LoanHomeVisitInvestigateService {
             loanHomeVisitInvestigatePageVo.setMobile(record.getMobile());
             loanHomeVisitInvestigatePageVo.setTimes(record.getResHomeVisDate());
             loanHomeVisitInvestigatePageVo.setAddress(record.getHomeVisAddress());
+            loanHomeVisitInvestigatePageVo.setZf(record.getBankName());
+            loanHomeVisitInvestigatePageVo.setFinProduct(record.getPolicyName());
+            loanHomeVisitInvestigatePageVo.setJfMember(record.getHomeVisStaffName());
             if (record.getInvestigateValue().equals("不通过")) {
                 loanHomeVisitInvestigatePageVo.setShowAppealBtn(true);
             }
@@ -444,7 +448,9 @@ public class LoanHomeVisitInvestigateService {
 
     public ResultBean<AppLoanHomeVisitInitAppealVo> getHomeVisitAppealInfo(String kcSid, String ssSid) {
         ResultBean rb = ResultBean.fireFail();
-        loanHomevisitAppealFeign.getHomeVisitAppealInfo(kcSid,ssSid);
-        return null;
+        LoanHomeVisitInitAppealVo loanHomeVisitInitAppealVo = loanHomevisitAppealFeign.getHomeVisitAppealInfo(kcSid, ssSid).getData();
+        AppLoanHomeVisitInitAppealVo appLoanHomeVisitInitAppealVo = new AppLoanHomeVisitInitAppealVo();
+        BeanUtil.copyProperties(loanHomeVisitInitAppealVo, appLoanHomeVisitInitAppealVo);
+        return rb.success().setData(appLoanHomeVisitInitAppealVo);
     }
 }