Browse Source

feature 代码提交

xiahan 7 tháng trước cách đây
mục cha
commit
f138727126

+ 21 - 0
jsglkh-common/src/main/java/com/rongwei/bscommon/sys/service/impl/SynchronizationDataServiceImpl.java

@@ -284,6 +284,20 @@ public class SynchronizationDataServiceImpl implements SynchronizationDataServic
         } else {
             log.info("项目考核-年度计划数据为 null");
         }
+
+        //技术成果评优 KC137
+        List<JtJscgpyqd> jtJscgpyqdList = jtJscgpyqdService.list(new LambdaQueryWrapper<JtJscgpyqd>().eq(JtJscgpyqd::getMainid, ids).eq(BaseDo::getDeleted, "0"));
+        if (!jtJscgpyqdList.isEmpty()) {
+            // 遍历每一行数据
+            for (JtJscgpyqd jtZdxmszmn : jtJscgpyqdList) {
+                String id = jtZdxmszmn.getId();
+                this.pushDataSync(id, "KC137");
+            }
+        } else {
+            log.info("项目考核-年度计划数据为 null");
+        }
+
+
         return R.ok();
     }
 
@@ -417,6 +431,13 @@ public class SynchronizationDataServiceImpl implements SynchronizationDataServic
             List<String> dataIds = jtNdjhqdList.stream().map(data -> data.getDataid() == null ? " " : data.getDataid()).collect(Collectors.toList());
             this.deleteDataSync(ids, dataIds, "KC129");
         }
+        //技术成果评优 KC137
+        List<JtJscgpyqd> jtJscgpyqdList = jtJscgpyqdService.list(new LambdaQueryWrapper<JtJscgpyqd>().eq(JtJscgpyqd::getMainid, id).eq(BaseDo::getDeleted, "0"));
+        if (!JtJscgpyqdList.isEmpty()) {
+            List<String> ids = jtNdjhqdList.stream().map(JtNdjhqd::getId).collect(Collectors.toList());
+            List<String> dataIds = jtNdjhqdList.stream().map(data -> data.getDataid() == null ? " " : data.getDataid()).collect(Collectors.toList());
+            this.deleteDataSync(ids, dataIds, "KC137");
+        }
         return R.ok();
     }
 

+ 3 - 3
jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/api/KC133ApiRequestAndProcessing.java

@@ -48,11 +48,11 @@ public class KC133ApiRequestAndProcessing implements ApiRequestAndProcessingStra
         assembleData.add(setOrdinaryData("xcxmmc", JtXcjhqd::getXmmc));
         assembleData.add(setOrdinaryData("xcbh", JtXcjhqd::getXcbh));
         assembleData.add(setOrdinaryData("bxcdw", JtXcjhqd::getBxcdw));
-        assembleData.add(setOrdinaryData("xctzwj", JtXcjhqd::getXctzwj));
+        assembleData.add(setFileInfo("xctzwj", JtXcjhqd::getXctzwj,true));
         assembleData.add(setOrdinaryData("xczt", JtXcjhqd::getXczt));
         assembleData.add(setDatePattern("wtzgrq", JtXcjhqd::getWtzgrq,DATE_PATTERN_YMD));
-        assembleData.add(setOrdinaryData("zgfkwj", JtXcjhqd::getZgfkwj));
-        assembleData.add(setOrdinaryData("xctbwj", JtXcjhqd::getXctbwj));
+        assembleData.add(setFileInfo("zgfkwj", JtXcjhqd::getZgfkwj,true));
+        assembleData.add(setFileInfo("xctbwj", JtXcjhqd::getXctbwj,true));
         assembleData.add(setDatePattern("jhkzsj", JtXcjhqd::getJhkzsj,DATE_PATTERN_YMD));
         assembleData.add(setDatePattern("sjkzsj", JtXcjhqd::getSjkzsj,DATE_PATTERN_YMD));
         JtXcjhqd jtXcjhqd = jtXcjhqdService.getById(id);