fan zha 0802

tnc-sms/src/main/java/org/jeecg/modules/smscheck/controller/BusinessReminderCardController.java

@@ -19,10 +19,13 @@ import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.modules.smscheck.entity.*;
 import org.jeecg.modules.smscheck.service.BusinessReminderCardService;
 import org.jeecg.modules.smscheck.service.PhonePurposeService;
+import org.jeecg.modules.smscheck.service.SysBusinessHallService;
+import org.jeecg.modules.smscheck.service.SysCompanyService;
 import org.jeecg.modules.smscheck.util.HttpClientUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.util.*;
 import java.util.regex.Matcher;
@@ -43,25 +46,63 @@ public class BusinessReminderCardController {
     private PhonePurposeService phonePurposeService;
 
     private static final String PHONE_PLACE_API_URL="https://cx.shouji.360.cn/phonearea.php";
-
-
+    @Resource
+    private SysCompanyService sysCompanyService;
+    @Resource
+    private SysBusinessHallService sysBusinessHallService;
     @ApiOperation(value = "入网信息业务-分页列表查询", notes = "入网信息业务-分页列表查询")
     @GetMapping(value = "/list")
     public Result<IPage<BusinessReminderCard>> queryPageList(BusinessReminderCard businessReminderCard,
                                                              @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                              @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                              HttpServletRequest request) {
+
+        String sysBusinessHall = request.getParameterMap().get("sysBusinessHall")==null?"":
+                Arrays.toString(request.getParameterMap().get("sysBusinessHall")).replace("[", "").replace("]", "").replace("*", "");
+
+
+
         businessReminderCard.setDelFlag( CommonConstant.DEL_FLAG_0);
         String numberResults_MultiString = request.getParameterMap().get("numberResults_MultiString")==null?"":
                 Arrays.toString(request.getParameterMap().get("numberResults_MultiString")).replace("[", "").replace("]", "").replace("*", "");
+        String numberResults = request.getParameterMap().get("numberResults")==null?"":
+                Arrays.toString(request.getParameterMap().get("numberResults")).replace("[", "").replace("]", "").replace("*", "");
+        businessReminderCard.setNumberResults(null);
+        businessReminderCard.setSysBusinessHall(null);
+        String createDateStart = request.getParameterMap().get("createDateStart")==null?"":
+                Arrays.toString(request.getParameterMap().get("createDateStart")).replace("[", "").replace("]", "").replace("*", "");
+        String createDateEnd = request.getParameterMap().get("createDateEnd")==null?"":
+                Arrays.toString(request.getParameterMap().get("createDateEnd")).replace("[", "").replace("]", "").replace("*", "");
+
+
+        QueryWrapper<BusinessReminderCard> queryWrapper = QueryGenerator.initQueryWrapper(businessReminderCard, null);
+        queryWrapper.eq("del_flag",CommonConstant.DEL_FLAG_0);
+
+        if (StringUtils.isNotBlank(sysBusinessHall)){
+            List<String> list = resultData(sysBusinessHall);
+            if (list.size()>0){
+                queryWrapper.in("sys_business_hall",list);
+            }else {
+                queryWrapper.eq("sys_business_hall",'无');
+            }
+        }
 
-        request.getParameterMap().get("numberResults_MultiString");
-        LambdaQueryWrapper<BusinessReminderCard> queryWrapperData = new LambdaQueryWrapper<>();
-        QueryWrapper<BusinessReminderCard> queryWrapper = QueryGenerator.initQueryWrapper(businessReminderCard, request.getParameterMap());
-
+        if (StringUtils.isNotBlank(createDateStart) && StringUtils.isNotBlank(createDateEnd) ){
+            queryWrapper.between("create_time",createDateStart,createDateEnd);
+        }
+        if (StringUtils.isNotBlank(createDateStart) || StringUtils.isNotBlank(createDateEnd) ){
+            queryWrapper.ge("create_time",createDateStart);
+        }
+        if ( StringUtils.isNotBlank(createDateEnd) ){
+            queryWrapper.le("create_time",createDateEnd);
+        }
         if (StringUtils.isNotBlank(numberResults_MultiString)){
-            queryWrapper.or().like("number_results",numberResults_MultiString);
+            queryWrapper.like("number_results",numberResults_MultiString);
         }
+        if (StringUtils.isNotBlank(numberResults)){
+            queryWrapper.like("number_results",numberResults);
+        }
+        queryWrapper.orderByDesc("create_time");
         Page<BusinessReminderCard> page = new Page<>(pageNo, pageSize);
         IPage<BusinessReminderCard> pageList = businessReminderCardService.page(page, queryWrapper);
         return Result.OK(pageList);
@@ -81,6 +122,22 @@ public class BusinessReminderCardController {
     }
 
 
+    private List<String> resultData(String name){
+        //营业厅查询处理
+        List<String>ids =new ArrayList<>();
+        List<SysCompany> sysCompanyList =sysCompanyService.list();
+        List<SysBusinessHallAndSysCompany> dataSysBusinessHall = sysBusinessHallService.getDataSysBusinessHall(sysCompanyList);
+        for (SysBusinessHallAndSysCompany sysBusinessHallAndSysCompany : dataSysBusinessHall) {
+            List<SysBusinessHall> sysBusinessHallList = sysBusinessHallAndSysCompany.getSysBusinessHallList();
+            for (SysBusinessHall businessHall : sysBusinessHallList) {
+                if (businessHall.getName().contains(name)){
+                    ids.add(businessHall.getId());
+                }
+            }
+        }
+        return ids;
+    }
+
     /**
      * 通过id查询 入网信息统计数
      *
@@ -252,20 +309,18 @@ public class BusinessReminderCardController {
         }
         List<BusinessReminderCard> businessReminderCard = businessReminderCardService.list(queryWrapperData);
         List<BusinessReminderCard> businessReminderCards =new ArrayList<>();
-        if (id==null){
-            int i = 0;
-            for (BusinessReminderCard reminderCard : businessReminderCard) {
-                if (ObjectUtil.isNotNull(reminderCard.getNumberResults())){
-                    if (!reminderCard.getNumberResults().contains("1")){
-                        i++;
-                        if (i>=2){
-//                businessReminderCard.stream().forEach(u->u.setIsSizeNumberResults("is"));
-//                reminderCard.setIsSizeNumberResults("is");
-                            reminderCard.setIsSizeNumberResults("is");
-                            businessReminderCards.add(reminderCard);
-                        }
-                    }
-                }
+
+        for (BusinessReminderCard u : businessReminderCard) {
+            if (!u.getNumberResults().contains("1")) {
+                businessReminderCards.add(u);
+            }
+        }
+
+
+
+        if (StringUtils.isBlank(id)){
+            if (businessReminderCards.size()>=2){
+                businessReminderCards.stream().forEach(u->u.setIsSizeNumberResults("is"));
             }
             return Result.OK(businessReminderCards);
         }else {