优化代码

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

@@ -16,6 +16,7 @@ import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.CommonUtils;
 import org.jeecg.common.util.MinioUtil;
 import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.smscheck.configs.CheckStateCode;
 import org.jeecg.modules.smscheck.entity.SmsCheckCustomerData;
 import org.jeecg.modules.smscheck.entity.SmsCheckCustomerInfo;
 import org.jeecg.modules.smscheck.service.ISmsCheckCustomerDataService;
@@ -30,7 +31,6 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.Arrays;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * @author jeecg-boot
@@ -46,7 +46,7 @@ public class SmsCheckCustomerDataController extends JeecgController<SmsCheckCust
     @Autowired
     private ISmsCheckCustomerDataService smsCheckCustomerDataService;
     @Autowired
-    private ISmsCheckCustomerInfoService smsCheckCustomerInfoService;
+    private ISmsCheckCustomerInfoService infoService;
 
     /**
      * 分页列表查询
@@ -115,23 +115,28 @@ public class SmsCheckCustomerDataController extends JeecgController<SmsCheckCust
 
     @AutoLog(value = "客户资料-编辑")
     @ApiOperation(value = "客户资料-编辑", notes = "客户资料-编辑")
-    @RequestMapping(value = "/edit/info/id", method = {RequestMethod.PUT, RequestMethod.POST})
-    public Result<String> editUserNo(@RequestBody SmsCheckCustomerData smsCheckCustomerData) {
-        if (StringUtils.isEmpty(smsCheckCustomerData.getInfoId())) {
+    @PostMapping(value = "/edit/info/id")
+    public Result<String> editUserNo(@RequestBody SmsCheckCustomerData customerData) {
+        String infoId = customerData.getInfoId();
+        if (StringUtils.isEmpty(infoId)) {
             return Result.error("客户编码不能为空");
         }
+
         LambdaQueryWrapper<SmsCheckCustomerData> queryWrapperData = new LambdaQueryWrapper<>();
-        queryWrapperData.eq(SmsCheckCustomerData::getInfoId,smsCheckCustomerData.getInfoId());
+        queryWrapperData.eq(SmsCheckCustomerData::getInfoId,customerData.getInfoId());
         List<SmsCheckCustomerData> list = smsCheckCustomerDataService.list(queryWrapperData);
         if (list.size() == 0){
-            boolean save = smsCheckCustomerDataService.save(smsCheckCustomerData);
+            boolean save = smsCheckCustomerDataService.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 =  smsCheckCustomerDataService.integration(smsCheckCustomerData,list.get(0));
-        boolean edit = smsCheckCustomerDataService.updateById(smsCheckCustomerData);
+        customerData =  smsCheckCustomerDataService.integration(customerData,list.get(0));
+        boolean edit = smsCheckCustomerDataService.updateById(customerData);
         if (!edit) {
             return Result.error("编辑失败");
         }

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

@@ -165,7 +165,7 @@ public class SmsCheckCustomerInfoController extends JeecgController<SmsCheckCust
 
     @AutoLog(value = "客户信息-编辑")
     @ApiOperation(value = "客户信息-编辑", notes = "客户信息-编辑")
-    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+    @PutMapping(value = "/edit")
     public Result<String> edit(@RequestBody SmsCheckCustomerInfo smsCheckCustomerInfo) {
         customerInfoService.updateById(smsCheckCustomerInfo);
         return Result.OK("编辑成功!");

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

@@ -100,7 +100,7 @@ public class SmsCheckIndexController {
      * @param request 请求
      * @return 结果
      */
-    @ApiOperation(value="完善客户资料日志-分页列表查询", notes="客户资料完善记录-分页列表查询")
+    @ApiOperation(value="领导角色的 最新动态、我的任务、本月目标", notes="领导角色的 最新动态、我的任务、本月目标")
     @GetMapping(value = "/typeWork")
     public Result<Dict> typeWork(String taskId,
                                 @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@@ -153,6 +153,7 @@ public class SmsCheckIndexController {
         }
         // 用户名关联
         target.setCreateBy(sysUser.getUsername());
+        // 稽核状态 0：未处理；1：未完善；2：待稽核；3：已整改；4：待整改；5：稽核通过；
         // 全部
         QueryWrapper<SmsCheckCustomerInfo> allTargetQuery = QueryGenerator.initQueryWrapper(target, request.getParameterMap());
         long allCount = infoService.count(allTargetQuery);
@@ -192,7 +193,7 @@ public class SmsCheckIndexController {
 
 
     /**
-     * 查询领导角色的 最新动态、我的任务、本月目标
+     * 查询客户经理角色的 最新动态、我的任务、本月目标
      *
      * @param taskId 对象
      * @param pageNo 页码
@@ -200,7 +201,7 @@ public class SmsCheckIndexController {
      * @param request 请求
      * @return 结果
      */
-    @ApiOperation(value="完善客户资料日志-分页列表查询", notes="客户资料完善记录-分页列表查询")
+    @ApiOperation(value="完善客户经理角色的 最新动态、我的任务、本月目标", notes="客户经理角色的 最新动态、我的任务、本月目标")
     @GetMapping(value = "/typeInfo")
     public Result<Dict> typeInfo(String taskId,
                                  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@@ -253,6 +254,7 @@ public class SmsCheckIndexController {
             target.setTaskId(taskId);
         }
         //target.setCreateBy(sysUser.getUsername());
+        // 稽核状态 0：未处理；1：未完善；2：待稽核；3：已整改；4：待整改；5：稽核通过；
         // 全部
         QueryWrapper<SmsCheckCustomerInfo> allTargetQuery = QueryGenerator.initQueryWrapper(target, request.getParameterMap());
         long allCount = infoService.count(allTargetQuery);

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

@@ -251,8 +251,10 @@ public class SmsCheckTaskController extends JeecgController<SmsCheckTask, ISmsCh
 			 // 0：未处理；1：未完善；2：待稽核；3：待整改；4：已整改；5：稽核通过；
 			 info.setCheckState(0);
 			 dataList.add(info);
+			 info.setTaskId(taskId);
 			 long count = customerInfoService.count(
 					 new LambdaQueryWrapper<SmsCheckCustomerInfo>()
+							 .eq(SmsCheckCustomerInfo::getTaskId, info.getTaskId())
 							 .eq(SmsCheckCustomerInfo::getUserNo, info.getUserNo())
 							 .eq(SmsCheckCustomerInfo::getDelFlag, CommonConstant.DEL_FLAG_0));
 			 if (count > 0) {
@@ -285,6 +287,13 @@ 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/SmsCheckCustomerInfo.java

@@ -98,10 +98,10 @@ public class SmsCheckCustomerInfo implements Serializable {
     @Excel(name = "员工三级部门编号", width = 15)
     @ApiModelProperty(value = "员工三级部门编号")
     private String staffDeptLevel3No;
-	/** 用户开通状态 */
+	/** 用户开通状态 (1：开通；2：拆机)*/
     @Excel(name = "用户开通状态", width = 15)
     @ApiModelProperty(value = "用户开通状态")
-    private String userOpenState;
+    private Integer userOpenState;
 	/** 码号 */
     @Excel(name = "码号", width = 15)
     @ApiModelProperty(value = "码号")

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

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