yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

优化

master
God 2 years ago
parent
630e672cfe
commit
8f547e5f49
7 changed files with 145 additions and 85 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancreditappealapply/LoanCreditAppealApplyFeign.java
  2. 5
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancreditappealapply/LoanCreditAppealApplyFeignFallback.java
  3. 3
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancreditappealapply/LoanCreditAppealApplyMapper.java
  4. 16
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancreditappealapply/LoanCreditAppealApplyMapper.xml
  5. 158
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancreditappealapply/LoanCreditAppealApplyRest.java
  6. 5
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancreditappealapply/LoanCreditAppealApplyService.java
  7. 34
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/creditreview/CreditReviewService.java

9
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancreditappealapply/LoanCreditAppealApplyFeign.java
View File

@ -68,7 +68,7 @@ public interface LoanCreditAppealApplyFeign {
@PostMapping("/save")
@ResponseBody
public ResultBean save(@RequestBody LoanCreditAppealApplyDto dto);
@ApiOperation("根据sid删除记录")
@DeleteMapping("/delBySids")
@ResponseBody
@ -78,7 +78,7 @@ public interface LoanCreditAppealApplyFeign {
@DeleteMapping("/delBySid")
@ResponseBody
public ResultBean delBySid(@RequestParam("sid") String sid);
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
@ResponseBody
@ -116,4 +116,9 @@ public interface LoanCreditAppealApplyFeign {
@ApiOperation(value = "终止任务")
@PostMapping(value = "/breakProcess")
public ResultBean breakProcess(@Valid @RequestBody LoanCreditApplyTaskQuery query);
@ApiOperation("根据审核sid查询待提交状态申诉")
@PostMapping("/fetchDetailsByShSidAndState")
@ResponseBody
ResultBean<LoanCreditAppealApplyDetailsVo> fetchDetailsByShSidAndState(@RequestParam("shSid") String shSid, @RequestParam("nodeState") String nodeState);
}

5
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancreditappealapply/LoanCreditAppealApplyFeignFallback.java
View File

@ -115,4 +115,9 @@ public class LoanCreditAppealApplyFeignFallback implements LoanCreditAppealApply
public ResultBean breakProcess(LoanCreditApplyTaskQuery query) {
return null;
}
@Override
public ResultBean<LoanCreditAppealApplyDetailsVo> fetchDetailsByShSidAndState(String shSid, String nodeState) {
return null;
}
}

3
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancreditappealapply/LoanCreditAppealApplyMapper.java
View File

@ -29,6 +29,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.anrui.riskcenter.api.loancreditappealapply.LoanCreditAppealApplyDetailsVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@ -74,4 +75,6 @@ public interface LoanCreditAppealApplyMapper extends BaseMapper<LoanCreditAppeal
LoanCreditAppealApply selectByApplySid(String sid);
int selectByAppSid(String sid);
LoanCreditAppealApplyDetailsVo fetchDetailsByShSidAndState(@Param("shSid") String shSid,@Param("nodeState") String nodeState);
}

16
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancreditappealapply/LoanCreditAppealApplyMapper.xml
View File

@ -61,7 +61,7 @@
</update>
<select id="selectNum" resultType="java.lang.String">
select RIGHT(billNo, 4)
select RIGHT (billNo, 4)
from loan_credit_appeal_apply
where billNo LIKE concat(#{billNo}, '%')
order by billNo desc
@ -69,7 +69,10 @@
</select>
<select id="selectByApplySid" resultType="com.yxt.anrui.riskcenter.api.loancreditappealapply.LoanCreditAppealApply">
select * from loan_credit_appeal_apply where creditApplySid = #{sid} order by id desc limit 1
select *
from loan_credit_appeal_apply
where creditApplySid = #{sid}
order by id desc limit 1
</select>
<select id="selectByAppSid" resultType="int">
@ -78,4 +81,13 @@
WHERE nodeState != '待提交'
and sid = #{sid}
</select>
<select id="fetchDetailsByShSidAndState"
resultType="com.yxt.anrui.riskcenter.api.loancreditappealapply.LoanCreditAppealApplyDetailsVo">
SELECT *
FROM loan_credit_appeal_apply
WHERE creditApplySid = #{shSid}
AND nodeState = #{nodeState}
ORDER BY createTime DESC LIMIT 1
</select>
</mapper>

158
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancreditappealapply/LoanCreditAppealApplyRest.java
View File

@ -39,6 +39,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import com.yxt.anrui.riskcenter.api.loancreditappealapply.LoanCreditAppealApply;
import com.yxt.anrui.riskcenter.api.loancreditappealapply.LoanCreditAppealApplyQuery;
import com.yxt.anrui.riskcenter.api.loancreditappealapply.LoanCreditAppealApplyVo;
@ -64,84 +65,89 @@ import com.yxt.anrui.riskcenter.api.loancreditappealapply.LoanCreditAppealApplyF
@RequestMapping("v1/loancreditappealapply")
public class LoanCreditAppealApplyRest implements LoanCreditAppealApplyFeign {
@Autowired
private LoanCreditAppealApplyService loanCreditAppealApplyService;
@Override
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<LoanCreditAppealApplyVo>> listPage(@RequestBody PagerQuery<LoanCreditAppealApplyQuery> pq){
ResultBean rb = ResultBean.fireFail();
PagerVo<LoanCreditAppealApplyVo> pv = loanCreditAppealApplyService.listPageVo(pq);
return rb.success().setData(pv);
}
@Override
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean save(@RequestBody LoanCreditAppealApplyDto dto){
return loanCreditAppealApplyService.saveOrUpdateDto(dto);
}
@Override
@ApiOperation("根据sid批量删除")
@Autowired
private LoanCreditAppealApplyService loanCreditAppealApplyService;
@Override
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<LoanCreditAppealApplyVo>> listPage(@RequestBody PagerQuery<LoanCreditAppealApplyQuery> pq) {
ResultBean rb = ResultBean.fireFail();
PagerVo<LoanCreditAppealApplyVo> pv = loanCreditAppealApplyService.listPageVo(pq);
return rb.success().setData(pv);
}
@Override
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean save(@RequestBody LoanCreditAppealApplyDto dto) {
return loanCreditAppealApplyService.saveOrUpdateDto(dto);
}
@Override
@ApiOperation("根据sid批量删除")
@DeleteMapping("/delBySids")
public ResultBean delBySids(@RequestBody String[] sids){
return loanCreditAppealApplyService.delAll(sids);
}
public ResultBean delBySids(@RequestBody String[] sids) {
return loanCreditAppealApplyService.delAll(sids);
}
@Override
public ResultBean delBySid(String sid) {
return loanCreditAppealApplyService.delBySid(sid);
}
@Override
public ResultBean delBySid(String sid) {
return loanCreditAppealApplyService.delBySid(sid);
}
@Override
@ApiOperation("根据SID获取一条记录")
@Override
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
public ResultBean<LoanCreditAppealApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
return loanCreditAppealApplyService.fetchDetailsVoBySid(sid);
}
@Override
public ResultBean<LoanCreditAppealApplyDetailsVo> init(String sid) {
return loanCreditAppealApplyService.init(sid);
}
@Override
public ResultBean submitLoanCreditApply(SubmitLoanCreditApplyDto dto) {
return loanCreditAppealApplyService.submitLoanCreditApply(dto);
}
@Override
public ResultBean complete(LoanCreditApplyCompleteDto query) {
BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(query, bv);
bv.setModelId(ProcDefEnum.LOANCREDITAPPEALAPPLY.getProDefId());
return loanCreditAppealApplyService.complete(bv);
}
@Override
public ResultBean<List<LoanCreditApplyNodeVo>> getPreviousNodesForReject(LoanCreditApplyNodeQuery query) {
return loanCreditAppealApplyService.getPreviousNodesForReject(query);
}
@Override
public ResultBean<List<LoanCreditApplyNodeVo>> getNextNodesForSubmit(LoanCreditApplyNodeQuery query) {
return loanCreditAppealApplyService.getNextNodesForSubmit(query);
}
@Override
public ResultBean reject(LoanCreditApplyTaskQuery query) {
return loanCreditAppealApplyService.reject(query);
}
@Override
public ResultBean revokeProcess(LoanCreditApplyTaskQuery query) {
return loanCreditAppealApplyService.revokeProcess(query);
}
@Override
public ResultBean breakProcess(LoanCreditApplyTaskQuery query) {
return loanCreditAppealApplyService.breakProcess(query);
}
public ResultBean<LoanCreditAppealApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid) {
return loanCreditAppealApplyService.fetchDetailsVoBySid(sid);
}
@Override
public ResultBean<LoanCreditAppealApplyDetailsVo> init(String sid) {
return loanCreditAppealApplyService.init(sid);
}
@Override
public ResultBean submitLoanCreditApply(SubmitLoanCreditApplyDto dto) {
return loanCreditAppealApplyService.submitLoanCreditApply(dto);
}
@Override
public ResultBean complete(LoanCreditApplyCompleteDto query) {
BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(query, bv);
bv.setModelId(ProcDefEnum.LOANCREDITAPPEALAPPLY.getProDefId());
return loanCreditAppealApplyService.complete(bv);
}
@Override
public ResultBean<List<LoanCreditApplyNodeVo>> getPreviousNodesForReject(LoanCreditApplyNodeQuery query) {
return loanCreditAppealApplyService.getPreviousNodesForReject(query);
}
@Override
public ResultBean<List<LoanCreditApplyNodeVo>> getNextNodesForSubmit(LoanCreditApplyNodeQuery query) {
return loanCreditAppealApplyService.getNextNodesForSubmit(query);
}
@Override
public ResultBean reject(LoanCreditApplyTaskQuery query) {
return loanCreditAppealApplyService.reject(query);
}
@Override
public ResultBean revokeProcess(LoanCreditApplyTaskQuery query) {
return loanCreditAppealApplyService.revokeProcess(query);
}
@Override
public ResultBean breakProcess(LoanCreditApplyTaskQuery query) {
return loanCreditAppealApplyService.breakProcess(query);
}
@Override
public ResultBean<LoanCreditAppealApplyDetailsVo> fetchDetailsByShSidAndState(String shSid, String nodeState) {
return loanCreditAppealApplyService.fetchDetailsByShSidAndState(shSid, nodeState);
}
}

5
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancreditappealapply/LoanCreditAppealApplyService.java
View File

@ -655,4 +655,9 @@ public class LoanCreditAppealApplyService extends MybatisBaseService<LoanCreditA
}
public ResultBean<LoanCreditAppealApplyDetailsVo> fetchDetailsByShSidAndState(String shSid, String nodeState) {
ResultBean rb = ResultBean.fireFail();
LoanCreditAppealApplyDetailsVo loanCreditAppealApplyDetailsVo = baseMapper.fetchDetailsByShSidAndState(shSid,nodeState);
return rb.success().setData(loanCreditAppealApplyDetailsVo);
}
}

34
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/creditreview/CreditReviewService.java
View File

@ -307,10 +307,34 @@ public class CreditReviewService {
CreditReviewDetailsSsVo creditReviewDetailsSsVo = new CreditReviewDetailsSsVo();
LoanPreloanCreditApplyDetailsVo loanPreloanCreditApplyDetailsVo;
if (query.getAddNew()) {
loanPreloanCreditApplyDetailsVo = loanPreloanCreditApplyFeign.fetchDetailsBySid(query.getSid()).getData();
creditReviewDetailsSsVo.setSid2(query.getSid());
creditReviewDetailsSsVo.setOrgPath(query.getOrgPath());
creditReviewDetailsSsVo.setUserSid(query.getUserSid());
LoanCreditAppealApplyDetailsVo loanCreditAppealApplyDetailsVo = loanCreditAppealApplyFeign.fetchDetailsByShSidAndState(query.getSid(), "待提交").getData();
if (loanCreditAppealApplyDetailsVo != null){
loanPreloanCreditApplyDetailsVo = loanPreloanCreditApplyFeign.fetchDetailsBySid(loanCreditAppealApplyDetailsVo.getCreditApplySid()).getData();
creditReviewDetailsSsVo.setReason(loanCreditAppealApplyDetailsVo.getAppealReason());
List<LoanCreditAppealPeoDetailsVo> loanCreditAppealPeos = loanCreditAppealApplyDetailsVo.getLoanCreditAppealPeos();
List<ShareholderDetailsVo> shareholderDetailsVos = new ArrayList<>();
for (LoanCreditAppealPeoDetailsVo loanCreditAppealPeo : loanCreditAppealPeos) {
ShareholderDetailsVo shareholderDetailsVo = new ShareholderDetailsVo();
shareholderDetailsVo.setShareholderName(loanCreditAppealPeo.getName());
shareholderDetailsVo.setShareholderIdNumber(loanCreditAppealPeo.getIdCard());
shareholderDetailsVo.setShareholderMobile(loanCreditAppealPeo.getPhone());
shareholderDetailsVo.setShareholderRemarks(loanCreditAppealPeo.getRemarks());
shareholderDetailsVos.add(shareholderDetailsVo);
}
creditReviewDetailsSsVo.setGuarantorList(shareholderDetailsVos);
creditReviewDetailsSsVo.setUploadFiles(loanCreditAppealApplyDetailsVo.getSsImages());
creditReviewDetailsSsVo.setOrgPath(loanCreditAppealApplyDetailsVo.getOrgSidPath());
creditReviewDetailsSsVo.setUserSid(loanCreditAppealApplyDetailsVo.getCreateBySid());
creditReviewDetailsSsVo.setSid2(loanCreditAppealApplyDetailsVo.getCreditApplySid());
creditReviewDetailsSsVo.setSid(loanCreditAppealApplyDetailsVo.getSid());
creditReviewDetailsSsVo.setTaskId(loanCreditAppealApplyDetailsVo.getTaskId());
creditReviewDetailsSsVo.setProcInsId(loanCreditAppealApplyDetailsVo.getInstanceId());
}else {
loanPreloanCreditApplyDetailsVo = loanPreloanCreditApplyFeign.fetchDetailsBySid(query.getSid()).getData();
creditReviewDetailsSsVo.setSid2(query.getSid());
creditReviewDetailsSsVo.setOrgPath(query.getOrgPath());
creditReviewDetailsSsVo.setUserSid(query.getUserSid());
}
} else {
LoanCreditAppealApplyDetailsVo loanCreditAppealApplyDetailsVo = loanCreditAppealApplyFeign.fetchDetailsBySid(query.getSid()).getData();
loanPreloanCreditApplyDetailsVo = loanPreloanCreditApplyFeign.fetchDetailsBySid(loanCreditAppealApplyDetailsVo.getCreditApplySid()).getData();
@ -386,7 +410,7 @@ public class CreditReviewService {
public ResultBean<List<IdentityDetailsVo>> selModelByUseOrgSid(CreditReviewDetailsQuery query) {
ResultBean rb = ResultBean.fireFail();
String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData();
List<BaseVehmodelConfigVos> baseVehmodelConfigVos = baseVehmodelConfigFeign.selModelByUseOrgSid(useOrgSid,query.getName()).getData();
List<BaseVehmodelConfigVos> baseVehmodelConfigVos = baseVehmodelConfigFeign.selModelByUseOrgSid(useOrgSid, query.getName()).getData();
List<IdentityDetailsVo> identityDetailsVos = new ArrayList<>();
for (BaseVehmodelConfigVos baseVehmodelConfigVo : baseVehmodelConfigVos) {
IdentityDetailsVo identityDetailsVo = new IdentityDetailsVo();

Write Preview
Loading…
Cancel
Save