Merge branch 'develp' of com_yunfei_saas/agmp-tss into master

src/main/java/com/yunfeiyun/agmp/tss/controller/TssWarnController.java

@@ -158,7 +158,7 @@ public class TssWarnController extends BaseController {
     public AjaxResult readAll(@RequestBody TssWarnReqVo reqVo) {
         reqVo.setTid(SecurityUtils.getTid());
         int count = tssWarnService.readAll(reqVo);
-        return toAjax(count);
+        return success(count);
     }
 
     /**

src/main/java/com/yunfeiyun/agmp/tss/service/impl/AgmTaskpickServiceImpl.java

@@ -4,6 +4,7 @@ import com.yunfeiyun.agmp.common.constant.ErrorCode;
 import com.yunfeiyun.agmp.common.constant.ResConstants;
 import com.yunfeiyun.agmp.common.core.domain.AjaxResult;
 import com.yunfeiyun.agmp.common.core.domain.entity.SysDictData;
+import com.yunfeiyun.agmp.common.core.domain.entity.SysUser;
 import com.yunfeiyun.agmp.common.enums.*;
 import com.yunfeiyun.agmp.common.exception.BizException;
 import com.yunfeiyun.agmp.common.framework.manager.ResManager;
@@ -15,6 +16,7 @@ import com.yunfeiyun.agmp.common.utils.serialno.NoGenerator;
 import com.yunfeiyun.agmp.common.web.system.domain.SysCusarea;
 import com.yunfeiyun.agmp.common.web.system.domain.SysRes;
 import com.yunfeiyun.agmp.common.web.system.mapper.SysResMapper;
+import com.yunfeiyun.agmp.common.web.system.mapper.SysUserMapper;
 import com.yunfeiyun.agmp.common.web.system.service.ISysConfigService;
 import com.yunfeiyun.agmp.common.web.system.service.ISysCusareaService;
 import com.yunfeiyun.agmp.common.web.system.service.ISysResService;
@@ -38,7 +40,10 @@ import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 农事任务采收Service业务层处理
@@ -106,7 +111,8 @@ public class AgmTaskpickServiceImpl implements IAgmTaskpickService {
     private ISysCusareaService sysCusareaService;
     @Resource
     private ISysResService sysResService;
-
+    @Resource
+    private SysUserMapper sysUserMapper;
 
     @Override
     public List<AgmTaskPickListResVo> selectFmsTaskpickList(AgmTaskPickListReqVo reqVo) {
@@ -571,6 +577,12 @@ public class AgmTaskpickServiceImpl implements IAgmTaskpickService {
             fmsTaskListReqVo.setTaskAuditstatus(TaskStatus.COMPLETED.getCode());
             fmsTaskListReqVo.setTid(reqVo.getTid());
             List<FmsTaskResVo> fmsTaskResVos = fmsTaskMapper.selectTaskListAll(fmsTaskListReqVo);
+            List<String> taskManagerIds = fmsTaskResVos.stream().map(FmsTaskResVo::getTaskManager).collect(Collectors.toList());
+            Map<String,SysUser> sysUserMap = new HashMap<>();
+            if(!taskManagerIds.isEmpty()){
+                List<SysUser> sysUserList = sysUserMapper.selectUserListByUserIds(taskManagerIds);
+                sysUserMap = sysUserList.stream().collect(Collectors.toMap(SysUser::getUserId,item->item));
+            }
             for (FmsTaskResVo fmsTaskResVo : fmsTaskResVos) {
                 TssGoodsperiodrcd goodsperiodrcd = new TssGoodsperiodrcd();
                 goodsperiodrcd.setGoodsperiodrcdId(goodsperiodrcd.getId());
@@ -583,7 +595,10 @@ public class AgmTaskpickServiceImpl implements IAgmTaskpickService {
                 goodsperiodrcd.setGoodsperiodrcdStartdate(startTime1);
                 goodsperiodrcd.setGoodsperiodrcdEnddate(endTime1);
                 goodsperiodrcd.setGoodsperiodrcdFmstaskcreateddate(fmsTaskResVo.getTaskPlanstartdate());
-                goodsperiodrcd.setGoodsperiodrcdFmstaskmanagername(fmsTaskResVo.getTaskManagername());
+                SysUser manager = sysUserMap.get(fmsTaskResVo.getTaskManager());
+                if(null != manager){
+                    goodsperiodrcd.setGoodsperiodrcdFmstaskmanagername(manager.getUserName());
+                }
                 goodsperiodrcd.setGoodsperiodrcdFmstaskremark(fmsTaskResVo.getTaskTypeContent());
                 goodsperiodrcd.setTid(reqVo.getTid());
                 addList.add(goodsperiodrcd);
@@ -622,6 +637,12 @@ public class AgmTaskpickServiceImpl implements IAgmTaskpickService {
                 fmsTaskListReqVo.setStartDate(startTime.format(DateTimeFormatter.ofPattern(CommonEnums.PATTERN_DATETIME.getCode())));
                 fmsTaskListReqVo.setEndDate(endTime);
                 List<FmsTaskResVo> fmsTaskResVos = fmsTaskMapper.selectTaskList(fmsTaskListReqVo);
+                List<String> taskManagerIds = fmsTaskResVos.stream().map(FmsTaskResVo::getTaskManager).collect(Collectors.toList());
+                Map<String,SysUser> sysUserMap = new HashMap<>();
+                if(!taskManagerIds.isEmpty()){
+                    List<SysUser> sysUserList = sysUserMapper.selectUserListByUserIds(taskManagerIds);
+                    sysUserMap = sysUserList.stream().collect(Collectors.toMap(SysUser::getUserId,item->item));
+                }
                 for (FmsTaskResVo fmsTaskResVo : fmsTaskResVos) {
                     TssGoodsperiodrcd goodsperiodrcd = new TssGoodsperiodrcd();
                     goodsperiodrcd.setTid(reqVo.getTid());
@@ -635,7 +656,10 @@ public class AgmTaskpickServiceImpl implements IAgmTaskpickService {
                     goodsperiodrcd.setGoodsperiodrcdStartdate(startTime1);
                     goodsperiodrcd.setGoodsperiodrcdEnddate(endTime1);
                     goodsperiodrcd.setGoodsperiodrcdFmstaskcreateddate(fmsTaskResVo.getTaskPlanstartdate());
-                    goodsperiodrcd.setGoodsperiodrcdFmstaskmanagername(fmsTaskResVo.getTaskManagername());
+                    SysUser manager = sysUserMap.get(fmsTaskResVo.getTaskManager());
+                    if(null != manager){
+                        goodsperiodrcd.setGoodsperiodrcdFmstaskmanagername(manager.getUserName());
+                    }
                     goodsperiodrcd.setGoodsperiodrcdFmstaskremark(fmsTaskResVo.getTaskTypeContent());
                     addList.add(goodsperiodrcd);