fix(企标稽查): 79397

laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardInspectVo.java

@@ -169,6 +169,13 @@ public class EnterpriseStandardInspectVo {
     @TableField(exist = false)
     private String createDate;
 
+    /**
+     * 计划稽查日期 查询用
+     */
+    @ApiModelProperty(value = "计划稽查日期 查询用")
+    @TableField(exist = false)
+    private String planInspectDates;
+
     /**
      * 企标编号/企标名称 查询用
      */

laws-modules/src/main/java/com/jero/modules/laws/enterprise/job/ESInspectStatusRefresh.java

@@ -1,8 +1,8 @@
 package com.jero.modules.laws.enterprise.job;
 
-import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.jero.modules.activiti.process.esinspect.common.EsInspectCommon;
 import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspect;
-import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectReport;
 import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectReportService;
 import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectService;
 import lombok.extern.slf4j.Slf4j;
@@ -11,11 +11,7 @@ import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
 
 import javax.annotation.Resource;
-import java.util.Calendar;
 import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * @author: Mzaxd
@@ -35,35 +31,12 @@ public class ESInspectStatusRefresh implements Job {
     
     @Override
     public void execute(JobExecutionContext context) throws JobExecutionException {
-        List<EnterpriseStandardInspectReport> reportList = inspectReportService.list();
+        log.info("企标稽查状态刷新任务执行开始");
-        Map<String, List<EnterpriseStandardInspectReport>> reportMap = reportList
+        inspectService.update(new LambdaUpdateWrapper<EnterpriseStandardInspect>()
-                .stream().filter(r -> StrUtil.isNotBlank(r.getInspectId()))
+                        .and(qw -> qw.eq(EnterpriseStandardInspect::getInspectStatus, EsInspectCommon.INSPECT_STATUS_1)
-                .collect(Collectors.groupingBy(EnterpriseStandardInspectReport::getInspectId));
+                                .or().eq(EnterpriseStandardInspect::getInspectStatus, EsInspectCommon.INSPECT_STATUS_2))
-        log.info("开始执行企标稽查状态刷新任务");
+                        .le(EnterpriseStandardInspect::getPlanInspectDate, new Date())
-        List<EnterpriseStandardInspect> list = inspectService.list();
+                        .set(EnterpriseStandardInspect::getInspectStatus, EsInspectCommon.INSPECT_STATUS_4));
-        // 遍历所有稽查记录，判断是否已经超过稽查截止日期，如果超过则将稽查状态置为已超期
-        for (EnterpriseStandardInspect inspect : list) {
-            Date planInspectDate = inspect.getPlanInspectDate();
-            if (inspect.getPlanInspectDate() == null) {
-                log.info("企标稽查记录{}未设置稽查截止日期，无法判断是否超期", inspect.getId());
-                continue;
-            }
-            Calendar calendar = Calendar.getInstance();
-            calendar.add(Calendar.DATE, -1); // 将日期设置为昨天
-            calendar.set(Calendar.HOUR_OF_DAY, 23); // 设置小时为23
-            calendar.set(Calendar.MINUTE, 59); // 设置分钟为59
-            calendar.set(Calendar.SECOND, 59); // 设置秒为59
-            Date yesterdayLastSecond = calendar.getTime(); // 获取昨天最后一秒的时间
-
-            if (planInspectDate.before(yesterdayLastSecond)) {
-                // 判断是否能找到稽查报告记录，如果找不到则将稽查状态置为已超期
-                List<EnterpriseStandardInspectReport> enterpriseStandardInspectReports = reportMap.get(inspect.getId());
-                if (enterpriseStandardInspectReports == null || enterpriseStandardInspectReports.isEmpty()) {
-                    inspect.setInspectStatus(INSPECT_STATUS_DELAY);
-                    inspectService.updateById(inspect);
-                }
-            }
-        }
         log.info("企标稽查状态刷新任务执行结束");
     }
 }

laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectServiceImpl.java

@@ -363,14 +363,18 @@ public class EnterpriseStandardInspectServiceImpl extends ServiceImpl<Enterprise
             String[] date = enterpriseStandardInspectVo.getCreateDate().split(",");
             queryWrapper.between("create_time", date[0], date[1]);
         }
+        if (StringUtils.isNotBlank(enterpriseStandardInspectVo.getPlanInspectDates())){
+            String[] date = enterpriseStandardInspectVo.getPlanInspectDates().split(",");
+            queryWrapper.between("plan_inspect_date", date[0], date[1]);
+        }
         if (StringUtils.isNotBlank(enterpriseStandardInspectVo.getInspectNoOrName())){
             queryWrapper.and(qw ->
                     qw.like("inspect_no", enterpriseStandardInspectVo.getInspectNoOrName())
                             .or().like("inspect_name", enterpriseStandardInspectVo.getInspectNoOrName()));
         }
         queryWrapper.eq(StringUtils.isNotBlank(enterpriseStandardInspectVo.getBelongDept()), "belong_dept", enterpriseStandardInspectVo.getBelongDept());
-        queryWrapper.eq(StringUtils.isNotBlank(enterpriseStandardInspectVo.getInspectNo()), "inspect_no", enterpriseStandardInspectVo.getInspectNo());
+        queryWrapper.like(StringUtils.isNotBlank(enterpriseStandardInspectVo.getInspectNo()), "inspect_no", enterpriseStandardInspectVo.getInspectNo());
-        queryWrapper.eq(StringUtils.isNotBlank(enterpriseStandardInspectVo.getInspectName()), "inspect_name", enterpriseStandardInspectVo.getInspectName());
+        queryWrapper.like(StringUtils.isNotBlank(enterpriseStandardInspectVo.getInspectName()), "inspect_name", enterpriseStandardInspectVo.getInspectName());
         queryWrapper.eq(StringUtils.isNotBlank(enterpriseStandardInspectVo.getInspectUser()), "inspect_user", enterpriseStandardInspectVo.getInspectUser());
         queryWrapper.orderByDesc("create_time");
         return queryWrapper;