预警加权限

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

@@ -17,6 +17,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.beanutils.PropertyUtils;
 import org.apache.poi.ss.formula.functions.T;
 import org.apache.shiro.SecurityUtils;
+import org.jeecg.common.api.CommonAPI;
 import org.jeecg.common.api.dto.message.MessageDTO;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
@@ -25,8 +26,11 @@ import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.system.api.ISysBaseAPI;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.util.JwtUtil;
 import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.system.vo.SysPermissionDataRuleModel;
 import org.jeecg.common.util.BeanCopyUtil;
+import org.jeecg.common.util.SpringContextUtils;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.smscheck.configs.CheckStateCode;
 import org.jeecg.modules.smscheck.configs.CheckTypeCode;
@@ -42,6 +46,7 @@ import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 
@@ -66,6 +71,9 @@ import java.util.stream.Collectors;
 public class SmsCheckCustomerInfoController extends JeecgController<SmsCheckCustomerInfo, ISmsCheckCustomerInfoService> {
     @Value("${jeecg.path.upload}")
     private String upLoadPath;
+    @Lazy
+    @Autowired
+    private CommonAPI commonApi;
     @Autowired
     private SmsTruckCustomerDataService smsTruckCustomerDataService;
     @Autowired
@@ -1637,14 +1645,18 @@ public class SmsCheckCustomerInfoController extends JeecgController<SmsCheckCust
     @PermissionData(pageComponent = "warningList/TaskCheckList")
     public Result<IPage<SmsCheckCustomerInfoBecomeDueAndInfo>> TaskCheckList(SmsCheckCustomerInfo smsCheckCustomerInfo,
                                                              @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                             @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                             HttpServletRequest request) {
+                                                             @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,HttpServletRequest request) {
+        String username = JwtUtil.getUserNameByToken(request);
+        List<SysPermissionDataRuleModel> dataRules
+                = commonApi.queryPermissionDataRule("warningList/TaskCheckList", "/smsCheck/customerInfo/warningList", username);
+        SysPermissionDataRuleModel sysPermissionDataRuleModel = dataRules.get(0);
+
         smsCheckCustomerInfo.setCustomerNo(smsCheckCustomerInfo.getCustomerNo() == null ? "" : smsCheckCustomerInfo.getCustomerNo().replace("*", ""));
         smsCheckCustomerInfo.setUserNo(smsCheckCustomerInfo.getUserNo() == null ? "" : smsCheckCustomerInfo.getUserNo().replace("*", ""));
         smsCheckCustomerInfo.setStaffName(smsCheckCustomerInfo.getStaffName() == null ? "" : smsCheckCustomerInfo.getStaffName().replace("*", ""));
         smsCheckCustomerInfo.setCheckState(smsCheckCustomerInfo.getCheckState() == null ? null : smsCheckCustomerInfo.getCheckState());
         smsCheckCustomerInfo.setType(smsCheckCustomerInfo.getType() == null ? null : smsCheckCustomerInfo.getType());
-        List<SmsCheckCustomerInfoBecomeDueAndInfo> infoList = customerInfoService.selectCompanyListPage(pageNo, pageSize, smsCheckCustomerInfo);
+        List<SmsCheckCustomerInfoBecomeDueAndInfo> infoList = customerInfoService.selectCompanyListPage(pageNo, pageSize, smsCheckCustomerInfo,sysPermissionDataRuleModel,  username);
         Page<SmsCheckCustomerInfoBecomeDueAndInfo> smsCheckCustomerInfoBecomeDueAndInfoPage = new Page<SmsCheckCustomerInfoBecomeDueAndInfo>(pageNo, pageSize).setRecords(infoList);
         return Result.ok(smsCheckCustomerInfoBecomeDueAndInfoPage);
     }
@@ -1670,36 +1682,36 @@ public class SmsCheckCustomerInfoController extends JeecgController<SmsCheckCust
         long count = dueService.count(countQueryWrapper);
 
         // 未处理数
-        LambdaQueryWrapper<SmsCheckCustomerInfoBecomeDue> undoCountQueryWrapper = new LambdaQueryWrapper<>();
-        undoCountQueryWrapper.in(SmsCheckCustomerInfoBecomeDue::getCheckState, Arrays.asList(1))
+        QueryWrapper<SmsCheckCustomerInfoBecomeDue> undoCountQueryWrapper = QueryGenerator.initQueryWrapper(new SmsCheckCustomerInfoBecomeDue(), request.getParameterMap());
+        undoCountQueryWrapper.lambda().in(SmsCheckCustomerInfoBecomeDue::getCheckState, Arrays.asList(1))
                 .eq(SmsCheckCustomerInfoBecomeDue::getDelFlag, CommonConstant.DEL_FLAG_0);
         long undoCount = dueService.count(undoCountQueryWrapper);
 
 
         // 待稽核数
-        LambdaQueryWrapper<SmsCheckCustomerInfoBecomeDue> uncheckCountQueryWrapper = new LambdaQueryWrapper<>();
+        QueryWrapper<SmsCheckCustomerInfoBecomeDue> uncheckCountQueryWrapper =  QueryGenerator.initQueryWrapper(new SmsCheckCustomerInfoBecomeDue(), request.getParameterMap());
         uncheckCountQueryWrapper
-                .in(SmsCheckCustomerInfoBecomeDue::getCheckState, Arrays.asList(2, 3))
+                .lambda().in(SmsCheckCustomerInfoBecomeDue::getCheckState, Arrays.asList(2, 3))
                 .eq(SmsCheckCustomerInfoBecomeDue::getDelFlag, CommonConstant.DEL_FLAG_0);
         long uncheckCount = dueService.count(uncheckCountQueryWrapper);
 
         // 待整改数
-        LambdaQueryWrapper<SmsCheckCustomerInfoBecomeDue> checkedCountQueryWrapper = new LambdaQueryWrapper<>();
+        QueryWrapper<SmsCheckCustomerInfoBecomeDue> checkedCountQueryWrapper = QueryGenerator.initQueryWrapper(new SmsCheckCustomerInfoBecomeDue(), request.getParameterMap());
         checkedCountQueryWrapper
-                .eq(SmsCheckCustomerInfoBecomeDue::getCheckState, 4)
+                .lambda().eq(SmsCheckCustomerInfoBecomeDue::getCheckState, 4)
                 .eq(SmsCheckCustomerInfoBecomeDue::getDelFlag, CommonConstant.DEL_FLAG_0);
         long checkedCount = dueService.count(checkedCountQueryWrapper);
 
         // 稽核完成数
-        LambdaQueryWrapper<SmsCheckCustomerInfoBecomeDue> passedCountQueryWrapper = new LambdaQueryWrapper<>();
+        QueryWrapper<SmsCheckCustomerInfoBecomeDue> passedCountQueryWrapper =  QueryGenerator.initQueryWrapper(new SmsCheckCustomerInfoBecomeDue(), request.getParameterMap());
         passedCountQueryWrapper
-                .eq(SmsCheckCustomerInfoBecomeDue::getCheckState, 5)
+                .lambda().eq(SmsCheckCustomerInfoBecomeDue::getCheckState, 5)
                 .eq(SmsCheckCustomerInfoBecomeDue::getDelFlag, CommonConstant.DEL_FLAG_0);
         long passedCount = dueService.count(passedCountQueryWrapper);
 
         // 为上传
-        LambdaQueryWrapper<SmsCheckCustomerInfoBecomeDue> noUp = new LambdaQueryWrapper<>();
-        noUp.eq(SmsCheckCustomerInfoBecomeDue::getCheckState, 0)
+        QueryWrapper<SmsCheckCustomerInfoBecomeDue> noUp = QueryGenerator.initQueryWrapper(new SmsCheckCustomerInfoBecomeDue(), request.getParameterMap());
+        noUp.lambda().eq(SmsCheckCustomerInfoBecomeDue::getCheckState, 0)
                 .eq(SmsCheckCustomerInfoBecomeDue::getDelFlag, CommonConstant.DEL_FLAG_0);
         long noUpCount = dueService.count(noUp);
         dict.put("count", count);

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

@@ -21,25 +21,25 @@ public class SmsCheckCustomerInfoBecomeDue implements Serializable {
     /** 关联稽核信息ID */
     private String infoId;
     /** 稽核状态（0：未处理；1：未完善；2：待稽核；4：待整改；5：稽核通过；） */
-    private int checkState;
+    private Integer checkState;
     /** 客户信息所属类型：1:行短稽核 2：物联网业务稽核 3.复开审批 4.中继线稽核 */
-    private int type;
+    private Integer type;
     /** 行短码号证书是否到期 */
-    private int shortNowCodeNumberDateIs;
+    private Integer shortNowCodeNumberDateIs;
     /** 行短备案通知是否到期 */
-    private int shortNowFilingsDataIs;
+    private Integer shortNowFilingsDataIs;
     /** 行短增值业务许可证是否到期 */
-    private int shortNowPermitDateIs;
+    private Integer shortNowPermitDateIs;
     /** 行短合同是否到期 */
-    private int shortNowContractDateIs;
+    private Integer shortNowContractDateIs;
     /** 物联网合同是否到期 */
-    private int lotContractDateIs;
+    private Integer lotContractDateIs;
     /** 中继线业务合同是否到期 */
-    private int truckContractDateIs;
+    private Integer truckContractDateIs;
     /** 中继线房屋租凭合同是否到期 */
-    private int truckHouseDateIs;
+    private Integer truckHouseDateIs;
     /** 中继线增值业务许可证是否到期 */
-    private int truckAddedLicenseDateIs;
+    private Integer truckAddedLicenseDateIs;
     /** 删除标识 */
     private Integer delFlag;
     /** 创建人 */

tnc-sms/src/main/java/org/jeecg/modules/smscheck/mapper/SmsCheckCustomerInfoMapper.java

@@ -6,6 +6,7 @@ import io.swagger.models.auth.In;
 import org.apache.ibatis.annotations.SelectProvider;
 import org.apache.ibatis.annotations.UpdateProvider;
 import org.jeecg.common.system.vo.SysDepartModel;
+import org.jeecg.common.system.vo.SysPermissionDataRuleModel;
 import org.jeecg.modules.smscheck.entity.*;
 import org.jeecg.modules.smscheck.vo.SmsCheckCustomerInfoTaskVo;
 import org.jeecg.modules.smscheck.vo.SmsCheckTaskVo;
@@ -49,11 +50,12 @@ public interface SmsCheckCustomerInfoMapper extends BaseMapper<SmsCheckCustomerI
     List<SmsCustomerInfoGroupByCheckState> groupCheckState(String startDate, String endDate,String taskId,String taskType);
 
     @SelectProvider(type = ProviderClass.class, method = "selectListPage")
-    List<SmsCheckCustomerInfoBecomeDueAndInfo> selectListPage(Integer pageNo, Integer pageSize, SmsCheckCustomerInfo smsCheckCustomerInfo);
+    List<SmsCheckCustomerInfoBecomeDueAndInfo> selectListPage(Integer pageNo, Integer pageSize, SmsCheckCustomerInfo smsCheckCustomerInfo, SysPermissionDataRuleModel sysPermissionDataRuleModel, SysUser sysUser );
 
     class ProviderClass {
 
-        public String selectListPage(Integer pageNo, Integer pageSize, SmsCheckCustomerInfo smsCheckCustomerInfo){
+        public String selectListPage(Integer pageNo, Integer pageSize, SmsCheckCustomerInfo smsCheckCustomerInfo,SysPermissionDataRuleModel sysPermissionDataRuleModel,  SysUser sysUser ){
+
 
             StringBuilder sql = new StringBuilder();
 
@@ -138,6 +140,17 @@ public interface SmsCheckCustomerInfoMapper extends BaseMapper<SmsCheckCustomerI
             if (smsCheckCustomerInfo.getType()!=null){
                 sql.append(" and  sms_check_customer_info_become_due.type  ="+smsCheckCustomerInfo.getType()+" ");
             }
+            if (sysPermissionDataRuleModel!=null && StringUtils.isNotBlank(sysPermissionDataRuleModel.getRuleName())){
+                if (sysPermissionDataRuleModel.getRuleName().equals("sysPowerOrg")){
+                    sql.append(" and  sms_check_customer_info_become_due.sys_org_code like  '"+sysUser.getOrgCode() +"%'");
+                }
+                if (sysPermissionDataRuleModel.getRuleName().equals("sysPowerCreateBy")){
+                    sql.append(" and sms_check_customer_info_become_due.staff_no like  '"+sysUser.getUsername() +"'");
+                }
+                if (sysPermissionDataRuleModel.getRuleName().equals("sysPowerThisOrg")){
+                    sql.append(" and  sms_check_customer_info_become_due.sys_org_code like  '"+sysUser.getOrgCode() +"'");
+                }
+            }
             sql.append(" ORDER BY sms_check_customer_info_become_due.create_time  LIMIT " + (pageNo - 1) * pageSize + "," + pageSize);
             return sql.toString();
         }

tnc-sms/src/main/java/org/jeecg/modules/smscheck/service/ISmsCheckCustomerInfoService.java

@@ -2,6 +2,7 @@ package org.jeecg.modules.smscheck.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.common.system.vo.SysDepartModel;
+import org.jeecg.common.system.vo.SysPermissionDataRuleModel;
 import org.jeecg.modules.smscheck.entity.*;
 import org.jeecg.modules.smscheck.vo.SmsCheckCustomerInfoTaskVo;
 import org.jeecg.modules.smscheck.vo.SmsCheckTaskVo;
@@ -34,7 +35,7 @@ public interface ISmsCheckCustomerInfoService extends IService<SmsCheckCustomerI
     List<SysDepartModel> getSysDepartModel();
 
 
-    List<SmsCheckCustomerInfoBecomeDueAndInfo> selectCompanyListPage(Integer pageNo, Integer pageSize, SmsCheckCustomerInfo smsCheckCustomerInfo);
+    List<SmsCheckCustomerInfoBecomeDueAndInfo> selectCompanyListPage(Integer pageNo, Integer pageSize, SmsCheckCustomerInfo smsCheckCustomerInfo, SysPermissionDataRuleModel sysPermissionDataRuleModel, String username);
 
 
 }

tnc-sms/src/main/java/org/jeecg/modules/smscheck/service/impl/SmsCheckCustomerInfoServiceImpl.java

@@ -1,6 +1,10 @@
 package org.jeecg.modules.smscheck.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import org.checkerframework.checker.units.qual.A;
+import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.system.vo.SysDepartModel;
+import org.jeecg.common.system.vo.SysPermissionDataRuleModel;
 import org.jeecg.modules.smscheck.entity.*;
 import org.jeecg.modules.smscheck.vo.SmsCheckCustomerInfoTaskVo;
 import org.jeecg.modules.smscheck.vo.SmsCheckTaskVo;
@@ -23,6 +27,8 @@ import java.util.List;
 public class SmsCheckCustomerInfoServiceImpl extends ServiceImpl<SmsCheckCustomerInfoMapper, SmsCheckCustomerInfo> implements ISmsCheckCustomerInfoService {
     @Autowired
     private SmsCheckCustomerInfoMapper smsCheckCustomerInfoMapper;
+    @Autowired
+    private SysSmsUserServiceImpl service;
     @Override
     public Integer checkInfoWarningCount(SmsCheckCustomerInfo smsCheckCustomerInfo) {
         return smsCheckCustomerInfoMapper.checkInfoWarningCount(smsCheckCustomerInfo)  ;
@@ -57,9 +63,13 @@ public class SmsCheckCustomerInfoServiceImpl extends ServiceImpl<SmsCheckCustome
     }
 
     @Override
-    public List<SmsCheckCustomerInfoBecomeDueAndInfo> selectCompanyListPage(Integer pageNo, Integer pageSize, SmsCheckCustomerInfo smsCheckCustomerInfo) {
+    public List<SmsCheckCustomerInfoBecomeDueAndInfo> selectCompanyListPage(Integer pageNo, Integer pageSize, SmsCheckCustomerInfo smsCheckCustomerInfo , SysPermissionDataRuleModel sysPermissionDataRuleModel, String username) {
+        LambdaQueryWrapper<SysUser> query = new LambdaQueryWrapper<SysUser>();
+        query.eq(SysUser::getDelFlag, CommonConstant.DEL_FLAG_0.toString()).eq(SysUser::getUsername,  username);
+        List<SysUser> list = service.list(query);
+        SysUser sysUser = list.get(0);
 
-        List<SmsCheckCustomerInfoBecomeDueAndInfo> smsCustomerInfoGroupByCheckStates = smsCheckCustomerInfoMapper.selectListPage(pageNo, pageSize, smsCheckCustomerInfo);
+        List<SmsCheckCustomerInfoBecomeDueAndInfo> smsCustomerInfoGroupByCheckStates = smsCheckCustomerInfoMapper.selectListPage(pageNo, pageSize, smsCheckCustomerInfo,sysPermissionDataRuleModel,sysUser);
         return smsCustomerInfoGroupByCheckStates;
     }