From 7ee844962f050cfc548e5dd661a586a4993cbf89 Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: Thu, 25 Jun 2026 10:28:01 +0800
Subject: [PATCH] 优化问题

---
 src/main/java/com/ruoyi/project/tr/specialCheck/scheduleLogTask/DealDataTask.java |   54 ++++++++++++++++++++++++++++++------------------------
 1 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/scheduleLogTask/DealDataTask.java b/src/main/java/com/ruoyi/project/tr/specialCheck/scheduleLogTask/DealDataTask.java
index 267f402..c7e7a7c 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/scheduleLogTask/DealDataTask.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/scheduleLogTask/DealDataTask.java
@@ -1,5 +1,8 @@
 package com.ruoyi.project.tr.specialCheck.scheduleLogTask;
 
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.ruoyi.project.tr.specialCheck.domin.TbBaseCheckItem;
+import com.ruoyi.project.tr.specialCheck.domin.TbSpecialCheckItemLog;
 import com.ruoyi.project.tr.specialCheck.domin.TbSpecialCheckTaskLog;
 import com.ruoyi.project.tr.specialCheck.mapper.TbBaseCheckItemMapper;
 import com.ruoyi.project.tr.specialCheck.mapper.TbSpecialCheckItemLogMapper;
@@ -18,7 +21,7 @@
      * 每年拉取完检查项需要生成对应的专项任务数据
      */
 
-    public static final String  TASK_ID = "a8de03f0-4c3e-43fe-a139-0e4ed34edd35";
+    public static final String  TASK_ID = "47da41f5-c747-4bd3-b4ab-d4d496e31e93";
 
 
     @Autowired
@@ -40,8 +43,9 @@
                 tbSpecialCheckTaskLog.setIndexId(null);
                 tbSpecialCheckTaskLog.setId(UUID.randomUUID().toString());
                 tbSpecialCheckTaskLog.setReportStatus((byte) 1);
+                tbSpecialCheckTaskLog.setZhunReportStatus((byte) 1);
                 //1为企业自查 2是市级及以下
-                tbSpecialCheckTaskLog.setCheckType("2");
+                tbSpecialCheckTaskLog.setCheckType(tbSpecialCheckTaskLog.getCheckType());
                 tbSpecialCheckTaskLog.setCreateDate(LocalDateTime.now());
                 tbSpecialCheckTaskLog.setUpdateDate(LocalDateTime.now());
                 taskSpecialLogMapper.save(tbSpecialCheckTaskLog);
@@ -50,28 +54,30 @@
         }
 
 
-//        //任务item
-//
-//        List<TbBaseCheckItem> tbBaseCheckItems = baseCheckItemMapper.listBaseCheckItemBytaskId(TASK_ID);
-//        if (ObjectUtils.isNotEmpty(tbBaseCheckItems)){
-//            for (TbBaseCheckItem tbBaseCheckItem : tbBaseCheckItems) {
-//                TbSpecialCheckItemLog tbSpecialCheckItemLog = new TbSpecialCheckItemLog();
-//                tbSpecialCheckItemLog.setId(UUID.randomUUID().toString());
-//                tbSpecialCheckItemLog.setCompanyCode("652310082");
-//                tbSpecialCheckItemLog.setTaskId(TASK_ID);
-//                tbSpecialCheckItemLog.setCheckItemId(tbBaseCheckItem.getId());
-//                tbSpecialCheckItemLog.setCheckName(tbBaseCheckItem.getCheckName());
-//                tbSpecialCheckItemLog.setCheckContent(tbBaseCheckItem.getCheckContent());
-//                tbSpecialCheckItemLog.setCheckWay(tbBaseCheckItem.getCheckWay());
-//                tbSpecialCheckItemLog.setCheckBasis(tbBaseCheckItem.getCheckBasis());
-//                tbSpecialCheckItemLog.setApplicablePlace(tbBaseCheckItem.getApplicablePlace());
-//                tbSpecialCheckItemLog.setCreateBy("李康");
-//                tbSpecialCheckItemLog.setCreateDate(tbBaseCheckItem.getCreateDate());
-//                tbSpecialCheckItemLog.setUpdateBy("李康");
-//                tbSpecialCheckItemLog.setUpdateDate(tbBaseCheckItem.getUpdateDate());
-//                itemLogMapper.save(tbSpecialCheckItemLog);
-//            }
-//        }
+        //任务item
+
+        List<TbBaseCheckItem> tbBaseCheckItems = baseCheckItemMapper.listBaseCheckItemBytaskId(TASK_ID);
+        if (ObjectUtils.isNotEmpty(tbBaseCheckItems)){
+            for (TbBaseCheckItem tbBaseCheckItem : tbBaseCheckItems) {
+                TbSpecialCheckItemLog tbSpecialCheckItemLog = new TbSpecialCheckItemLog();
+                tbSpecialCheckItemLog.setId(UUID.randomUUID().toString());
+                tbSpecialCheckItemLog.setCompanyCode("652310082");
+                tbSpecialCheckItemLog.setTaskId(TASK_ID);
+                tbSpecialCheckItemLog.setCheckItemId(tbBaseCheckItem.getId());
+                tbSpecialCheckItemLog.setCheckName(tbBaseCheckItem.getCheckName());
+                tbSpecialCheckItemLog.setCheckContent(tbBaseCheckItem.getCheckContent());
+                tbSpecialCheckItemLog.setCheckWay(tbBaseCheckItem.getCheckWay());
+                tbSpecialCheckItemLog.setCheckBasis(tbBaseCheckItem.getCheckBasis());
+                tbSpecialCheckItemLog.setApplicablePlace(tbBaseCheckItem.getApplicablePlace());
+                tbSpecialCheckItemLog.setCreateBy("李康");
+                tbSpecialCheckItemLog.setCreateDate(tbBaseCheckItem.getCreateDate());
+                tbSpecialCheckItemLog.setUpdateBy("李康");
+                tbSpecialCheckItemLog.setDeleted((byte) 0);
+                tbSpecialCheckItemLog.setReportStatus((byte)1);
+                tbSpecialCheckItemLog.setUpdateDate(tbBaseCheckItem.getUpdateDate());
+                itemLogMapper.save(tbSpecialCheckItemLog);
+            }
+        }
 
 
 

--
Gitblit v1.9.2