Forráskód Böngészése

调整一下解除邀请的时机,在状态为5、7的状态下

zhuangdezheng 1 éve
szülő
commit
5571d593c0

+ 5 - 2
src/main/java/cn/ezhizao/project/business/product/controller/BizDayworkItemController.java

@@ -503,11 +503,15 @@ public class BizDayworkItemController extends BaseController {
             daywork.setDeptId(bizDayworkItem.getDeptId());
             daywork.setProcessQualifiedNum(daywork.getTemporaryProcessQualifiedNum());
             bizDayworkService.updateById(daywork);
+            // 如果被邀请人不是本工段内的人,则需要从当前资源组中删除被邀请人
+            bizProductionResourceGroupDetailService.deleTemporanyPeople(daywork);
         }
 
         if (bizDayworkItem.getStatus().equals("5")) {
             daywork.setProcessQualifiedNum(daywork.getTemporaryProcessQualifiedNum());
             bizDayworkService.updateById(daywork);
+            // 如果被邀请人不是本工段内的人,则需要从当前资源组中删除被邀请人
+            bizProductionResourceGroupDetailService.deleTemporanyPeople(daywork);
         }
         /** 当最后一道序完成时,释放该批次下所有载具 */
         if (bizDayworkItem.getStatus().equals("3")) {
@@ -529,7 +533,6 @@ public class BizDayworkItemController extends BaseController {
                 //最后一道序的时候,把daywork表的status设置为2
                 daywork.setStatus(2);
             }
-            bizProductionResourceGroupDetailService.deleTemporanyPeople(daywork);
             bizDayworkService.updateById(daywork);
         }
         //如果没有合格数,则投产数量为总数量,上道序的合格数为下到序的投产数
@@ -576,7 +579,7 @@ public class BizDayworkItemController extends BaseController {
             groupSubPlan.setProductionPlanDetailId(bizDayworkItem.getProductionPlanDetailId());
             List<BizProductionResourceGroupSubPlan> groupSubPlanList = bizProductionResourceGroupSubPlanService.getList(groupSubPlan);
             //如果没分配
-            if(groupSubPlanList.size()==0){
+            if(groupSubPlanList.isEmpty()){
                 //查产品id
                 BizProductionPlanDetail productionPlanDetail = bizProductionPlanDetailService.getOne(new QueryWrapper<BizProductionPlanDetail>().eq("id", bizDayworkItem.getProductionPlanDetailId()));
                 //存放保存的subPlanList

+ 3 - 4
src/main/java/cn/ezhizao/project/business/resourceGroup/service/impl/BizProductionResourceGroupDetailServiceImpl.java

@@ -92,7 +92,7 @@ public class BizProductionResourceGroupDetailServiceImpl  extends ServiceImpl<Bi
         queryWrapper.eq("protem_process_id", bizDaywork.getProtemProcessId());
         queryWrapper.eq("deleted", 0);
         List<BizProductionResourceGroupDetail> list = list(queryWrapper);
-        if (list.size() > 0) {
+        if (!list.isEmpty()) {
             for (BizProductionResourceGroupDetail bizProductionResourceGroupDetail : list) {
                 ids.add(bizProductionResourceGroupDetail.getCommonId());
                 detailIds.add(bizProductionResourceGroupDetail.getId());
@@ -104,7 +104,6 @@ public class BizProductionResourceGroupDetailServiceImpl  extends ServiceImpl<Bi
 
 
             //存放工段人员的明细
-            List<SysDeptUser> info = new ArrayList<>();
             //删除工段临时人员
             QueryWrapper<SysDeptUser> query = new QueryWrapper<>();
             query.eq("dept_id", deptId);
@@ -112,10 +111,10 @@ public class BizProductionResourceGroupDetailServiceImpl  extends ServiceImpl<Bi
             query.and(i -> i.in("user_id", ids));
             query.eq("is_temporary", bizDaywork.getId());
             List<SysDeptUser> detail = sysDeptUserService.list(query);
-            info.addAll(detail);
 
+            List<SysDeptUser> info = new ArrayList<>(detail);
 
-            if (info.size() > 0) {
+            if (!info.isEmpty()) {
                 info.forEach(i -> {
                     i.setDeleted(1);
                 });