From 2112ea04f0ddc5b5c633c7798146a395cb7b1ef5 Mon Sep 17 00:00:00 2001 From: fugang <931571141@qq.com> Date: Wed, 27 Dec 2023 17:36:58 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E8=AE=A1=E5=88=92=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/BPlanEnterpriseMapper.java | 5 +++++ .../quartz/EnterpristQuartz.java | 12 ++++++++---- .../service/BPlanEnterpriseService.java | 6 ++++++ .../service/impl/BPlanEnterpriseServiceImpl.java | 5 ++++- .../mapper/yingji/BPlanEnterpriseMapper.xml | 16 +++++++++++++++- 5 files changed, 38 insertions(+), 6 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/mapper/BPlanEnterpriseMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/mapper/BPlanEnterpriseMapper.java index 1881635..dfd4497 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/mapper/BPlanEnterpriseMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/mapper/BPlanEnterpriseMapper.java @@ -133,5 +133,10 @@ public interface BPlanEnterpriseMapper extends BaseMapper { */ List selectUpdateAll(); + + /** + * 批量更新最新检查时间字段 + */ + void updateEndTime(); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/quartz/EnterpristQuartz.java b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/quartz/EnterpristQuartz.java index 85f320f..7107042 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/quartz/EnterpristQuartz.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/quartz/EnterpristQuartz.java @@ -37,16 +37,20 @@ public class EnterpristQuartz { private IBEnterpriseNewService bEnterpriseNewService; - // 每周一早上五点5点执行一次任务 生成企业新表 - @Scheduled(cron = "0 0 17 ? * SUN") + // 每天早上5点执行一次任务 更新企业新表的最新检查时间字段 + @Scheduled(cron = "0 0 5 * * ?") // @GetMapping("/getList") // @ApiOperation(value = "定时任务") public AjaxResult updateInformationData() { //三表关联查询数据 List list = bEnterpriseNewMapper.seletAll(); //清空企业新表中的数据 - bEnterpriseNewMapper.deletAll(); - bEnterpriseNewService.saveBatch(list); + // bEnterpriseNewMapper.deletAll(); + // bEnterpriseNewService.saveBatch(list); + + // 改成只更新最新检查时间字段 + bPlanEnterpriseService.updateEndTime() + return AjaxResult.success(); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/service/BPlanEnterpriseService.java b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/service/BPlanEnterpriseService.java index 79ef9c1..b8e7834 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/service/BPlanEnterpriseService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/service/BPlanEnterpriseService.java @@ -120,5 +120,11 @@ public interface BPlanEnterpriseService extends IService { * @return */ List selectUpdateAll(); + + + /** + * 批量更新最新检查时间字段 + */ + void updateEndTime(); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/service/impl/BPlanEnterpriseServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/service/impl/BPlanEnterpriseServiceImpl.java index 590a335..3be5572 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/service/impl/BPlanEnterpriseServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/service/impl/BPlanEnterpriseServiceImpl.java @@ -124,6 +124,9 @@ public class BPlanEnterpriseServiceImpl extends ServiceImpl - order by isPoint desc + order by law_sort,planned_month+0 delete @@ -349,6 +349,20 @@ ) e ON a.enterprise_id = e.USC_CODE + + UPDATE b_enterprise_new a + INNER JOIN ( + SELECT + USC_CODE, + MAX_EXAMINE_END_TIME + FROM + ( SELECT ROW_NUMBER ( ) over ( PARTITION BY USC_CODE ORDER BY EXAMINE_END_TIME DESC ) rowId, USC_CODE, EXAMINE_END_TIME AS MAX_EXAMINE_END_TIME FROM sz_enfor_examine ) S + WHERE + rowId = 1 + ) c ON a.enterprise_id = c.USC_CODE + SET a.EXAMINE_END_TIME = c.MAX_EXAMINE_END_TIME + + UPDATE b_plan_enterprise From 370622f65d261acf90cebd221d89097cffe9c52e Mon Sep 17 00:00:00 2001 From: dongdingding <207595406@qq.com> Date: Wed, 27 Dec 2023 17:39:56 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E8=A7=A3=E5=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../quartz/EnterpristQuartz.java | 2 +- .../service/impl/BPlanEnterpriseServiceImpl.java | 3 ++- .../mapper/yingji/BPlanEnterpriseMapper.xml | 15 ++++++++++++++- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/quartz/EnterpristQuartz.java b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/quartz/EnterpristQuartz.java index 7107042..b586374 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/quartz/EnterpristQuartz.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/quartz/EnterpristQuartz.java @@ -49,7 +49,7 @@ public class EnterpristQuartz { // bEnterpriseNewService.saveBatch(list); // 改成只更新最新检查时间字段 - bPlanEnterpriseService.updateEndTime() + bPlanEnterpriseService.updateEndTime(); return AjaxResult.success(); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/service/impl/BPlanEnterpriseServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/service/impl/BPlanEnterpriseServiceImpl.java index 3be5572..8f2fe7b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/service/impl/BPlanEnterpriseServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/service/impl/BPlanEnterpriseServiceImpl.java @@ -126,7 +126,8 @@ public class BPlanEnterpriseServiceImpl extends ServiceImpl where id = #{id} - + + UPDATE b_enterprise_new a + INNER JOIN ( + SELECT + USC_CODE, + MAX_EXAMINE_END_TIME + FROM + ( SELECT ROW_NUMBER ( ) over ( PARTITION BY USC_CODE ORDER BY EXAMINE_END_TIME DESC ) rowId, USC_CODE, EXAMINE_END_TIME AS MAX_EXAMINE_END_TIME FROM sz_enfor_examine ) S + WHERE + rowId = 1 + ) c + ON a.enterprise_id = c.USC_CODE + SET a.EXAMINE_END_TIME = c.MAX_EXAMINE_END_TIME + From 4ffbba2019e29785552013541b121c3fe5a0de8a Mon Sep 17 00:00:00 2001 From: fugang <931571141@qq.com> Date: Thu, 28 Dec 2023 10:48:16 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8DupdateIdList?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/yingji/BPlanEnterpriseMapper.xml | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/ruoyi-system/src/main/resources/mapper/yingji/BPlanEnterpriseMapper.xml b/ruoyi-system/src/main/resources/mapper/yingji/BPlanEnterpriseMapper.xml index ed6c44e..68134c4 100644 --- a/ruoyi-system/src/main/resources/mapper/yingji/BPlanEnterpriseMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/yingji/BPlanEnterpriseMapper.xml @@ -349,21 +349,6 @@ ) e ON a.enterprise_id = e.USC_CODE - - UPDATE b_enterprise_new a - INNER JOIN ( - SELECT - USC_CODE, - MAX_EXAMINE_END_TIME - FROM - ( SELECT ROW_NUMBER ( ) over ( PARTITION BY USC_CODE ORDER BY EXAMINE_END_TIME DESC ) rowId, USC_CODE, EXAMINE_END_TIME AS MAX_EXAMINE_END_TIME FROM sz_enfor_examine ) S - WHERE - rowId = 1 - ) c ON a.enterprise_id = c.USC_CODE - SET a.EXAMINE_END_TIME = c.MAX_EXAMINE_END_TIME - - - UPDATE b_plan_enterprise SET status = 1 From f8d5972d9e21867d623be272767a3ea882ca7e72 Mon Sep 17 00:00:00 2001 From: fugang <931571141@qq.com> Date: Thu, 28 Dec 2023 13:29:48 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/yingji/BPlanEnterpriseMapper.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ruoyi-system/src/main/resources/mapper/yingji/BPlanEnterpriseMapper.xml b/ruoyi-system/src/main/resources/mapper/yingji/BPlanEnterpriseMapper.xml index 68134c4..82aae0b 100644 --- a/ruoyi-system/src/main/resources/mapper/yingji/BPlanEnterpriseMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/yingji/BPlanEnterpriseMapper.xml @@ -107,7 +107,7 @@ - order by law_sort,planned_month+0 + order by isPoint desc delete @@ -177,6 +177,7 @@ + order by law_sort,planned_month+0