diff --git a/src/main/java/com/mudu/controller/ASafeRwfjController.java b/src/main/java/com/mudu/controller/ASafeRwfjController.java index f9f6896..4375d8b 100644 --- a/src/main/java/com/mudu/controller/ASafeRwfjController.java +++ b/src/main/java/com/mudu/controller/ASafeRwfjController.java @@ -2,9 +2,11 @@ package com.mudu.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.ruoyi.common.core.controller.BaseController; + import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.common.core.domain.AjaxResult; + +import com.mudu.base.controller.BaseController; +import com.mudu.base.domain.AjaxResult; import com.mudu.entity.ASafeRwfj; import com.mudu.service.ASafeRwfjService; import io.swagger.annotations.Api; diff --git a/src/main/java/com/mudu/controller/ASafeXcrwwzController.java b/src/main/java/com/mudu/controller/ASafeXcrwwzController.java index 6bf0a70..c93a4b5 100644 --- a/src/main/java/com/mudu/controller/ASafeXcrwwzController.java +++ b/src/main/java/com/mudu/controller/ASafeXcrwwzController.java @@ -2,9 +2,11 @@ package com.mudu.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.ruoyi.common.core.controller.BaseController; + import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.common.core.domain.AjaxResult; + +import com.mudu.base.controller.BaseController; +import com.mudu.base.domain.AjaxResult; import com.mudu.entity.ASafeXcrwwz; import com.mudu.service.ASafeXcrwwzService; import io.swagger.annotations.Api; diff --git a/src/main/java/com/mudu/controller/ASafeZcrwwzController.java b/src/main/java/com/mudu/controller/ASafeZcrwwzController.java index d8a7d4f..b76925a 100644 --- a/src/main/java/com/mudu/controller/ASafeZcrwwzController.java +++ b/src/main/java/com/mudu/controller/ASafeZcrwwzController.java @@ -2,9 +2,11 @@ package com.mudu.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.ruoyi.common.core.controller.BaseController; + import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.common.core.domain.AjaxResult; + +import com.mudu.base.controller.BaseController; +import com.mudu.base.domain.AjaxResult; import com.mudu.entity.ASafeZcrwwz; import com.mudu.service.ASafeZcrwwzService; import io.swagger.annotations.Api; diff --git a/src/main/java/com/mudu/controller/AcheckTaskController.java b/src/main/java/com/mudu/controller/AcheckTaskController.java index 3ddf368..edb5c6f 100644 --- a/src/main/java/com/mudu/controller/AcheckTaskController.java +++ b/src/main/java/com/mudu/controller/AcheckTaskController.java @@ -56,10 +56,26 @@ public class AcheckTaskController { @Resource private ASafeZcrwjlService aSafeZcrwjlService; + + @Resource + private ASafeRwfjService aSafeRwfjService; + + + @Resource + private ASafeZcrwwzService aSafeZcrwwzService; + + + @Resource + private SzsASafeZcyhxxService szsASafeZcyhxxService; + + + @Resource + private ASafeXcrwwzService aSafeXcrwwzService; + /** * 新增创建时间为昨天且处于审批通过的工单数据 * - * @param list + * @param list todo * @Param qymc 企业名称 */ @PostMapping("/insert") @@ -71,7 +87,7 @@ public class AcheckTaskController { String xcrwjcxzgxxUuid = UUID.randomUUID().toString().replace("-", "").toLowerCase(); String xcrwwzUuid = UUID.randomUUID().toString().replace("-", "").toLowerCase(); String yhzgxxUuid = UUID.randomUUID().toString().replace("-", "").toLowerCase(); - + String rwfjUuid = UUID.randomUUID().toString().replace("-", "").toLowerCase(); //获取企业编号 String enterPriseId = a.getEnterpriseID(); //获取人员编号 @@ -98,6 +114,7 @@ public class AcheckTaskController { } else { aSafeXcrw.setJcsj(null); } + //完成状态 aSafeXcrw.setWczt(1); //入库人员 @@ -142,26 +159,27 @@ public class AcheckTaskController { } else { aSafeXcrwjcx.setJcsj(null); } - //整改时间 + //整改时间 todo 整改完成时间 if (a.getReportDateTime() != null) { aSafeXcrwjcx.setZgsj(a.getReportDateTime()); } else { aSafeXcrwjcx.setZgsj(null); } + //整改描述 todo //整改期限 aSafeXcrwjcx.setZgqx(a.getNeedFinalDateTime()); //整改状态 aSafeXcrwjcx.setZgzt(1); //整改逾期 Date currentTime = new Date(); // 获取当前时间 - if (currentTime.after(a.getNeedFinalDateTime())) { + if (a.getNeedFinalDateTime() != null && currentTime.after(a.getNeedFinalDateTime())) { // 超过截止时间， aSafeXcrwjcx.setZgyq(1); } else { // 未超过截止时间， aSafeXcrwjcx.setZgyq(0); } - + //市风险点编号 todo //任务类型 aSafeXcrwjcx.setRwlx(3); //入库人员 @@ -184,6 +202,7 @@ public class AcheckTaskController { aSafeXcrwjcxzgxx.setXxbh(xcrwjcxzgxxUuid); //任务编号对应a_safe_xcrw的信息编号 aSafeXcrwjcx.setRwbh(xcrwuuid); + //描述 content todo //巡查检查项编号 a_safe_xcrwjcx的XXBH aSafeXcrwjcxzgxx.setXcjcxbh(xcrwjcxUuid); //时间 @@ -208,9 +227,20 @@ public class AcheckTaskController { /** * 巡查任务位置 a_safe_xcrwwz */ + ASafeXcrwwz aSafeXcrwwz = new ASafeXcrwwz(); //xxbh - - + aSafeXcrwwz.setXxbh(xcrwwzUuid); + //任务编号 + aSafeXcrwwz.setRwbh(xcrwuuid); + //完成状态 + aSafeXcrwwz.setWczt(1); + //入库时间 + aSafeXcrwwz.setRksj(new Date()); + //更新时间 + aSafeXcrwwz.setGxsj(new Date()); + //记录状态 + aSafeXcrwwz.setJlzt(1); + aSafeXcrwwzService.save(aSafeXcrwwz); /** * 巡查风险点位置隐患 a_safe_yhzgxx */ @@ -238,7 +268,8 @@ public class AcheckTaskController { //整改期限 aSafeYhzgxx.setZgqx(a.getNeedFinalDateTime()); //不合格检查项a_safe_xcrwjcx中JCXJG=1的数量 - aSafeYhzgxx.setBhgjcx(list.size()); + aSafeYhzgxx.setBhgjcx(0); + //整改时间 todo 隐患描述 //整改状态 aSafeYhzgxx.setZgzt(1); //入库人员 @@ -253,9 +284,29 @@ public class AcheckTaskController { aSafeYhzgxx.setJlzt(1); aSafeYhzgxxService.save(aSafeYhzgxx); /** - * 附件表a_safe_rwfj + * 附件表a_safe_rwfj todo 少字段 */ - //todo 少实体类 + ASafeRwfj aSafeRwfj = new ASafeRwfj(); + String api = "http://221.229.220.83:8007/api/"; + aSafeRwfj.setXxbh(rwfjUuid); + //附件地址 + if (a.getRelativePath() != null) { + aSafeRwfj.setFjdz(api + a.getRelativePath()); + } + //文件类型 + aSafeRwfj.setWjlx("ZGQTP"); + //关联父级编号 自查巡查任务主表的XXBH + aSafeRwfj.setPid(xcrwuuid); + //显示顺序 todo + int b = 0; + aSafeRwfj.setXssx(b++); + //记录状态 + aSafeRwfj.setJlzt(1); + //入库时间 + aSafeRwfj.setRksj(new Date()); + //更新时间 + aSafeRwfj.setGxsj(new Date()); + aSafeRwfjService.save(aSafeRwfj); } @@ -272,11 +323,13 @@ public class AcheckTaskController { */ String zcrwUuid = UUID.randomUUID().toString().replace("-", "").toLowerCase(); String zcrwjlUuid = UUID.randomUUID().toString().replace("-", "").toLowerCase(); + String zcrwwzUuid = UUID.randomUUID().toString().replace("-", "").toLowerCase(); + String zcyhxxUuid = UUID.randomUUID().toString().replace("-", "").toLowerCase(); ASafeZcrw aSafeZcrw = new ASafeZcrw(); aSafeZcrw.setXxbh(zcrwUuid); //企业编号 aSafeZcrw.setQybh(a.getEnterpriseID()); - //自查项 + //自查项 小的listsize aSafeZcrw.setZcx(list.size()); //完成项 aSafeZcrw.setWcx(list.size()); @@ -303,14 +356,51 @@ public class AcheckTaskController { //入库时间 aSafeZcrwjl.setRksj(new Date()); //更新时间 - aSafeZcrwjl.setGxsj(new Date()); + aSafeZcrwjl.setGxsj(new Date());//todo 完成状态 +//是否发现隐患 todo + //AddDateTime 检查时间 +//检查时间 + // AddUserNamere人员 + //市风险点编号 todo + //content 隐患描述 aSafeZcrwjlService.save(aSafeZcrwjl); /** *自查任务位置表a_safe_zcrwwz */ - // 少表 todo - - + ASafeZcrwwz aSafeZcrwwz = new ASafeZcrwwz(); + aSafeZcrwwz.setXxbh(zcrwwzUuid); + aSafeZcrwwz.setQybh(a.getEnterpriseID()); + aSafeZcrwwz.setRwbh(zcrwUuid); + //市风险点编号 todo + //入库时间 + aSafeZcrwwz.setRksj(new Date()); + //更新时间 + aSafeZcrwwz.setGxsj(new Date()); + aSafeZcrwwz.setJlzt(1); + aSafeZcrwwzService.save(aSafeZcrwwz); + /** + * 自查任务隐患/整改 szs_a_safe_zcyhxx同巡查信息 + */ + SzsASafeZcyhxx szsASafeZcyhxx = new SzsASafeZcyhxx(); + //信息编号 + szsASafeZcyhxx.setXxbh(zcyhxxUuid); + //任务编号对应a_safe_xcrw的信息编号 + szsASafeZcyhxx.setRwbh(zcrwUuid); + //巡查检查项编号 a_safe_xcrwjcx的XXBH + szsASafeZcyhxx.setXcjcxbh(zcrwjlUuid); + //类型 + szsASafeZcyhxx.setSjlx("ZG"); + //时间 todo时间必填 + szsASafeZcyhxx.setSj(new Date()); + //是否合格 + szsASafeZcyhxx.setSfhg(1); + //入库时间 + szsASafeZcyhxx.setRksj(new Date()); + //更新时间 + szsASafeZcyhxx.setGxsj(new Date()); + //记录状态 + szsASafeZcyhxx.setJlzt(1); + szsASafeZcyhxxService.save(szsASafeZcyhxx); } return success(); } diff --git a/src/main/java/com/mudu/controller/SzsASafeZcyhxxController.java b/src/main/java/com/mudu/controller/SzsASafeZcyhxxController.java index cc7a2d7..62cceba 100644 --- a/src/main/java/com/mudu/controller/SzsASafeZcyhxxController.java +++ b/src/main/java/com/mudu/controller/SzsASafeZcyhxxController.java @@ -2,23 +2,15 @@ package com.mudu.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.ruoyi.common.core.controller.BaseController; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.common.core.domain.AjaxResult; +import com.mudu.base.controller.BaseController; +import com.mudu.base.domain.AjaxResult; import com.mudu.entity.SzsASafeZcyhxx; import com.mudu.service.SzsASafeZcyhxxService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.io.Serializable; 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 3671dff..b7e1ab2 100644 --- a/src/main/java/com/mudu/entity/dto/request/ACheckQuatzRequest.java +++ b/src/main/java/com/mudu/entity/dto/request/ACheckQuatzRequest.java @@ -18,11 +18,6 @@ import java.util.Date; public class ACheckQuatzRequest { - /** - * 工单id - */ - @ApiModelProperty(value = "工单id") - private String id; /** * 归属地 @@ -30,12 +25,6 @@ public class ACheckQuatzRequest { @ApiModelProperty(value = "归属地") private String locationName; - /** - * 企业名称 - */ - @ApiModelProperty(value = "企业名称") - private String enterpriseName; - /** * 企业编号 @@ -61,27 +50,22 @@ public class ACheckQuatzRequest { @ApiModelProperty("上报时间(如果巡查一起提交,获取巡查的巡查日期") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date ReportDateTime; + private Date reportDateTime; - /** - * 上报人 - */ - @ApiModelProperty(value = "上报人") - private String ReportPersonName; /** * 隐患内容 */ @ApiModelProperty(value = "隐患内容") - private String Description; + private String description; /** * 现场图片 */ @ApiModelProperty(value = "现场图片") - private String RelativePath; + private String relativePath; /** * 风险点id