diff --git a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/request/BPlanEnterpriseRequest.java b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/request/BPlanEnterpriseRequest.java index f6220b9..82d6fe4 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/request/BPlanEnterpriseRequest.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/request/BPlanEnterpriseRequest.java @@ -179,7 +179,7 @@ public class BPlanEnterpriseRequest { * 0:未检查 1:已检查 */ @ApiModelProperty(value = "0:未检查 1:已检查") - private Integer checkStatus; + private Integer checkStatus=0; /** 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..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 @@ -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..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 @@ -124,6 +124,10 @@ public class BPlanEnterpriseServiceImpl extends ServiceImpl + order by law_sort,planned_month+0 - UPDATE b_plan_enterprise SET status = 1 @@ -386,7 +386,20 @@ 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 + @@ -413,6 +426,7 @@ user_id, dept_id, uuto, + check_status, @@ -437,6 +451,7 @@ #{userId}, #{deptId}, #{uuto}, + #{checkStatus},