1、完善稽核任务和稽核客户资料

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

@@ -1,5 +1,7 @@
 package org.jeecg.modules.smscheck.controller;
 
+import cn.hutool.core.lang.Dict;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -8,6 +10,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.constant.CommonConstant;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.modules.smscheck.entity.SmsCheckCustomerInfo;
@@ -153,4 +156,50 @@ public class SmsCheckCustomerInfoController extends JeecgController<SmsCheckCust
         return super.importExcel(request, response, SmsCheckCustomerInfo.class);
     }
 
+	 /**
+	  * 通过id查询 稽核统计数
+	  *
+	  * @param id 主键
+	  * @return 数据
+	  */
+	 //@AutoLog(value = "客户信息-通过id查询")
+	 @ApiOperation(value="客户信息-通过id查询 稽核统计数", notes="客户信息-通过id查询 稽核统计数")
+	 @GetMapping(value = "/count")
+	 public Result<Dict> count(@RequestParam(name="id") String id) {
+		 Dict dict = Dict.create();
+		 // 客户总数
+		 long count = smsCheckCustomerInfoService.count(new LambdaQueryWrapper<SmsCheckCustomerInfo>()
+				 .eq(SmsCheckCustomerInfo::getTaskId, id)
+				 .eq(SmsCheckCustomerInfo::getDelFlag, CommonConstant.DEL_FLAG_0));
+		 // 未处理数
+		 long undoCount = smsCheckCustomerInfoService.count(new LambdaQueryWrapper<SmsCheckCustomerInfo>()
+				 .eq(SmsCheckCustomerInfo::getTaskId, id)
+				 .in(SmsCheckCustomerInfo::getCheckState, Arrays.asList(0,1))
+				 .eq(SmsCheckCustomerInfo::getDelFlag, CommonConstant.DEL_FLAG_0));
+
+		 // 待稽核数
+		 long uncheckCount = smsCheckCustomerInfoService.count(new LambdaQueryWrapper<SmsCheckCustomerInfo>()
+				 .eq(SmsCheckCustomerInfo::getTaskId, id)
+				 .in(SmsCheckCustomerInfo::getCheckState, Arrays.asList(2,4))
+				 .eq(SmsCheckCustomerInfo::getDelFlag, CommonConstant.DEL_FLAG_0));
+		 // 待整改数
+		 long checkedCount = smsCheckCustomerInfoService.count(new LambdaQueryWrapper<SmsCheckCustomerInfo>()
+				 .eq(SmsCheckCustomerInfo::getTaskId, id)
+				 .eq(SmsCheckCustomerInfo::getCheckState, 3)
+				 .eq(SmsCheckCustomerInfo::getDelFlag, CommonConstant.DEL_FLAG_0));
+		 // 稽核完成数
+		 long passedCount = smsCheckCustomerInfoService.count(new LambdaQueryWrapper<SmsCheckCustomerInfo>()
+				 .eq(SmsCheckCustomerInfo::getTaskId, id)
+				 .eq(SmsCheckCustomerInfo::getCheckState, 5)
+				 .eq(SmsCheckCustomerInfo::getDelFlag, CommonConstant.DEL_FLAG_0));
+
+		 dict.put("count", count);
+		 dict.put("undoCount", undoCount);
+		 dict.put("uncheckCount", uncheckCount);
+		 dict.put("checkedCount", checkedCount);
+		 dict.put("passedCount", passedCount);
+
+		 return Result.OK(dict);
+	 }
+
 }

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

@@ -91,6 +91,7 @@ public class SmsCheckTaskController extends JeecgController<SmsCheckTask, ISmsCh
 	@ApiOperation(value="稽核任务-添加", notes="稽核任务-添加")
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody SmsCheckTask smsCheckTask) {
+		// 0：未开始；1：进行中；2：已结束；
 		smsCheckTask.setTaskState(0);
 		smsCheckTask.setCustomerCount(0);
 		smsCheckTask.setCheckCount(0);
@@ -245,17 +246,20 @@ public class SmsCheckTaskController extends JeecgController<SmsCheckTask, ISmsCh
 		 int customerCount = 0;
 		 for (int i = 0; i < list.size(); i++) {
 			 SmsCheckCustomerInfoVo infoVo = list.get(i);
-			 SmsCheckCustomerInfo info = new SmsCheckCustomerInfo();
 			 infoVo.setTaskId(taskId);
+			 SmsCheckCustomerInfo info = new SmsCheckCustomerInfo();
 			 BeanUtil.copyProperties(infoVo, info, true);
-			 info.setStaffInfo(infoVo.getStaffNo());
+			 info.setDelFlag(CommonConstant.DEL_FLAG_0);
+			 // 0：未处理；1：未完善；2：待稽核；3：待整改；4：已整改；5：稽核通过；
+			 info.setCheckState(0);
 			 dataList.add(info);
 			 long count = customerInfoService.count(
 					 new LambdaQueryWrapper<SmsCheckCustomerInfo>()
-							 .eq(SmsCheckCustomerInfo::getCustomerNo, info.getCustomerNo())
+							 .eq(SmsCheckCustomerInfo::getUserNo, info.getUserNo())
 							 .eq(SmsCheckCustomerInfo::getDelFlag, CommonConstant.DEL_FLAG_0));
 			 if (count > 0) {
-				 return Result.error("客户[" + info.getCustomerNo() + "]已存在！");
+				 // TODO 重复处理，放校验里面？
+//				 return Result.error("客户[" + info.getCustomerNo() + "]已存在！");
 			 } else {
 				 customerCount++;
 				 customerInfoService.save(info);
@@ -267,7 +271,7 @@ public class SmsCheckTaskController extends JeecgController<SmsCheckTask, ISmsCh
 			 task.setCustomerCount(task.getCustomerCount() + customerCount);
 			 taskService.updateById(task);
 		 }
-		 return Result.OK("导入成功！");
+		 return Result.OK("导入成功！导入条数" + customerCount);
 	 }
 
 	 /**
@@ -278,6 +282,7 @@ public class SmsCheckTaskController extends JeecgController<SmsCheckTask, ISmsCh
 	  * @return 客户信息
 	  */
 	 private SmsCheckCustomerInfoVo checkCustomerInfo(SmsCheckCustomerInfoVo vo, Tuple dictTuple) {
+		 // TODO 客户重复性校验、数据合法性校验等
 		 // 过滤客户编号和员工编号为空的信息
 		 if (StrUtil.isBlank(vo.getCustomerNo()) && StrUtil.isBlank(vo.getUserNo())) {
 			 return null;

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

@@ -9,6 +9,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -158,19 +159,24 @@ public class SmsCheckCustomerInfo implements Serializable {
 	/** 合同签署主体与实际开通客户是否一致 */
     @Excel(name = "合同签署主体与实际开通客户是否一致", width = 15)
     @ApiModelProperty(value = "合同签署主体与实际开通客户是否一致")
-    private String contractOpenCustomerSame;
+    private Integer contractOpenCustomerSame;
 	/** 是否有集团价格审批 */
     @Excel(name = "是否有集团价格审批", width = 15)
     @ApiModelProperty(value = "是否有集团价格审批")
-    private String groupPriceApproval;
+    private Integer groupPriceApproval;
 	/** 资料是否完整 */
     @Excel(name = "资料是否完整", width = 15)
     @ApiModelProperty(value = "资料是否完整")
-    private String dataComplete;
+    private Integer dataComplete;
 	/** 是否完成整改 */
     @Excel(name = "是否完成整改", width = 15)
     @ApiModelProperty(value = "是否完成整改")
-    private String rectifyReformOver;
+    private Integer rectifyReformOver;
+    /** 稽核状态 0：未处理；1：未完善；2：待稽核；3：待整改；4：已整改；5：稽核通过； */
+    @Excel(name = "稽核状态", width = 15, dicCode = "sms_check_check_state")
+    @Dict(dicCode = "sms_check_check_state")
+    @ApiModelProperty(value = "稽核状态")
+    private Integer checkState;
 	/** 描述 */
     @Excel(name = "描述", width = 15)
     @ApiModelProperty(value = "描述")

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

@@ -37,7 +37,7 @@ public class SmsCheckTask implements Serializable {
     @Excel(name = "任务名称", width = 15)
     @ApiModelProperty(value = "任务名称")
     private String taskName;
-	/** 任务状态 */
+	/** 任务状态 0：未开始；1：进行中；2：已结束； */
     @Excel(name = "任务状态", width = 15, dicCode = "sms_check_task_state")
     @Dict(dicCode = "sms_check_task_state")
     @ApiModelProperty(value = "任务状态")
@@ -66,6 +66,10 @@ public class SmsCheckTask implements Serializable {
     @Excel(name = "客户总数", width = 15)
     @ApiModelProperty(value = "客户总数")
     private Integer customerCount;
+    /** 待稽核数 */
+    @Excel(name = "待稽核数", width = 15)
+    @ApiModelProperty(value = "待稽核数")
+    private Integer uncheckCount;
 	/** 稽核数 */
     @Excel(name = "稽核数", width = 15)
     @ApiModelProperty(value = "稽核数")

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

@@ -148,7 +148,7 @@ spring:
           #driver-class-name: com.mysql.cj.jdbc.Driver
   #redis 配置
   redis:
-     database: 0
+     database: 1
      host: 202.85.214.182
      port: 6379
      password: liuwm_123