From 0e9681356c588bb53159da20f870163d7cee37b5 Mon Sep 17 00:00:00 2001 From: shijie <648688341@qq.com> Date: Tue, 23 Mar 2021 09:54:59 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=98=E6=AC=BE=E8=AE=B0=E5=BD=95=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E4=BF=AE=E6=94=B9=EF=BC=8C=E4=BB=A5=E5=8F=8A=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E9=83=A8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AlRepaymentEntryController.java | 4 ++-- .../guarantee/mapper/AlRepaymentEntryMapper.java | 2 +- .../service/IAlRepaymentEntryService.java | 3 ++- .../service/impl/AlRepaymentEntryServiceImpl.java | 4 ++-- .../impl/DgMessageInvestigationServiceImpl.java | 14 +++++++++++++- .../mapper/guarantee/AlRepaymentEntryMapper.xml | 3 +++ 6 files changed, 23 insertions(+), 7 deletions(-) diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/AlRepaymentEntryController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/AlRepaymentEntryController.java index e0cb1387..de950bb4 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/AlRepaymentEntryController.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/AlRepaymentEntryController.java @@ -70,10 +70,10 @@ public class AlRepaymentEntryController { @Log(detail = "还款记录列表",level = 3,operationUnit = OperationUnit.INSURANCE,operationType = OperationType.SELECT) @GetMapping("/repaymentList") @ApiOperation(value = "还款记录列表") - public ResponseResult repaymentList(@RequestParam(value="page",required=false) Integer page, @RequestParam(value="size",required=false) Integer size, + public ResponseResult repaymentList(@RequestParam(value="page",required=false) Integer page, @RequestParam(value="size",required=false) Integer size,@RequestParam(value = "insuranceId") Integer insuranceId, @RequestParam(value = "CustomerNumberOrName", required = false) String CustomerNumberOrName, @RequestParam(value="status",required=false) Integer status){ - PageUtils data = alRepaymentEntryService.queryPage(page, size, CustomerNumberOrName,status); + PageUtils data = alRepaymentEntryService.queryPage(page, size, CustomerNumberOrName,status,insuranceId); return new ResponseResult().SUCCESS(data); } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/AlRepaymentEntryMapper.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/AlRepaymentEntryMapper.java index 34fd29a8..62040a60 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/AlRepaymentEntryMapper.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/AlRepaymentEntryMapper.java @@ -22,7 +22,7 @@ import java.util.List; @Mapper public interface AlRepaymentEntryMapper extends BaseMapper { - IPage pageByCondition(Page page, String customerNumberOrName, Integer status); + IPage pageByCondition(Page page, String customerNumberOrName, Integer status,Integer insuranceId); List selectListByIds(List ids); diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IAlRepaymentEntryService.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IAlRepaymentEntryService.java index 43f81dfd..a5811a31 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IAlRepaymentEntryService.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IAlRepaymentEntryService.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.daqing.financial.guarantee.model.request.AlRepaymentEntryReq; import com.daqing.framework.domain.guarantee.AlRepaymentEntry; import com.daqing.framework.utils.PageUtils; +import io.swagger.models.auth.In; import javax.servlet.http.HttpServletResponse; import java.util.List; @@ -24,7 +25,7 @@ public interface IAlRepaymentEntryService extends IService { AlRepaymentEntry repaymentDetail(Integer id); - PageUtils queryPage(Integer page, Integer size, String customerNumberOrName, Integer status); + PageUtils queryPage(Integer page, Integer size, String customerNumberOrName, Integer status, Integer insuranceId); int updateRepayment(AlRepaymentEntryReq alRepaymentEntryReq); diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/AlRepaymentEntryServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/AlRepaymentEntryServiceImpl.java index b34e9222..5fb3a869 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/AlRepaymentEntryServiceImpl.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/AlRepaymentEntryServiceImpl.java @@ -64,7 +64,7 @@ public class AlRepaymentEntryServiceImpl extends ServiceImpl positionVO = this.getBaseMapper().pageByCondition(new Page(page, size),customerNumberOrName,status); + IPage positionVO = this.getBaseMapper().pageByCondition(new Page(page, size),customerNumberOrName,status,insuranceId); return new PageUtils(positionVO); } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgMessageInvestigationServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgMessageInvestigationServiceImpl.java index e24f0f74..14f5e6d6 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgMessageInvestigationServiceImpl.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgMessageInvestigationServiceImpl.java @@ -292,6 +292,12 @@ public class DgMessageInvestigationServiceImpl extends ServiceImpl() + .eq("business_id",messageInvestigation.getBusinessId())); + //修改信息部调查员的审批状态为审核中，操作状态为已处理 DgMessageInvestigation investigation = new DgMessageInvestigation(); investigation.setOperatingStatus(StatusCode.CZ_PROCESSED);//已处理 @@ -349,7 +355,7 @@ public class DgMessageInvestigationServiceImpl extends ServiceImpllambdaUpdate() .set(DgMessageInvestigation::getEmpId, Integer.parseInt(dgApplyAmountInfoController.getUserId())) - .set(DgMessageInvestigation::getStatus, approvalMessageRequest.getStatus()) + .set(DgMessageInvestigation::getStatus, dgMessageInvestigation.getStatus())//approvalMessageRequest.getStatus() .set(DgMessageInvestigation::getOperatingStatus, StatusCode.CZ_PROCESSED) .set(DgMessageInvestigation::getRemark, approvalMessageRequest.getRemark()) .eq(DgMessageInvestigation::getId, approvalMessageRequest.getId()) @@ -408,6 +414,12 @@ public class DgMessageInvestigationServiceImpl extends ServiceImpl() .eq("business_id", messageInvestigation2.getBusinessId()).eq("type", 3)); + DgMessageInvestigation assign = new DgMessageInvestigation(); + assign.setStatus(StatusCode.SP_IN_REVIEW);//审批状态为审核中 + //修改该业务下所有审批状态为审核中 + this.baseMapper.update(assign,new QueryWrapper() + .eq("business_id",messageInvestigation.getBusinessId())); + if(count>0){//资产领导有数据，则直接修改领导状态 DgMessageInvestigation assignUser = new DgMessageInvestigation(); assignUser.setStatus(StatusCode.SP_IN_REVIEW);//审批状态为审核中 diff --git a/dq-financial-guarantee/src/main/resources/mapper/guarantee/AlRepaymentEntryMapper.xml b/dq-financial-guarantee/src/main/resources/mapper/guarantee/AlRepaymentEntryMapper.xml index cf87e53e..fc47c941 100644 --- a/dq-financial-guarantee/src/main/resources/mapper/guarantee/AlRepaymentEntryMapper.xml +++ b/dq-financial-guarantee/src/main/resources/mapper/guarantee/AlRepaymentEntryMapper.xml @@ -29,6 +29,9 @@ AND repayment_date = #{customerNumberOrName} + + AND insurance_id = #{insuranceId} + order by create_time desc