修改缺陷内容

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

@@ -44,7 +44,7 @@ import java.util.List;
 @Slf4j
 public class SmsCheckCustomerDataController extends JeecgController<SmsCheckCustomerData, ISmsCheckCustomerDataService> {
     @Autowired
-    private ISmsCheckCustomerDataService smsCheckCustomerDataService;
+    private ISmsCheckCustomerDataService customerDataService;
     @Autowired
     private ISmsCheckCustomerInfoService infoService;
 
@@ -66,7 +66,7 @@ public class SmsCheckCustomerDataController extends JeecgController<SmsCheckCust
                                                              HttpServletRequest request) {
         QueryWrapper<SmsCheckCustomerData> queryWrapper = QueryGenerator.initQueryWrapper(smsCheckCustomerData, request.getParameterMap());
         Page<SmsCheckCustomerData> page = new Page<>(pageNo, pageSize);
-        IPage<SmsCheckCustomerData> pageList = smsCheckCustomerDataService.page(page, queryWrapper);
+        IPage<SmsCheckCustomerData> pageList = customerDataService.page(page, queryWrapper);
         return Result.OK(pageList);
     }
 
@@ -80,7 +80,7 @@ public class SmsCheckCustomerDataController extends JeecgController<SmsCheckCust
         LambdaQueryWrapper<SmsCheckCustomerData> queryWrapperData = new LambdaQueryWrapper<>();
         queryWrapperData.eq(SmsCheckCustomerData::getInfoId,smsCheckCustomerData.getInfoId());
         Page<SmsCheckCustomerData> page = new Page<>(1, 100);
-        IPage<SmsCheckCustomerData> pageList = smsCheckCustomerDataService.page(page, queryWrapperData);
+        IPage<SmsCheckCustomerData> pageList = customerDataService.page(page, queryWrapperData);
         return Result.OK(pageList);
     }
 
@@ -95,7 +95,7 @@ public class SmsCheckCustomerDataController extends JeecgController<SmsCheckCust
     @ApiOperation(value = "客户资料-添加", notes = "客户资料-添加")
     @PostMapping(value = "/add")
     public Result<String> add(@RequestBody SmsCheckCustomerData smsCheckCustomerData) {
-        smsCheckCustomerDataService.save(smsCheckCustomerData);
+        customerDataService.save(smsCheckCustomerData);
         return Result.OK("添加成功！");
     }
 
@@ -109,7 +109,7 @@ public class SmsCheckCustomerDataController extends JeecgController<SmsCheckCust
     @ApiOperation(value = "客户资料-编辑", notes = "客户资料-编辑")
     @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
     public Result<String> edit(@RequestBody SmsCheckCustomerData smsCheckCustomerData) {
-        smsCheckCustomerDataService.updateById(smsCheckCustomerData);
+        customerDataService.updateById(smsCheckCustomerData);
         return Result.OK("编辑成功!");
     }
 
@@ -124,9 +124,9 @@ public class SmsCheckCustomerDataController extends JeecgController<SmsCheckCust
 
         LambdaQueryWrapper<SmsCheckCustomerData> queryWrapperData = new LambdaQueryWrapper<>();
         queryWrapperData.eq(SmsCheckCustomerData::getInfoId,customerData.getInfoId());
-        List<SmsCheckCustomerData> list = smsCheckCustomerDataService.list(queryWrapperData);
+        List<SmsCheckCustomerData> list = customerDataService.list(queryWrapperData);
         if (list.size() == 0){
-            boolean save = smsCheckCustomerDataService.save(customerData);
+            boolean save = customerDataService.save(customerData);
             if (!save){
                 return Result.error("编辑失败");
             }
@@ -135,8 +135,8 @@ public class SmsCheckCustomerDataController extends JeecgController<SmsCheckCust
             infoService.updateById(customerInfo);
             return Result.OK("编辑成功!");
         }
-        customerData =  smsCheckCustomerDataService.integration(customerData,list.get(0));
-        boolean edit = smsCheckCustomerDataService.updateById(customerData);
+        customerData =  customerDataService.integration(customerData,list.get(0));
+        boolean edit = customerDataService.updateById(customerData);
         if (!edit) {
             return Result.error("编辑失败");
         }
@@ -154,7 +154,7 @@ public class SmsCheckCustomerDataController extends JeecgController<SmsCheckCust
     @ApiOperation(value = "客户资料-通过id删除", notes = "客户资料-通过id删除")
     @DeleteMapping(value = "/delete")
     public Result<String> delete(@RequestParam(name = "id") String id) {
-        smsCheckCustomerDataService.removeById(id);
+        customerDataService.removeById(id);
         return Result.OK("删除成功!");
     }
 
@@ -168,7 +168,7 @@ public class SmsCheckCustomerDataController extends JeecgController<SmsCheckCust
     @ApiOperation(value = "客户资料-批量删除", notes = "客户资料-批量删除")
     @DeleteMapping(value = "/deleteBatch")
     public Result<String> deleteBatch(@RequestParam(name = "ids") String ids) {
-        this.smsCheckCustomerDataService.removeByIds(Arrays.asList(ids.split(",")));
+        this.customerDataService.removeByIds(Arrays.asList(ids.split(",")));
         return Result.OK("批量删除成功!");
     }
 
@@ -182,7 +182,7 @@ public class SmsCheckCustomerDataController extends JeecgController<SmsCheckCust
     @ApiOperation(value = "客户资料-通过id查询", notes = "客户资料-通过id查询")
     @GetMapping(value = "/queryById")
     public Result<SmsCheckCustomerData> queryById(@RequestParam(name = "id") String id) {
-        SmsCheckCustomerData smsCheckCustomerData = smsCheckCustomerDataService.getById(id);
+        SmsCheckCustomerData smsCheckCustomerData = customerDataService.getById(id);
         if (smsCheckCustomerData == null) {
             return Result.error("未找到对应数据");
         }
@@ -248,4 +248,49 @@ public class SmsCheckCustomerDataController extends JeecgController<SmsCheckCust
         return result;
     }
 
+    /**
+     * 通过infoId清除上附件
+     *
+     * @param infoId 主键
+     * @return 结果
+     */
+    @AutoLog(value = "客户信息-通过infoId清除上传附件")
+    @ApiOperation(value = "客户信息-通过infoId清除上传附件", notes = "客户信息-通过infoId清除上传附件")
+    @DeleteMapping(value = "/clear")
+    public Result<String> clear(@RequestParam(name = "infoId") String infoId) {
+        customerDataService.remove(new LambdaQueryWrapper<SmsCheckCustomerData>()
+                .eq(SmsCheckCustomerData::getInfoId, infoId));
+        return Result.OK("删除成功!");
+    }
+
+    @AutoLog(value = "客户资料-编辑")
+    @ApiOperation(value = "客户资料-编辑", notes = "客户资料-编辑")
+    @PostMapping(value = "/updateFile")
+    public Result<String> updateFile(@RequestBody SmsCheckCustomerData customerData) {
+        String infoId = customerData.getInfoId();
+        if (StringUtils.isEmpty(infoId)) {
+            return Result.error("客户编码不能为空");
+        }
+
+        LambdaQueryWrapper<SmsCheckCustomerData> queryWrapperData = new LambdaQueryWrapper<>();
+        queryWrapperData.eq(SmsCheckCustomerData::getInfoId,customerData.getInfoId());
+        List<SmsCheckCustomerData> list = customerDataService.list(queryWrapperData);
+        if (list.size() == 0){
+            boolean save = customerDataService.save(customerData);
+            if (!save){
+                return Result.error("编辑失败");
+            }
+            SmsCheckCustomerInfo customerInfo = infoService.getById(infoId);
+            customerInfo.setCheckState(CheckStateCode.CHECK_STSTE_1);
+            infoService.updateById(customerInfo);
+            return Result.OK("编辑成功!");
+        }
+        SmsCheckCustomerData data = list.get(0);
+        customerData.setId(data.getId());
+        boolean edit = customerDataService.updateById(customerData);
+        if (!edit) {
+            return Result.error("编辑失败");
+        }
+        return Result.OK("编辑成功!");
+    }
 }

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

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
@@ -20,18 +19,15 @@ 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.vo.LoginUser;
-import org.jeecg.config.shiro.ShiroRealm;
 import org.jeecg.modules.smscheck.configs.CheckStateCode;
 import org.jeecg.modules.smscheck.entity.*;
-import org.jeecg.modules.smscheck.service.ISmsCheckCustomerInfoLogService;
-import org.jeecg.modules.smscheck.service.ISmsCheckCustomerInfoService;
-import org.jeecg.modules.smscheck.service.ISmsCheckTaskService;
-import org.jeecg.modules.smscheck.service.ISmsCheckWorkLogService;
+import org.jeecg.modules.smscheck.service.*;
+import org.jeecg.modules.smscheck.vo.SmsCheckCustomerInfoTaskVo;
+import org.jeecg.modules.smscheck.vo.SmsCheckTaskVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 
-import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.*;
@@ -49,18 +45,14 @@ import java.util.*;
 public class SmsCheckCustomerInfoController extends JeecgController<SmsCheckCustomerInfo, ISmsCheckCustomerInfoService> {
     @Autowired
     private ISmsCheckCustomerInfoService customerInfoService;
-
     @Autowired
 	private ISmsCheckWorkLogService workLogService;
     @Autowired
     private ISmsCheckCustomerInfoLogService infoLogService;
-    @Autowired
-    private ISysBaseAPI sysBaseAPI;
-    @Autowired
-    private ISmsCheckCustomerInfoService smsCheckCustomerInfoService;
-
     @Autowired
     private ISmsCheckTaskService taskService;
+    @Autowired
+    private ISysBaseAPI sysBaseAPI;
 
     /**
      * 分页列表查询
@@ -209,7 +201,6 @@ public class SmsCheckCustomerInfoController extends JeecgController<SmsCheckCust
         return Result.OK("提交成功!");
     }
 
-
     /**
      * 通过id删除
      *
@@ -352,6 +343,21 @@ public class SmsCheckCustomerInfoController extends JeecgController<SmsCheckCust
 		boolean flag = customerInfoService.update(new LambdaUpdateWrapper<SmsCheckCustomerInfo>()
 			 .eq(SmsCheckCustomerInfo::getId, workLog.getInfoId())
 			 .set(SmsCheckCustomerInfo::getCheckState, checkState));
+        // FIXME 后续需要改为短信通知
+        String checkResult = "稽核不通过";
+        if (checkState == 5) {
+            checkResult = "稽核通过";
+        }
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        String workNo = info.getStaffNo();
+        LoginUser toUser = sysBaseAPI.getUserByWorkNo(workNo);
+        MessageDTO message = new MessageDTO();
+        message.setTitle(checkResult + "，用户编号：【" + info.getUserNo() + "】");
+        message.setContent("客户名称：【" + info.getCustomerName() + "】，服务号码：【" + info.getSmsNumber()
+                + "】，用户编号：【" + info.getUserNo() + "】的客户资料，" + checkResult);
+        message.setFromUser(sysUser.getUsername());
+        message.setToUser(toUser.getUsername());
+        sysBaseAPI.sendSysAnnouncement(message);
 
 		if (flag) {
 			workLogService.save(workLog);
@@ -374,7 +380,7 @@ public class SmsCheckCustomerInfoController extends JeecgController<SmsCheckCust
         String workNo = info.getStaffNo();
         LoginUser toUser = sysBaseAPI.getUserByWorkNo(workNo);
         MessageDTO message = new MessageDTO();
-        message.setTitle("稽核代办，用户编号：【" + info.getUserNo() + "】");
+        message.setTitle("稽核待办，用户编号：【" + info.getUserNo() + "】");
         message.setContent("客户名称：【" + info.getCustomerName() + "】，服务号码：【" + info.getSmsNumber()
                 + "】，用户编号：【" + info.getUserNo() + "】的客户资料请尽快完善。");
         message.setFromUser(sysUser.getUsername());
@@ -391,7 +397,7 @@ public class SmsCheckCustomerInfoController extends JeecgController<SmsCheckCust
             return Result.error("该用户不存在");
         }
         smsCheckCustomerInfo.setStaffNo(workNo);
-        Integer count =  smsCheckCustomerInfoService.checkInfoWarningCount(smsCheckCustomerInfo);
+        Integer count =  customerInfoService.checkInfoWarningCount(smsCheckCustomerInfo);
         if (count == null){
             return Result.error("该用户没有相关信息");
         }
@@ -401,12 +407,12 @@ public class SmsCheckCustomerInfoController extends JeecgController<SmsCheckCust
     @PostMapping(value = "/checkInfo/warning/all/count")
     public Result<String> checkInfoWarningCountAll(@RequestBody SmsCheckCustomerInfo smsCheckCustomerInfo) {
         smsCheckCustomerInfo.setCheckState(CheckStateCode.CHECK_STSTE_0);
-        Integer count0 =  smsCheckCustomerInfoService.checkInfoWarningCount(smsCheckCustomerInfo);
+        Integer count0 =  customerInfoService.checkInfoWarningCount(smsCheckCustomerInfo);
         smsCheckCustomerInfo.setCheckState(CheckStateCode.CHECK_STSTE_1);
-        Integer count1 =  smsCheckCustomerInfoService.checkInfoWarningCount(smsCheckCustomerInfo);
+        Integer count1 =  customerInfoService.checkInfoWarningCount(smsCheckCustomerInfo);
         smsCheckCustomerInfo.setCheckState(CheckStateCode.CHECK_STSTE_4);
-        Integer count4 =  smsCheckCustomerInfoService.checkInfoWarningCount(smsCheckCustomerInfo);
-        SmsCheckCustomerInfoVo smsCheckCustomerInfoVo = new SmsCheckCustomerInfoVo();
+        Integer count4 =  customerInfoService.checkInfoWarningCount(smsCheckCustomerInfo);
+        SmsCheckCustomerInfoTaskVo smsCheckCustomerInfoVo = new SmsCheckCustomerInfoTaskVo();
         smsCheckCustomerInfoVo.setCheckState0(count0);
         smsCheckCustomerInfoVo.setCheckState1(count1);
         smsCheckCustomerInfoVo.setCheckState4(count4);
@@ -415,12 +421,12 @@ public class SmsCheckCustomerInfoController extends JeecgController<SmsCheckCust
 
     @PostMapping(value = "/checkInfo/warning/count/time")
     public Result<String> checkInfoWarningCountTime(@RequestBody SmsCheckCustomerInfo smsCheckCustomerInfo) {
-        List<SmsCheckTaskVo> smsCheckTaskVos = smsCheckCustomerInfoService.checkInfoWarningCountTime(smsCheckCustomerInfo);
+        List<SmsCheckTaskVo> smsCheckTaskVos = customerInfoService.checkInfoWarningCountTime(smsCheckCustomerInfo);
         return Result.ok(smsCheckTaskVos);
     }
     @PostMapping(value = "/checkInfo/warning/count/staff")
     public Result<String> checkInfoWarningCountStaff(@RequestBody SmsCheckCustomerInfo smsCheckCustomerInfo) {
-        List<SmsCheckTaskVo> smsCheckTaskVos = smsCheckCustomerInfoService.checkInfoWarningCountStaff(smsCheckCustomerInfo);
+        List<SmsCheckTaskVo> smsCheckTaskVos = customerInfoService.checkInfoWarningCountStaff(smsCheckCustomerInfo);
         return Result.ok(smsCheckTaskVos);
     }
 
@@ -435,7 +441,7 @@ public class SmsCheckCustomerInfoController extends JeecgController<SmsCheckCust
     public Result<IPage<SmsCheckCustomerInfo>> selectCompanyList (SmsCheckCustomerInfo smsCheckCustomerInfo,
                                        @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                        @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize){
-        List<SmsCheckCustomerInfo> smsCheckCustomerInfos = smsCheckCustomerInfoService.selectCompanyList(smsCheckCustomerInfo);
+        List<SmsCheckCustomerInfo> smsCheckCustomerInfos = customerInfoService.selectCompanyList(smsCheckCustomerInfo);
         Page<SmsCheckCustomerInfo> page = new Page<>();
         page.setRecords(smsCheckCustomerInfos);
         return Result.ok(page);
@@ -473,7 +479,7 @@ public class SmsCheckCustomerInfoController extends JeecgController<SmsCheckCust
         if (!StringUtils.isEmpty(customerName)){
             queryWrapper.eq("customer_name",customerName);
         }
-        List<SmsCheckCustomerInfo> list = smsCheckCustomerInfoService.getBaseMapper().selectList(queryWrapper);
+        List<SmsCheckCustomerInfo> list = customerInfoService.getBaseMapper().selectList(queryWrapper);
         Set<String> set = new HashSet<>();
         for (SmsCheckCustomerInfo info:list) {
             set.add(info.getTaskId());

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

@@ -94,7 +94,7 @@ public class SmsCheckIndexController {
     /**
      * 查询领导角色的 最新动态、我的任务、本月目标
      *
-     * @param taskId 对象
+     * @param taskIds 对象
      * @param pageNo 页码
      * @param pageSize 每页条数
      * @param request 请求
@@ -102,18 +102,19 @@ public class SmsCheckIndexController {
      */
     @ApiOperation(value="领导角色的 最新动态、我的任务、本月目标", notes="领导角色的 最新动态、我的任务、本月目标")
     @GetMapping(value = "/typeWork")
-    public Result<Dict> typeWork(String taskId,
+    public Result<Dict> typeWork(@RequestParam(name="taskIds",required = false)List<String> taskIds,
                                 @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                 @RequestParam(name="pageSize", defaultValue="5") Integer pageSize,
                                 HttpServletRequest request) {
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         // 最新动态
         SmsCheckCustomerInfoLog infoLog = new SmsCheckCustomerInfoLog();
-        if (StrUtil.isNotBlank(taskId)) {
-            infoLog.setTaskId(taskId);
-        }
+
         infoLog.setTargetUsername(sysUser.getUsername());
         QueryWrapper<SmsCheckCustomerInfoLog> infoLogQuery = QueryGenerator.initQueryWrapper(infoLog, request.getParameterMap());
+        if (CollUtil.isNotEmpty(taskIds)) {
+            infoLogQuery.lambda().in(SmsCheckCustomerInfoLog::getTaskId, taskIds);
+        }
         infoLogQuery.lambda().orderByDesc(SmsCheckCustomerInfoLog::getCreateTime);
         IPage<SmsCheckCustomerInfoLog> infoLogPage = infoLogService.page(new Page<>(pageNo, pageSize), infoLogQuery);
 
@@ -129,11 +130,11 @@ public class SmsCheckIndexController {
 
         // 我的任务
         SmsCheckCustomerInfo info = new SmsCheckCustomerInfo();
-        if (StrUtil.isNotBlank(taskId)) {
-            info.setTaskId(taskId);
-        }
         info.setCreateBy(sysUser.getUsername());
         QueryWrapper<SmsCheckCustomerInfo> infoQuery = QueryGenerator.initQueryWrapper(info, request.getParameterMap());
+        if (CollUtil.isNotEmpty(taskIds)) {
+            infoQuery.lambda().in(SmsCheckCustomerInfo::getTaskId, taskIds);
+        }
         // 稽核状态 0：未处理；1：未完善；2：待稽核；3：已整改；4：待整改；5：稽核通过；
         infoQuery.lambda().in(SmsCheckCustomerInfo::getCheckState, Arrays.asList(2, 3));
         infoQuery.lambda().orderByDesc(SmsCheckCustomerInfo::getCreateTime);
@@ -148,29 +149,41 @@ public class SmsCheckIndexController {
 
         // 本月目标
         SmsCheckCustomerInfo target = new SmsCheckCustomerInfo();
-        if (StrUtil.isNotBlank(taskId)) {
-            target.setTaskId(taskId);
-        }
         // 用户名关联
         target.setCreateBy(sysUser.getUsername());
         // 稽核状态 0：未处理；1：未完善；2：待稽核；3：已整改；4：待整改；5：稽核通过；
         // 全部
         QueryWrapper<SmsCheckCustomerInfo> allTargetQuery = QueryGenerator.initQueryWrapper(target, request.getParameterMap());
+        if (CollUtil.isNotEmpty(taskIds)) {
+            allTargetQuery.lambda().in(SmsCheckCustomerInfo::getTaskId, taskIds);
+        }
         long allCount = infoService.count(allTargetQuery);
         // 未完善
         QueryWrapper<SmsCheckCustomerInfo> undoTargetQuery = QueryGenerator.initQueryWrapper(target, request.getParameterMap());
+        if (CollUtil.isNotEmpty(taskIds)) {
+            undoTargetQuery.lambda().in(SmsCheckCustomerInfo::getTaskId, taskIds);
+        }
         undoTargetQuery.lambda().in(SmsCheckCustomerInfo::getCheckState, Arrays.asList(0,1));
         long undoCount = infoService.count(undoTargetQuery);
         // 待稽核
         QueryWrapper<SmsCheckCustomerInfo> uncheckTargetQuery = QueryGenerator.initQueryWrapper(target, request.getParameterMap());
+        if (CollUtil.isNotEmpty(taskIds)) {
+            uncheckTargetQuery.lambda().in(SmsCheckCustomerInfo::getTaskId, taskIds);
+        }
         uncheckTargetQuery.lambda().in(SmsCheckCustomerInfo::getCheckState, Arrays.asList(2,3));
         long uncheckCount = infoService.count(uncheckTargetQuery);
         // 待整改
         QueryWrapper<SmsCheckCustomerInfo> checkedTargetQuery = QueryGenerator.initQueryWrapper(target, request.getParameterMap());
+        if (CollUtil.isNotEmpty(taskIds)) {
+            checkedTargetQuery.lambda().in(SmsCheckCustomerInfo::getTaskId, taskIds);
+        }
         checkedTargetQuery.lambda().in(SmsCheckCustomerInfo::getCheckState, Arrays.asList(4));
         long checkedCount = infoService.count(checkedTargetQuery);
         // 通过
         QueryWrapper<SmsCheckCustomerInfo> doneTargetQuery = QueryGenerator.initQueryWrapper(target, request.getParameterMap());
+        if (CollUtil.isNotEmpty(taskIds)) {
+            doneTargetQuery.lambda().in(SmsCheckCustomerInfo::getTaskId, taskIds);
+        }
         doneTargetQuery.lambda().in(SmsCheckCustomerInfo::getCheckState, Arrays.asList(5));
         long doneCount = infoService.count(doneTargetQuery);
 
@@ -195,7 +208,7 @@ public class SmsCheckIndexController {
     /**
      * 查询客户经理角色的 最新动态、我的任务、本月目标
      *
-     * @param taskId 对象
+     * @param taskIds 对象
      * @param pageNo 页码
      * @param pageSize 每页条数
      * @param request 请求
@@ -203,18 +216,18 @@ public class SmsCheckIndexController {
      */
     @ApiOperation(value="完善客户经理角色的 最新动态、我的任务、本月目标", notes="客户经理角色的 最新动态、我的任务、本月目标")
     @GetMapping(value = "/typeInfo")
-    public Result<Dict> typeInfo(String taskId,
+    public Result<Dict> typeInfo(@RequestParam(name="taskIds",required = false)List<String> taskIds,
                                  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                  @RequestParam(name="pageSize", defaultValue="5") Integer pageSize,
                                  HttpServletRequest request) {
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         // 最新动态
         SmsCheckWorkLog workLog = new SmsCheckWorkLog();
-        if (StrUtil.isNotBlank(taskId)) {
-            workLog.setTaskId(taskId);
-        }
         workLog.setTargetUsername(sysUser.getUsername());
         QueryWrapper<SmsCheckWorkLog> workLogQuery = QueryGenerator.initQueryWrapper(workLog, request.getParameterMap());
+        if (CollUtil.isNotEmpty(taskIds)) {
+            workLogQuery.lambda().in(SmsCheckWorkLog::getTaskId, taskIds);
+        }
         workLogQuery.lambda().orderByDesc(SmsCheckWorkLog::getCreateTime);
         IPage<SmsCheckWorkLog> workLogPage = workLogService.page(new Page<>(pageNo, pageSize), workLogQuery);
 
@@ -230,12 +243,12 @@ public class SmsCheckIndexController {
 
         // 我的任务
         SmsCheckCustomerInfo info = new SmsCheckCustomerInfo();
-        if (StrUtil.isNotBlank(taskId)) {
-            info.setTaskId(taskId);
-        }
         // 员工工号关联
         info.setStaffNo(sysUser.getWorkNo());
         QueryWrapper<SmsCheckCustomerInfo> infoQuery = QueryGenerator.initQueryWrapper(info, request.getParameterMap());
+        if (CollUtil.isNotEmpty(taskIds)) {
+            infoQuery.lambda().in(SmsCheckCustomerInfo::getTaskId, taskIds);
+        }
         // 稽核状态 0：未处理；1：未完善；2：待稽核；3：已整改；4：待整改；5：稽核通过；
         infoQuery.lambda().in(SmsCheckCustomerInfo::getCheckState, Arrays.asList(0, 1, 4));
         infoQuery.lambda().orderByDesc(SmsCheckCustomerInfo::getCreateTime);
@@ -250,28 +263,40 @@ public class SmsCheckIndexController {
 
         // 本月目标
         SmsCheckCustomerInfo target = new SmsCheckCustomerInfo();
-        if (StrUtil.isNotBlank(taskId)) {
-            target.setTaskId(taskId);
-        }
         //target.setCreateBy(sysUser.getUsername());
         // 稽核状态 0：未处理；1：未完善；2：待稽核；3：已整改；4：待整改；5：稽核通过；
         // 全部
         QueryWrapper<SmsCheckCustomerInfo> allTargetQuery = QueryGenerator.initQueryWrapper(target, request.getParameterMap());
+        if (CollUtil.isNotEmpty(taskIds)) {
+            allTargetQuery.lambda().in(SmsCheckCustomerInfo::getTaskId, taskIds);
+        }
         long allCount = infoService.count(allTargetQuery);
         // 未完善
         QueryWrapper<SmsCheckCustomerInfo> undoTargetQuery = QueryGenerator.initQueryWrapper(target, request.getParameterMap());
+        if (CollUtil.isNotEmpty(taskIds)) {
+            undoTargetQuery.lambda().in(SmsCheckCustomerInfo::getTaskId, taskIds);
+        }
         undoTargetQuery.lambda().in(SmsCheckCustomerInfo::getCheckState, Arrays.asList(0,1));
         long undoCount = infoService.count(undoTargetQuery);
         // 待稽核
         QueryWrapper<SmsCheckCustomerInfo> uncheckTargetQuery = QueryGenerator.initQueryWrapper(target, request.getParameterMap());
+        if (CollUtil.isNotEmpty(taskIds)) {
+            uncheckTargetQuery.lambda().in(SmsCheckCustomerInfo::getTaskId, taskIds);
+        }
         uncheckTargetQuery.lambda().in(SmsCheckCustomerInfo::getCheckState, Arrays.asList(2,3));
         long uncheckCount = infoService.count(uncheckTargetQuery);
         // 待整改
         QueryWrapper<SmsCheckCustomerInfo> checkedTargetQuery = QueryGenerator.initQueryWrapper(target, request.getParameterMap());
+        if (CollUtil.isNotEmpty(taskIds)) {
+            checkedTargetQuery.lambda().in(SmsCheckCustomerInfo::getTaskId, taskIds);
+        }
         checkedTargetQuery.lambda().in(SmsCheckCustomerInfo::getCheckState, Arrays.asList(4));
         long checkedCount = infoService.count(checkedTargetQuery);
         // 通过
         QueryWrapper<SmsCheckCustomerInfo> doneTargetQuery = QueryGenerator.initQueryWrapper(target, request.getParameterMap());
+        if (CollUtil.isNotEmpty(taskIds)) {
+            doneTargetQuery.lambda().in(SmsCheckCustomerInfo::getTaskId, taskIds);
+        }
         doneTargetQuery.lambda().in(SmsCheckCustomerInfo::getCheckState, Arrays.asList(5));
         long doneCount = infoService.count(doneTargetQuery);
 

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

@@ -2,11 +2,10 @@ package org.jeecg.modules.smscheck.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.SelectProvider;
 import org.jeecg.modules.smscheck.entity.SmsCheckCustomerInfo;
-import org.jeecg.modules.smscheck.entity.SmsCheckCustomerInfoVo;
-import org.jeecg.modules.smscheck.entity.SmsCheckTaskVo;
+import org.jeecg.modules.smscheck.vo.SmsCheckCustomerInfoTaskVo;
+import org.jeecg.modules.smscheck.vo.SmsCheckTaskVo;
 
 import java.util.List;
 
@@ -31,7 +30,7 @@ public interface SmsCheckCustomerInfoMapper extends BaseMapper<SmsCheckCustomerI
     List<SmsCheckTaskVo> checkInfoWarningCountStaff(SmsCheckCustomerInfo smsCheckCustomerInfo);
 
     @SelectProvider(type = ProviderClass.class,method = "checkInfoWarningCountStaff")
-    List<SmsCheckCustomerInfoVo> checkInfoWarningPageList(Integer pageNo, Integer pageSize);
+    List<SmsCheckCustomerInfoTaskVo> checkInfoWarningPageList(Integer pageNo, Integer pageSize);
 
     class ProviderClass{
         public String checkInfoWarningCount(SmsCheckCustomerInfo smsCheckCustomerInfo){

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

@@ -2,7 +2,7 @@ package org.jeecg.modules.smscheck.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 
-import org.jeecg.modules.smscheck.entity.OSSFile;
+import org.jeecg.modules.smscheck.vo.OSSFile;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;

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

@@ -2,8 +2,8 @@ package org.jeecg.modules.smscheck.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.smscheck.entity.SmsCheckCustomerInfo;
-import org.jeecg.modules.smscheck.entity.SmsCheckCustomerInfoVo;
-import org.jeecg.modules.smscheck.entity.SmsCheckTaskVo;
+import org.jeecg.modules.smscheck.vo.SmsCheckCustomerInfoTaskVo;
+import org.jeecg.modules.smscheck.vo.SmsCheckTaskVo;
 
 import java.util.List;
 
@@ -23,5 +23,5 @@ public interface ISmsCheckCustomerInfoService extends IService<SmsCheckCustomerI
 
     List<SmsCheckTaskVo> checkInfoWarningCountStaff(SmsCheckCustomerInfo smsCheckCustomerInfo);
 
-    List<SmsCheckCustomerInfoVo> checkInfoWarningPageList(Integer pageNo, Integer pageSize);
+    List<SmsCheckCustomerInfoTaskVo> checkInfoWarningPageList(Integer pageNo, Integer pageSize);
 }

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

@@ -1,8 +1,8 @@
 package org.jeecg.modules.smscheck.service.impl;
 
 import org.jeecg.modules.smscheck.entity.SmsCheckCustomerInfo;
-import org.jeecg.modules.smscheck.entity.SmsCheckCustomerInfoVo;
-import org.jeecg.modules.smscheck.entity.SmsCheckTaskVo;
+import org.jeecg.modules.smscheck.vo.SmsCheckCustomerInfoTaskVo;
+import org.jeecg.modules.smscheck.vo.SmsCheckTaskVo;
 import org.jeecg.modules.smscheck.mapper.SmsCheckCustomerInfoMapper;
 import org.jeecg.modules.smscheck.service.ISmsCheckCustomerInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,7 +38,7 @@ public class SmsCheckCustomerInfoServiceImpl extends ServiceImpl<SmsCheckCustome
     }
 
     @Override
-    public List<SmsCheckCustomerInfoVo> checkInfoWarningPageList(Integer pageNo, Integer pageSize) {
+    public List<SmsCheckCustomerInfoTaskVo> checkInfoWarningPageList(Integer pageNo, Integer pageSize) {
         return smsCheckCustomerInfoMapper.checkInfoWarningPageList(pageNo,pageSize);
     }
 

tnc-sms/src/main/java/org/jeecg/modules/smscheck/entity/OSSFile.java → tnc-sms/src/main/java/org/jeecg/modules/smscheck/vo/OSSFile.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.smscheck.entity;
+package org.jeecg.modules.smscheck.vo;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;

tnc-sms/src/main/java/org/jeecg/modules/smscheck/entity/SmsCheckCustomerInfoVo.java → tnc-sms/src/main/java/org/jeecg/modules/smscheck/vo/SmsCheckCustomerInfoTaskVo.java

@@ -1,12 +1,11 @@
-package org.jeecg.modules.smscheck.entity;
+package org.jeecg.modules.smscheck.vo;
 
-import io.swagger.models.auth.In;
 import lombok.Data;
 
 import java.util.List;
 
 @Data
-public class SmsCheckCustomerInfoVo {
+public class SmsCheckCustomerInfoTaskVo {
     private Integer checkState0;
     private Integer checkState1;
     private Integer checkState4;

tnc-sms/src/main/java/org/jeecg/modules/smscheck/entity/SmsCheckTaskVo.java → tnc-sms/src/main/java/org/jeecg/modules/smscheck/vo/SmsCheckTaskVo.java

@@ -1,6 +1,7 @@
-package org.jeecg.modules.smscheck.entity;
+package org.jeecg.modules.smscheck.vo;
 
 import lombok.Data;
+import org.jeecg.modules.smscheck.entity.SmsCheckTask;
 
 @Data
 public class SmsCheckTaskVo extends SmsCheckTask {

tnc-system/src/main/resources/application-prod.yml

@@ -22,8 +22,8 @@ management:
 spring:
   servlet:
     multipart:
-      max-file-size: 10MB
-      max-request-size: 10MB
+      max-file-size: 50MB
+      max-request-size: 50MB
   mail:
     host: smtp.163.com
     username: jeecgos@163.com

tnc-system/src/main/resources/application-test.yml

@@ -22,8 +22,8 @@ management:
 spring:
   servlet:
     multipart:
-      max-file-size: 10MB
-      max-request-size: 10MB
+      max-file-size: 50MB
+      max-request-size: 50MB
   mail:
     host: smtp.163.com
     username: jeecgos@163.com