Merge remote-tracking branch 'origin/master'

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<PageUtils>().SUCCESS(data);
     }

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<AlRepaymentEntry> {
 
-    IPage<AlRepaymentEntry> pageByCondition(Page page, String customerNumberOrName, Integer status);
+    IPage<AlRepaymentEntry> pageByCondition(Page page, String customerNumberOrName, Integer status,Integer insuranceId);
 
     List<AlRepaymentRes> selectListByIds(List<String> ids);
 

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> {
 
     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);
 

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/AlRepaymentEntryServiceImpl.java

@@ -64,7 +64,7 @@ public class AlRepaymentEntryServiceImpl extends ServiceImpl<AlRepaymentEntryMap
     }
 
     @Override
-    public PageUtils queryPage(Integer page, Integer size, String customerNumberOrName, Integer status) {
+    public PageUtils queryPage(Integer page, Integer size, String customerNumberOrName, Integer status, Integer insuranceId) {
         //分页参数
         if (page <= 0) {
             page = 1;
@@ -72,7 +72,7 @@ public class AlRepaymentEntryServiceImpl extends ServiceImpl<AlRepaymentEntryMap
         if (size <= 0) {
             size = 10;
         }
-        IPage<AlRepaymentEntry> positionVO = this.getBaseMapper().pageByCondition(new Page(page, size),customerNumberOrName,status);
+        IPage<AlRepaymentEntry> positionVO = this.getBaseMapper().pageByCondition(new Page(page, size),customerNumberOrName,status,insuranceId);
 
         return new PageUtils(positionVO);
     }

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgMessageInvestigationServiceImpl.java

@@ -292,6 +292,12 @@ public class DgMessageInvestigationServiceImpl extends ServiceImpl<DgMessageInve
 
         //如果是信息部经理驳回情况
         if(messageInvestigation.getOperatingStatus().equals(StatusCode.CZ_ON_HAND) && messageInvestigation.getStatus().equals(StatusCode.SP_REJECT)){
+            //修改所有审批状态为审核中
+            DgMessageInvestigation investigation1 = new DgMessageInvestigation();
+            investigation1.setStatus(StatusCode.SP_IN_REVIEW);//审核中
+            this.baseMapper.update(investigation1,new QueryWrapper<DgMessageInvestigation>()
+                    .eq("business_id",messageInvestigation.getBusinessId()));
+
             //修改信息部调查员的审批状态为审核中，操作状态为已处理
             DgMessageInvestigation investigation = new DgMessageInvestigation();
             investigation.setOperatingStatus(StatusCode.CZ_PROCESSED);//已处理
@@ -349,7 +355,7 @@ public class DgMessageInvestigationServiceImpl extends ServiceImpl<DgMessageInve
                 null,
                 Wrappers.<DgMessageInvestigation>lambdaUpdate()
                         .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<DgMessageInve
             Integer count = this.baseMapper.selectCount(new QueryWrapper<DgMessageInvestigation>()
                     .eq("business_id", messageInvestigation2.getBusinessId()).eq("type", 3));
 
+            DgMessageInvestigation assign = new DgMessageInvestigation();
+            assign.setStatus(StatusCode.SP_IN_REVIEW);//审批状态为审核中
+            //修改该业务下所有审批状态为审核中
+            this.baseMapper.update(assign,new QueryWrapper<DgMessageInvestigation>()
+                    .eq("business_id",messageInvestigation.getBusinessId()));
+
             if(count>0){//资产领导有数据，则直接修改领导状态
                 DgMessageInvestigation assignUser = new DgMessageInvestigation();
                 assignUser.setStatus(StatusCode.SP_IN_REVIEW);//审批状态为审核中

dq-financial-guarantee/src/main/resources/mapper/guarantee/AlRepaymentEntryMapper.xml

@@ -29,6 +29,9 @@
             <if test="customerNumberOrName != null and customerNumberOrName != '' ">
                 AND repayment_date = #{customerNumberOrName}
             </if>
+            <if test="insuranceId != null">
+                AND insurance_id = #{insuranceId}
+            </if>
         </where>
         order by create_time desc
     </select>