客户提出修改意见

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

@@ -14,6 +14,7 @@ import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.dto.message.MessageDTO;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.aspect.annotation.PermissionData;
 import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.system.api.ISysBaseAPI;
 import org.jeecg.common.system.base.controller.JeecgController;
@@ -66,6 +67,7 @@ public class SmsCheckCustomerInfoController extends JeecgController<SmsCheckCust
     //@AutoLog(value = "客户信息-分页列表查询")
     @ApiOperation(value = "客户信息-分页列表查询", notes = "客户信息-分页列表查询")
     @GetMapping(value = "/list")
+    @PermissionData(pageComponent = "smscheck/modules/TaskCheckList")
     public Result<IPage<SmsCheckCustomerInfo>> queryPageList(SmsCheckCustomerInfo smsCheckCustomerInfo,
                                                              @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                              @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
@@ -146,9 +148,9 @@ public class SmsCheckCustomerInfoController extends JeecgController<SmsCheckCust
         if (list.size()>0){
             return Result.error("该用户已经存在");
         }
-        String realname = sysUser.getRealname();
+        smsCheckCustomerInfo.setStaffUsername(sysUser.getUsername());
         smsCheckCustomerInfo.setStaffNo(workNo);
-        smsCheckCustomerInfo.setStaffName(realname);
+        smsCheckCustomerInfo.setStaffName(sysUser.getRealname());
         smsCheckCustomerInfo.setCheckState(CheckStateCode.CHECK_STSTE_1);
         customerInfoService.save(smsCheckCustomerInfo);
         return Result.OK("添加成功！");
@@ -254,6 +256,7 @@ public class SmsCheckCustomerInfoController extends JeecgController<SmsCheckCust
      * @return excel文件
      */
     @RequestMapping(value = "/exportXls")
+    @PermissionData(pageComponent = "smscheck/modules/TaskCheckList")
     public ModelAndView exportXls(HttpServletRequest request, SmsCheckCustomerInfo smsCheckCustomerInfo) {
         return super.exportXls(request, smsCheckCustomerInfo, SmsCheckCustomerInfo.class, "客户信息");
     }
@@ -279,33 +282,42 @@ public class SmsCheckCustomerInfoController extends JeecgController<SmsCheckCust
     //@AutoLog(value = "客户信息-通过id查询")
     @ApiOperation(value = "客户信息-通过id查询 稽核统计数", notes = "客户信息-通过id查询 稽核统计数")
     @GetMapping(value = "/count")
-    public Result<Dict> count(@RequestParam(name = "id") String id) {
+    @PermissionData(pageComponent = "smscheck/modules/TaskCheckList")
+    public Result<Dict> count(@RequestParam(name = "id") String id,HttpServletRequest request) {
         Dict dict = Dict.create();
         // 客户总数
-        long count = customerInfoService.count(new LambdaQueryWrapper<SmsCheckCustomerInfo>()
-                .eq(SmsCheckCustomerInfo::getTaskId, id)
-                .eq(SmsCheckCustomerInfo::getDelFlag, CommonConstant.DEL_FLAG_0));
+        QueryWrapper<SmsCheckCustomerInfo> countQueryWrapper = QueryGenerator.initQueryWrapper(new SmsCheckCustomerInfo(), request.getParameterMap());
+        countQueryWrapper.lambda().eq(SmsCheckCustomerInfo::getTaskId, id)
+                .eq(SmsCheckCustomerInfo::getDelFlag, CommonConstant.DEL_FLAG_0);
+        long count = customerInfoService.count(countQueryWrapper);
+
         // 未处理数
-        long undoCount = customerInfoService.count(new LambdaQueryWrapper<SmsCheckCustomerInfo>()
-                .eq(SmsCheckCustomerInfo::getTaskId, id)
+        QueryWrapper<SmsCheckCustomerInfo> undoCountQueryWrapper = QueryGenerator.initQueryWrapper(new SmsCheckCustomerInfo(), request.getParameterMap());
+        undoCountQueryWrapper.lambda().eq(SmsCheckCustomerInfo::getTaskId, id)
                 .in(SmsCheckCustomerInfo::getCheckState, Arrays.asList(0, 1))
-                .eq(SmsCheckCustomerInfo::getDelFlag, CommonConstant.DEL_FLAG_0));
+                .eq(SmsCheckCustomerInfo::getDelFlag, CommonConstant.DEL_FLAG_0);
+        long undoCount = customerInfoService.count(undoCountQueryWrapper);
 
         // 待稽核数
-        long uncheckCount = customerInfoService.count(new LambdaQueryWrapper<SmsCheckCustomerInfo>()
-                .eq(SmsCheckCustomerInfo::getTaskId, id)
+        QueryWrapper<SmsCheckCustomerInfo> uncheckCountQueryWrapper = QueryGenerator.initQueryWrapper(new SmsCheckCustomerInfo(), request.getParameterMap());
+        uncheckCountQueryWrapper.lambda().eq(SmsCheckCustomerInfo::getTaskId, id)
                 .in(SmsCheckCustomerInfo::getCheckState, Arrays.asList(2, 3))
-                .eq(SmsCheckCustomerInfo::getDelFlag, CommonConstant.DEL_FLAG_0));
+                .eq(SmsCheckCustomerInfo::getDelFlag, CommonConstant.DEL_FLAG_0);
+        long uncheckCount = customerInfoService.count(uncheckCountQueryWrapper);
+
         // 待整改数
-        long checkedCount = customerInfoService.count(new LambdaQueryWrapper<SmsCheckCustomerInfo>()
-                .eq(SmsCheckCustomerInfo::getTaskId, id)
+        QueryWrapper<SmsCheckCustomerInfo> checkedCountQueryWrapper = QueryGenerator.initQueryWrapper(new SmsCheckCustomerInfo(), request.getParameterMap());
+        checkedCountQueryWrapper.lambda().eq(SmsCheckCustomerInfo::getTaskId, id)
                 .eq(SmsCheckCustomerInfo::getCheckState, 4)
-                .eq(SmsCheckCustomerInfo::getDelFlag, CommonConstant.DEL_FLAG_0));
+                .eq(SmsCheckCustomerInfo::getDelFlag, CommonConstant.DEL_FLAG_0);
+        long checkedCount = customerInfoService.count(checkedCountQueryWrapper);
+
         // 稽核完成数
-        long passedCount = customerInfoService.count(new LambdaQueryWrapper<SmsCheckCustomerInfo>()
-                .eq(SmsCheckCustomerInfo::getTaskId, id)
+        QueryWrapper<SmsCheckCustomerInfo> passedCountQueryWrapper = QueryGenerator.initQueryWrapper(new SmsCheckCustomerInfo(), request.getParameterMap());
+        passedCountQueryWrapper.lambda().eq(SmsCheckCustomerInfo::getTaskId, id)
                 .eq(SmsCheckCustomerInfo::getCheckState, 5)
-                .eq(SmsCheckCustomerInfo::getDelFlag, CommonConstant.DEL_FLAG_0));
+                .eq(SmsCheckCustomerInfo::getDelFlag, CommonConstant.DEL_FLAG_0);
+        long passedCount = customerInfoService.count(passedCountQueryWrapper);
 
         dict.put("count", count);
         dict.put("undoCount", undoCount);

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

@@ -16,6 +16,7 @@ import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.api.ISysBaseAPI;
 import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.vo.DictModel;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.smscheck.entity.SmsCheckCustomerInfo;
 import org.jeecg.modules.smscheck.entity.SmsCheckCustomerInfoLog;
@@ -26,6 +27,7 @@ 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.vo.IndexRecentVo;
+import org.jeecg.modules.smscheck.vo.IndexTaskVo;
 import org.jeecg.modules.smscheck.vo.SmsCheckCustomerInfoSubTaskVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -34,8 +36,11 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 
 @Api(tags="首页-工作台")
@@ -82,11 +87,18 @@ public class SmsCheckIndexController {
         QueryWrapper<SmsCheckTask> queryWrapper = QueryGenerator.initQueryWrapper(smsCheckTask, request.getParameterMap());
         Page<SmsCheckTask> page = new Page<>(pageNo, pageSize);
         IPage<SmsCheckTask> pageList = taskService.page(page, queryWrapper);
-
+        Map<String, String> checkTaskState = getDictItemMap("sms_check_task_state");
+        List<IndexTaskVo> taskList = new ArrayList<>();
+        pageList.getRecords().forEach(task -> {
+            IndexTaskVo taskVo = new IndexTaskVo();
+            BeanUtil.copyProperties(task, taskVo);
+            taskVo.setTaskStateText(checkTaskState.get(task.getTaskState().toString()));
+            taskList.add(taskVo);
+        });
 
         Dict result = Dict.create();
         result.put("isManager", isManager);
-        result.put("records", pageList.getRecords());
+        result.put("records", taskList);
 
         return Result.OK(result);
     }
@@ -316,5 +328,16 @@ public class SmsCheckIndexController {
 
         return Result.OK(result);
     }
-
+    /**.
+     * 通过字典代码和字典值获取所有字典项Map
+     *
+     * @param dictCode 字典代码
+     * @return 所有字典项Map
+     */
+    private Map<String, String> getDictItemMap(String dictCode) {
+        List<DictModel> dictCodeList =
+                sysBaseAPI.queryDictItemsByCode(dictCode);
+        return dictCodeList.stream()
+                .collect(Collectors.toMap(DictModel::getValue, DictModel::getText));
+    }
 }

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

@@ -16,6 +16,7 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.aspect.annotation.PermissionData;
 import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.system.api.ISysBaseAPI;
 import org.jeecg.common.system.base.controller.JeecgController;
@@ -69,6 +70,7 @@ public class SmsCheckTaskController extends JeecgController<SmsCheckTask, ISmsCh
 	//@AutoLog(value = "稽核任务-分页列表查询")
 	@ApiOperation(value="稽核任务-分页列表查询", notes="稽核任务-分页列表查询")
 	@GetMapping(value = "/list")
+	@PermissionData(pageComponent = "smscheck/modules/TaskList")
 	public Result<IPage<SmsCheckTask>> queryPageList(SmsCheckTask smsCheckTask,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
@@ -287,13 +289,6 @@ public class SmsCheckTaskController extends JeecgController<SmsCheckTask, ISmsCh
 		 if (StrUtil.isBlank(vo.getCustomerNo()) && StrUtil.isBlank(vo.getUserNo())) {
 			 return null;
 		 }
-		 // 用户状态
-		 String userStateStr = vo.getUserStateStr();
-		 // FIXME 只有在用状态，其他状态？
-		 vo.setUserState(0);
-		 if("在用".equals(userStateStr)) {
-			 vo.setUserState(1);
-		 }
 		 // 格式化入网时间
 		 String accessTime = vo.getNetworkAccessTime();
 		 DateTime accessTimeDate = DateUtil.parse(accessTime, "yyyyMMdd");

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

@@ -79,6 +79,10 @@ public class SmsCheckCustomerData implements Serializable {
     @Excel(name = "增值业务许可证", width = 15)
     @ApiModelProperty(value = "增值业务许可证")
     private String valueAddedLicence;
+    /** 其他资料 */
+    @Excel(name = "其他资料", width = 15)
+    @ApiModelProperty(value = "其他资料")
+    private String otherData;
 	/** 员工id */
     @Excel(name = "员工id", width = 15)
     @ApiModelProperty(value = "员工id")

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

@@ -69,6 +69,10 @@ public class SmsCheckCustomerInfo implements Serializable {
     /** 员工姓名 */
     @Excel(name = "员工姓名", width = 15)
     @ApiModelProperty(value = "员工姓名")
+    private String staffUsername;
+    /** 员工姓名 */
+    @Excel(name = "员工姓名", width = 15)
+    @ApiModelProperty(value = "员工姓名")
     private String staffName;
     /** 员工编号 */
     @Excel(name = "员工姓名", width = 15)

tnc-sms/src/main/java/org/jeecg/modules/smscheck/vo/IndexTaskVo.java

@@ -0,0 +1,55 @@
+package org.jeecg.modules.smscheck.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @description 行短稽核任务
+ * @author jeecg-boot
+ * @date 2022-06-20
+ * @version V1.0
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="sms_check_task对象", description="稽核任务")
+public class IndexTaskVo implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/** 主键 */
+    @ApiModelProperty(value = "主键")
+    private String id;
+	/** 任务名称 */
+    @ApiModelProperty(value = "任务名称")
+    private String taskName;
+	/** 任务状态 0：未开始；1：进行中；2：已结束； */
+    @ApiModelProperty(value = "任务状态")
+    private Integer taskState;
+    @ApiModelProperty(value = "任务状态")
+    private String taskStateText;
+	/** 任务开始时间 */
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "任务开始时间")
+    private Date taskStartTime;
+	/** 任务结束时间 */
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "任务结束时间")
+    private Date taskEndTime;
+	/** 描述 */
+    @ApiModelProperty(value = "描述")
+    private String description;
+
+
+
+}
+

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

@@ -54,13 +54,9 @@ public class SmsCheckCustomerInfoVo implements Serializable {
     @Excel(name = "入网时间", width = 15)
     @ApiModelProperty(value = "入网时间")
     private String networkAccessTime;
-    /** 用户状态 在用，其他？ */
-    @Excel(name = "用户状态", width = 15)
-    @ApiModelProperty(value = "用户状态")
-    private String userStateStr;
 	/** 用户状态 */
     @ApiModelProperty(value = "用户状态")
-    private Integer userState;
+    private String userState;
 	/** 用户发展员工 */
     @Excel(name = "用户发展员工", width = 15)
     @ApiModelProperty(value = "用户发展员工")