From e159dfb39baed0b68c4c037ebaf1930e5f43ad0b Mon Sep 17 00:00:00 2001 From: ruanqi Date: Tue, 11 Apr 2023 14:46:45 +0800 Subject: [PATCH] =?UTF-8?q?0412=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../production/dao/AbnormalMapper.java | 23 ++++++++++++++++ .../service/impl/DailyPlanServiceImpl.java | 27 +++++++++++++++++++ .../mapper/production/AbnormalMapper.xml | 11 ++++++++ 3 files changed, 61 insertions(+) diff --git a/src/main/java/com/heai/modules/production/dao/AbnormalMapper.java b/src/main/java/com/heai/modules/production/dao/AbnormalMapper.java index 9136b94..7c96fc7 100644 --- a/src/main/java/com/heai/modules/production/dao/AbnormalMapper.java +++ b/src/main/java/com/heai/modules/production/dao/AbnormalMapper.java @@ -4,6 +4,8 @@ import com.heai.modules.production.entity.AbnormalFeedBackData; import com.heai.modules.production.entity.AbnormalFeedBackDataIn; import com.heai.modules.production.entity.AbnormalItemData; import com.heai.modules.production.entity.SOScheduledRoutingOutData; +import com.heai.modules.taskmanage.dto.TaskDto; +import com.heai.modules.taskmanage.entity.TaskDetailEntity; import org.apache.ibatis.annotations.Mapper; import org.springframework.stereotype.Repository; @@ -60,4 +62,25 @@ public interface AbnormalMapper { void saveAbnormalDetail(AbnormalFeedBackDataIn inData); void updateFeedBackStatus(AbnormalFeedBackDataIn inData); + /** + * @Description 找到发起人 + * @Title getOriginator + * @param + * @author rq + * @date 2023/4/11 14:06 + * @return TaskDto + * @throw + */ + TaskDto getOriginator(); + + /** + * @Description 找到群发人 + * @Title getAbnormalUsers + * @param taskDto + * @author rq + * @date 2023/4/11 14:29 + * @return List + * @throw + */ + List getAbnormalUsers(TaskDto taskDto); } diff --git a/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java b/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java index 4f63212..c493cb7 100644 --- a/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java +++ b/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java @@ -9,6 +9,9 @@ import com.heai.modules.production.dao.*; import com.heai.modules.production.entity.*; import com.heai.modules.production.service.DailyPlanService; import com.heai.modules.production.util.BigDecimalUtils; +import com.heai.modules.taskmanage.dto.TaskDto; +import com.heai.modules.taskmanage.entity.TaskDetailEntity; +import com.heai.modules.taskmanage.service.TaskListService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -37,6 +40,10 @@ public class DailyPlanServiceImpl implements DailyPlanService { @Autowired private ProcedureMapper procedureMapper; + + @Autowired + private TaskListService taskListService; + @Override public List getShopOrderData( DailyPlanInData dailyPlanInData){ return dailyPlanMapper.getShopOrderData(dailyPlanInData); @@ -1064,6 +1071,26 @@ public class DailyPlanServiceImpl implements DailyPlanService { if("Y".equals(abList.get(0).getNeedFeedBackFlag())){ abnormalMapper.saveAbnormalData(inData); } + //判断是否群发所有部门异常信息 通过沟通看板,abnormalUser 表设定群发人员 + if("Y".equals(abList.get(0).getNeedInspectFlag())){ + Date date=DateUtil.getDateToDate(new Date(),"yyyy-MM-dd"); + TaskDto taskDto=abnormalMapper.getOriginator(); + taskDto.setCustomer(inData.getSeqNo().toString()); + taskDto.setProject("异常反馈"); + taskDto.setFinalStatus("未完成"); + taskDto.setRequiredCompletionDate(date); + taskDto.setStatus("未受理"); + taskDto.setTaskDescription(inData.getAbnormalRemark()); + taskDto.setTaskHeader(abList.get(0).getAbnormalDesc()); + taskDto.setTaskInitiator(taskDto.getCreatedBy()); + taskDto.setTaskStartDate(date); + List taskDetails=abnormalMapper.getAbnormalUsers(taskDto); + if(taskDetails.size()==0){ + throw new RuntimeException("未维护异常反馈群发任务组!请联系管理员"); + } + taskDto.setTaskDetails(taskDetails); + taskListService.saveBatchTaskList(taskDto); + } } @Override @Transactional diff --git a/src/main/resources/mapper/production/AbnormalMapper.xml b/src/main/resources/mapper/production/AbnormalMapper.xml index 268cea4..1809f55 100644 --- a/src/main/resources/mapper/production/AbnormalMapper.xml +++ b/src/main/resources/mapper/production/AbnormalMapper.xml @@ -70,4 +70,15 @@ update AbnormalFeedBack set Status=#{status} where id=#{id} + + + + \ No newline at end of file