fan zha 0802

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

@@ -73,9 +73,12 @@ public class BusinessReminderCardController  extends JeecgController<BusinessRem
                                                              @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("*", "");
-
+//        //判研营业厅
+//        String sysBusinessHall = request.getParameterMap().get("sysBusinessHall")==null?"":
+//                Arrays.toString(request.getParameterMap().get("sysBusinessHall")).replace("[", "").replace("]", "").replace("*", "");
+        //创建人 营业厅
+         String businessAddress = request.getParameterMap().get("businessAddress")==null?"":
+                 Arrays.toString(request.getParameterMap().get("businessAddress")).replace("[", "").replace("]", "").replace("*", "");
 
 
         businessReminderCard.setDelFlag( CommonConstant.DEL_FLAG_0);
@@ -94,13 +97,18 @@ public class BusinessReminderCardController  extends JeecgController<BusinessRem
         QueryWrapper<BusinessReminderCard> queryWrapper = QueryGenerator.initQueryWrapper(businessReminderCard, null);
         queryWrapper.eq("del_flag",CommonConstant.DEL_FLAG_0);
 
-        if (StringUtils.isNotBlank(sysBusinessHall)){
-            List<String> list = resultData(sysBusinessHall,null);
-            if (list.size()>0){
-                queryWrapper.in("sys_business_hall",list);
-            }else {
-                queryWrapper.eq("sys_business_hall",'无');
-            }
+        //判研营业厅
+//        if (StringUtils.isNotBlank(sysBusinessHall)){
+//            List<String> list = resultData(sysBusinessHall,null);
+//            if (list.size()>0){
+//                queryWrapper.in("sys_business_hall",list);
+//            }else {
+//                queryWrapper.eq("sys_business_hall",'无');
+//            }
+//        }
+        //
+        if(StringUtils.isNotBlank(businessAddress)){
+            queryWrapper.like("business_address",businessAddress);
         }
 
         if (StringUtils.isNotBlank(createDateStart) && StringUtils.isNotBlank(createDateEnd) ){
@@ -222,7 +230,7 @@ public class BusinessReminderCardController  extends JeecgController<BusinessRem
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 
         // Step.2 获取导出数据
-        List<BusinessReminderCard> pageList = service.list(queryWrapper);
+        List<BusinessReminderCard> pageList = businessReminderCardService.list(queryWrapper);
         List<BusinessReminderCard> exportList = new ArrayList<>();
 
         // 过滤选中数据
@@ -278,6 +286,12 @@ public class BusinessReminderCardController  extends JeecgController<BusinessRem
                 }
                 reminderCard.setNumberResults(str.toString());
             }
+            if ( reminderCard.getCreateTime()!=null){
+                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+                String dateString = sdf.format(reminderCard.getCreateTime());
+                reminderCard.setStaffNo(dateString);
+            }
 
         }
 
@@ -463,7 +477,7 @@ public class BusinessReminderCardController  extends JeecgController<BusinessRem
         String cardNo = request.getParameterMap().get("cardNo")==null?"": Arrays.toString(request.getParameterMap().get("cardNo")).replace("[", "").replace("]", "").replace("*", "");
         String id = request.getParameterMap().get("id")==null?"": Arrays.toString(request.getParameterMap().get("id")).replace("[", "").replace("]", "").replace("*", "");
          LambdaQueryWrapper<BusinessReminderCard> queryWrapperData = new LambdaQueryWrapper<>();
-        queryWrapperData.eq(BusinessReminderCard::getCardNo, cardNo).eq(BusinessReminderCard::getDelFlag, CommonConstant.DEL_FLAG_0).orderByDesc(BusinessReminderCard::getUpdateTime);
+        queryWrapperData.eq(BusinessReminderCard::getCardNo, cardNo).eq(BusinessReminderCard::getDelFlag, CommonConstant.DEL_FLAG_0).orderByDesc(BusinessReminderCard::getCreateTime);
         if (StringUtils.isNotBlank(id)){
             queryWrapperData.eq(BusinessReminderCard::getId,id);
         }

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

@@ -105,12 +105,10 @@ public class BusinessReminderCard {
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "创建日期")
-    @Excel(name = "创建日期", width = 15)
-    private String createTime;
+    private Date createTime;
 
 
-    @ApiModelProperty(value = "创建人营业厅")
-    @Excel(name = "创建人营业厅", width = 15)
+    @ApiModelProperty(value = "判研营业厅")
     private String sysBusinessHall;
     /** 更新人 */
     @ApiModelProperty(value = "更新人")
@@ -159,7 +157,8 @@ public class BusinessReminderCard {
     private String wordAddress;
 
     /** 营业厅地址 */
-    @ApiModelProperty(value = "营业厅地址")
+    @ApiModelProperty(value = "创建人营业厅地址")
+    @Excel(name = "创建人营业厅地址", width = 15)
     private String businessAddress;
 
     // 研判结果 个数
@@ -188,7 +187,8 @@ public class BusinessReminderCard {
 
     //身份证是否有期
     private String cardStartTimeAndEnd ;
-    //staffNo
+    //staffNo  这个未使用 导出时候暂用下  进行日期转换
+    @Excel(name = "创建日期", width = 15)
     private String staffNo;
     //地址判研
     private String judgmentResearchAddress;