完善稽核首页和稽核任务功能

tnc-base/tnc-base-api/tnc-system-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java

@@ -338,4 +338,11 @@ public interface ISysBaseAPI extends CommonAPI {
      */
     List<DictModel> loadDictItemByKeyword(String dictCode, String keyword, Integer pageSize);
 
+    /**
+     * 根据用户 员工号查询用户信息
+     * @param workNo 员工号
+     * @return 用户信息
+     */
+    LoginUser getUserByWorkNo(String workNo);
+
 }

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

@@ -11,24 +11,26 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 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.constant.CommonConstant;
+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.common.system.vo.SysUserCacheInfo;
 import org.jeecg.config.shiro.ShiroRealm;
 import org.jeecg.modules.smscheck.configs.CheckStateCode;
 import org.jeecg.modules.smscheck.entity.SmsCheckCustomerInfo;
+import org.jeecg.modules.smscheck.entity.SmsCheckCustomerInfoLog;
 import org.jeecg.modules.smscheck.entity.SmsCheckWorkLog;
+import org.jeecg.modules.smscheck.service.ISmsCheckCustomerInfoLogService;
 import org.jeecg.modules.smscheck.service.ISmsCheckCustomerInfoService;
 import org.jeecg.modules.smscheck.service.ISmsCheckWorkLogService;
 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.Arrays;
@@ -46,12 +48,14 @@ import java.util.List;
 @Slf4j
 public class SmsCheckCustomerInfoController extends JeecgController<SmsCheckCustomerInfo, ISmsCheckCustomerInfoService> {
     @Autowired
-    private ISmsCheckCustomerInfoService smsCheckCustomerInfoService;
-    @Autowired
-    private ShiroRealm shiroRealm;
+    private ISmsCheckCustomerInfoService customerInfoService;
 
-	 @Autowired
-	 private ISmsCheckWorkLogService workLogService;
+    @Autowired
+	private ISmsCheckWorkLogService workLogService;
+    @Autowired
+    private ISmsCheckCustomerInfoLogService infoLogService;
+    @Autowired
+    private ISysBaseAPI sysBaseAPI;
 
     /**
      * 分页列表查询
@@ -72,7 +76,7 @@ public class SmsCheckCustomerInfoController extends JeecgController<SmsCheckCust
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         QueryWrapper<SmsCheckCustomerInfo> queryWrapper = QueryGenerator.initQueryWrapper(smsCheckCustomerInfo, request.getParameterMap());
         Page<SmsCheckCustomerInfo> page = new Page<>(pageNo, pageSize);
-        IPage<SmsCheckCustomerInfo> pageList = smsCheckCustomerInfoService.page(page, queryWrapper);
+        IPage<SmsCheckCustomerInfo> pageList = customerInfoService.page(page, queryWrapper);
         return Result.OK(pageList);
     }
 
@@ -101,7 +105,7 @@ public class SmsCheckCustomerInfoController extends JeecgController<SmsCheckCust
         QueryWrapper<SmsCheckCustomerInfo> queryWrapper = QueryGenerator.initQueryWrapper(smsCheckCustomerInfo, request.getParameterMap());
         Page<SmsCheckCustomerInfo> page = new Page<>(pageNo, pageSize);
         queryWrapper.orderByAsc("create_time");
-        IPage<SmsCheckCustomerInfo> pageList = smsCheckCustomerInfoService.page(page, queryWrapper);
+        IPage<SmsCheckCustomerInfo> pageList = customerInfoService.page(page, queryWrapper);
         return Result.OK(pageList);
     }
 
@@ -115,7 +119,7 @@ public class SmsCheckCustomerInfoController extends JeecgController<SmsCheckCust
     @ApiOperation(value = "客户信息-添加", notes = "客户信息-添加")
     @PostMapping(value = "/add")
     public Result<String> add(@RequestBody SmsCheckCustomerInfo smsCheckCustomerInfo) {
-        smsCheckCustomerInfoService.save(smsCheckCustomerInfo);
+        customerInfoService.save(smsCheckCustomerInfo);
         return Result.OK("添加成功！");
     }
 
@@ -141,7 +145,7 @@ public class SmsCheckCustomerInfoController extends JeecgController<SmsCheckCust
         }
         LambdaQueryWrapper<SmsCheckCustomerInfo> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(SmsCheckCustomerInfo::getUserNo,smsCheckCustomerInfo.getUserNo());
-        List<SmsCheckCustomerInfo> list = smsCheckCustomerInfoService.list(queryWrapper);
+        List<SmsCheckCustomerInfo> list = customerInfoService.list(queryWrapper);
         if (list.size()>0){
             return Result.error("该用户已经存在");
         }
@@ -149,7 +153,7 @@ public class SmsCheckCustomerInfoController extends JeecgController<SmsCheckCust
         smsCheckCustomerInfo.setStaffNo(workNo);
         smsCheckCustomerInfo.setStaffName(realname);
         smsCheckCustomerInfo.setCheckState(CheckStateCode.CHECK_STSTE_1);
-        smsCheckCustomerInfoService.save(smsCheckCustomerInfo);
+        customerInfoService.save(smsCheckCustomerInfo);
         return Result.OK("添加成功！");
     }
 
@@ -158,19 +162,45 @@ public class SmsCheckCustomerInfoController extends JeecgController<SmsCheckCust
     @ApiOperation(value = "客户信息-编辑", notes = "客户信息-编辑")
     @RequestMapping(value = "/edit/", method = {RequestMethod.PUT, RequestMethod.POST})
     public Result<String> edit(@RequestBody SmsCheckCustomerInfo smsCheckCustomerInfo) {
-        smsCheckCustomerInfoService.updateById(smsCheckCustomerInfo);
+        customerInfoService.updateById(smsCheckCustomerInfo);
         return Result.OK("编辑成功!");
     }
 
     @AutoLog(value = "客户信息-提交稽核")
     @ApiOperation(value = "客户信息-提交稽核", notes = "客户信息-提交稽核")
     @RequestMapping(value = "/edit/check/state", method = {RequestMethod.PUT, RequestMethod.POST})
-    public Result<String> editCheckState(@RequestBody SmsCheckCustomerInfo smsCheckCustomerInfo) {
-        if (StringUtils.isEmpty(smsCheckCustomerInfo.getId())){
+    public Result<String> editCheckState(@RequestBody SmsCheckCustomerInfo info) {
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+
+        if (StringUtils.isEmpty(info.getId())){
             return Result.error("提交失败");
         }
-        smsCheckCustomerInfo.setCheckState(CheckStateCode.CHECK_STSTE_2);
-        smsCheckCustomerInfoService.updateById(smsCheckCustomerInfo);
+        info.setCheckState(CheckStateCode.CHECK_STSTE_2);
+        customerInfoService.updateById(info);
+
+        String infoId = info.getId();
+        SmsCheckCustomerInfo infoPo = customerInfoService.getById(infoId);
+
+        // 客户资料日志
+        SmsCheckCustomerInfoLog infoLog = new SmsCheckCustomerInfoLog();
+        infoLog.setTaskId(infoPo.getTaskId());
+        infoLog.setInfoId(infoPo.getId());
+        infoLog.setCustomerNo(infoPo.getCustomerNo());
+        infoLog.setCustomerName(infoPo.getCustomerName());
+        infoLog.setSmsNumber(infoPo.getSmsNumber());
+        infoLog.setUserNo(infoPo.getUserNo());
+
+        // 此处是领导用户名
+        infoLog.setTargetUsername(infoPo.getCreateBy());
+        infoLog.setStaffName(sysUser.getRealname());
+
+        // TODO 是否需要？
+        infoLog.setStaffId(sysUser.getId());
+        infoLog.setStaffNo(infoPo.getStaffNo());
+        infoLog.setStaffUsername(sysUser.getUsername());
+
+        infoLogService.save(infoLog);
+
         return Result.OK("提交成功!");
     }
 
@@ -185,7 +215,7 @@ public class SmsCheckCustomerInfoController extends JeecgController<SmsCheckCust
     @ApiOperation(value = "客户信息-通过id删除", notes = "客户信息-通过id删除")
     @DeleteMapping(value = "/delete")
     public Result<String> delete(@RequestParam(name = "id") String id) {
-        smsCheckCustomerInfoService.removeById(id);
+        customerInfoService.removeById(id);
         return Result.OK("删除成功!");
     }
 
@@ -199,7 +229,7 @@ public class SmsCheckCustomerInfoController extends JeecgController<SmsCheckCust
     @ApiOperation(value = "客户信息-批量删除", notes = "客户信息-批量删除")
     @DeleteMapping(value = "/deleteBatch")
     public Result<String> deleteBatch(@RequestParam(name = "ids") String ids) {
-        this.smsCheckCustomerInfoService.removeByIds(Arrays.asList(ids.split(",")));
+        this.customerInfoService.removeByIds(Arrays.asList(ids.split(",")));
         return Result.OK("批量删除成功!");
     }
 
@@ -213,7 +243,7 @@ public class SmsCheckCustomerInfoController extends JeecgController<SmsCheckCust
     @ApiOperation(value = "客户信息-通过id查询", notes = "客户信息-通过id查询")
     @GetMapping(value = "/queryById")
     public Result<SmsCheckCustomerInfo> queryById(@RequestParam(name = "id") String id) {
-        SmsCheckCustomerInfo smsCheckCustomerInfo = smsCheckCustomerInfoService.getById(id);
+        SmsCheckCustomerInfo smsCheckCustomerInfo = customerInfoService.getById(id);
         if (smsCheckCustomerInfo == null) {
             return Result.error("未找到对应数据");
         }
@@ -256,27 +286,27 @@ public class SmsCheckCustomerInfoController extends JeecgController<SmsCheckCust
     public Result<Dict> count(@RequestParam(name = "id") String id) {
         Dict dict = Dict.create();
         // 客户总数
-        long count = smsCheckCustomerInfoService.count(new LambdaQueryWrapper<SmsCheckCustomerInfo>()
+        long count = customerInfoService.count(new LambdaQueryWrapper<SmsCheckCustomerInfo>()
                 .eq(SmsCheckCustomerInfo::getTaskId, id)
                 .eq(SmsCheckCustomerInfo::getDelFlag, CommonConstant.DEL_FLAG_0));
         // 未处理数
-        long undoCount = smsCheckCustomerInfoService.count(new LambdaQueryWrapper<SmsCheckCustomerInfo>()
+        long undoCount = customerInfoService.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>()
+        long uncheckCount = customerInfoService.count(new LambdaQueryWrapper<SmsCheckCustomerInfo>()
                 .eq(SmsCheckCustomerInfo::getTaskId, id)
                 .in(SmsCheckCustomerInfo::getCheckState, Arrays.asList(2, 3))
                 .eq(SmsCheckCustomerInfo::getDelFlag, CommonConstant.DEL_FLAG_0));
         // 待整改数
-        long checkedCount = smsCheckCustomerInfoService.count(new LambdaQueryWrapper<SmsCheckCustomerInfo>()
+        long checkedCount = customerInfoService.count(new LambdaQueryWrapper<SmsCheckCustomerInfo>()
                 .eq(SmsCheckCustomerInfo::getTaskId, id)
                 .eq(SmsCheckCustomerInfo::getCheckState, 4)
                 .eq(SmsCheckCustomerInfo::getDelFlag, CommonConstant.DEL_FLAG_0));
         // 稽核完成数
-        long passedCount = smsCheckCustomerInfoService.count(new LambdaQueryWrapper<SmsCheckCustomerInfo>()
+        long passedCount = customerInfoService.count(new LambdaQueryWrapper<SmsCheckCustomerInfo>()
                 .eq(SmsCheckCustomerInfo::getTaskId, id)
                 .eq(SmsCheckCustomerInfo::getCheckState, 5)
                 .eq(SmsCheckCustomerInfo::getDelFlag, CommonConstant.DEL_FLAG_0));
@@ -301,15 +331,19 @@ public class SmsCheckCustomerInfoController extends JeecgController<SmsCheckCust
 	 @PostMapping(value = "/checkInfo")
 	 public Result<String> checkInfo(@RequestBody SmsCheckWorkLog workLog) {
 
-		// 0：未处理；1：未完善；2：待稽核；3：待整改；4：已整改；5：稽核通过；
-		int checkState = 3;
+        String staffNo = workLog.getStaffNo();
+        LoginUser staff = sysBaseAPI.getUserByWorkNo(staffNo);
+        workLog.setTargetUsername(staff.getUsername());
+        workLog.setTargetRealname(staff.getRealname());
+		// 0：未处理；1：未完善；2：待稽核；3：已整改；4：待整改；5：稽核通过；
+		int checkState = 4;
 		// 1：未通过；2：通过
 		if (workLog.getBasicCheckState() == 2 && workLog.getStandardCheckState() == 2
 			 && workLog.getDataCheckState() == 2) {
 			checkState = 5;
 		}
 		// 更新客户信息
-		boolean flag = smsCheckCustomerInfoService.update(new LambdaUpdateWrapper<SmsCheckCustomerInfo>()
+		boolean flag = customerInfoService.update(new LambdaUpdateWrapper<SmsCheckCustomerInfo>()
 			 .eq(SmsCheckCustomerInfo::getId, workLog.getInfoId())
 			 .set(SmsCheckCustomerInfo::getCheckState, checkState));
 
@@ -320,7 +354,28 @@ public class SmsCheckCustomerInfoController extends JeecgController<SmsCheckCust
 		 return Result.error("稽核失败!");
 	}
 
-
+    /**
+     * 通知客户经理
+     *
+     * @param info 对象
+     * @return 结果
+     */
+    @AutoLog(value = "通知客户经理")
+    @ApiOperation(value = "通知客户经理", notes = "通知客户经理")
+    @PostMapping(value = "/notice")
+    public Result<String> notice(@RequestBody SmsCheckCustomerInfo info) {
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        String workNo = info.getStaffNo();
+        LoginUser toUser = sysBaseAPI.getUserByWorkNo(workNo);
+        MessageDTO message = new MessageDTO();
+        message.setTitle("稽核代办，用户编号：【" + info.getUserNo() + "】");
+        message.setContent("客户名称：【" + info.getCustomerName() + "】，服务号码：【" + info.getSmsNumber()
+                + "】，用户编号：【" + info.getUserNo() + "】的客户资料请尽快完善。");
+        message.setFromUser(sysUser.getUsername());
+        message.setToUser(toUser.getUsername());
+        sysBaseAPI.sendSysAnnouncement(message);
+        return Result.OK("添加成功！");
+    }
 
 
  }

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

@@ -3,6 +3,7 @@ package org.jeecg.modules.smscheck.controller;
 
 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 com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -18,9 +19,12 @@ import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.smscheck.entity.SmsCheckCustomerInfo;
 import org.jeecg.modules.smscheck.entity.SmsCheckCustomerInfoLog;
 import org.jeecg.modules.smscheck.entity.SmsCheckTask;
+import org.jeecg.modules.smscheck.entity.SmsCheckWorkLog;
 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.vo.IndexRecentVo;
 import org.jeecg.modules.smscheck.vo.SmsCheckCustomerInfoSubTaskVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -44,6 +48,8 @@ public class SmsCheckIndexController {
     @Autowired
     private ISmsCheckCustomerInfoLogService infoLogService;
     @Autowired
+    private ISmsCheckWorkLogService workLogService;
+    @Autowired
     private ISmsCheckCustomerInfoService infoService;
     @Autowired
     private ISysBaseAPI sysBaseAPI;
@@ -103,30 +109,42 @@ public class SmsCheckIndexController {
         // 最新动态
         SmsCheckCustomerInfoLog infoLog = new SmsCheckCustomerInfoLog();
         infoLog.setTaskId(taskId);
-        infoLog.setStaffId(sysUser.getId());
+        infoLog.setTargetUsername(sysUser.getUsername());
         QueryWrapper<SmsCheckCustomerInfoLog> infoLogQuery = QueryGenerator.initQueryWrapper(infoLog, request.getParameterMap());
         infoLogQuery.lambda().orderByDesc(SmsCheckCustomerInfoLog::getCreateTime);
         IPage<SmsCheckCustomerInfoLog> infoLogPage = infoLogService.page(new Page<>(pageNo, pageSize), infoLogQuery);
 
+        List<IndexRecentVo> recentList = infoLogPage.convert(po -> {
+            String username = po.getCreateBy();
+            LoginUser user = sysBaseAPI.getUserByName(username);
+            IndexRecentVo vo = new IndexRecentVo();
+            vo.setCustomerName(po.getCustomerName());
+            vo.setRealname(user.getRealname());
+            vo.setCreateTime(DateUtil.format(po.getCreateTime(),"yy-MM-dd HH:mm"));
+            return vo;
+        }).getRecords();
+
         // 我的任务
         SmsCheckCustomerInfo info = new SmsCheckCustomerInfo();
         info.setTaskId(taskId);
         info.setCreateBy(sysUser.getUsername());
         QueryWrapper<SmsCheckCustomerInfo> infoQuery = QueryGenerator.initQueryWrapper(info, request.getParameterMap());
+        // 稽核状态 0：未处理；1：未完善；2：待稽核；3：已整改；4：待整改；5：稽核通过；
         infoQuery.lambda().in(SmsCheckCustomerInfo::getCheckState, Arrays.asList(2, 3));
         infoQuery.lambda().orderByDesc(SmsCheckCustomerInfo::getCreateTime);
         IPage<SmsCheckCustomerInfo> infoPage = infoService.page(new Page<>(pageNo, pageSize), infoQuery);
 
-        IPage<SmsCheckCustomerInfoSubTaskVo> infoVoPage = infoPage.convert(infoObj -> {
+        List<SmsCheckCustomerInfoSubTaskVo> subTaskList = infoPage.convert(infoObj -> {
             SmsCheckCustomerInfoSubTaskVo voObj = new SmsCheckCustomerInfoSubTaskVo();
             BeanUtil.copyProperties(infoObj, voObj);
             voObj.setOperateType("work");
             return voObj;
-        });
+        }).getRecords();
 
         // 本月目标
         SmsCheckCustomerInfo target = new SmsCheckCustomerInfo();
         target.setTaskId(taskId);
+        // 用户名关联
         target.setCreateBy(sysUser.getUsername());
         // 全部
         QueryWrapper<SmsCheckCustomerInfo> allTargetQuery = QueryGenerator.initQueryWrapper(target, request.getParameterMap());
@@ -150,9 +168,9 @@ public class SmsCheckIndexController {
 
         Dict result = Dict.create();
         // 最新动态
-        result.put("recentList", infoLogPage.getRecords());
+        result.put("recentList", recentList);
         // 我的任务
-        result.put("subTaskList", infoVoPage.getRecords());
+        result.put("subTaskList", subTaskList);
         // 本月目标
         Dict targetObj = Dict.create();
         targetObj.put("allCount", allCount);
@@ -183,27 +201,39 @@ public class SmsCheckIndexController {
                                  HttpServletRequest request) {
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         // 最新动态
-        SmsCheckCustomerInfoLog infoLog = new SmsCheckCustomerInfoLog();
-        infoLog.setTaskId(taskId);
-        infoLog.setStaffId(sysUser.getId());
-        QueryWrapper<SmsCheckCustomerInfoLog> infoLogQuery = QueryGenerator.initQueryWrapper(infoLog, request.getParameterMap());
-        infoLogQuery.lambda().orderByDesc(SmsCheckCustomerInfoLog::getCreateTime);
-        IPage<SmsCheckCustomerInfoLog> infoLogPage = infoLogService.page(new Page<>(pageNo, pageSize), infoLogQuery);
+        SmsCheckWorkLog workLog = new SmsCheckWorkLog();
+        workLog.setTaskId(taskId);
+        workLog.setTargetUsername(sysUser.getUsername());
+        QueryWrapper<SmsCheckWorkLog> workLogQuery = QueryGenerator.initQueryWrapper(workLog, request.getParameterMap());
+        workLogQuery.lambda().orderByDesc(SmsCheckWorkLog::getCreateTime);
+        IPage<SmsCheckWorkLog> workLogPage = workLogService.page(new Page<>(pageNo, pageSize), workLogQuery);
+
+        List<IndexRecentVo> recentList = workLogPage.convert(po -> {
+            String username = po.getCreateBy();
+            LoginUser user = sysBaseAPI.getUserByName(username);
+            IndexRecentVo vo = new IndexRecentVo();
+            vo.setCustomerName(po.getCustomerName());
+            vo.setRealname(user.getRealname());
+            vo.setCreateTime(DateUtil.format(po.getCreateTime(),"yy-MM-dd HH:mm"));
+            return vo;
+        }).getRecords();
 
         // 我的任务
         SmsCheckCustomerInfo info = new SmsCheckCustomerInfo();
         info.setTaskId(taskId);
-        info.setCreateBy(sysUser.getUsername());
+        // 员工工号关联
+        info.setStaffNo(sysUser.getWorkNo());
         QueryWrapper<SmsCheckCustomerInfo> infoQuery = QueryGenerator.initQueryWrapper(info, request.getParameterMap());
-        infoQuery.lambda().in(SmsCheckCustomerInfo::getCheckState, Arrays.asList(2, 3));
+        // 稽核状态 0：未处理；1：未完善；2：待稽核；3：已整改；4：待整改；5：稽核通过；
+        infoQuery.lambda().in(SmsCheckCustomerInfo::getCheckState, Arrays.asList(0, 1, 4));
         infoQuery.lambda().orderByDesc(SmsCheckCustomerInfo::getCreateTime);
         IPage<SmsCheckCustomerInfo> infoPage = infoService.page(new Page<>(pageNo, pageSize), infoQuery);
 
-        List<SmsCheckCustomerInfoSubTaskVo> subTaskList = infoPage.convert(infoObj -> {
-            SmsCheckCustomerInfoSubTaskVo voObj = new SmsCheckCustomerInfoSubTaskVo();
-            BeanUtil.copyProperties(infoObj, voObj, false);
-            voObj.setOperateType("info");
-            return voObj;
+        List<SmsCheckCustomerInfoSubTaskVo> subTaskList = infoPage.convert(po -> {
+            SmsCheckCustomerInfoSubTaskVo vo = new SmsCheckCustomerInfoSubTaskVo();
+            BeanUtil.copyProperties(po, vo);
+            vo.setOperateType("info");
+            return vo;
         }).getRecords();
 
         // 本月目标
@@ -232,7 +262,7 @@ public class SmsCheckIndexController {
 
         Dict result = Dict.create();
         // 最新动态
-        result.put("recentList", infoLogPage.getRecords());
+        result.put("recentList", recentList);
         // 我的任务
         result.put("subTaskList", subTaskList);
         // 本月目标

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

@@ -7,10 +7,13 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+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.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.modules.smscheck.entity.SmsCheckWorkLog;
 import org.jeecg.modules.smscheck.service.ISmsCheckWorkLogService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -36,6 +39,8 @@ import java.util.Map;
 public class SmsCheckWorkLogController extends JeecgController<SmsCheckWorkLog, ISmsCheckWorkLogService> {
 	@Autowired
 	private ISmsCheckWorkLogService smsCheckWorkLogService;
+	@Autowired
+	private ISysBaseAPI sysBaseAPI;
 
 	 /**
 	  * 分页列表查询

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

@@ -172,7 +172,7 @@ public class SmsCheckCustomerInfo implements Serializable {
     @Excel(name = "是否完成整改", width = 15)
     @ApiModelProperty(value = "是否完成整改")
     private Integer rectifyReformOver;
-    /** 稽核状态 0：未处理；1：未完善；2：待稽核；3：待整改；4：已整改；5：稽核通过； */
+    /** 稽核状态 0：未处理；1：未完善；2：待稽核；3：已整改；4：待整改；5：稽核通过； */
     @Excel(name = "稽核状态", width = 15, dicCode = "sms_check_check_state")
     @Dict(dicCode = "sms_check_check_state")
     @ApiModelProperty(value = "稽核状态")

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

@@ -57,10 +57,16 @@ public class SmsCheckCustomerInfoLog implements Serializable {
     @Excel(name = "用户编号", width = 15)
     @ApiModelProperty(value = "用户编号")
     private String userNo;
+    /** 目标用户名 */
+    @ApiModelProperty(value = "目标用户名")
+    private String targetUsername;
 	/** 员工id */
     @Excel(name = "员工id", width = 15)
     @ApiModelProperty(value = "员工id")
     private String staffId;
+    /** 员工用户名 */
+    @ApiModelProperty(value = "员工用户名")
+    private String staffUsername;
 	/** 员工姓名 */
     @Excel(name = "员工姓名", width = 15)
     @ApiModelProperty(value = "员工姓名")

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

@@ -35,6 +35,10 @@ public class SmsCheckWorkLog implements Serializable {
     @TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "主键")
     private String id;
+    /** 任务id */
+    @Excel(name = "任务id", width = 15)
+    @ApiModelProperty(value = "任务id")
+    private String taskId;
 	/** 客户信息id */
     @Excel(name = "客户信息id", width = 15)
     @ApiModelProperty(value = "客户信息id")
@@ -43,6 +47,14 @@ public class SmsCheckWorkLog implements Serializable {
     @Excel(name = "客户编号", width = 15)
     @ApiModelProperty(value = "客户编号")
     private String customerNo;
+    /** 客户名称 */
+    @Excel(name = "客户名称", width = 15)
+    @ApiModelProperty(value = "客户名称")
+    private String customerName;
+    /** 服务号码（全） */
+    @Excel(name = "服务号码（全）", width = 15)
+    @ApiModelProperty(value = "服务号码（全）")
+    private String smsNumber;
 	/** 客户资料id */
     @Excel(name = "客户资料id", width = 15)
     @ApiModelProperty(value = "客户资料id")
@@ -71,6 +83,12 @@ public class SmsCheckWorkLog implements Serializable {
     @Excel(name = "附件资料稽核结果", width = 15)
     @ApiModelProperty(value = "附件资料稽核结果")
     private String dataCheckNote;
+    /** 目标用户名 */
+    @ApiModelProperty(value = "目标用户名")
+    private String targetUsername;
+    /** 目标用户姓名 */
+    @ApiModelProperty(value = "目标用户姓名")
+    private String targetRealname;
 	/** 员工id */
     @Excel(name = "员工id", width = 15)
     @ApiModelProperty(value = "员工id")

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

@@ -0,0 +1,33 @@
+package org.jeecg.modules.smscheck.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ *
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="首页-最新动态", description="首页-最新动态")
+public class IndexRecentVo {
+    /** 客户名称 */
+    @ApiModelProperty(value = "客户名称(全)")
+    private String customerName;
+    /** 服务号码(全) */
+    @ApiModelProperty(value = "服务号码(全)")
+    private String smsNumber;
+    /** 目标用户名 */
+    @ApiModelProperty(value = "目标用户名")
+    private String username;
+    /** 目标用户姓名 */
+    @ApiModelProperty(value = "目标用户姓名")
+    private String realname;
+    /** 时间 格式：年-月-日 时:分 */
+    @ApiModelProperty(value = "时间")
+    private String createTime;
+
+}

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

@@ -68,6 +68,9 @@ public class SmsCheckCustomerInfoVo implements Serializable {
     /** 员工工号 */
     @ApiModelProperty(value = "员工工号")
     private String staffNo;
+    /** 员工用户名 */
+    @ApiModelProperty(value = "员工用户名")
+    private String staffUsername;
 
 	/** 用户发展二级部门 */
     @Excel(name = "用户发展二级部门", width = 15)

tnc-system/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java

@@ -1154,4 +1154,17 @@ public class SysBaseApiImpl implements ISysBaseAPI {
 		return sysDictService.queryTableDictTextByKeys(table, text, code, Arrays.asList(keys.split(",")));
 	}
 
+	@Override
+	public LoginUser getUserByWorkNo(String workNo) {
+		if(oConvertUtils.isEmpty(workNo)) {
+			return null;
+		}
+		LoginUser loginUser = new LoginUser();
+		SysUser sysUser = userMapper.getUserByWorkNo(workNo);
+		if(sysUser==null) {
+			return null;
+		}
+		BeanUtils.copyProperties(sysUser, loginUser);
+		return loginUser;
+	}
 }