fan zha 0802

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

@@ -85,8 +85,7 @@ public class BusinessReminderCardController  extends JeecgController<BusinessRem
         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("*", "");
+        List<String> numberResults = request.getParameterMap().get("numberResults[]")==null?new ArrayList<>():  new ArrayList<>(Arrays.asList(request.getParameterMap().get("numberResults[]")));
         businessReminderCard.setNumberResults(null);
         businessReminderCard.setSysBusinessHall(null);
         String createDateStart = request.getParameterMap().get("createDateStart")==null?"":
@@ -124,10 +123,15 @@ public class BusinessReminderCardController  extends JeecgController<BusinessRem
         if (StringUtils.isNotBlank(numberResults_MultiString)){
             queryWrapper.like("number_results",numberResults_MultiString);
         }
-        if (StringUtils.isNotBlank(numberResults)){
-            queryWrapper.like("number_results",numberResults);
+        if (numberResults.size()!=0){
+            List<Integer> collect = numberResults.stream().map(Integer::valueOf)
+                    .collect(Collectors.toList());
+            if (collect.contains(3)){
+                collect.add(4);
+            }
+            queryWrapper.in("number_results",collect);
         }
-        queryWrapper.orderByDesc("update_time");
+        queryWrapper.orderByDesc("create_time");
         Page<BusinessReminderCard> page = new Page<>(pageNo, pageSize);
         IPage<BusinessReminderCard> pageList = businessReminderCardService.page(page, queryWrapper);
         return Result.OK(pageList);
@@ -181,8 +185,7 @@ public class BusinessReminderCardController  extends JeecgController<BusinessRem
         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("*", "");
+        List<String> numberResults = request.getParameterMap().get("numberResults[]")==null?new ArrayList<>():  new ArrayList<>(Arrays.asList(request.getParameterMap().get("numberResults[]")));
         businessReminderCard.setNumberResults(null);
         businessReminderCard.setSysBusinessHall(null);
         String createDateStart = request.getParameterMap().get("createDateStart")==null?"":
@@ -215,10 +218,15 @@ public class BusinessReminderCardController  extends JeecgController<BusinessRem
         if (StringUtils.isNotBlank(numberResults_MultiString)){
             queryWrapper.like("number_results",numberResults_MultiString);
         }
-        if (StringUtils.isNotBlank(numberResults)){
-            queryWrapper.like("number_results",numberResults);
+        if (numberResults.size()!=0){
+            List<Integer> collect = numberResults.stream().map(Integer::valueOf)
+                    .collect(Collectors.toList());
+            if (collect.contains(3)){
+                collect.add(4);
+            }
+            queryWrapper.in("number_results",collect);
         }
-        queryWrapper.orderByDesc("update_time");
+        queryWrapper.orderByDesc("create_time");
         return  queryWrapper;
     }
 
@@ -378,6 +386,8 @@ public class BusinessReminderCardController  extends JeecgController<BusinessRem
         businessReminderCard.setDelFlag(CommonConstant.DEL_FLAG_0);
         businessReminderCard.setUpdateTime(new Date());
         businessReminderCard.setStatus("0");
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        businessReminderCard.setUserId(sysUser.getId());
         boolean save = businessReminderCardService.save(businessReminderCard);
         if (save) {
             return Result.OK();
@@ -385,6 +395,32 @@ public class BusinessReminderCardController  extends JeecgController<BusinessRem
         return Result.error("新增失败");
     }
 
+    /**
+     * 校验 是否同一人修改
+     *
+     * @param data
+     * @return
+     */
+    @PostMapping(value = "/check")
+    public Result<?> check(@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.isEmpty()){
+            return Result.error("Id为空");
+        }
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        for (String s : list) {
+            BusinessReminderCard byId = businessReminderCardService.getById(s);
+            if (!byId.getUserId().equals(sysUser.getId())){
+                return Result.error("证件号为:"+byId.getCardNo()+". 创建人跟修改人不一致。");
+            }
+            return Result.OK();
+        }
+        return Result.OK();
+    }
+
     /**
      * 修改 入网用户信息
      *
@@ -411,7 +447,7 @@ public class BusinessReminderCardController  extends JeecgController<BusinessRem
         businessReminderCardLog.setBusinessReminderCreateBy(byId.getCreateBy());
         businessReminderCardLog.setUpdateBy(sysUser.getUsername());
         businessReminderCardLog.setDelFlag(0);
-        businessReminderCardLog.setUserId(byId.getId());
+        businessReminderCardLog.setUserId(sysUser.getId());
         businessReminderCardLogService.save(businessReminderCardLog);
 
         if (updateById) {

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

@@ -194,4 +194,6 @@ public class BusinessReminderCard {
     private String judgmentResearchAddress;
 
     private String status;
+
+    private String userId;
 }

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

@@ -44,12 +44,13 @@ public class BusinessReminderCardLog {
 
 
     private String sysBusinessHall;
-
+    @ApiModelProperty(value = "主表外键")
     private String businessReminderCardId;
     /** 删除标识 */
     //@Excel(name = "删除标识", width = 15)
     @ApiModelProperty(value = "删除标识")
     private Integer delFlag;
+    @ApiModelProperty(value = "主表创建人")
     private String businessReminderCreateBy;
 
     private String userId;