From 03bde76124244dd4557984dc1dc289b2e24d2cde Mon Sep 17 00:00:00 2001 From: dongdingding <207595406@qq.com> Date: Wed, 22 May 2024 16:37:10 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E6=9F=A5=E4=BB=BB=E5=8A=A1=E7=9A=84?= =?UTF-8?q?=E9=9A=90=E6=82=A3=EF=BC=8C=E6=8E=A8=E9=80=81=E5=88=B0a=5Fsafe?= =?UTF-8?q?=5Fyhzgxx=EF=BC=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mudu/quartz/AcheckTaskQuartz.java | 97 +++++++++++++------ 1 file changed, 69 insertions(+), 28 deletions(-) diff --git a/src/main/java/com/mudu/quartz/AcheckTaskQuartz.java b/src/main/java/com/mudu/quartz/AcheckTaskQuartz.java index b212e0a..b03f364 100644 --- a/src/main/java/com/mudu/quartz/AcheckTaskQuartz.java +++ b/src/main/java/com/mudu/quartz/AcheckTaskQuartz.java @@ -6,35 +6,11 @@ import cn.hutool.http.HttpRequest; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; import com.mudu.base.domain.AjaxResult; -import com.mudu.entity.ACheckQuatzEntity; -import com.mudu.entity.ACheckQuatzZichaEntity; -import com.mudu.entity.ASafeQyjcxx; -import com.mudu.entity.ASafeRwfj; -import com.mudu.entity.ASafeRwzq; -import com.mudu.entity.ASafeXcrw; -import com.mudu.entity.ASafeXcrwjcx; -import com.mudu.entity.ASafeXcrwjcxzgxx; -import com.mudu.entity.ASafeXcrwwz; -import com.mudu.entity.ASafeYhzgxx; -import com.mudu.entity.ASafeZcrw; -import com.mudu.entity.ASafeZcrwjl; -import com.mudu.entity.ASafeZcrwwz; -import com.mudu.entity.SzsASafeZcyhxx; +import com.mudu.entity.*; import com.mudu.entity.dto.request.ACheckQuatzRequest; import com.mudu.entity.dto.request.ACheckQuatzZichaRequest; import com.mudu.entity.dto.response.ACheckXcTpResponse; -import com.mudu.service.ASafeQyjcxxService; -import com.mudu.service.ASafeRwfjService; -import com.mudu.service.ASafeRwzqService; -import com.mudu.service.ASafeXcrwService; -import com.mudu.service.ASafeXcrwjcxService; -import com.mudu.service.ASafeXcrwjcxzgxxService; -import com.mudu.service.ASafeXcrwwzService; -import com.mudu.service.ASafeYhzgxxService; -import com.mudu.service.ASafeZcrwService; -import com.mudu.service.ASafeZcrwjlService; -import com.mudu.service.ASafeZcrwwzService; -import com.mudu.service.SzsASafeZcyhxxService; +import com.mudu.service.*; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Configuration; import org.springframework.scheduling.annotation.EnableScheduling; @@ -615,6 +591,7 @@ public class AcheckTaskQuartz { String zcrwjlUuid = UUID.randomUUID().toString().replace("-", "").toLowerCase(); String zcrwwzUuid = UUID.randomUUID().toString().replace("-", "").toLowerCase(); String zcyhxxUuid = UUID.randomUUID().toString().replace("-", "").toLowerCase(); + String yhzgxxUuid = UUID.randomUUID().toString().replace("-", "").toLowerCase(); /** * 附件表a_safe_rwfj */ @@ -648,7 +625,10 @@ public class AcheckTaskQuartz { * 自查任务隐患/整改 szs_a_safe_zcyhxx同巡查信息 */ saveZcyHxx(a, b, zcyhxxUuid, zcrwUuid, zcrwjlUuid, rwzqUuid); - + /** + * 自查风险点位置隐患 a_safe_yhzgxx + */ + saveZihaYhzgxx(list, a, b, yhzgxxUuid, zcrwUuid, rwzqUuid, zcrwUuid); } } return success(); @@ -710,7 +690,7 @@ public class AcheckTaskQuartz { //任务编号 aSafeZcrwjl.setRwbh(zcrwUuid); //企业风险点编号 - aSafeZcrwjl.setQyfxdbh(b.getFxdbh()); + aSafeZcrwjl.setQyfxdbh(b.getCheckId()); //企业风险点位置编号 aSafeZcrwjl.setQyfxdwzbh(b.getFxbh()); //是否发现隐患 @@ -873,4 +853,65 @@ public class AcheckTaskQuartz { } + /** + * @param list + * @param a 定时任务巡查请求类 + * @param b 定时任务实体类 + * @param yhzgxxUuid 风险点隐患id + * @param rwzqUuid 任务周期id + * @param xcrwwzUuid 巡查任务位置id + */ + private void saveZihaYhzgxx(List list, ACheckQuatzZichaRequest a, ACheckQuatzZichaEntity b, String yhzgxxUuid, String zcrwUuid, String rwzqUuid, String xcrwwzUuid) { + ASafeYhzgxx aSafeYhzgxx = new ASafeYhzgxx(); + //信息编号 + aSafeYhzgxx.setXxbh(yhzgxxUuid); + //任务编号 + aSafeYhzgxx.setRwbh(zcrwUuid); + //位置编号 + // aSafeYhzgxx.setWzbh(); + //企业编号 + aSafeYhzgxx.setQybh(b.getEnterpriseID()); + //周期编号 + aSafeYhzgxx.setZqbh(rwzqUuid); + //企业风险点编号 对应a_safe_fxd的信息编号 + aSafeYhzgxx.setQyfxdbh(b.getCheckId()); + //隐患来源 + aSafeYhzgxx.setYhly("2"); + //检查时间 + aSafeYhzgxx.setJcsj(a.getReportDateTime()); + //整改期限 + // aSafeYhzgxx.setZgqx(b.getNeedFinalDateTime()); + //不合格检查项a_safe_xcrwjcx中JCXJG=1的数量 + aSafeYhzgxx.setBhgjcx(list.size()); + //是否展示 + aSafeYhzgxx.setSfzs(1); + //巡查位置编号 + // aSafeYhzgxx.setXcwzbh(xcrwwzUuid); + //复查是否合格 + aSafeYhzgxx.setFcsfhg(1); + //隐患描述 + aSafeYhzgxx.setYhms(b.getContent()); + //整改结果 + aSafeYhzgxx.setZgjg("已完成"); + //历史逾期 + aSafeYhzgxx.setLsyq(0); + //整改时间 + aSafeYhzgxx.setZgsj(b.getReportDateTime()); + //完成状态 + aSafeYhzgxx.setWczt(1); + //整改状态 + aSafeYhzgxx.setZgzt(1); + //入库人员 + // aSafeYhzgxx.setRkry(b.getRybh()); + //入库时间 + aSafeYhzgxx.setRksj(new Date()); + //更新人员 + // aSafeYhzgxx.setGxry(b.getRybh()); + //更新时间 + aSafeYhzgxx.setGxsj(new Date()); + //记录状态 + aSafeYhzgxx.setJlzt(1); + aSafeYhzgxxService.save(aSafeYhzgxx); + } + }