diff --git a/src/main/java/com/mudu/entity/ACheckQuatzEntity.java b/src/main/java/com/mudu/entity/ACheckQuatzEntity.java index 37aad06..626af00 100644 --- a/src/main/java/com/mudu/entity/ACheckQuatzEntity.java +++ b/src/main/java/com/mudu/entity/ACheckQuatzEntity.java @@ -50,7 +50,7 @@ public class ACheckQuatzEntity { private String isFinal; /** - * 创建时间 + * 上报时间(如果巡查一起提交,获取巡查的巡查日期 */ @ApiModelProperty("上报时间(如果巡查一起提交,获取巡查的巡查日期") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") diff --git a/src/main/java/com/mudu/entity/ASafeXcrwjcxzgxx.java b/src/main/java/com/mudu/entity/ASafeXcrwjcxzgxx.java index 4ad3e44..6c001f9 100644 --- a/src/main/java/com/mudu/entity/ASafeXcrwjcxzgxx.java +++ b/src/main/java/com/mudu/entity/ASafeXcrwjcxzgxx.java @@ -1,15 +1,13 @@ package com.mudu.entity; -import java.util.Date; - -import java.io.Serializable; - import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableField; -import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.io.Serializable; +import java.util.Date; + /** * (ASafeXcrwjcxzgxx)表实体类 @@ -50,9 +48,9 @@ public class ASafeXcrwjcxzgxx implements Serializable { @ApiModelProperty(value = "数据来源") private String sjlx; /** - * 时间 + * 每一次整改/复查时间 */ - @ApiModelProperty(value = "时间") + @ApiModelProperty(value = "每一次整改/复查时间") private Date sj; /** * 是否合格 diff --git a/src/main/java/com/mudu/entity/dto/request/ACheckQuatzRequest.java b/src/main/java/com/mudu/entity/dto/request/ACheckQuatzRequest.java index bf6946d..721b708 100644 --- a/src/main/java/com/mudu/entity/dto/request/ACheckQuatzRequest.java +++ b/src/main/java/com/mudu/entity/dto/request/ACheckQuatzRequest.java @@ -1,7 +1,6 @@ package com.mudu.entity.dto.request; import com.fasterxml.jackson.annotation.JsonFormat; - import com.mudu.entity.ACheckQuatzEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -45,7 +44,7 @@ public class ACheckQuatzRequest { private String entCode; /** - * 创建时间 + * 上报时间(如果巡查一起提交,获取巡查的巡查日期 */ @ApiModelProperty("上报时间(如果巡查一起提交,获取巡查的巡查日期") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") diff --git a/src/main/java/com/mudu/quartz/AcheckTaskQuartz.java b/src/main/java/com/mudu/quartz/AcheckTaskQuartz.java index dfdf569..f44a193 100644 --- a/src/main/java/com/mudu/quartz/AcheckTaskQuartz.java +++ b/src/main/java/com/mudu/quartz/AcheckTaskQuartz.java @@ -6,23 +6,46 @@ import cn.hutool.http.HttpRequest; import cn.hutool.json.JSONUtil; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; -import com.mudu.entity.*; +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.ASafeTfg; +import com.mudu.entity.ASafeTfgsh; +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.dto.request.ACheckQuatzRequest; import com.mudu.entity.dto.request.ACheckQuatzZichaRequest; import com.mudu.entity.dto.response.ACheckXcTpResponse; import com.mudu.entity.dto.response.RwzqUuidResponse; -import com.mudu.service.*; +import com.mudu.service.ASafeQyjcxxService; +import com.mudu.service.ASafeRwfjService; +import com.mudu.service.ASafeRwzqService; +import com.mudu.service.ASafeTfgService; +import com.mudu.service.ASafeTfgshService; +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.impl.LoginService; import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.Configuration; -import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.scheduling.annotation.Scheduled; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -331,7 +354,7 @@ public class AcheckTaskQuartz { aSafeYhzgxx.setLsyq(0); //整改时间 aSafeYhzgxx.setZgsj(b.getReportDateTime()); - //完成状态 + //完成状态 todo 1 aSafeYhzgxx.setWczt(1); //整改状态 aSafeYhzgxx.setZgzt(1); @@ -366,7 +389,7 @@ public class AcheckTaskQuartz { aSafeXcrwwz.setWzmc(b.getWzmc()); //周期编号 aSafeXcrwwz.setZqbh(rwzqUuid); - //完成状态 + //完成状态 todo 1 aSafeXcrwwz.setWczt(1); //入库时间 aSafeXcrwwz.setRksj(new Date()); @@ -396,7 +419,7 @@ public class AcheckTaskQuartz { //巡查检查项编号 a_safe_xcrwjcx的XXBH aSafeXcrwjcxzgxx.setXcjcxbh(xcrwjcxUuid); //时间 - aSafeXcrwjcxzgxx.setSj(a.getFinalDateTime()); + aSafeXcrwjcxzgxx.setSj(b.getReviewDateTime()); //类型 aSafeXcrwjcxzgxx.setSjlx("ZG"); //是否合格 @@ -483,8 +506,8 @@ public class AcheckTaskQuartz { aSafeXcrwjcx.setFclsyq(0); //复查信息 aSafeXcrwjcx.setFcxx(b.getReviewContent()); - //位置编号 - aSafeXcrwjcx.setWzbh(xcrwuuid); + //位置编号 todo 企业风险点位置的位置编号即 企业风险位置的xxbh + aSafeXcrwjcx.setWzbh(b.getWzxxbh()); //巡查位置编号 aSafeXcrwjcx.setXcwzbh(xcrwwzUuid); //巡查风险点编号 @@ -520,11 +543,11 @@ public class AcheckTaskQuartz { //任务类型 aSafeXcrw.setRwlx("WGXC"); //巡查项 - aSafeXcrw.setXcx(list.size()); + aSafeXcrw.setXcx(a.getList().size()); //完成项 - aSafeXcrw.setWcx(list.size()); + aSafeXcrw.setWcx(a.getList().size()); //发现隐患数 - aSafeXcrw.setFxyhs(list.size()); + aSafeXcrw.setFxyhs(a.getList().size()); //检查时间 if (a.getReportDateTime() != null) { aSafeXcrw.setJcsj(a.getReportDateTime());