修改caldar表

application-facade/src/main/java/com/factory/web/service/impl/fa/FirstArticleServiceImpl.java

@@ -919,6 +919,7 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
         /* 更新中断的操作人 */
         if (req.getTypeFlag() == 2) {
             LambdaUpdateWrapper<FirstArticleCalendar> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
+            lambdaUpdateWrapper.eq(FirstArticleCalendar::getBentelerPlanId, req.getBentelerPlanId());
             firstArticleCalendarService.update(lambdaUpdateWrapper);
         }
 

application-facade/src/main/java/com/factory/wx/service/impl/WxPlanServiceImpl.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.factory.base.entity.po.benteler.BentelerPlan;
 import com.factory.base.entity.po.remote.UserInfo;
 import com.factory.user.mapper.UserInfoMapper;
-import com.factory.web.entity.fa.FirstArticleCalendar1;
+import com.factory.web.entity.fa.FirstArticleCalendar;
 import com.factory.web.entity.fa.FirstArticleTitle;
 import com.factory.web.entity.pm.OnsiteCalendar;
 import com.factory.web.entity.pm.OnsiteTitle;
@@ -51,15 +51,18 @@ public class WxPlanServiceImpl implements WxPlanService {
     @Override
     public WxPlanBaseInfoRes getFirstArticlePlanBaseInfo(Long planId) {
         BentelerPlan bentelerPlan = bentelerPlanMapper.selectById(planId);
-        List<FirstArticleCalendar1> firstArticleCalendarList = firstArticleCalendarMapper.selectList(Wrappers.<FirstArticleCalendar1>lambdaQuery()
-                .eq(FirstArticleCalendar1::getBentelerPlanId, planId));
+        List<FirstArticleCalendar> firstArticleCalendarList = firstArticleCalendarMapper.selectList(Wrappers.<FirstArticleCalendar>lambdaQuery()
+                .eq(FirstArticleCalendar::getBentelerPlanId, planId));
 
         //获取点检负责人
         List<String> usersName = new ArrayList<>();
         List<Integer> frequency = new ArrayList<>();
         firstArticleCalendarList.forEach(firstArticleCalendar -> {
-            String name = assembleUserName(firstArticleCalendar.getUserId(), firstArticleCalendar.getShift());
-            if (!name.isEmpty()) usersName.add(name);
+            String name = assembleUserName(1L, "");
+            //todo
+            if (!name.isEmpty()) {
+                usersName.add(name);
+            }
             frequency.add(firstArticleCalendar.getTypeFlag());
         });
         //获取title
@@ -90,7 +93,9 @@ public class WxPlanServiceImpl implements WxPlanService {
         List<Integer> frequency = new ArrayList<>();
         onsiteCalendarList.forEach(onsiteCalendar -> {
             String name = assembleUserName(onsiteCalendar.getUserId(), onsiteCalendar.getShift());
-            if (!name.isEmpty()) usersName.add(name);
+            if (!name.isEmpty()) {
+                usersName.add(name);
+            }
             frequency.add(onsiteCalendar.getTypeFlag());
         });