更新报工查询

mes/src/main/java/com/ximai/mes/pro/controller/ProFeedbackController.java

@@ -7,19 +7,25 @@ import com.ximai.common.core.controller.BaseController;
 import com.ximai.common.core.domain.AjaxResult;
 import com.ximai.common.core.page.TableDataInfo;
 import com.ximai.common.enums.BusinessType;
+import com.ximai.common.utils.SecurityUtils;
 import com.ximai.common.utils.data.ExceptionUtil;
 import com.ximai.common.utils.data.StringUtils;
 import com.ximai.mes.constant.TaskWorkunitStatusEnum;
+import com.ximai.mes.md.domain.MdWorkunit;
 import com.ximai.mes.md.domain.MdWorkunitWorker;
 import com.ximai.mes.md.mapper.MdWorkunitWorkerMapper;
 import com.ximai.mes.md.service.IMdWorkstationService;
+import com.ximai.mes.md.service.IMdWorkunitService;
+import com.ximai.mes.md.vo.MdWorkunitVo;
 import com.ximai.mes.pro.domain.ProFeedback;
 import com.ximai.mes.pro.domain.task.ProTaskAssistProcess;
 import com.ximai.mes.pro.domain.vo.ProFeedbackVo;
+import com.ximai.mes.pro.dto.ProFeedbackCheckListDto;
 import com.ximai.mes.pro.mapper.ProFeedbackMapper;
 import com.ximai.mes.pro.mapper.task.ProTaskAssistProcessMapper;
 import com.ximai.mes.pro.service.IProFeedbackService;
 import com.ximai.mes.pro.service.proWorkOrder.IProWorkOrderSoSizeItemService;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.transaction.annotation.Transactional;
@@ -50,11 +56,15 @@ public class ProFeedbackController extends BaseController {
     @Resource
     private ProTaskAssistProcessMapper proTaskAssistProcessMapper;
 
+    @Autowired
+    private IMdWorkunitService mdWorkunitService;
     /**
      * 查询生产报工记录列表
      */
     @GetMapping("/list")
-    public TableDataInfo<ProFeedbackVo> list(ProFeedback proFeedback) {
+    public TableDataInfo<ProFeedbackVo> list(ProFeedbackCheckListDto proFeedbackCheckListDto) {
+        ProFeedback proFeedback = new ProFeedback();
+        BeanUtils.copyProperties(proFeedbackCheckListDto,proFeedback);
         startPage();
         QueryWrapper<ProFeedback> query = new QueryWrapper<>();
         query.eq(StringUtils.isNotEmpty(proFeedback.getFeedbackType()), "f.feedback_type", proFeedback.getFeedbackType());
@@ -67,6 +77,12 @@ public class ProFeedbackController extends BaseController {
         query.eq(proFeedback.getLastFeedback() != null , "f.Last_Feedback", proFeedback.getLastFeedback());
 //        query.eq(StringUtils.isNotEmpty(proFeedback.getUserId()), "pww.user_id", proFeedback.getUserId());
         query.eq(StringUtils.isNotEmpty(proFeedback.getWorkunitId()), "tw.workunit_id", proFeedback.getWorkunitId());
+        if(proFeedbackCheckListDto.getIsCheckUser() && StringUtils.isEmpty(proFeedback.getWorkunitId())){
+            List<MdWorkunitVo> mdWorkunitVolist = mdWorkunitService.selectMdWorkunitListByUser(new QueryWrapper<MdWorkunit>().eq("user_name", SecurityUtils.getUsername()));
+            if(mdWorkunitVolist.size() < 1)
+                return  getDataTable(new ArrayList<>());
+            query.in(mdWorkunitVolist.size() > 0 , "tw.workunit_id", mdWorkunitVolist.stream().map(mdWorkunitVo -> mdWorkunitVo.getWorkunitId()).collect(Collectors.toList()));
+        }
         query.eq(StringUtils.isNotEmpty(proFeedback.getTaskWorkunitId()), "tw.task_workunit_id", proFeedback.getTaskWorkunitId());
         query.between(StringUtils.isNotEmpty(proFeedback.getCreateStartTime()) && StringUtils.isNotEmpty(proFeedback.getCreateEndTime()), "f.update_time", proFeedback.getCreateStartTime(), proFeedback.getCreateEndTime());
         query.like(StringUtils.isNotEmpty(proFeedback.getNickName()), "f.nick_name", proFeedback.getNickName());
@@ -91,6 +107,50 @@ public class ProFeedbackController extends BaseController {
         return getDataTable(proFeedbackVoList);
     }
 
+    /**
+     * 查询生产报工记录列表
+     */
+    @GetMapping("/listByUserId")
+    public TableDataInfo<ProFeedbackVo> listByUserId(ProFeedback proFeedback) {
+        startPage();
+        List<MdWorkunitVo> mdWorkunitVolist = mdWorkunitService.selectMdWorkunitListByUser(new QueryWrapper<MdWorkunit>().eq("user_name", SecurityUtils.getUsername()));
+        if(mdWorkunitVolist.size() < 1)
+            return  getDataTable(new ArrayList<>());
+        QueryWrapper<ProFeedback> query = new QueryWrapper<>();
+        query.eq(StringUtils.isNotEmpty(proFeedback.getFeedbackType()), "f.feedback_type", proFeedback.getFeedbackType());
+        query.eq(StringUtils.isNotEmpty(proFeedback.getStatus()), "f.status", proFeedback.getStatus());
+        query.eq(StringUtils.isNotEmpty(proFeedback.getAssistProcessCode()), "ap.assist_process_code", proFeedback.getAssistProcessCode());
+        query.eq(StringUtils.isNotEmpty(proFeedback.getWorkstationName()), "f.workstation_name", proFeedback.getWorkstationName());
+        query.eq(StringUtils.isNotEmpty(proFeedback.getItemName()), "it.item_name", proFeedback.getItemName());
+        query.eq(StringUtils.isNotEmpty(proFeedback.getWorkorderCode()), "f.workorder_code", proFeedback.getWorkorderCode());
+        query.eq(StringUtils.isNotEmpty(proFeedback.getSapItemCode()), "it.sap_item_code", proFeedback.getSapItemCode());
+        query.eq(proFeedback.getLastFeedback() != null , "f.Last_Feedback", proFeedback.getLastFeedback());
+        //query.eq(StringUtils.isNotEmpty(proFeedback.getUserId()), "pww.user_id", proFeedback.getUserId());
+        //query.eq(StringUtils.isNotEmpty(proFeedback.getWorkunitId()), "tw.workunit_id", proFeedback.getWorkunitId());
+        query.in(mdWorkunitVolist.size() > 0 , "tw.workunit_id", mdWorkunitVolist.stream().map(mdWorkunitVo -> mdWorkunitVo.getWorkunitId()).collect(Collectors.toList()));
+        query.eq(StringUtils.isNotEmpty(proFeedback.getTaskWorkunitId()), "tw.task_workunit_id", proFeedback.getTaskWorkunitId());
+        query.between(StringUtils.isNotEmpty(proFeedback.getCreateStartTime()) && StringUtils.isNotEmpty(proFeedback.getCreateEndTime()), "f.update_time", proFeedback.getCreateStartTime(), proFeedback.getCreateEndTime());
+        query.like(StringUtils.isNotEmpty(proFeedback.getNickName()), "f.nick_name", proFeedback.getNickName());
+        query.notIn("tw.status", TaskWorkunitStatusEnum.CLOSE.getStatus());
+        query.orderByAsc("f.feedback_time");
+        List<ProFeedbackVo> list = proFeedbackService.queryProFeedbackListJoinTaskWorkUnit(query);
+        List<ProFeedbackVo> proFeedbackVoList = new ArrayList<>();
+        if (proFeedback.getUserId() != null) {
+            List<MdWorkunitWorker> mdWorkunitWorkers = mdWorkunitWorkerMapper.selectListByQw(new QueryWrapper<MdWorkunitWorker>().eq("user_id", proFeedback.getUserId()));
+            Set<Long> collect = mdWorkunitWorkers.stream().map(MdWorkunitWorker::getWorkunitId).collect(Collectors.toSet());
+//            objects = list.stream().filter(x -> !collect.add(x.getWorkunitId())).sorted(Comparator.comparing(ProFeedbackVo::getFeedbackTime).reversed()).collect(Collectors.toList());
+            proFeedbackVoList = list.stream().filter(x -> !collect.add(x.getWorkunitId())).sorted(Comparator.comparing(ProFeedbackVo::getUpdateTime).reversed()).collect(Collectors.toList());
+        }
+        proFeedbackVoList = proFeedbackVoList.isEmpty() ? list : proFeedbackVoList;
+        proFeedbackVoList.forEach(s->{
+            if(IMdWorkstationService.OUTSOURCE_WORKSTATION_ID.equals(s.getWorkstationId())){
+                s.setAssistProcessCode(s.getTaskCode());
+            }
+        });
+
+
+        return getDataTable(proFeedbackVoList);
+    }
     /**
      * 获取生产报工记录详细信息
      */

mes/src/main/java/com/ximai/mes/pro/dto/ProFeedbackCheckListDto.java

+package com.ximai.mes.pro.dto;
+
+import com.ximai.mes.pro.domain.ProFeedback;
+import lombok.Data;
+
+@Data
+public class ProFeedbackCheckListDto extends ProFeedback {
+    Boolean isCheckUser = false;
+}