客户资源管理根据日期查询修改，添加状态查询，修改语句添加为空修改

dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerServiceImpl.java

@@ -82,6 +82,8 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerDao, CustomerEntity
             size = 10;
         }
         Page<Object> pages = new Page<>(page, size);
+        if(customerRequest.getEndTime()!=null && customerRequest.getEndTime()!="")
+            customerRequest.setEndTime(customerRequest.getEndTime()+" 23:59:59");
         // 查询所有客户的基本信息
         IPage<CustomerEntityResponse> customerEntityIPage = customerDao.queryList(pages, customerRequest);
         // 获取所有的客户基本信息

dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerWorkbenchServiceImpl.java

@@ -59,6 +59,10 @@ public class CustomerWorkbenchServiceImpl extends ServiceImpl<CustomerWorkbenchD
         this.timeCheckout(cwr.getCreateTime(), cwr.getStartTime(), cwr.getEndTime(), cwr);
         //IPage<CustomerEntity> customerEntityIPage = this.getBaseMapper().queryList(new Page(page, size), cwr);
         //List<CustomerEntity> customers = customerEntityIPage.getRecords();
+
+        if(cwr.getEndTime()!=null)
+            cwr.setEndTime(cwr.getEndTime()+" 23:59:59");
+
         IPage<CustomerEntityResponse> customerEntityIPage = this.getBaseMapper().queryList(new Page(page, size), cwr);
         List<CustomerEntityResponse> customers = customerEntityIPage.getRecords();
         // 获取所有的客户经理id

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgApplyAmountInfoController.java

@@ -215,7 +215,7 @@ public class DgApplyAmountInfoController implements DgApplyAmountInfoControllerA
     @GetMapping("/businessApplicationList")
     @ApiOperation(value = "业务申请列表")
     public ResponseResult businessApplicationList(@RequestParam(value="page",required=false) Integer page,@RequestParam(value="size",required=false) Integer size,
-            @RequestParam(value = "CustomerNumberOrName", required = false) String CustomerNumberOrName){
+            @RequestParam(value = "CustomerNumberOrName", required = false) String CustomerNumberOrName,@RequestParam(value = "status", required = false) Integer status){
         //获取当前登录用户id
         String userId = getUserId();
 
@@ -225,7 +225,7 @@ public class DgApplyAmountInfoController implements DgApplyAmountInfoControllerA
         if(roleIds != null) {
             String[] ids = roleIds.split(",");
             List<String> roleIdlist = Arrays.asList(ids);
-            data = applyAmountListService.queryPage(page, size, CustomerNumberOrName, roleIdlist, userId);
+            data = applyAmountListService.queryPage(page, size, CustomerNumberOrName, roleIdlist, userId, status);
 
         }
 

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgLoanCommitteeConsiderController.java

@@ -40,8 +40,8 @@ public class DgLoanCommitteeConsiderController {
     @GetMapping("/list")
     @ApiOperation(value = "列表", notes = "列表", response = DgLoanCommitteeConsiderResponse.class)
     public ResponseResult list(@RequestParam("page") Integer page,
-                               @RequestParam("size") Integer size, String codeOrName) {
+                               @RequestParam("size") Integer size, String codeOrName,@RequestParam(value = "status", required = false) Integer status) {
-        return ResponseResult.SUCCESS(dgLoanCommitteeConsiderService.list(page, size, codeOrName));
+        return ResponseResult.SUCCESS(dgLoanCommitteeConsiderService.list(page, size, codeOrName,status));
     }
 
     /**

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgWorkConferenceConsiderController.java

@@ -38,8 +38,8 @@ public class DgWorkConferenceConsiderController {
     @GetMapping("/list")
     @ApiOperation(value = "列表", notes = "列表")
     public ResponseResult list(@RequestParam("page") Integer page,
-                               @RequestParam("size") Integer size, String codeOrName) {
+                               @RequestParam("size") Integer size, String codeOrName,@RequestParam(value = "status", required = false) Integer status) {
-        return ResponseResult.SUCCESS(dgWorkConferenceConsiderService.list(page, size, codeOrName));
+        return ResponseResult.SUCCESS(dgWorkConferenceConsiderService.list(page, size, codeOrName,status));
     }
 
     /**

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgApplyAmountListMapper.java

@@ -22,7 +22,7 @@ import java.util.List;
 @Mapper
 public interface DgApplyAmountListMapper extends BaseMapper<DgApplyAmountList> {
 
-    IPage<BusinessApplicationListResponse> pageByCondition(Page page, String customerNumberOrName, List<String> roleIdlist, String userId);
+    IPage<BusinessApplicationListResponse> pageByCondition(Page page, String customerNumberOrName, List<String> roleIdlist, String userId, Integer status);
 
     List<DgNoticeListResponse> selectApplyList(@Param("userId") String userId, @Param("roleIdlist") List<String> roleIdlist);
 }

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgLoanCommitteeConsiderMapper.java

@@ -28,7 +28,7 @@ import java.util.List;
 public interface DgLoanCommitteeConsiderMapper extends BaseMapper<DgLoanCommitteeConsider> {
 
     IPage<DgLoanCommitteeConsiderResponse> list(Page page, @Param("codeOrName") String codeOrName, @Param("roleIds") List<Integer> roleIds,
-                                                @Param("userId") Integer userId);
+                                                @Param("userId") Integer userId,@Param("status") Integer status);
 
     List<DgLoanCommitteeConsiderResponse> excelList(@Param("ids") List<Integer> ids);
 

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgWorkConferenceConsiderMapper.java

@@ -25,7 +25,7 @@ import java.util.List;
 public interface DgWorkConferenceConsiderMapper extends BaseMapper<DgWorkConferenceConsider> {
 
     IPage<DgWorkConferencePO> list(Page page, @Param("codeOrName") String codeOrName, @Param("roleIds") List<Integer> roleIds,
-                                   @Param("userId") Integer userId);
+                                   @Param("userId") Integer userId, @Param("status") Integer status);
 
     List<DgWorkConferencePO> excelList(@Param("ids") List<Integer> ids);
 

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

@@ -17,5 +17,5 @@ import java.util.List;
  */
 public interface IDgApplyAmountListService extends IService<DgApplyAmountList> {
 
-    PageUtils queryPage(Integer page, Integer size, String customerNumberOrName, List<String> roleIdlist, String userId);
+    PageUtils queryPage(Integer page, Integer size, String customerNumberOrName, List<String> roleIdlist, String userId, Integer status);
 }

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

@@ -19,7 +19,7 @@ import java.util.List;
  */
 public interface IDgLoanCommitteeConsiderService extends IService<DgLoanCommitteeConsider> {
 
-    PageUtils list(Integer page, Integer size, String codeOrName);
+    PageUtils list(Integer page, Integer size, String codeOrName, Integer status);
 
     Boolean check(DgLoanCommitteeConsiderRequest dgLoanCommitteeConsiderRequest);
 

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

@@ -19,7 +19,7 @@ import java.util.List;
  */
 public interface IDgWorkConferenceConsiderService extends IService<DgWorkConferenceConsider> {
 
-    PageUtils list(Integer page, Integer size, String codeOrName);
+    PageUtils list(Integer page, Integer size, String codeOrName,Integer status);
 
     Boolean check(Integer id, String opinion, Integer status, List<String> empNames);
 

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

@@ -24,7 +24,7 @@ import java.util.List;
 public class DgApplyAmountListServiceImpl extends ServiceImpl<DgApplyAmountListMapper, DgApplyAmountList> implements IDgApplyAmountListService {
 
     @Override
-    public PageUtils queryPage(Integer page, Integer size, String customerNumberOrName, List<String> roleIdlist, String userId) {
+    public PageUtils queryPage(Integer page, Integer size, String customerNumberOrName, List<String> roleIdlist, String userId, Integer status) {
         //分页参数
         if (page <= 0) {
             page = 1;
@@ -32,7 +32,7 @@ public class DgApplyAmountListServiceImpl extends ServiceImpl<DgApplyAmountListM
         if (size <= 0) {
             size = 10;
         }
-        IPage<BusinessApplicationListResponse> positionVO = this.getBaseMapper().pageByCondition(new Page(page, size),customerNumberOrName,roleIdlist,userId);
+        IPage<BusinessApplicationListResponse> positionVO = this.getBaseMapper().pageByCondition(new Page(page, size),customerNumberOrName,roleIdlist,userId,status);
 
         return new PageUtils(positionVO);
     }

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

@@ -298,7 +298,7 @@ public class DgEfficiencyServiceImpl extends ServiceImpl<DgEfficiencyMapper, DgA
         //担保业务员角色、担保经理角色
         if (roleIdList.contains(String.valueOf(PromptSuccess.DB_YWY_ID)) | roleIdList.contains(String.valueOf(PromptSuccess.DB_JL_ID))) {
             //业务申请列表查询
-            IPage<BusinessApplicationListResponse> positionVO = applyAmountListMapper.pageByCondition(new Page(1, size), "", roleIdList, this.getUserId());
+            IPage<BusinessApplicationListResponse> positionVO = applyAmountListMapper.pageByCondition(new Page(1, size), "", roleIdList, this.getUserId(),null);
             List<BusinessApplicationListResponse> records = positionVO.getRecords();
             if (records != null && records.size() != 0) {
                 records.forEach(businessApplicationListResponse -> {
@@ -408,7 +408,7 @@ public class DgEfficiencyServiceImpl extends ServiceImpl<DgEfficiencyMapper, DgA
         }
         //工作会
         if (roleIdList.contains(String.valueOf(PromptSuccess.GZU_ID))) {
-            IPage<DgWorkConferencePO> list = workConferenceConsiderMapper.list(new Page(1, size), "", roleList, currentUser);
+            IPage<DgWorkConferencePO> list = workConferenceConsiderMapper.list(new Page(1, size), "", roleList, currentUser,null);
             List<DgWorkConferencePO> records = list.getRecords();
             if (records != null && records.size() != 0) {
                 records.forEach(dgWorkConferencePO -> {
@@ -429,7 +429,7 @@ public class DgEfficiencyServiceImpl extends ServiceImpl<DgEfficiencyMapper, DgA
         }
         //担保部A/B角、贷审会
         if (roleIdList.contains(String.valueOf(PromptSuccess.DB_A_ID)) | roleIdList.contains(String.valueOf(PromptSuccess.DB_B_ID)) | roleIdList.contains(String.valueOf(PromptSuccess.DSH_ID))) {
-            IPage<DgLoanCommitteeConsiderResponse> list = loanCommitteeConsiderMapper.list(new Page(1, size), "", roleList, currentUser);
+            IPage<DgLoanCommitteeConsiderResponse> list = loanCommitteeConsiderMapper.list(new Page(1, size), "", roleList, currentUser,null);
             List<DgLoanCommitteeConsiderResponse> records = list.getRecords();
             if (records != null && records.size() != 0) {
                 records.forEach(dgLoanCommitteeConsiderResponse -> {

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

@@ -297,12 +297,22 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl<DgGuaranteeAss
                     .eq("role_id", PromptSuccess.DSH_ID).eq("status", 4));
             if(count>0 || count1>0){//说明数据是C角或者贷审会驳回回来的
                 //AB角调查，修改审核意见以及状态
-                DgGuaranteeAssignUser dgGuaranteeAssignUser2 = new DgGuaranteeAssignUser();
+/*                DgGuaranteeAssignUser dgGuaranteeAssignUser2 = new DgGuaranteeAssignUser();
                 dgGuaranteeAssignUser2.setId(investigateGuaranteeRequest.getId());//主键id
                 dgGuaranteeAssignUser2.setStatus(investigateGuaranteeRequest.getStatus());//状态为驳回(只有A,B角同时同意，状态才改为审核中)
                 dgGuaranteeAssignUser2.setOperatingStatus(StatusCode.CZ_PROCESSED);//操作状态设置为已处理
                 dgGuaranteeAssignUser2.setApplyContent(investigateGuaranteeRequest.getApplyContent());//审核意见
-                this.baseMapper.updateById(dgGuaranteeAssignUser2);
+                this.baseMapper.updateById(dgGuaranteeAssignUser2);*/
+
+                //插入或更新的字段有 空字符串 或者 null
+                this.baseMapper.update(
+                        null,
+                        Wrappers.<DgGuaranteeAssignUser>lambdaUpdate()
+                                .set(DgGuaranteeAssignUser::getApplyContent, investigateGuaranteeRequest.getApplyContent())
+                                .set(DgGuaranteeAssignUser::getOperatingStatus, StatusCode.CZ_PROCESSED)
+                                .set(DgGuaranteeAssignUser::getStatus, investigateGuaranteeRequest.getStatus())
+                                .eq(DgGuaranteeAssignUser::getId, investigateGuaranteeRequest.getId())
+                );
 
                 int i = this.baseMapper.selectCount(new QueryWrapper<DgGuaranteeAssignUser>().eq("business_id", guaranteeAssignUser.getBusinessId())
                         .eq("type", 1).eq("status", StatusCode.SP_IN_REVIEW).eq("operating_status", StatusCode.CZ_PROCESSED));

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

@@ -73,7 +73,7 @@ public class DgLoanCommitteeConsiderServiceImpl extends ServiceImpl<DgLoanCommit
      * 列表
      */
     @Override
-    public PageUtils list(Integer page, Integer size, String codeOrName) {
+    public PageUtils list(Integer page, Integer size, String codeOrName, Integer status) {
         if (page == null || size == null || page < 1 || size < 1) {
             page = 1;
             size = 10;
@@ -92,7 +92,7 @@ public class DgLoanCommitteeConsiderServiceImpl extends ServiceImpl<DgLoanCommit
             roleList.add(Integer.parseInt(roleId));
         }
         IPage<DgLoanCommitteeConsiderResponse> list = this.getBaseMapper().list(new Page(page, size),
-                codeOrName, roleList, Integer.parseInt(userId));
+                codeOrName, roleList, Integer.parseInt(userId),status);
         return new PageUtils(list);
     }
 

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

@@ -79,7 +79,7 @@ public class DgWorkConferenceConsiderServiceImpl extends ServiceImpl<DgWorkConfe
      * 列表
      */
     @Override
-    public PageUtils list(Integer page, Integer size, String codeOrName) {
+    public PageUtils list(Integer page, Integer size, String codeOrName,Integer status) {
         if (page == null || size == null || page < 1 || size < 1) {
             page = 1;
             size = 10;
@@ -97,7 +97,7 @@ public class DgWorkConferenceConsiderServiceImpl extends ServiceImpl<DgWorkConfe
         for (String roleId : roleIds) {
             roleList.add(Integer.parseInt(roleId));
         }
-        IPage<DgWorkConferencePO> list = this.getBaseMapper().list(new Page(page, size), codeOrName, roleList, Integer.parseInt(userId));
+        IPage<DgWorkConferencePO> list = this.getBaseMapper().list(new Page(page, size), codeOrName, roleList, Integer.parseInt(userId),status);
         List<DgWorkConferencePO> dgWorkConferencePOS = list.getRecords();
         List<DgWorkConferenceResponse> listResponse = new ArrayList<>();
         if (dgWorkConferencePOS != null && dgWorkConferencePOS.size() != 0) {

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

@@ -36,6 +36,9 @@
             <if test="userId != null and userId != ''">
                 AND (au.emp_id =#{userId} or au.emp_id is null or au.emp_id ='')
             </if>
+            <if test="status != null">
+                AND au.status = #{status}
+            </if>
         </where>
         order by au.create_time desc
     </select>

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

@@ -42,6 +42,9 @@
         <if test="codeOrName != null and codeOrName != ''">
             AND (a.business_code LIKE CONCAT('%',#{codeOrName},'%') OR c.name LIKE CONCAT('%',#{codeOrName},'%'))
         </if>
+        <if test="status != null">
+            AND l.status = #{status}
+        </if>
         ORDER BY a.create_time DESC
     </select>
 

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

@@ -51,6 +51,9 @@
         <if test="codeOrName != null and codeOrName != ''">
             AND (a.business_code LIKE CONCAT('%',#{codeOrName},'%') OR c.name LIKE CONCAT('%',#{codeOrName},'%'))
         </if>
+        <if test="status != null">
+            AND w.audit_status = #{status}
+        </if>
         ORDER BY a.create_time DESC
     </select>