Browse Source

0412更新

master
ruanqi 3 years ago
parent
commit
e159dfb39b
  1. 23
      src/main/java/com/heai/modules/production/dao/AbnormalMapper.java
  2. 27
      src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java
  3. 11
      src/main/resources/mapper/production/AbnormalMapper.xml

23
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<TaskDetailEntity>
* @throw
*/
List<TaskDetailEntity> getAbnormalUsers(TaskDto taskDto);
}

27
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<ShopOrderData> 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<TaskDetailEntity> taskDetails=abnormalMapper.getAbnormalUsers(taskDto);
if(taskDetails.size()==0){
throw new RuntimeException("未维护异常反馈群发任务组!请联系管理员");
}
taskDto.setTaskDetails(taskDetails);
taskListService.saveBatchTaskList(taskDto);
}
}
@Override
@Transactional

11
src/main/resources/mapper/production/AbnormalMapper.xml

@ -70,4 +70,15 @@
update AbnormalFeedBack set Status=#{status}
where id=#{id}
</update>
<select id="getOriginator" resultType="com.heai.modules.taskmanage.dto.TaskDto">
select top 1 site,userId AS createdBy FROM AbnormalUser WHERE Originator='Y'
</select>
<select id="getAbnormalUsers" resultType="com.heai.modules.taskmanage.entity.TaskDetailEntity">
select a.site,a.userId AS responsiblePerson,b.department,#{createdBy} as CreatedBy,GetDate() as createdDate,'未完成' as finalStatus
,'未受理' as status
FROM AbnormalUser a left join [Users] b on a.userId=b.userID and a.site=b.site
WHERE a.Originator='N' and b.department is not null
</select>
</mapper>
Loading…
Cancel
Save