4月30日

src/main/java/org/springblade/modules/project/controller/WorkFocusController.java

@@ -281,8 +281,28 @@ public class WorkFocusController extends BladeController {
 					}
 				} else {
 
-					WorkFocusEntity region = BeanUtil.copyProperties(readInfo, WorkFocusEntity.class);
-					WorkFocusProgressEntity workFocusProgress = BeanUtil.copyProperties(readInfo, WorkFocusProgressEntity.class);
+					WorkFocusEntity region = new WorkFocusEntity();
+					List<WorkFocusEntity> workFocusEntities = workfocusService.getBaseMapper().selectList(Wrappers.<WorkFocusEntity>lambdaQuery().eq(WorkFocusEntity::getWorkPlan, readInfo.getWorkPlan()));
+					if(workFocusEntities!=null && workFocusEntities.size()>=1){
+						region = workFocusEntities.get(0);
+					}else{
+						region = BeanUtil.copyProperties(readInfo, WorkFocusEntity.class);
+					}
+
+
+					WorkFocusProgressEntity workFocusProgress = new WorkFocusProgressEntity();
+					BeanUtil.copyProperties(readInfo, WorkFocusProgressEntity.class);
+
+					List<WorkFocusProgressEntity> workF = workFocusProgressService.getBaseMapper().selectList(Wrappers.<WorkFocusProgressEntity>lambdaQuery().
+							eq(WorkFocusProgressEntity::getWorkFocusId, region.getId()).
+							eq(WorkFocusProgressEntity::getYear,year).
+							eq(WorkFocusProgressEntity::getMonth,moth)
+					);
+					if(workF!=null && workF.size()>=1 ){
+						workFocusProgress = workF.get(0);
+					}else{
+						workFocusProgress = BeanUtil.copyProperties(readInfo, WorkFocusProgressEntity.class);
+					}
 
 					workFocusProgress.setYear(year);
 					workFocusProgress.setMonth(moth);

src/main/resources/application.yml

@@ -1,6 +1,6 @@
 #服务器配置
 server:
-  port: 80
+  port: 8014
   undertow:
     threads:
       # 设置IO线程数, 它主要执行非阻塞的任务,它们会负责多个连接, 默认设置每个CPU核心一个线程