From ea73448d84ced8a50079fc12fbc7caf46ec43481 Mon Sep 17 00:00:00 2001 From: dongdingding <207595406@qq.com> Date: Fri, 31 May 2024 17:01:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mudu/mapper/ASafeXcrwMapper.java | 8 ++++++ .../java/com/mudu/mapper/ASafeZcrwMapper.java | 10 ++++++++ .../com/mudu/quartz/AcheckTaskQuartz.java | 25 ++++++++++++------- .../com/mudu/service/ASafeXcrwService.java | 7 ++++++ .../com/mudu/service/ASafeZcrwService.java | 6 +++++ .../service/impl/ASafeXcrwServiceImpl.java | 8 ++++++ .../service/impl/ASafeZcrwServiceImpl.java | 11 +++++++- 7 files changed, 65 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/mudu/mapper/ASafeXcrwMapper.java b/src/main/java/com/mudu/mapper/ASafeXcrwMapper.java index 20d1864..b0aec4c 100644 --- a/src/main/java/com/mudu/mapper/ASafeXcrwMapper.java +++ b/src/main/java/com/mudu/mapper/ASafeXcrwMapper.java @@ -2,6 +2,7 @@ package com.mudu.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.mudu.entity.ASafeXcrw; +import org.apache.ibatis.annotations.Select; /** * (ASafeXcrw)表数据库访问层 @@ -11,5 +12,12 @@ import com.mudu.entity.ASafeXcrw; */ public interface ASafeXcrwMapper extends BaseMapper { + + /** + * 查询巡查任务主表2个月内是否有记录就不推 + */ + @Select("select count(*) from a_safe_xcrw where rksj BETWEEN DATE_SUB( CURDATE(), INTERVAL 2 MONTH ) AND CURDATE()") + Integer xcrwNum(); + } diff --git a/src/main/java/com/mudu/mapper/ASafeZcrwMapper.java b/src/main/java/com/mudu/mapper/ASafeZcrwMapper.java index f2cf8af..32d671e 100644 --- a/src/main/java/com/mudu/mapper/ASafeZcrwMapper.java +++ b/src/main/java/com/mudu/mapper/ASafeZcrwMapper.java @@ -2,6 +2,8 @@ package com.mudu.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.mudu.entity.ASafeZcrw; +import org.apache.ibatis.annotations.Select; +import org.springframework.stereotype.Service; /** * (ASafeZcrw)表数据库访问层 @@ -11,5 +13,13 @@ import com.mudu.entity.ASafeZcrw; */ public interface ASafeZcrwMapper extends BaseMapper { + /** + * 查询自查任务主表1个月内是否有记录就不推 + */ + + @Select("select count(*) from a_safe_zcrw where rksj BETWEEN DATE_SUB( CURDATE(), INTERVAL 1 MONTH ) AND CURDATE() ") + Integer zcrwNum(); + + } diff --git a/src/main/java/com/mudu/quartz/AcheckTaskQuartz.java b/src/main/java/com/mudu/quartz/AcheckTaskQuartz.java index 4ee41fc..d40a775 100644 --- a/src/main/java/com/mudu/quartz/AcheckTaskQuartz.java +++ b/src/main/java/com/mudu/quartz/AcheckTaskQuartz.java @@ -114,10 +114,11 @@ public class AcheckTaskQuartz { // @PostMapping("/insert") // @ApiOperation(value = "新增创建时间为昨天且处于审批通过的工单数据") public AjaxResult selectAll() throws ParseException { - - // todo 查询巡查任务主表本月是否有记录就不推 - - // todo 查询自查任务主表本月是否有记录 有就不推 + // todo 查询巡查任务主表2月是否有记录就不推 + Integer xcrwNum = aSafeXcrwService.xcrwNum(); + if (xcrwNum > 0) { + throw new IllegalArgumentException("已存在数据"); + } //巡查任务周期id RwzqUuidResponse rwzqUuidResponse = aSafeRwzqService.getXcUuid(); String rwzqUuid = rwzqUuidResponse.getXxbh(); @@ -359,7 +360,8 @@ public class AcheckTaskQuartz { //任务编号对应a_safe_xcrw的信息编号 aSafeXcrwjcx.setRwbh(xcrwuuid); //企业风险点编号 对应a_safe_fxd的信息编号 - aSafeXcrwjcx.setQyfxdbh(b.getCheckId()); + //todo + aSafeXcrwjcx.setQyfxdbh(b.getFxdxxbh()); //周期编号 aSafeXcrwjcx.setZqbh(rwzqUuid); //完成状态 @@ -403,11 +405,11 @@ public class AcheckTaskQuartz { //复查信息 aSafeXcrwjcx.setFcxx(b.getReviewContent()); //位置编号 - aSafeXcrwjcx.setWzbh(b.getWzxxbh()); + aSafeXcrwjcx.setWzbh(xcrwuuid); //巡查位置编号 aSafeXcrwjcx.setXcwzbh(xcrwwzUuid); //巡查风险点编号 - aSafeXcrwjcx.setXcfxdbh(yhzgxxUuid); + aSafeXcrwjcx.setXcfxdbh(b.getFxdxxbh()); //任务类型 aSafeXcrwjcx.setRwlx(3); //入库人员 @@ -573,6 +575,11 @@ public class AcheckTaskQuartz { // @PostMapping("/zicha") // @ApiOperation(value = "自查") public AjaxResult zicha() throws ParseException { + // todo 查询自查任务主表本月是否有记录 有就不推 + Integer zcrwNum = aSafeZcrwService.zcrwNum(); + if (zcrwNum > 0) { + throw new IllegalArgumentException("已存在数据"); + } //自己查任务周期id RwzqUuidResponse rwzqUuidResponse = aSafeRwzqService.getZcUuid(); String rwzqUuid = rwzqUuidResponse.getXxbh(); @@ -877,7 +884,7 @@ public class AcheckTaskQuartz { //任务编号 aSafeYhzgxx.setRwbh(zcrwUuid); //位置编号 - // aSafeYhzgxx.setWzbh(); + aSafeYhzgxx.setWzbh(b.getWzbh()); //企业编号 aSafeYhzgxx.setQybh(b.getEnterpriseID()); //周期编号 @@ -895,7 +902,7 @@ public class AcheckTaskQuartz { //是否展示 aSafeYhzgxx.setSfzs(1); //巡查位置编号 - // aSafeYhzgxx.setXcwzbh(xcrwwzUuid); + aSafeYhzgxx.setXcwzbh(xcrwwzUuid); //复查是否合格 aSafeYhzgxx.setFcsfhg(1); //隐患描述 diff --git a/src/main/java/com/mudu/service/ASafeXcrwService.java b/src/main/java/com/mudu/service/ASafeXcrwService.java index 6f0b0c2..f796dbe 100644 --- a/src/main/java/com/mudu/service/ASafeXcrwService.java +++ b/src/main/java/com/mudu/service/ASafeXcrwService.java @@ -11,5 +11,12 @@ import com.mudu.entity.ASafeXcrw; */ public interface ASafeXcrwService extends IService { + + /** + * 查询巡查任务主表2个月内是否有记录就不推 + */ + + Integer xcrwNum(); + } diff --git a/src/main/java/com/mudu/service/ASafeZcrwService.java b/src/main/java/com/mudu/service/ASafeZcrwService.java index 193ee47..2c456c5 100644 --- a/src/main/java/com/mudu/service/ASafeZcrwService.java +++ b/src/main/java/com/mudu/service/ASafeZcrwService.java @@ -11,5 +11,11 @@ import com.mudu.entity.ASafeZcrw; */ public interface ASafeZcrwService extends IService { + /** + * 查询自查任务主表1个月内是否有记录就不推 + */ + + Integer zcrwNum(); + } diff --git a/src/main/java/com/mudu/service/impl/ASafeXcrwServiceImpl.java b/src/main/java/com/mudu/service/impl/ASafeXcrwServiceImpl.java index 973dfb8..fd115ab 100644 --- a/src/main/java/com/mudu/service/impl/ASafeXcrwServiceImpl.java +++ b/src/main/java/com/mudu/service/impl/ASafeXcrwServiceImpl.java @@ -6,6 +6,8 @@ import com.mudu.entity.ASafeXcrw; import com.mudu.service.ASafeXcrwService; import org.springframework.stereotype.Service; +import javax.annotation.Resource; + /** * (ASafeXcrw)表服务实现类 * @@ -15,5 +17,11 @@ import org.springframework.stereotype.Service; @Service("aSafeXcrwService") public class ASafeXcrwServiceImpl extends ServiceImpl implements ASafeXcrwService { + @Resource + private ASafeXcrwMapper aSafeXcrwMapper; + @Override + public Integer xcrwNum() { + return aSafeXcrwMapper.xcrwNum(); + } } diff --git a/src/main/java/com/mudu/service/impl/ASafeZcrwServiceImpl.java b/src/main/java/com/mudu/service/impl/ASafeZcrwServiceImpl.java index 4e7bc19..9509c59 100644 --- a/src/main/java/com/mudu/service/impl/ASafeZcrwServiceImpl.java +++ b/src/main/java/com/mudu/service/impl/ASafeZcrwServiceImpl.java @@ -1,11 +1,13 @@ package com.mudu.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.mudu.mapper.ASafeZcrwMapper; import com.mudu.entity.ASafeZcrw; +import com.mudu.mapper.ASafeZcrwMapper; import com.mudu.service.ASafeZcrwService; import org.springframework.stereotype.Service; +import javax.annotation.Resource; + /** * (ASafeZcrw)表服务实现类 * @@ -15,5 +17,12 @@ import org.springframework.stereotype.Service; @Service("aSafeZcrwService") public class ASafeZcrwServiceImpl extends ServiceImpl implements ASafeZcrwService { + @Resource + private ASafeZcrwMapper aSafeZcrwMapper; + + @Override + public Integer zcrwNum() { + return aSafeZcrwMapper.zcrwNum(); + } }