Merge branch 'master' of http://git.ningdatech.com/liushuai/project-management into 20230913_project_declared_new

pmapi/src/main/java/com/ningdatech/pmapi/gov/convert/ProjectConvert.java

@@ -378,7 +378,7 @@ public class ProjectConvert {
         req.setBaseAccountAppName(apply.getBaseAccountAppName());
         req.setBaseBasisEstablish(apply.getBaseBasisEstablish());
         req.setBaseCoreBusiness(apply.getBaseCoreBusiness());
-        req.setBaseCoreBusinessCode(apply.getBaseCoreBusinessCode());
+//        req.setBaseCoreBusinessCode(apply.getBaseCoreBusinessCode());
         req.setBaseBrainName(apply.getBaseBrainName());
         req.setBaseDevelopCode(apply.getBaseDevelopCode());
         req.setBaseLowestLevel(apply.getBaseLowestLevel());

pmapi/src/main/java/com/ningdatech/pmapi/gov/manage/GovProjectCollectionManage.java

@@ -389,7 +389,7 @@ public class GovProjectCollectionManage {
         }
 
         GovBizProjectBaseinfoDTO base = saveDTO.getBaseinfo();
-        String baseProjId = base.getBaseProjId();
+        String baseProjId = saveDTO.getBaseProjId();
         String baseAreaCode = user.getRegionCode() + BizConst.NINE_AREA_CODE_LAST;
         String baseProjName = base.getBaseProjName();
 

pmapi/src/main/java/com/ningdatech/pmapi/gov/model/dto/GovBizProjectApplyDTO.java

@@ -69,7 +69,7 @@ public class GovBizProjectApplyDTO implements Serializable {
     private LocalDateTime baseProjEndTime;
 
     @ApiModelProperty("项目期限")
-    private LocalDateTime baseProjDuration;
+    private String baseProjDuration;
 
     @ApiModelProperty("项目年度")
     private String baseProjSetYear;

pmapi/src/main/java/com/ningdatech/pmapi/scheduler/task/SynProjectCoreBizTask.java

@@ -67,7 +67,7 @@ public class SynProjectCoreBizTask {
      * 定时同步前置机数据 每天1点开始执行一次 不按照单位
      *
      */
-    @Scheduled(cron = "0 0 2 * * ?")
+//    @Scheduled(cron = "0 0 2 * * ?")
     public void doTask() throws UnknownHostException {
         if (!HOST.equals(InetAddress.getLocalHost().getHostName())) {
             log.info("定时器没开启或者host不对! {}:{}",
@@ -79,7 +79,13 @@ public class SynProjectCoreBizTask {
         StopWatch stopWatch = new StopWatch();
         stopWatch.start();
 
-        syncCoreBiz();
+        List<DingOrganization> orgs = organizationService.list(Wrappers.lambdaQuery(DingOrganization.class)
+                .in(DingOrganization::getTypeCode, Lists.newArrayList(DingOrganizationContant.UNIT_TYPE
+                        , DingOrganizationContant.GOV_TEMPORARY)));
+
+        log.info("总共需要同步 orgs size ：{}",orgs.size());
+
+        syncCoreBiz(orgs);
         stopWatch.stop();
         log.info("同步项目核心业务结束====={}s",stopWatch.getTotalTimeSeconds());
     }