新增坐标

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

@@ -85,6 +85,9 @@ public class BusinessReminderCardController  extends JeecgController<BusinessRem
          String businessAddress = request.getParameterMap().get("businessAddress")==null?"":
                  Arrays.toString(request.getParameterMap().get("businessAddress")).replace("[", "").replace("]", "").replace("*", "");
 
+        String upTimeStart = request.getParameterMap().get("upTimeStart")==null?"":Arrays.toString(request.getParameterMap().get("upTimeStart")).replace("[", "").replace("]", "").replace("*", "");
+        String upTimeEnd = request.getParameterMap().get("upTimeEnd")==null?"":Arrays.toString(request.getParameterMap().get("upTimeEnd")).replace("[", "").replace("]", "").replace("*", "");
+
 
         businessReminderCard.setDelFlag( CommonConstant.DEL_FLAG_0);
         String numberResults_MultiString = request.getParameterMap().get("numberResults_MultiString")==null?"":
@@ -111,6 +114,16 @@ public class BusinessReminderCardController  extends JeecgController<BusinessRem
 //            }
 //        }
         //
+        if (StringUtils.isNotBlank(upTimeStart) && StringUtils.isNotBlank(upTimeEnd) ){
+            queryWrapper.between("up_time",upTimeStart,upTimeEnd);
+        }
+        if (StringUtils.isNotBlank(upTimeStart)  && StringUtils.isBlank(upTimeEnd) ){
+            queryWrapper.ge("up_time",upTimeStart);
+        }
+        if ( StringUtils.isNotBlank(upTimeEnd) && StringUtils.isBlank(upTimeStart) ){
+            queryWrapper.le("up_time",upTimeEnd);
+        }
+
         if(StringUtils.isNotBlank(businessAddress)){
             queryWrapper.like("business_address",businessAddress);
         }
@@ -118,10 +131,10 @@ public class BusinessReminderCardController  extends JeecgController<BusinessRem
         if (StringUtils.isNotBlank(createDateStart) && StringUtils.isNotBlank(createDateEnd) ){
             queryWrapper.between("create_time",createDateStart,createDateEnd);
         }
-        if (StringUtils.isNotBlank(createDateStart) || StringUtils.isNotBlank(createDateEnd) ){
+        if (StringUtils.isNotBlank(createDateStart) && StringUtils.isBlank(createDateEnd) ){
             queryWrapper.ge("create_time",createDateStart);
         }
-        if ( StringUtils.isNotBlank(createDateEnd) ){
+        if ( StringUtils.isNotBlank(createDateEnd) && StringUtils.isBlank(createDateStart)){
             queryWrapper.le("create_time",createDateEnd);
         }
         if (StringUtils.isNotBlank(numberResults_MultiString)){
@@ -135,6 +148,8 @@ public class BusinessReminderCardController  extends JeecgController<BusinessRem
             }
             queryWrapper.in("number_results",collect);
         }
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        queryWrapper.likeRight("sys_org_code",sysUser.getOrgCode());
         queryWrapper.orderByDesc("create_time");
         Page<BusinessReminderCard> page = new Page<>(pageNo, pageSize);
         IPage<BusinessReminderCard> pageList = businessReminderCardService.page(page, queryWrapper);
@@ -209,20 +224,32 @@ public class BusinessReminderCardController  extends JeecgController<BusinessRem
                 queryWrapper.eq("sys_business_hall",'无');
             }
         }
+        String upTimeStart = request.getParameterMap().get("upTimeStart")==null?"":Arrays.toString(request.getParameterMap().get("upTimeStart")).replace("[", "").replace("]", "").replace("*", "");
+        String upTimeEnd = request.getParameterMap().get("upTimeEnd")==null?"":Arrays.toString(request.getParameterMap().get("upTimeEnd")).replace("[", "").replace("]", "").replace("*", "");
 
+        if (StringUtils.isNotBlank(upTimeStart) && StringUtils.isNotBlank(upTimeEnd) ){
+            queryWrapper.between("up_time",upTimeStart,upTimeEnd);
+        }
+        if (StringUtils.isNotBlank(upTimeStart)  && StringUtils.isBlank(upTimeEnd) ){
+            queryWrapper.ge("up_time",upTimeStart);
+        }
+        if ( StringUtils.isNotBlank(upTimeEnd) && StringUtils.isBlank(upTimeStart) ){
+            queryWrapper.le("up_time",upTimeEnd);
+        }
         if (StringUtils.isNotBlank(createDateStart) && StringUtils.isNotBlank(createDateEnd) ){
             queryWrapper.between("create_time",createDateStart,createDateEnd);
         }
-        if (StringUtils.isNotBlank(createDateStart) || StringUtils.isNotBlank(createDateEnd) ){
+        if (StringUtils.isNotBlank(createDateStart) && StringUtils.isBlank(createDateEnd) ){
             queryWrapper.ge("create_time",createDateStart);
         }
-        if ( StringUtils.isNotBlank(createDateEnd) ){
+        if ( StringUtils.isNotBlank(createDateEnd) && StringUtils.isBlank(createDateStart) ){
             queryWrapper.le("create_time",createDateEnd);
         }
         if (StringUtils.isNotBlank(numberResults_MultiString)){
             queryWrapper.like("number_results",numberResults_MultiString);
         }
-
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        queryWrapper.likeRight("sys_org_code",sysUser.getOrgCode());
         if (info.equals("up")){
             if (numberResults.size() == 1){
                 queryWrapper.like("number_results",numberResults.get(0));
@@ -431,21 +458,52 @@ public class BusinessReminderCardController  extends JeecgController<BusinessRem
             }
         }
 
-        List<BusinessReminderCard> exportListNew = new ArrayList<>();
+        List<BusinessReminderCardVo> exportListNew = new ArrayList<>();
         for (BusinessReminderCard card : exportList) {
             String[] split = card.getNewPhone().split(",");
             if (split.length>1){
                 for (String s : split) {
-                    BusinessReminderCard businessReminderCard1 = new BusinessReminderCard();
+                    BusinessReminderCardVo businessReminderCard1 = new BusinessReminderCardVo();
                     BeanUtils.copyProperties(card ,businessReminderCard1);
                     businessReminderCard1.setNewPhone(s);
+                    if (StringUtils.isNotBlank(businessReminderCard1.getStatus())){
+                        if (businessReminderCard1.getStatus().equals("0")){
+                            businessReminderCard1.setUpStatus("新建未报");
+                            businessReminderCard1.setCurrent(businessReminderCard1.getBusinessAddress());
+                        }
+                        if (businessReminderCard1.getStatus().equals("1")){
+                            businessReminderCard1.setUpStatus("已报分公司");
+                            businessReminderCard1.setCurrent("已报分公司");
+                        }
+                        if (businessReminderCard1.getStatus().equals("2")){
+                            businessReminderCard1.setUpStatus("上报成功");
+                            businessReminderCard1.setCurrent("已完成");
+                        }
+                    }
+
                     exportListNew.add(businessReminderCard1);
                 }
             }else{
-                exportListNew.add(card);
+                BusinessReminderCardVo businessReminderCard1 = new BusinessReminderCardVo();
+                BeanUtils.copyProperties(card ,businessReminderCard1);
+                if (StringUtils.isNotBlank(businessReminderCard1.getStatus())){
+                    if (businessReminderCard1.getStatus().equals("0")){
+                        businessReminderCard1.setUpStatus("新建未报");
+                        businessReminderCard1.setCurrent(businessReminderCard1.getBusinessAddress());
+                    }
+                    if (businessReminderCard1.getStatus().equals("1")){
+                        businessReminderCard1.setUpStatus("已报分公司");
+                        businessReminderCard1.setCurrent("已报分公司");
+                    }
+                    if (businessReminderCard1.getStatus().equals("2")){
+                        businessReminderCard1.setUpStatus("上报成功");
+                        businessReminderCard1.setCurrent("已完成");
+                    }
+                }
+                exportListNew.add(businessReminderCard1);
             }
         }
-         return getModelAndView(exportListNew,"入网信息业务",BusinessReminderCard.class);
+         return getModelAndView(exportListNew,"入网信息业务",BusinessReminderCardVo.class);
     }
 
 
@@ -917,12 +975,30 @@ public class BusinessReminderCardController  extends JeecgController<BusinessRem
             return Result.error("Id为空");
         }
         UpdateWrapper<BusinessReminderCard> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.in("id", list).set("status", 1).set("up_time",new Date());
+        updateWrapper.in("id", list).set("status", 2).set("up_time",new Date());
         boolean update = businessReminderCardService.update(updateWrapper);
         if (update) {
             return Result.ok("上报成功");
         }
         return Result.error("上报失败");
     }
+    @PostMapping(value = "/escalationCom")
+    public Result<?> escalationCom(@RequestBody  Map<String, List<String>> data) {
+        if (data==null|| data.size()==0){
+            return Result.error("参数为空");
+        }
+        List<String> list = data.get("ids");
+        if (list==null|| list.size()==0){
+            return Result.error("Id为空");
+        }
+        UpdateWrapper<BusinessReminderCard> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.in("id", list).set("status", 1);
+        boolean update = businessReminderCardService.update(updateWrapper);
+        if (update) {
+            return Result.ok("上报成功");
+        }
+        return Result.error("上报失败");
+    }
+
 
-}
+}

tnc-sms/src/main/java/org/jeecg/modules/smscheck/entity/BusinessReminderCard.java

@@ -128,13 +128,12 @@ public class BusinessReminderCard {
     private String sysBusinessHall;
     /** 更新人 */
     @ApiModelProperty(value = "更新人")
-    @Excel(name = "更新人", width = 15)
     private String updateBy;
     @ApiModelProperty(value = "更新人营业厅")
     //@Excel(name = "更新人营业厅", width = 15)
     private String newBusinessAddress;
     @ApiModelProperty(value = "新开手机号码")
-    @Excel(name = "新开手机号码", width = 15)
+    @Excel(name = "新办手机号码", width = 15)
     @Desensitization(type = DesensitizationTypeEnum.NEW_PHONE)
     private String newPhone;
 
@@ -175,7 +174,7 @@ public class BusinessReminderCard {
 
     /** 营业厅地址 */
     @ApiModelProperty(value = "创建人营业厅地址")
-    @Excel(name = "创建人营业厅地址", width = 15)
+    @Excel(name = "创建人归属部门", width = 15)
     private String businessAddress;
 
     // 研判结果 个数
@@ -214,6 +213,9 @@ public class BusinessReminderCard {
 
     private String userId;
     private String age;
-
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "上报时间")
+    @Excel(name = "上报时间", width = 15)
     private Date upTime;
 }

tnc-sms/src/main/java/org/jeecg/modules/smscheck/entity/BusinessReminderCardVo.java

@@ -124,13 +124,11 @@ public class BusinessReminderCardVo {
     private String sysBusinessHall;
     /** 更新人 */
     @ApiModelProperty(value = "更新人")
-    @Excel(name = "更新人", width = 15)
     private String updateBy;
     @ApiModelProperty(value = "更新人营业厅")
-    @Excel(name = "更新人营业厅", width = 15)
     private String newBusinessAddress;
     @ApiModelProperty(value = "新开手机号码")
-    @Excel(name = "新开手机号码", width = 15)
+    @Excel(name = "新办手机号码", width = 15)
     private String newPhone;
 
     @ApiModelProperty(value = "判研结果")
@@ -170,7 +168,7 @@ public class BusinessReminderCardVo {
 
     /** 营业厅地址 */
     @ApiModelProperty(value = "创建人营业厅地址")
-    @Excel(name = "创建人营业厅地址", width = 15)
+    @Excel(name = "创建人归属部门", width = 15)
     private String businessAddress;
 
     // 研判结果 个数
@@ -208,4 +206,15 @@ public class BusinessReminderCardVo {
     private String status;
 
     private String userId;
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "上报时间")
+    @Excel(name = "上报时间", width = 15)
+    private Date upTime;
+    @Excel(name = "当前处理部门", width = 15)
+    private String current;
+    @Excel(name = "上报状态", width = 15)
+    private String upStatus;
+
+
 }