加权限

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

@@ -26,6 +26,7 @@ import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.smscheck.entity.*;
 import org.jeecg.modules.smscheck.entity.excel.NameListExcel;
 import org.jeecg.modules.smscheck.entity.excel.ShowDownExcel;
+import org.jeecg.modules.smscheck.mapper.SysSmsUserMapper;
 import org.jeecg.modules.smscheck.service.*;
 import org.jeecg.modules.smscheck.util.HttpClientUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
@@ -73,6 +74,7 @@ public class BusinessReminderCardController  extends JeecgController<BusinessRem
     private SysBusinessHallService sysBusinessHallService;
     @ApiOperation(value = "入网信息业务-分页列表查询", notes = "入网信息业务-分页列表查询")
     @GetMapping(value = "/list")
+    @PermissionData(pageComponent = "networkAccess/userStatistics")
     public Result<IPage<BusinessReminderCard>> queryPageList(BusinessReminderCard businessReminderCard,
                                                              @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                              @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
@@ -148,8 +150,14 @@ public class BusinessReminderCardController  extends JeecgController<BusinessRem
             }
             queryWrapper.in("number_results",collect);
         }
-        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        queryWrapper.likeRight("sys_org_code",sysUser.getOrgCode());
+//        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+//        queryWrapper.likeRight("sys_org_code",sysUser.getOrgCode());
+//        // 如果是营业员 在拼上 staff_no
+//        if(StringUtils.isNotBlank(sysUser.getRoleCode()) && sysUser.getRoleCode().equals("YingYeyYuan")){
+//            queryWrapper.eq("staff_no",sysUser.getWorkNo());
+//        }
+        //QueryGenerator.installAuthMplus(queryWrapper, BusinessReminderCard.class);
+        String sql = QueryGenerator.installAuthJdbc(BusinessReminderCard.class);
         queryWrapper.orderByDesc("create_time");
         Page<BusinessReminderCard> page = new Page<>(pageNo, pageSize);
         IPage<BusinessReminderCard> pageList = businessReminderCardService.page(page, queryWrapper);
@@ -248,8 +256,9 @@ public class BusinessReminderCardController  extends JeecgController<BusinessRem
         if (StringUtils.isNotBlank(numberResults_MultiString)){
             queryWrapper.like("number_results",numberResults_MultiString);
         }
-        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        queryWrapper.likeRight("sys_org_code",sysUser.getOrgCode());
+//        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+//        queryWrapper.likeRight("sys_org_code",sysUser.getOrgCode());
+        String sql = QueryGenerator.installAuthJdbc(BusinessReminderCard.class);
         if (info.equals("up")){
             if (numberResults.size() == 1){
                 queryWrapper.like("number_results",numberResults.get(0));
@@ -271,6 +280,7 @@ public class BusinessReminderCardController  extends JeecgController<BusinessRem
 
     @ApiOperation(value = "入网信息业务-导出", notes = "入网信息业务-导出")
     @GetMapping(value = "/exportXls")
+    @PermissionData(pageComponent = "networkAccess/userStatistics")
     public ModelAndView exportXls(HttpServletRequest request, BusinessReminderCard businessReminderCard)  throws Exception {
         // Step.1 组装查询条件
 
@@ -291,6 +301,7 @@ public class BusinessReminderCardController  extends JeecgController<BusinessRem
 
     @ApiOperation(value = "入网信息业务-导出", notes = "入网信息业务-导出")
     @GetMapping(value = "/exportXlsUp")
+    @PermissionData(pageComponent = "networkAccess/userStatistics")
     public ModelAndView exportXlsUp(HttpServletRequest request, BusinessReminderCard businessReminderCard)  throws Exception {
         // Step.1 组装查询条件
 
@@ -431,26 +442,29 @@ public class BusinessReminderCardController  extends JeecgController<BusinessRem
                     copyList(exportList,excelList,ShowDownExcel.class);
                     int i =1;
                     for (ShowDownExcel showDownExcel : excelList) {
-                        showDownExcel.setIndex(i);
-                        i++;
-                        if (showDownExcel.getStatus().equals("0")){
+                        if (showDownExcel.getStatus().equals("0")||showDownExcel.getStatus().equals("1")){
                             showDownExcel.setIsNow("否");
                             showDownExcel.setLabel("安防停机-不可复开");
                         }
-                        if (showDownExcel.getStatus().equals("1")){
+                        if (showDownExcel.getStatus().equals("2")){
                             showDownExcel.setIsNow("是");
                             showDownExcel.setLabel("安防停机-不可复开");
                         }
                         String[] split = showDownExcel.getNewPhone().split(",");
                         if (split.length>1){
                             for (String s : split) {
+
                                 ShowDownExcel showDownExcel1 = new ShowDownExcel();
                                 BeanUtils.copyProperties(showDownExcel ,showDownExcel1);
+                                showDownExcel1.setIndex(i);
                                 showDownExcel1.setNewPhone(s);
                                 excelListNew.add(showDownExcel1);
+                                i++;
                             }
                         }else {
+                            showDownExcel.setIndex(i);
                             excelListNew.add(showDownExcel);
+                            i++;
                         }
                     }
                     return getModelAndView(excelListNew,"上报关停号码列表",ShowDownExcel.class);

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

@@ -213,8 +213,8 @@ public class BusinessReminderCard {
 
     private String userId;
     private String age;
-    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "上报时间")
     @Excel(name = "上报时间", width = 15)
     private Date upTime;

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

@@ -209,7 +209,7 @@ public class BusinessReminderCardVo {
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "上报时间")
-    @Excel(name = "上报时间", width = 1,format = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "上报时间", width = 15,format = "yyyy-MM-dd HH:mm:ss")
     private Date upTime;
     @Excel(name = "当前处理部门", width = 15)
     private String current;