修改首页相关功能

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

@@ -331,11 +331,12 @@ public class SmsCheckCustomerInfoController extends JeecgController<SmsCheckCust
 	  * @param workLog 对象
 	  * @return 结果
 	  */
-	 @AutoLog(value = "稽核任务-稽核客户信息")
-	 @ApiOperation(value="稽核任务-稽核客户信息", notes="稽核任务-稽核客户信息")
-	 @PostMapping(value = "/checkInfo")
-	 public Result<String> checkInfo(@RequestBody SmsCheckWorkLog workLog) {
-
+	@AutoLog(value = "稽核任务-稽核客户信息")
+	@ApiOperation(value="稽核任务-稽核客户信息", notes="稽核任务-稽核客户信息")
+	@PostMapping(value = "/checkInfo")
+    public Result<String> checkInfo(@RequestBody SmsCheckWorkLog workLog) {
+        SmsCheckCustomerInfo info = customerInfoService.getById(workLog.getInfoId());
+        workLog.setTaskId(info.getTaskId());
         String staffNo = workLog.getStaffNo();
         LoginUser staff = sysBaseAPI.getUserByWorkNo(staffNo);
         workLog.setTargetUsername(staff.getUsername());
@@ -356,7 +357,7 @@ public class SmsCheckCustomerInfoController extends JeecgController<SmsCheckCust
 			workLogService.save(workLog);
 			return Result.OK("稽核完成!");
 		}
-		 return Result.error("稽核失败!");
+		return Result.error("稽核失败!");
 	}
 
     /**

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

@@ -5,6 +5,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Dict;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -108,7 +109,9 @@ public class SmsCheckIndexController {
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         // 最新动态
         SmsCheckCustomerInfoLog infoLog = new SmsCheckCustomerInfoLog();
-        infoLog.setTaskId(taskId);
+        if (StrUtil.isNotBlank(taskId)) {
+            infoLog.setTaskId(taskId);
+        }
         infoLog.setTargetUsername(sysUser.getUsername());
         QueryWrapper<SmsCheckCustomerInfoLog> infoLogQuery = QueryGenerator.initQueryWrapper(infoLog, request.getParameterMap());
         infoLogQuery.lambda().orderByDesc(SmsCheckCustomerInfoLog::getCreateTime);
@@ -126,7 +129,9 @@ public class SmsCheckIndexController {
 
         // 我的任务
         SmsCheckCustomerInfo info = new SmsCheckCustomerInfo();
-        info.setTaskId(taskId);
+        if (StrUtil.isNotBlank(taskId)) {
+            info.setTaskId(taskId);
+        }
         info.setCreateBy(sysUser.getUsername());
         QueryWrapper<SmsCheckCustomerInfo> infoQuery = QueryGenerator.initQueryWrapper(info, request.getParameterMap());
         // 稽核状态 0：未处理；1：未完善；2：待稽核；3：已整改；4：待整改；5：稽核通过；
@@ -143,7 +148,9 @@ public class SmsCheckIndexController {
 
         // 本月目标
         SmsCheckCustomerInfo target = new SmsCheckCustomerInfo();
-        target.setTaskId(taskId);
+        if (StrUtil.isNotBlank(taskId)) {
+            target.setTaskId(taskId);
+        }
         // 用户名关联
         target.setCreateBy(sysUser.getUsername());
         // 全部
@@ -202,7 +209,9 @@ public class SmsCheckIndexController {
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         // 最新动态
         SmsCheckWorkLog workLog = new SmsCheckWorkLog();
-        workLog.setTaskId(taskId);
+        if (StrUtil.isNotBlank(taskId)) {
+            workLog.setTaskId(taskId);
+        }
         workLog.setTargetUsername(sysUser.getUsername());
         QueryWrapper<SmsCheckWorkLog> workLogQuery = QueryGenerator.initQueryWrapper(workLog, request.getParameterMap());
         workLogQuery.lambda().orderByDesc(SmsCheckWorkLog::getCreateTime);
@@ -220,7 +229,9 @@ public class SmsCheckIndexController {
 
         // 我的任务
         SmsCheckCustomerInfo info = new SmsCheckCustomerInfo();
-        info.setTaskId(taskId);
+        if (StrUtil.isNotBlank(taskId)) {
+            info.setTaskId(taskId);
+        }
         // 员工工号关联
         info.setStaffNo(sysUser.getWorkNo());
         QueryWrapper<SmsCheckCustomerInfo> infoQuery = QueryGenerator.initQueryWrapper(info, request.getParameterMap());
@@ -238,7 +249,9 @@ public class SmsCheckIndexController {
 
         // 本月目标
         SmsCheckCustomerInfo target = new SmsCheckCustomerInfo();
-        target.setTaskId(taskId);
+        if (StrUtil.isNotBlank(taskId)) {
+            target.setTaskId(taskId);
+        }
         //target.setCreateBy(sysUser.getUsername());
         // 全部
         QueryWrapper<SmsCheckCustomerInfo> allTargetQuery = QueryGenerator.initQueryWrapper(target, request.getParameterMap());

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

@@ -23,6 +23,9 @@ import java.io.Serializable;
 public class SmsCheckCustomerInfoSubTaskVo implements Serializable {
     private static final long serialVersionUID = 1L;
 
+    /** 客户id */
+    @ApiModelProperty(value = "客户id")
+    private String id;
 	/** 任务id */
     @ApiModelProperty(value = "任务id")
     private String taskId;