diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/materialplanboom/MaterialPlanBoomDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/materialplanboom/MaterialPlanBoomDO.java index 3110da1..9495d71 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/materialplanboom/MaterialPlanBoomDO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/materialplanboom/MaterialPlanBoomDO.java @@ -65,5 +65,7 @@ public class MaterialPlanBoomDO extends BaseDO { private String compositionName; @TableField(exist = false) private Long compositionId; + @TableField(exist = false) + private String projectMaterialPlanNo; } \ No newline at end of file diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/materialplanboom/MaterialPlanBoomMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/materialplanboom/MaterialPlanBoomMapper.java index b75379c..75b6645 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/materialplanboom/MaterialPlanBoomMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/materialplanboom/MaterialPlanBoomMapper.java @@ -7,6 +7,7 @@ import com.chanko.yunxi.mes.framework.mybatis.core.query.LambdaQueryWrapperX; import com.chanko.yunxi.mes.framework.mybatis.core.mapper.BaseMapperX; import com.chanko.yunxi.mes.module.heli.dal.dataobject.composition.CompositionDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.materialplanboom.MaterialPlanBoomDO; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.materialplandetail.MaterialPlanDetailDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.plansub.PlanSubDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.processbom.ProcessBomDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.processbom.ProcessBomDetailDO; @@ -15,6 +16,7 @@ import com.chanko.yunxi.mes.module.heli.enums.ProcessBomStatusEnum; import com.github.yulichang.wrapper.MPJLambdaWrapper; import org.apache.ibatis.annotations.Mapper; import com.chanko.yunxi.mes.module.heli.controller.admin.materialplanboom.vo.*; +import org.apache.ibatis.annotations.Param; import org.springframework.util.StringUtils; /** @@ -66,6 +68,8 @@ public interface MaterialPlanBoomMapper extends BaseMapperX return selectPage(reqVO,query); } + List selectafterten(@Param("id") Long txrid, @Param("evday") String evday); + // default PageResult selectPage(MaterialPlanBoomPageReqVO reqVO) { // return selectPage(reqVO, new LambdaQueryWrapperX() // .eqIfPresent(MaterialPlanBoomDO::getId, reqVO.getId()) diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/materialplandetail/MaterialPlanDetailMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/materialplandetail/MaterialPlanDetailMapper.java index 004db6d..6c1fbc2 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/materialplandetail/MaterialPlanDetailMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/materialplandetail/MaterialPlanDetailMapper.java @@ -16,6 +16,7 @@ import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.mysql.cj.x.protobuf.MysqlxDatatypes; import org.apache.ibatis.annotations.Mapper; import com.chanko.yunxi.mes.module.heli.controller.admin.materialplandetail.vo.*; +import org.apache.ibatis.annotations.Param; import org.springframework.util.StringUtils; /** @@ -78,7 +79,7 @@ public interface MaterialPlanDetailMapper extends BaseMapperX selectafterten(Long id); + List selectafterten(@Param("id") Long id, @Param("evday") String evday); List selectafterten1(); } \ No newline at end of file diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/bdgzsomthing/bdgzsomthingServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/bdgzsomthing/bdgzsomthingServiceImpl.java index 014efa7..a4c6d37 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/bdgzsomthing/bdgzsomthingServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/bdgzsomthing/bdgzsomthingServiceImpl.java @@ -1,6 +1,7 @@ package com.chanko.yunxi.mes.module.heli.service.bdgzsomthing; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.http.useragent.UserAgentUtil; import cn.hutool.system.SystemUtil; import com.alibaba.fastjson.JSON; @@ -10,6 +11,8 @@ import com.chanko.yunxi.mes.framework.security.core.util.SecurityFrameworkUtils; import com.chanko.yunxi.mes.module.heli.controller.admin.taskdispatch.vo.TaskDispatchPageReqVO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.attentiontodo.AttentiontodoDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.deliverorder.DeliverOrderDO; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.materialplan.MaterialPlanDO; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.materialplanboom.MaterialPlanBoomDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.materialplandetail.MaterialPlanDetailDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.pgmaster.PgMasterLineDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.plan.PlanDO; @@ -22,6 +25,8 @@ import com.chanko.yunxi.mes.module.heli.dal.dataobject.weiXinXiaoXi.WeixinXiaoXi import com.chanko.yunxi.mes.module.heli.dal.dataobject.zjpgmaster.ZjPgMasterLineDO; import com.chanko.yunxi.mes.module.heli.dal.mysql.attentiontodo.AttentiontodoMapper; import com.chanko.yunxi.mes.module.heli.dal.mysql.deliverorder.DeliverOrderMapper; +import com.chanko.yunxi.mes.module.heli.dal.mysql.materialplan.MaterialPlanMapper; +import com.chanko.yunxi.mes.module.heli.dal.mysql.materialplanboom.MaterialPlanBoomMapper; import com.chanko.yunxi.mes.module.heli.dal.mysql.materialplandetail.MaterialPlanDetailMapper; import com.chanko.yunxi.mes.module.heli.dal.mysql.pgmaster.PgMasterMapper; import com.chanko.yunxi.mes.module.heli.dal.mysql.plan.PlanMapper; @@ -31,6 +36,7 @@ import com.chanko.yunxi.mes.module.heli.dal.mysql.taskdispatch.TaskDispatchDetai import com.chanko.yunxi.mes.module.heli.dal.mysql.taskdispatch.TaskDispatchMapper; import com.chanko.yunxi.mes.module.heli.enums.TaskDispatchTypeEnum; import com.chanko.yunxi.mes.module.heli.service.attentiontodo.AttentiontodoService; +import com.chanko.yunxi.mes.module.heli.service.materialplan.MaterialPlanService; import com.chanko.yunxi.mes.module.system.api.user.AdminUserApi; import com.chanko.yunxi.mes.module.system.api.user.dto.AdminUserRespDTO; import com.chanko.yunxi.mes.module.system.controller.admin.user.UserController; @@ -62,6 +68,7 @@ import java.time.LocalDateTime; import java.time.temporal.ChronoUnit; import java.util.*; import java.util.stream.Collectors; +import java.util.stream.Stream; import com.chanko.yunxi.mes.module.heli.controller.admin.bdgzsomthing.vo.*; import com.chanko.yunxi.mes.module.heli.dal.dataobject.bdgzsomthing.bdgzsomthingDO; @@ -108,6 +115,11 @@ public class bdgzsomthingServiceImpl implements bdgzsomthingService { private PgMasterMapper pgMasterMapper; @Resource private ProjectOrderMapper projectOrderMapper; + + @Resource + private MaterialPlanBoomMapper materialPlanBoomMapper; + @Resource + private MaterialPlanMapper materialPlanMapper; @Override public Long createbdgzsomthing(bdgzsomthingSaveReqVO createReqVO) { // 插入 @@ -307,7 +319,18 @@ public class bdgzsomthingServiceImpl implements bdgzsomthingService { else if(attentiontodoRespVO.getAttr5().equals("2")){ BdgzsomthingDO.setDborgz("关注"); } - BdgzsomthingDO.setClick(attentiontodoRespVO.getAttr4());//提醒人 + if (ObjectUtil.isEmpty(attentiontodoRespVO.getAttr4())){ + TaskDispatchDO taskDispatchDO = taskDispatchMapper.selectOne(new LambdaQueryWrapper().eq(TaskDispatchDO::getCode, deliverOrderDO.getCode())); + if (ObjectUtil.isNotEmpty(taskDispatchDO)){ + AdminUserDO user = adminUserService.getUser(Long.valueOf(taskDispatchDO.getCreator())); + if (ObjectUtil.isNotEmpty(user)){ + BdgzsomthingDO.setClick(user.getNickname()); + } + } + + }else { + BdgzsomthingDO.setClick(attentiontodoRespVO.getAttr4()); + }//提醒人 if(attentiontodoRespVO.getLevel().equals("1")){ BdgzsomthingDO.setLevel("紧急"); } @@ -324,7 +347,7 @@ public class bdgzsomthingServiceImpl implements bdgzsomthingService { //去重查询,重复则不加 List selecteqint = bdgzsomthingMapper.selecteqint(BdgzsomthingDO); - + System.out.println("生产任务单"+BdgzsomthingDO); if(selecteqint.size()>0){ }else{ @@ -395,7 +418,18 @@ public class bdgzsomthingServiceImpl implements bdgzsomthingService { else if(attentiontodoRespVO.getAttr5().equals("2")){ BdgzsomthingDO.setDborgz("关注"); } - BdgzsomthingDO.setClick(attentiontodoRespVO.getAttr4());//提醒人 + if (ObjectUtil.isEmpty(attentiontodoRespVO.getAttr4())){ + TaskDispatchDO taskDispatchDO = taskDispatchMapper.selectOne(new LambdaQueryWrapper().eq(TaskDispatchDO::getCode, deliverOrderDO.getCode())); + if (ObjectUtil.isNotEmpty(taskDispatchDO)){ + AdminUserDO user = adminUserService.getUser(Long.valueOf(taskDispatchDO.getCreator())); + if (ObjectUtil.isNotEmpty(user)){ + BdgzsomthingDO.setClick(user.getNickname()); + } + } + + }else { + BdgzsomthingDO.setClick(attentiontodoRespVO.getAttr4()); + }//提醒人 if(attentiontodoRespVO.getLevel().equals("1")){ BdgzsomthingDO.setLevel("紧急"); } @@ -690,7 +724,15 @@ public class bdgzsomthingServiceImpl implements bdgzsomthingService { else if(attentiontodoRespVO.getAttr5().equals("2")){ BdgzsomthingDO.setDborgz("关注"); } - BdgzsomthingDO.setClick(attentiontodoRespVO.getAttr4());//提醒人 + if (ObjectUtil.isEmpty(attentiontodoRespVO.getAttr4())){ + AdminUserDO user = adminUserService.getUser(Long.valueOf(deliverOrderDO.getCreator())); + if (ObjectUtil.isNotEmpty(user)){ + BdgzsomthingDO.setClick(user.getNickname()); + } + + }else { + BdgzsomthingDO.setClick(attentiontodoRespVO.getAttr4()); + }//提醒人 if(attentiontodoRespVO.getLevel().equals("1")){ BdgzsomthingDO.setLevel("紧急"); } @@ -734,6 +776,7 @@ public class bdgzsomthingServiceImpl implements bdgzsomthingService { attentiontodoDO.setAttr5("1"); attentiontodoDO.setAttr4(userApi.getUser( Long.parseLong(storageLogNowDO.getCreator())).getNickname()); //改对应 attentiontodoDO.setLevel("1"); + attentiontodoDO.setEvday("10"); attentiontodookddfh9.add(attentiontodoDO); @@ -759,13 +802,26 @@ public class bdgzsomthingServiceImpl implements bdgzsomthingService { for (AttentiontodoDO attentiontodoRespVO : attentiontodookddfh9) { - List selectafterten = materialPlanDetailMapper.selectafterten(attentiontodoRespVO.getTxrid()); + List selectafterten = materialPlanDetailMapper.selectafterten(attentiontodoRespVO.getTxrid(),attentiontodoRespVO.getEvday()); + List selectafterten1 = materialPlanBoomMapper.selectafterten(attentiontodoRespVO.getTxrid(), attentiontodoRespVO.getEvday()); + Set uniqueProjectMaterialPlanNos = Stream.concat(selectafterten.stream(), selectafterten1.stream()) + .map(obj -> { + if (obj instanceof MaterialPlanDetailDO) { + return ((MaterialPlanDetailDO) obj).getProjectMaterialPlanNo(); + } else if (obj instanceof MaterialPlanBoomDO) { + return ((MaterialPlanBoomDO) obj).getProjectMaterialPlanNo(); + } else { + throw new IllegalArgumentException("Unexpected object type"); + } + }) + .collect(Collectors.toSet()); + { - for (MaterialPlanDetailDO deliverOrderDO : selectafterten) { + for (String projectMaterialPlanNo : uniqueProjectMaterialPlanNos) { bdgzsomthingDO BdgzsomthingDO = new bdgzsomthingDO(); BdgzsomthingDO.setThingname(attentiontodoRespVO.getEvent());//事件名称 BdgzsomthingDO.setAttr4("0");//是否点击 - BdgzsomthingDO.setThings("计划单号:"+deliverOrderDO.getProjectMaterialPlanNo()+"货物临近到货日期");//事件名称 + BdgzsomthingDO.setThings("计划单号:"+projectMaterialPlanNo+"货物临近到货日期");//事件名称 BdgzsomthingDO.setAttr2(null);//因为不用跳转所以为null BdgzsomthingDO.setClicktime(attentiontodoRespVO.getRemindtime());//提醒周期 BdgzsomthingDO.setTenantId(attentiontodoRespVO.getTxrid()); @@ -776,7 +832,18 @@ public class bdgzsomthingServiceImpl implements bdgzsomthingService { else if(attentiontodoRespVO.getAttr5().equals("2")){ BdgzsomthingDO.setDborgz("关注"); } - BdgzsomthingDO.setClick(attentiontodoRespVO.getAttr4());//提醒人 + if (ObjectUtil.isEmpty(attentiontodoRespVO.getAttr4())){ + MaterialPlanDO planDO = materialPlanMapper.selectOne(new LambdaQueryWrapper().eq(MaterialPlanDO::getProjectMaterialPlanNo, projectMaterialPlanNo)); + if (ObjectUtil.isNotEmpty(planDO)){ + AdminUserDO user = adminUserService.getUser(Long.valueOf(planDO.getCreator())); + if (ObjectUtil.isNotEmpty(user)){ + BdgzsomthingDO.setClick(user.getNickname()); + } + } + + }else { + BdgzsomthingDO.setClick(attentiontodoRespVO.getAttr4()); + } if(attentiontodoRespVO.getLevel().equals("1")){ BdgzsomthingDO.setLevel("紧急"); } @@ -788,7 +855,7 @@ public class bdgzsomthingServiceImpl implements bdgzsomthingService { } BdgzsomthingDO.setYesorno("0");//是否点击 - BdgzsomthingDO.setAttr3(deliverOrderDO.getProjectMaterialPlanNo());//获取数据当前表的id 改 + BdgzsomthingDO.setAttr3(projectMaterialPlanNo);//获取数据当前表的id 改 BdgzsomthingDO.setShowname(null);//获取数据当前表的创建事件 改 //去重查询,重复则不加 List selecteqint = bdgzsomthingMapper.selecteqintone(BdgzsomthingDO); @@ -814,6 +881,7 @@ public class bdgzsomthingServiceImpl implements bdgzsomthingService { + } public int updateById(bdgzsomthingDO entity){ diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/materialplan/MaterialPlanServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/materialplan/MaterialPlanServiceImpl.java index 48053dd..e98955f 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/materialplan/MaterialPlanServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/materialplan/MaterialPlanServiceImpl.java @@ -1,8 +1,20 @@ package com.chanko.yunxi.mes.module.heli.service.materialplan; +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.chanko.yunxi.mes.framework.common.util.object.ObjectUtils; +import com.chanko.yunxi.mes.framework.security.core.util.SecurityFrameworkUtils; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.attentiontodo.AttentiontodoDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.bdgzsomthing.bdgzsomthingDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.serialnumber.SerialNumberDO; +import com.chanko.yunxi.mes.module.heli.dal.mysql.attentiontodo.AttentiontodoMapper; +import com.chanko.yunxi.mes.module.heli.service.attentiontodo.AttentiontodoService; import com.chanko.yunxi.mes.module.heli.service.serialnumber.SerialNumberService; +import com.chanko.yunxi.mes.module.system.api.user.AdminUserApi; +import com.chanko.yunxi.mes.module.system.dal.dataobject.user.AdminUserDO; +import com.chanko.yunxi.mes.module.system.dal.mysql.user.AdminUserMapper; +import com.chanko.yunxi.mes.module.system.service.user.AdminUserService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -39,6 +51,15 @@ public class MaterialPlanServiceImpl implements MaterialPlanService { @Resource private SerialNumberService serialNumberService; @Resource + private AdminUserApi userApi; + + @Autowired + private AttentiontodoService attentiontodoService; + @Resource + private AttentiontodoMapper attentiontodoMapper; + @Resource + private AdminUserService adminUserService; + @Resource private com.chanko.yunxi.mes.module.heli.dal.mysql.bdgzsomthing.bdgzsomthingMapper bdgzsomthingMapper; @Override public Long createMaterialPlan(MaterialPlanSaveReqVO createReqVO) { @@ -72,6 +93,73 @@ public class MaterialPlanServiceImpl implements MaterialPlanService { LocalDateTime currTime = LocalDateTime.now(); if(updateReqVO.getStatus()==2){ updateObj.setSubmitTime(currTime); + MaterialPlanDO materialPlanDO = materialPlanMapper.selectById(updateReqVO.getId()); + + + List attentiontodook = attentiontodoMapper.selectByIdlist(8);//查找该类型的待办和关注人 改 + String nickname = userApi.getUser( SecurityFrameworkUtils.getLoginUser().getId()).getNickname(); + List attentiontodook1 = attentiontodoService.getAttentiontodolistdaiban(8); + if (attentiontodook1.size()<1){ + { + + AttentiontodoDO attentiontodoDO = new AttentiontodoDO(); + attentiontodoDO.setEvent("《物料需求计划》提交后"); + attentiontodoDO.setAttr5("1"); + attentiontodoDO.setAttr4(nickname); + attentiontodoDO.setLevel("1"); + attentiontodook.add(attentiontodoDO); + + } + + } + for (AttentiontodoDO attentiontodoRespVO : attentiontodook) { + { + // for (StorageLogNowDO storageLogNowDO : pageResult) { + bdgzsomthingDO BdgzsomthingDO = new bdgzsomthingDO(); + BdgzsomthingDO.setThingname(attentiontodoRespVO.getEvent());//事件名称 + BdgzsomthingDO.setThings(materialPlanDO.getProjectMaterialPlanNo()+"已提交送审");//事件名称 + BdgzsomthingDO.setAttr2(materialPlanDO.getProjectMaterialPlanNo());//跳转携带参数 + BdgzsomthingDO.setAttr3(materialPlanDO.getProjectMaterialPlanNo());//独特标识 +// BdgzsomthingDO.setClicktime(attentiontodoRespVO.getRemindtime());//提醒周期 +// BdgzsomthingDO.setShowname(new Date());比较创建时间,不用单独填写 + if(attentiontodoRespVO.getAttr5().equals("1")){//提醒状态 + BdgzsomthingDO.setDborgz("待办"); + } + else if(attentiontodoRespVO.getAttr5().equals("2")){ + BdgzsomthingDO.setDborgz("关注"); + } + //提醒人 + if (ObjectUtil.isEmpty(attentiontodoRespVO.getAttr4())){ + AdminUserDO user = adminUserService.getUser(Long.valueOf(materialPlanDO.getCreator())); + if (ObjectUtil.isNotEmpty(user)){ + BdgzsomthingDO.setClick(user.getNickname()); + } + }else { + BdgzsomthingDO.setClick(attentiontodoRespVO.getAttr4()); + } + if(attentiontodoRespVO.getLevel().equals("1")){ + BdgzsomthingDO.setLevel("紧急"); + } + else if(attentiontodoRespVO.getLevel().equals("2")){ + BdgzsomthingDO.setLevel("一般"); + } + else if(attentiontodoRespVO.getLevel().equals("3")){ + BdgzsomthingDO.setLevel("非紧急"); + } +// BdgzsomthingDO.setClick(attentiontodoRespVO.getRemindman());//提醒人 + BdgzsomthingDO.setYesorno("0");//是否点击 + BdgzsomthingDO.setAttr4("0");//是否已处理 + + +// BdgzsomthingDO.setShowname(operateReqVO.getCreateTime());//获取数据当前表的创建事件 改 + bdgzsomthingMapper.insert(BdgzsomthingDO); + + + + + // } + } + } } if(updateReqVO.getStatus()== 3){ updateObj.setAuditTime(currTime); @@ -79,10 +167,10 @@ public class MaterialPlanServiceImpl implements MaterialPlanService { materialPlanMapper.updateById(updateObj); - bdgzsomthingDO abc= new bdgzsomthingDO(); - abc.setThingname("《物料需求计划》提交后"); - abc.setAttr3(updateObj.getProjectMaterialPlanNo()); - bdgzsomthingMapper.updateok(abc); +// bdgzsomthingDO abc= new bdgzsomthingDO(); +// abc.setThingname("《物料需求计划》提交后"); +// abc.setAttr3(updateObj.getProjectMaterialPlanNo()); +// bdgzsomthingMapper.updateok(abc); } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/materialplandetail/MaterialPlanDetailServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/materialplandetail/MaterialPlanDetailServiceImpl.java index ceac9a5..62e142a 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/materialplandetail/MaterialPlanDetailServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/materialplandetail/MaterialPlanDetailServiceImpl.java @@ -36,11 +36,7 @@ import static com.chanko.yunxi.mes.module.heli.enums.ErrorCodeConstants.*; @Service @Validated public class MaterialPlanDetailServiceImpl implements MaterialPlanDetailService { - @Resource - private AdminUserApi userApi; - @Autowired - private AttentiontodoService attentiontodoService; @Resource private MaterialPlanMapper materialPlanMapper; @Resource @@ -66,65 +62,7 @@ public class MaterialPlanDetailServiceImpl implements MaterialPlanDetailService MaterialPlanDetailDO updateObj = BeanUtils.toBean(updateReqVO, MaterialPlanDetailDO.class); materialPlanDetailMapper.updateById(updateObj); //需求计划送审 完美点击插入 - MaterialPlanDO materialPlanDO = materialPlanMapper.selectById(updateObj.getProjectMaterialPlanId()); - - List attentiontodook = attentiontodoMapper.selectByIdlist(8);//查找该类型的待办和关注人 改 - String nickname = userApi.getUser( SecurityFrameworkUtils.getLoginUser().getId()).getNickname(); - List attentiontodook1 = attentiontodoService.getAttentiontodolistdaiban(8); - if (attentiontodook1.size()<1){ - { - - AttentiontodoDO attentiontodoDO = new AttentiontodoDO(); - attentiontodoDO.setEvent("《物料需求计划》提交后"); - attentiontodoDO.setAttr5("1"); - attentiontodoDO.setAttr4(nickname); - attentiontodoDO.setLevel("1"); - attentiontodook.add(attentiontodoDO); - - } - - } - for (AttentiontodoDO attentiontodoRespVO : attentiontodook) { - { - // for (StorageLogNowDO storageLogNowDO : pageResult) { - bdgzsomthingDO BdgzsomthingDO = new bdgzsomthingDO(); - BdgzsomthingDO.setThingname(attentiontodoRespVO.getEvent());//事件名称 - BdgzsomthingDO.setThings(materialPlanDO.getProjectMaterialPlanNo()+"已提交送审");//事件名称 - BdgzsomthingDO.setAttr2(materialPlanDO.getProjectMaterialPlanNo());//跳转携带参数 - BdgzsomthingDO.setAttr3(materialPlanDO.getProjectMaterialPlanNo());//独特标识 -// BdgzsomthingDO.setClicktime(attentiontodoRespVO.getRemindtime());//提醒周期 -// BdgzsomthingDO.setShowname(new Date());比较创建时间,不用单独填写 - if(attentiontodoRespVO.getAttr5().equals("1")){//提醒状态 - BdgzsomthingDO.setDborgz("待办"); - } - else if(attentiontodoRespVO.getAttr5().equals("2")){ - BdgzsomthingDO.setDborgz("关注"); - } - BdgzsomthingDO.setClick(attentiontodoRespVO.getAttr4());//提醒人 - if(attentiontodoRespVO.getLevel().equals("1")){ - BdgzsomthingDO.setLevel("紧急"); - } - else if(attentiontodoRespVO.getLevel().equals("2")){ - BdgzsomthingDO.setLevel("一般"); - } - else if(attentiontodoRespVO.getLevel().equals("3")){ - BdgzsomthingDO.setLevel("非紧急"); - } -// BdgzsomthingDO.setClick(attentiontodoRespVO.getRemindman());//提醒人 - BdgzsomthingDO.setYesorno("0");//是否点击 - BdgzsomthingDO.setAttr4("0");//是否已处理 - - -// BdgzsomthingDO.setShowname(operateReqVO.getCreateTime());//获取数据当前表的创建事件 改 - bdgzsomthingMapper.insert(BdgzsomthingDO); - - - - - // } - } - } ////////////////////////////////////////////////// diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/processbom/ProcessBomServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/processbom/ProcessBomServiceImpl.java index 6c80b95..574d820 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/processbom/ProcessBomServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/processbom/ProcessBomServiceImpl.java @@ -1,6 +1,7 @@ package com.chanko.yunxi.mes.module.heli.service.processbom; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.generator.IFill; @@ -41,7 +42,9 @@ import com.chanko.yunxi.mes.module.heli.service.plantaskbom.PlanTaskBomService; import com.chanko.yunxi.mes.module.system.api.user.AdminUserApi; import com.chanko.yunxi.mes.module.system.controller.admin.dict.vo.data.DictDataPageReqVO; import com.chanko.yunxi.mes.module.system.dal.dataobject.dict.DictDataDO; +import com.chanko.yunxi.mes.module.system.dal.dataobject.user.AdminUserDO; import com.chanko.yunxi.mes.module.system.dal.mysql.dict.DictDataMapper; +import com.chanko.yunxi.mes.module.system.service.user.AdminUserService; import org.apache.poi.ss.formula.functions.T; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -98,6 +101,8 @@ public class ProcessBomServiceImpl implements ProcessBomService { private AttentiontodoMapper attentiontodoMapper; @Resource private DictDataMapper dictDataMapper; + @Resource + private AdminUserService adminUserService; @Override @Transactional(rollbackFor = Exception.class) public Long createProcessBom(ProcessBomSaveReqVO createReqVO) { @@ -547,8 +552,8 @@ public class ProcessBomServiceImpl implements ProcessBomService { bdgzsomthingDO BdgzsomthingDO = new bdgzsomthingDO(); BdgzsomthingDO.setThingname(attentiontodoRespVO.getEvent());//事件名称 BdgzsomthingDO.setThings("BOM" + updateObj.getProjectSubCode() + "审核已通过,请推送任务通知单");//事件名称 - BdgzsomthingDO.setAttr2(getplanid.getId().toString());//跳转携带参数 - BdgzsomthingDO.setAttr3(getplanid.getId().toString());//独特标识 + BdgzsomthingDO.setAttr2(getplanid.getPlanNo());//跳转携带参数 + BdgzsomthingDO.setAttr3(getplanid.getPlanNo());//独特标识 // BdgzsomthingDO.setClicktime(attentiontodoRespVO.getRemindtime());//提醒周期 // BdgzsomthingDO.setShowname(new Date());比较创建时间,不用单独填写 if (attentiontodoRespVO.getAttr5().equals("1")) {//提醒状态 @@ -556,7 +561,18 @@ public class ProcessBomServiceImpl implements ProcessBomService { } else if (attentiontodoRespVO.getAttr5().equals("2")) { BdgzsomthingDO.setDborgz("关注"); } - BdgzsomthingDO.setClick(attentiontodoRespVO.getAttr4());//提醒人 + + if (ObjectUtil.isEmpty(attentiontodoRespVO.getAttr4())){ + ProcessBomDO processBomDO = processBomMapper.selectById(updateReqVO.getId()); + if (ObjectUtil.isNotEmpty(processBomDO)){ + AdminUserDO user = adminUserService.getUser(Long.valueOf(processBomDO.getCreator())); + if (ObjectUtil.isNotEmpty(user)){ + BdgzsomthingDO.setClick(user.getNickname()); + } + } + }else { + BdgzsomthingDO.setClick(attentiontodoRespVO.getAttr4()); + } if (attentiontodoRespVO.getLevel().equals("1")) { BdgzsomthingDO.setLevel("紧急"); } else if (attentiontodoRespVO.getLevel().equals("2")) { @@ -745,7 +761,15 @@ public class ProcessBomServiceImpl implements ProcessBomService { } else if (attentiontodoRespVO.getAttr5().equals("2")) { BdgzsomthingDO.setDborgz("关注"); } - BdgzsomthingDO.setClick(attentiontodoRespVO.getAttr4());//提醒人 + if (ObjectUtil.isEmpty(attentiontodoRespVO.getAttr4())){ + AdminUserDO user = adminUserService.getUser(Long.valueOf(processBomDO.getCreator())); + if (ObjectUtil.isNotEmpty(user)){ + BdgzsomthingDO.setClick(user.getNickname()); + } + + }else { + BdgzsomthingDO.setClick(attentiontodoRespVO.getAttr4()); + } if (attentiontodoRespVO.getLevel().equals("1")) { BdgzsomthingDO.setLevel("紧急"); } else if (attentiontodoRespVO.getLevel().equals("2")) { @@ -810,7 +834,14 @@ public class ProcessBomServiceImpl implements ProcessBomService { } else if (attentiontodoRespVO.getAttr5().equals("2")) { BdgzsomthingDO.setDborgz("关注"); } - BdgzsomthingDO.setClick(attentiontodoRespVO.getAttr4());//提醒人 + if (ObjectUtil.isEmpty(attentiontodoRespVO.getAttr4())){ + AdminUserDO user = adminUserService.getUser(Long.valueOf(processBomDO.getCreator())); + if (ObjectUtil.isNotEmpty(user)){ + BdgzsomthingDO.setClick(user.getNickname()); + } + }else { + BdgzsomthingDO.setClick(attentiontodoRespVO.getAttr4()); + } if (attentiontodoRespVO.getLevel().equals("1")) { BdgzsomthingDO.setLevel("紧急"); } else if (attentiontodoRespVO.getLevel().equals("2")) { diff --git a/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/materialplanboom/MaterialPlanBoomMapper.xml b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/materialplanboom/MaterialPlanBoomMapper.xml index 6082617..938f7c6 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/materialplanboom/MaterialPlanBoomMapper.xml +++ b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/materialplanboom/MaterialPlanBoomMapper.xml @@ -8,4 +8,24 @@ 代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。 文档可见：https://www.iocoder.cn/MyBatis/x-plugins/ --> + \ No newline at end of file diff --git a/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/materialplandetail/MaterialPlanDetailMapper.xml b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/materialplandetail/MaterialPlanDetailMapper.xml index 6f0489a..d9e80a7 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/materialplandetail/MaterialPlanDetailMapper.xml +++ b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/materialplandetail/MaterialPlanDetailMapper.xml @@ -10,7 +10,7 @@ -->