bug处理

pms-service/src/main/java/com/tofly/pms/supervise/service/impl/ProjectReportPersonnelServiceImpl.java

@@ -63,7 +63,12 @@ public class ProjectReportPersonnelServiceImpl extends ServiceImpl<ProjectReport
         } else {
             throw new IllegalArgumentException("汇报人/主管/总监类型不合法");
         }
-        return super.save(entity);
+        try {
+            super.save(entity);
+        }catch (Exception e ){
+            log.error(e.getMessage(),e);
+        }
+        return true;
     }
 
     private void checkEntity(ProjectReportPersonnel entity) {
@@ -319,9 +324,9 @@ public class ProjectReportPersonnelServiceImpl extends ServiceImpl<ProjectReport
     public boolean copyFromLast(String reportId, String lastReportId) {
         List<ProjectReportPersonnel> lastReportPersonnelList = baseMapper.getReportUser(lastReportId);
         List<ProjectReportPersonnel> reportUser = baseMapper.getReportUser(reportId);
-        if (CollectionUtil.isNotEmpty(reportUser)) {
-            throw new RuntimeException("当前周报已配置人员，无法复制");
-        }
+//        if (CollectionUtil.isNotEmpty(reportUser)) {
+//            throw new RuntimeException("当前周报已配置人员，无法复制");
+//        }
         if (CollectionUtil.isNotEmpty(lastReportPersonnelList)) {
             for (ProjectReportPersonnel projectReportPersonnel : lastReportPersonnelList) {
                 projectReportPersonnel.setReportId(reportId);

pms-service/src/main/java/com/tofly/pms/supervise/service/impl/ReportContentServiceImpl.java

@@ -61,7 +61,7 @@ public class ReportContentServiceImpl<M extends BaseMapper<T>, T extends ReportC
         updateStatus(reportId, projectId, userId);
         return super.save(entity);
     }
-
+    @Transactional
     public boolean updateById(T entity) {
         String userId = UserTokenUtil.getTokenUserID();
         Assert.notBlank(userId, "没有获取到当前用户的信息，当前登录用户不合法");
@@ -70,6 +70,7 @@ public class ReportContentServiceImpl<M extends BaseMapper<T>, T extends ReportC
         T dbEntity = this.getOne(Wrappers.lambdaQuery(entityClass)
                 .eq(T::getId, entity.getId()));
         Assert.isTrue(Objects.nonNull(dbEntity),"{}-{}：不存在", entity.getReportId(), entity.getProjectName());
+        updateStatus(entity.getReportId(), entity.getProjectId(), userId);
         return super.updateById(entity);
     }
 

pms-service/src/test/java/PmsServiceApplicationTest.java

@@ -30,6 +30,8 @@ public class PmsServiceApplicationTest {
     @Resource
     ProjectReportService projectReportService;
 
+    @Resource
+    ProjectReportPersonnelService projectReportPersonnelService;
     @Test
     void contextLoads() {
         List<ProjectReportVO> result = projectReportService.listOfProjectReport("第20240819期", 192);
@@ -45,8 +47,13 @@ public class PmsServiceApplicationTest {
         boolean save = projectReportService.save(entity);
         System.out.println("save = " + save);
     }
-    @Resource
-    ProjectReportPersonnelService projectReportPersonnelService;
+
+
+    @Test
+    void testCopy(){
+        projectReportPersonnelService.copyFromLast("第20241018期", "第20241012期");
+    }
+
     @Test
     void testSaveBatch(){
         ProjectReportPersonnelVO vo = new ProjectReportPersonnelVO();