案件完善

问题修改

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeign.java

@@ -90,6 +90,11 @@ public interface FinCompanyInvoicingFeign {
     @ResponseBody
     public ResultBean<FinCompanyInvoicingDetailsVo> getDetailsByUseOrgAndSystem(@RequestParam("useOrgSid") String useOrgSid, @RequestParam("systemSid") String systemSid);
 
+    @ApiOperation("根据采购系统查询")
+    @GetMapping("/getDetailsBySystem")
+    @ResponseBody
+    ResultBean<FinCompanyInvoicingDetailsVo> getDetailsBySystem(@RequestParam("systemSid") String systemSid);
+
     @ApiOperation("根据分公司查询开票信息")
     @GetMapping("/selectInvoingList")
     @ResponseBody

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeignFallback.java

@@ -85,6 +85,11 @@ public class FinCompanyInvoicingFeignFallback implements FinCompanyInvoicingFeig
         return null;
     }
 
+    @Override
+    public ResultBean<FinCompanyInvoicingDetailsVo> getDetailsBySystem(String systemSid) {
+        return null;
+    }
+
     @Override
     public ResultBean<List<InvoicingVo>> selectInvoingList(String busSid) {
         return null;

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.java

@@ -70,6 +70,8 @@ public interface FinCompanyInvoicingMapper extends BaseMapper<FinCompanyInvoicin
 
     FinCompanyInvoicingDetailsVo getDetailsByUseOrgAndSystem(@Param("useOrgSid") String useOrgSid, @Param("systemSid") String systemSid);
 
+    FinCompanyInvoicingDetailsVo getDetailsBySystem(@Param("systemSid") String systemSid);
+
     List<InvoicingVo> selectInvoingList(String useOrgSid);
 
     List<FinCompanyInvoicingDetailsVo> qyFetchListByName(@Param(Constants.WRAPPER) QueryWrapper qw);

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.xml

@@ -34,6 +34,12 @@
           and purchaseSystemSid = #{systemSid} limit 1
     </select>
 
+    <select id="getDetailsBySystem" resultType="com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingDetailsVo">
+        select *
+        from fin_company_invoicing
+        where purchaseSystemSid = #{systemSid} limit 1
+    </select>
+
     <select id="selectInvoingList" resultType="com.yxt.anrui.fin.api.fincompanyinvoicing.InvoicingVo">
         select name dictValue, sid, sid as dictKey
         from fin_company_invoicing
@@ -118,6 +124,4 @@
           and useOrgSid = #{useOrgSid}
           and isDelete = 0
     </select>
-
-
 </mapper>

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingRest.java

@@ -112,6 +112,11 @@ public class FinCompanyInvoicingRest implements FinCompanyInvoicingFeign {
         return finCompanyInvoicingService.getDetailsByUseOrgAndSystem(useOrgSid, systemSid);
     }
 
+    @Override
+    public ResultBean<FinCompanyInvoicingDetailsVo> getDetailsBySystem(String systemSid) {
+        return finCompanyInvoicingService.getDetailsBySystem(systemSid);
+    }
+
     @Override
     public ResultBean<List<InvoicingVo>> selectInvoingList(String busSid) {
         return finCompanyInvoicingService.selectInvoingList(busSid);

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingService.java

@@ -242,6 +242,12 @@ public class FinCompanyInvoicingService extends MybatisBaseService<FinCompanyInv
         return rb.success().setData(vo);
     }
 
+    public ResultBean<FinCompanyInvoicingDetailsVo> getDetailsBySystem(String systemSid) {
+        ResultBean<FinCompanyInvoicingDetailsVo> rb = ResultBean.fireFail();
+        FinCompanyInvoicingDetailsVo vo = baseMapper.getDetailsBySystem(systemSid);
+        return rb.success().setData(vo);
+    }
+
     public ResultBean<List<InvoicingVo>> selectInvoingList(String busSid) {
         ResultBean<List<InvoicingVo>> rb = ResultBean.fireFail();
         List<InvoicingVo> list = new ArrayList<>();

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseappealapply/LoanCaseAppealApplyDetailsVo.java

@@ -35,6 +35,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -144,9 +145,9 @@ public class LoanCaseAppealApplyDetailsVo implements Vo {
     private String taskId; // 任务id
 
     @ApiModelProperty
-    private List<LoanCaseAppealFile> pjclFiles;
+    private List<LoanCaseAppealFile> pjclFiles = new ArrayList<>();
     @ApiModelProperty
-    private List<LoanCaseAppealFile> ysclFiles;
+    private List<LoanCaseAppealFile> ysclFiles = new ArrayList<>();
     @ApiModelProperty("上诉车辆")
     private List<LoanCaseAppealVehDetailsVo> loanCaseAppealVehList;
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseappealapply/LoanCaseAppealApplyDto.java

@@ -56,6 +56,8 @@ public class LoanCaseAppealApplyDto implements Dto {
 
     @ApiModelProperty("备注")
     private String remarks;
+    @ApiModelProperty("创建人sid")
+    private String createBySid;
 	@ApiModelProperty("创建人")
     private String createByName; // 创建人
 	@ApiModelProperty("申请编号")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancasecloseapply/LoanCaseCloseApplyDetailsVo.java

@@ -36,6 +36,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -139,7 +140,7 @@ public class LoanCaseCloseApplyDetailsVo implements Vo {
     private String taskId; // 任务id
 
     @ApiModelProperty
-    private List<LoanCaseCloseFile> jaclFiles;
+    private List<LoanCaseCloseFile> jaclFiles = new ArrayList<>();
     @ApiModelProperty("执行措施")
     private List<LoanCaseProgressExecuteMeasure> loanCaseProgressExecuteMeasures;
     @ApiModelProperty("上诉车辆")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancasecloseapply/LoanCaseCloseApplyDto.java

@@ -58,6 +58,8 @@ public class LoanCaseCloseApplyDto implements Dto {
 
     @ApiModelProperty("备注")
     private String remarks;
+    @ApiModelProperty("创建人sid")
+    private String createBySid;
 	@ApiModelProperty("创建人")
     private String createByName; // 创建人
 	@ApiModelProperty("申请编号")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancasecloseapply/LoanCaseCloseApplyQuery.java

@@ -69,7 +69,7 @@ public class LoanCaseCloseApplyQuery implements Query {
     @ApiModelProperty("贷款人")
     private String lenderName;
     @ApiModelProperty("结案方式")
-    private String closeTypeValue;
+    private String closeTypeKey;
     @ApiModelProperty("结案开始日期")
     private String closeStartDate;
     @ApiModelProperty("结案结束日期")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteapply/LoanCaseExecuteApplyDetailsVo.java

@@ -35,6 +35,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -142,9 +143,9 @@ public class LoanCaseExecuteApplyDetailsVo implements Vo {
     private String taskId; // 任务id
 
     @ApiModelProperty
-    private List<LoanCaseExecuteFile> pjclFiles;
+    private List<LoanCaseExecuteFile> pjclFiles = new ArrayList<>();
     @ApiModelProperty
-    private List<LoanCaseExecuteFile> zxclFiles;
+    private List<LoanCaseExecuteFile> zxclFiles = new ArrayList<>();
     @ApiModelProperty("上诉车辆")
     private List<LoanCaseExecuteVehDetailsVo> loanCaseExecuteVehList;
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteapply/LoanCaseExecuteApplyDto.java

@@ -58,6 +58,8 @@ public class LoanCaseExecuteApplyDto implements Dto {
 
     @ApiModelProperty("备注")
     private String remarks;
+    @ApiModelProperty("创建人sid")
+    private String createBySid;
 	@ApiModelProperty("创建人")
     private String createByName; // 创建人
 	@ApiModelProperty("申请编号")

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

@@ -197,6 +197,7 @@ public class LoanCapitalCreditResultService extends MybatisBaseService<LoanCapit
         if (StringUtils.isNotBlank(query.getCapCarefulResult())) {
             qw.like("lr.capCarefulResult", query.getCapCarefulResult());
         }
+        qw.ne("bo.nodeState", "作废");
         qw.groupBy("lr.sid");
         qw.orderByDesc("lr.createTime");
         IPage<LoanCapitalCreditResult> page = PagerUtil.queryToPage(pq);

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseappealapply/LoanCaseAppealApplyService.java

@@ -45,6 +45,7 @@ import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
 import com.yxt.anrui.portal.api.sysparameter.SysParameterFeign;
+import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
@@ -108,6 +109,8 @@ public class LoanCaseAppealApplyService extends MybatisBaseService<LoanCaseAppea
 	@Autowired
 	private SysParameterFeign sysParameterFeign;
 	@Autowired
+	private SysStaffOrgFeign sysStaffOrgFeign;
+	@Autowired
 	private LoanCaseAppealVehService loanCaseAppealVehService;
 	@Autowired
 	private LoanCaseProgressService loanCaseProgressService;
@@ -282,6 +285,7 @@ public class LoanCaseAppealApplyService extends MybatisBaseService<LoanCaseAppea
 		this.updateByDto(dto);
 		loanCaseAppealVehService.delByMainSid(dtoSid);
 		for (LoanCaseAppealVehDto loanCaseAppealVehDto : loanCaseAppealVehList) {
+			loanCaseAppealVehDto.setSid("");
 			loanCaseAppealVehDto.setMainSid(dtoSid);
 			loanCaseAppealVehService.saveOrUpdateDto(loanCaseAppealVehDto);
 		}
@@ -401,6 +405,12 @@ public class LoanCaseAppealApplyService extends MybatisBaseService<LoanCaseAppea
 		loanCaseAppealApplyDetailsVo.setJudgMoney(loanCaseProgressTrial.getVerdictAmount().toString());
 		loanCaseAppealApplyDetailsVo.setReceivejudgDate(loanCaseProgressTrial.getReceiveTime());
 		loanCaseAppealApplyDetailsVo.setJudgRemarks(loanCaseProgressTrial.getVerdictRemarks());
+		loanCaseAppealApplyDetailsVo.setBusSid(sid);
+		String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
+		SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData();
+		loanCaseAppealApplyDetailsVo.setUseOrgSid(useOrgSid);
+		loanCaseAppealApplyDetailsVo.setUseOrgName(organizationVo.getName());
+		loanCaseAppealApplyDetailsVo.setOrgPath(orgPath);
 		List<LoanCaseAppealFile> pjclFiles = new ArrayList<>();
 		String verdictFiles = loanCaseProgressTrial.getVerdictFiles();
 		if (StringUtils.isNotBlank(verdictFiles)){

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancasecloseapply/LoanCaseCloseApplyRest.java

@@ -86,7 +86,7 @@ public class LoanCaseCloseApplyRest implements LoanCaseCloseApplyFeign {
 
 	@Override
 	@ApiOperation("根据sid批量删除")
-    @PostMapping("/delBySids")
+    @DeleteMapping("/delBySids")
     public ResultBean delBySids(@RequestBody String[] sids){
 		return loanCaseCloseApplyService.delAll(sids);
 	}
@@ -102,9 +102,7 @@ public class LoanCaseCloseApplyRest implements LoanCaseCloseApplyFeign {
 
 	@Override
 	public ResultBean<LoanCaseCloseApplyDetailsVo> details(String sid, String userSid, String orgPath) {
-		ResultBean rb = ResultBean.fireFail();
-		LoanCaseCloseApplyDetailsVo vo = loanCaseCloseApplyService.details(sid,userSid,orgPath);
-		return rb.success().setData(vo);
+		return loanCaseCloseApplyService.details(sid,userSid,orgPath);
 	}
 
 	@Override

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancasecloseapply/LoanCaseCloseApplyService.java

@@ -44,6 +44,7 @@ import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
 import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
+import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
@@ -111,6 +112,8 @@ public class LoanCaseCloseApplyService extends MybatisBaseService<LoanCaseCloseA
 	@Autowired
 	private SysOrganizationFeign sysOrganizationFeign;
 	@Autowired
+	private SysStaffOrgFeign sysStaffOrgFeign;
+	@Autowired
 	private LoanCaseCloseVehService loanCaseCloseVehService;
 	@Autowired
 	private LoanCaseProgressService loanCaseProgressService;
@@ -205,8 +208,8 @@ public class LoanCaseCloseApplyService extends MybatisBaseService<LoanCaseCloseA
 		if (StringUtils.isNotBlank(query.getLenderName())){
 			qw.like("lenderName",query.getLenderName());
 		}
-		if (StringUtils.isNotBlank(query.getCloseTypeValue())){
-			qw.like("closeTypeValue",query.getCloseTypeValue());
+		if (StringUtils.isNotBlank(query.getCloseTypeKey())){
+			qw.like("closeTypeKey",query.getCloseTypeKey());
 		}
 		qw.apply(StringUtils.isNotBlank(query.getCloseStartDate()), "date_format (closeDate,'%Y-%m-%d') >= date_format('" + query.getCloseStartDate() + "','%Y-%m-%d')").
 				apply(StringUtils.isNotBlank(query.getCloseEndDate()), "date_format (closeDate,'%Y-%m-%d') <= date_format('" + query.getCloseEndDate() + "','%Y-%m-%d')"
@@ -266,6 +269,7 @@ public class LoanCaseCloseApplyService extends MybatisBaseService<LoanCaseCloseA
 		this.updateByDto(dto);
 		loanCaseCloseVehService.delByMainSid(dtoSid);
 		for (LoanCaseCloseVehDto loanCaseCloseVehDto : loanCaseCloseVehList) {
+			loanCaseCloseVehDto.setSid("");
 			loanCaseCloseVehDto.setMainSid(dtoSid);
 			loanCaseCloseVehService.saveOrUpdateDto(loanCaseCloseVehDto);
 		}
@@ -310,6 +314,11 @@ public class LoanCaseCloseApplyService extends MybatisBaseService<LoanCaseCloseA
 		BeanUtil.copyProperties(entity, vo);
 		List<LoanCaseCloseVehDetailsVo> loanCaseCloseVehDetailsVos = loanCaseCloseVehService.selByMainSid(sid);
 		vo.setLoanCaseCloseVehList(loanCaseCloseVehDetailsVos);
+		LoanCaseProgressExecute loanCaseProgressExecute = loanCaseProgressExecuteService.selByMainSid(entity.getBusSid());
+		vo.setReturnMoney(loanCaseProgressExecute.getExecuteAmountAll().toString());
+		vo.setNotReturnMoney(loanCaseProgressExecute.getExecuteNotAmount().toString());
+		List<LoanCaseProgressExecuteMeasure> loanCaseProgressExecuteMeasures = loanCaseProgressExecuteMeasureService.selByMainSid(loanCaseProgressExecute.getSid());
+		vo.setLoanCaseProgressExecuteMeasures(loanCaseProgressExecuteMeasures);
 		List<LoanFile> jacl = loanFileService.selectByLinkSid(sid, LoanFileEnum.CLOSE.getAttachType());
 		List<LoanCaseCloseFile> jaclFiles = new ArrayList<>();
 		if (jacl != null && jacl.size() > 0) {
@@ -633,7 +642,8 @@ public class LoanCaseCloseApplyService extends MybatisBaseService<LoanCaseCloseA
 		return rb.success();
 	}
 
-	public LoanCaseCloseApplyDetailsVo details(String sid, String userSid, String orgPath) {
+	public ResultBean<LoanCaseCloseApplyDetailsVo> details(String sid, String userSid, String orgPath) {
+		ResultBean rb = ResultBean.fireFail();
 		LoanCaseCloseApplyDetailsVo loanCaseCloseApplyDetailsVo = new LoanCaseCloseApplyDetailsVo();
 		SysUserVo sysUserVo = sysUserFeign.fetchBySid(userSid).getData();
 		loanCaseCloseApplyDetailsVo.setCreateBySid(userSid);
@@ -659,8 +669,24 @@ public class LoanCaseCloseApplyService extends MybatisBaseService<LoanCaseCloseA
 		loanCaseCloseApplyDetailsVo.setIsFullLitigation(loanCaseProgress.getFull());
 		loanCaseCloseApplyDetailsVo.setSueMoneyTotal(loanCaseProgress.getSueMoney().toString());
 		loanCaseCloseApplyDetailsVo.setPartProceRemarks(loanCaseProgress.getSueShows());
-		LoanCaseProgressTrial loanCaseProgressTrial = loanCaseProgressTrialService.selByJdAndSid(sid, loanCaseProgress.getCaseStage());
-		loanCaseCloseApplyDetailsVo.setFinalJudgMoney(loanCaseProgressTrial.getVerdictAmount().toString());
+		String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
+		SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData();
+		loanCaseCloseApplyDetailsVo.setUseOrgSid(useOrgSid);
+		loanCaseCloseApplyDetailsVo.setUseOrgName(organizationVo.getName());
+		loanCaseCloseApplyDetailsVo.setOrgPath(orgPath);
+		LoanCaseProgressTrial loanCaseProgressTrialZs = loanCaseProgressTrialService.selByJdAndSid(sid, "再审");
+		LoanCaseProgressTrial loanCaseProgressTrialEs = loanCaseProgressTrialService.selByJdAndSid(sid, "二审");
+		LoanCaseProgressTrial loanCaseProgressTrialYs = loanCaseProgressTrialService.selByJdAndSid(sid, "一审");
+		if (loanCaseProgressTrialZs != null && loanCaseProgressTrialZs.getVerdictAmount() != null){
+			loanCaseCloseApplyDetailsVo.setFinalJudgMoney(loanCaseProgressTrialZs.getVerdictAmount().toString());
+		}else if (loanCaseProgressTrialEs != null && loanCaseProgressTrialEs.getVerdictAmount() != null ){
+			loanCaseCloseApplyDetailsVo.setFinalJudgMoney(loanCaseProgressTrialEs.getVerdictAmount().toString());
+		}else if (loanCaseProgressTrialYs != null && loanCaseProgressTrialYs.getVerdictAmount() != null){
+			loanCaseCloseApplyDetailsVo.setFinalJudgMoney(loanCaseProgressTrialYs.getVerdictAmount().toString());
+		}else {
+			return rb.setMsg("没有判决金额");
+		}
+		loanCaseCloseApplyDetailsVo.setBusSid(sid);
 		LoanCaseProgressExecute loanCaseProgressExecute = loanCaseProgressExecuteService.selByMainSid(sid);
 		loanCaseCloseApplyDetailsVo.setReturnMoney(loanCaseProgressExecute.getExecuteAmountAll().toString());
 		loanCaseCloseApplyDetailsVo.setNotReturnMoney(loanCaseProgressExecute.getExecuteNotAmount().toString());
@@ -678,6 +704,6 @@ public class LoanCaseCloseApplyService extends MybatisBaseService<LoanCaseCloseA
 			loanCaseCloseVehDetailsVos.add(loanCaseCloseVehDetailsVo);
 		}
 		loanCaseCloseApplyDetailsVo.setLoanCaseCloseVehList(loanCaseCloseVehDetailsVos);
-		return loanCaseCloseApplyDetailsVo;
+		return rb.success().setData(loanCaseCloseApplyDetailsVo);
 	}
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseexecuteapply/LoanCaseExecuteApplyRest.java

@@ -86,7 +86,7 @@ public class LoanCaseExecuteApplyRest implements LoanCaseExecuteApplyFeign {
 
 	@Override
 	@ApiOperation("根据sid批量删除")
-    @PostMapping("/delBySids")
+    @DeleteMapping("/delBySids")
     public ResultBean delBySids(@RequestBody String[] sids){
 		return loanCaseExecuteApplyService.delAll(sids);
 	}
@@ -102,9 +102,7 @@ public class LoanCaseExecuteApplyRest implements LoanCaseExecuteApplyFeign {
 
 	@Override
 	public ResultBean<LoanCaseExecuteApplyDetailsVo> details(String sid, String userSid, String orgPath) {
-		ResultBean rb = ResultBean.fireFail();
-		LoanCaseExecuteApplyDetailsVo vo = loanCaseExecuteApplyService.details(sid,userSid,orgPath);
-		return rb.success().setData(vo);
+		return loanCaseExecuteApplyService.details(sid,userSid,orgPath);
 	}
 
 	@Override

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseexecuteapply/LoanCaseExecuteApplyService.java

@@ -44,6 +44,7 @@ import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
 import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
+import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
@@ -104,6 +105,8 @@ public class LoanCaseExecuteApplyService extends MybatisBaseService<LoanCaseExec
 	@Autowired
 	private SysOrganizationFeign sysOrganizationFeign;
 	@Autowired
+	private SysStaffOrgFeign sysStaffOrgFeign;
+	@Autowired
 	private LoanCaseExecuteVehService loanCaseExecuteVehService;
 	@Autowired
 	private LoanCaseProgressService loanCaseProgressService;
@@ -272,6 +275,7 @@ public class LoanCaseExecuteApplyService extends MybatisBaseService<LoanCaseExec
 		this.updateByDto(dto);
 		loanCaseExecuteVehService.delByMainSid(dtoSid);
 		for (LoanCaseExecuteVehDto loanCaseExecuteVehDto : loanCaseExecuteVehList) {
+			loanCaseExecuteVehDto.setSid("");
 			loanCaseExecuteVehDto.setMainSid(dtoSid);
 			loanCaseExecuteVehService.saveOrUpdateDto(loanCaseExecuteVehDto);
 		}
@@ -667,7 +671,8 @@ public class LoanCaseExecuteApplyService extends MybatisBaseService<LoanCaseExec
 		return rb.success();
 	}
 
-	public LoanCaseExecuteApplyDetailsVo details(String sid, String userSid, String orgPath) {
+	public ResultBean<LoanCaseExecuteApplyDetailsVo> details(String sid, String userSid, String orgPath) {
+		ResultBean rb = ResultBean.fireFail();
 		LoanCaseExecuteApplyDetailsVo loanCaseExecuteApplyDetailsVo = new LoanCaseExecuteApplyDetailsVo();
 		SysUserVo sysUserVo = sysUserFeign.fetchBySid(userSid).getData();
 		loanCaseExecuteApplyDetailsVo.setCreateBySid(userSid);
@@ -696,8 +701,25 @@ public class LoanCaseExecuteApplyService extends MybatisBaseService<LoanCaseExec
 		LoanCaseProgressTrial loanCaseProgressTrial = loanCaseProgressTrialService.selByJdAndSid(sid, loanCaseProgress.getCaseStage());
 		loanCaseExecuteApplyDetailsVo.setJudgDate(DateUtil.formatDate(loanCaseProgressTrial.getVerdictTime()));
 		loanCaseExecuteApplyDetailsVo.setJudgResult(loanCaseProgressTrial.getVerdictResult());
+		LoanCaseProgressTrial loanCaseProgressTrialZs = loanCaseProgressTrialService.selByJdAndSid(sid, "再审");
+		LoanCaseProgressTrial loanCaseProgressTrialEs = loanCaseProgressTrialService.selByJdAndSid(sid, "二审");
+		LoanCaseProgressTrial loanCaseProgressTrialYs = loanCaseProgressTrialService.selByJdAndSid(sid, "一审");
+		if (loanCaseProgressTrialZs != null && loanCaseProgressTrialZs.getVerdictAmount() != null){
+			loanCaseExecuteApplyDetailsVo.setJudgMoney(loanCaseProgressTrial.getVerdictAmount().toString());
+		}else if (loanCaseProgressTrialEs != null && loanCaseProgressTrialEs.getVerdictAmount() != null){
 			loanCaseExecuteApplyDetailsVo.setJudgMoney(loanCaseProgressTrial.getVerdictAmount().toString());
+		}else if (loanCaseProgressTrialYs != null && loanCaseProgressTrialYs.getVerdictAmount() != null){
+			loanCaseExecuteApplyDetailsVo.setJudgMoney(loanCaseProgressTrial.getVerdictAmount().toString());
+		}else {
+			return rb.setMsg("没有判决金额");
+		}
 		loanCaseExecuteApplyDetailsVo.setJudgRemarks(loanCaseProgressTrial.getVerdictRemarks());
+		String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
+		SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData();
+		loanCaseExecuteApplyDetailsVo.setUseOrgSid(useOrgSid);
+		loanCaseExecuteApplyDetailsVo.setUseOrgName(organizationVo.getName());
+		loanCaseExecuteApplyDetailsVo.setOrgPath(orgPath);
+		loanCaseExecuteApplyDetailsVo.setBusSid(sid);
 		List<LoanCaseExecuteFile> pjclFiles = new ArrayList<>();
 		String verdictFiles = loanCaseProgressTrial.getVerdictFiles();
 		if (StringUtils.isNotBlank(verdictFiles)){
@@ -723,6 +745,6 @@ public class LoanCaseExecuteApplyService extends MybatisBaseService<LoanCaseExec
 			loanCaseExecuteVehDetailsVos.add(loanCaseExecuteVehDetailsVo);
 		}
 		loanCaseExecuteApplyDetailsVo.setLoanCaseExecuteVehList(loanCaseExecuteVehDetailsVos);
-		return loanCaseExecuteApplyDetailsVo;
+		return rb.success().setData(loanCaseExecuteApplyDetailsVo);
 	}
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java

@@ -295,10 +295,10 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
         if (StringUtils.isBlank(loanHomevisitPrep.getDownUrl())){
             return rb.setMsg("未生成消贷合同信息");
         }
-        List<BusSalesOrderLoancontract> busSalesOrderLoancontracts = busSalesOrderLoancontractFeign.fetchAllByOrderSidAndDkrSid(loanHomevisitPrep.getSaleOrderSid(), loanHomevisitPrep.getSaleOrderBorrowerSid()).getData();
+        /*List<BusSalesOrderLoancontract> busSalesOrderLoancontracts = busSalesOrderLoancontractFeign.fetchAllByOrderSidAndDkrSid(loanHomevisitPrep.getSaleOrderSid(), loanHomevisitPrep.getSaleOrderBorrowerSid()).getData();
         if (busSalesOrderLoancontracts == null || busSalesOrderLoancontracts.isEmpty()) {
             return rb.setMsg("未生成消贷合同信息");
-        }
+        }*/
         baseMapper.visit(sid);
         //推送家访考察
         LoanHomevisitInvestigate loanHomevisitInvestigate = new LoanHomevisitInvestigate();
@@ -391,7 +391,7 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
         }
         AppOrderDetailsVo appOrderDetailsVo = resultBean.getData();
         //甲方
-        ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(appOrderDetailsVo.getUseOrgSid(), appOrderDetailsVo.getPurchaseSystemSid());
+        ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsBySystem(appOrderDetailsVo.getPurchaseSystemSid());
         printConfirmDto.setCreateOrgName(invoicingDetailsVoResultBean.getData().getName());
         busSalesOrderLoancontractFeign.delByOrderSidAndDkrSid(loanHomevisitPrepVo.getSaleOrderSid(), loanHomevisitPrepVo.getBorrowerSid());
         String urlAll = "";

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/caseclose/AppCaseProgressExecuteMeasureDetailsVo.java

@@ -1,6 +1,7 @@
 package com.yxt.anrui.terminal.api.risk.caseclose;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -27,7 +28,8 @@ public class AppCaseProgressExecuteMeasureDetailsVo {
     @ApiModelProperty("执行说明")
     private String measureShows;
     @ApiModelProperty("操作时间")
-    private String operatorTime;
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date operatorTime;
     @ApiModelProperty("操作人")
     private String operator;
     @ApiModelProperty("附件")

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/caseclose/CaseCloseService.java

@@ -180,7 +180,7 @@ public class CaseCloseService {
             appCaseProgressExecuteMeasureDetailsVo.setMeasureTime(DateUtil.formatDate(loanCaseProgressExecuteMeasure.getMeasureTime()));
             appCaseProgressExecuteMeasureDetailsVo.setMeasureMoney(loanCaseProgressExecuteMeasure.getMeasureMoney().toString());
             appCaseProgressExecuteMeasureDetailsVo.setMeasureShows(loanCaseProgressExecuteMeasure.getMeasureShows());
-            appCaseProgressExecuteMeasureDetailsVo.setOperatorTime(loanCaseProgressExecuteMeasure.getOperatorTime());
+            appCaseProgressExecuteMeasureDetailsVo.setOperatorTime(DateUtil.parse(loanCaseProgressExecuteMeasure.getOperatorTime()));
             appCaseProgressExecuteMeasureDetailsVo.setOperator(loanCaseProgressExecuteMeasure.getOperator());
             ArrayList<String> appMeasureFiles = new ArrayList<>();
             String measureFiles = loanCaseProgressExecuteMeasure.getMeasureFiles();