From 90a9f73c4cadba0a1a68d823cf4b8246a7f7add8 Mon Sep 17 00:00:00 2001 From: dongdingding <207595406@qq.com> Date: Wed, 28 Aug 2024 09:44:19 +0800 Subject: [PATCH] bug fix --- .../java/com/mudu/entity/ASafeQyjcxx.java | 2 + .../dto/request/ACheckQuatzRequest.java | 5 + .../entity/dto/response/FxdwzResponse.java | 21 +++ .../com/mudu/mapper/ASafeQyjcxxMapper.java | 11 ++ .../java/com/mudu/mapper/ASafeRwzqMapper.java | 11 ++ .../com/mudu/quartz/AcheckTaskQuartz.java | 148 +++++++----------- .../com/mudu/service/ASafeQyjcxxService.java | 10 ++ .../com/mudu/service/ASafeRwzqService.java | 12 +- .../service/impl/ASafeQyjcxxServiceImpl.java | 6 + .../service/impl/ASafeRwzqServiceImpl.java | 5 + src/main/resources/application-dev.yml | 10 +- src/main/resources/application.yml | 2 +- .../mapper/mudu/ASafeQyjcxxMapper.xml | 6 + .../resources/mapper/mudu/ASafeRwzqMapper.xml | 5 + 14 files changed, 156 insertions(+), 98 deletions(-) create mode 100644 src/main/java/com/mudu/entity/dto/response/FxdwzResponse.java diff --git a/src/main/java/com/mudu/entity/ASafeQyjcxx.java b/src/main/java/com/mudu/entity/ASafeQyjcxx.java index ed057f8..3470701 100644 --- a/src/main/java/com/mudu/entity/ASafeQyjcxx.java +++ b/src/main/java/com/mudu/entity/ASafeQyjcxx.java @@ -570,6 +570,8 @@ public class ASafeQyjcxx implements Serializable { public ASafeQyjcxx() { } + + public ASafeQyjcxx(EnterpriseResponse res) { this.jd = conversion(res.getLongitude()); 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 721b708..b137de3 100644 --- a/src/main/java/com/mudu/entity/dto/request/ACheckQuatzRequest.java +++ b/src/main/java/com/mudu/entity/dto/request/ACheckQuatzRequest.java @@ -58,6 +58,11 @@ public class ACheckQuatzRequest { @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 finalDateTime; + + /** + * qyjcxx 的xxbh + */ + private String xxbh; /** * 定时任务请求类 */ diff --git a/src/main/java/com/mudu/entity/dto/response/FxdwzResponse.java b/src/main/java/com/mudu/entity/dto/response/FxdwzResponse.java new file mode 100644 index 0000000..063d1e2 --- /dev/null +++ b/src/main/java/com/mudu/entity/dto/response/FxdwzResponse.java @@ -0,0 +1,21 @@ +package com.mudu.entity.dto.response; + +import lombok.Data; + +/** + * @author dong + * @since 2024/8/27 20:04 + */ +@Data +public class FxdwzResponse { + + /** + * 位置编号 + */ + private String wzbh; + + /** + * 风险点位置编号 + */ + private String xxbh; +} diff --git a/src/main/java/com/mudu/mapper/ASafeQyjcxxMapper.java b/src/main/java/com/mudu/mapper/ASafeQyjcxxMapper.java index 46f9f7e..258a95c 100644 --- a/src/main/java/com/mudu/mapper/ASafeQyjcxxMapper.java +++ b/src/main/java/com/mudu/mapper/ASafeQyjcxxMapper.java @@ -2,6 +2,7 @@ package com.mudu.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.mudu.entity.ASafeQyjcxx; +import com.mudu.entity.dto.response.FxdwzResponse; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -29,5 +30,15 @@ public interface ASafeQyjcxxMapper extends BaseMapper { * @param list 企业信用代码 */ void updateByTyshxybm(List list); + + + + /** + * 根据企业id查询a_safe_fxdwz的wzbh和xxbh + * + * @param enterPriseId 企业id + * @return + */ + FxdwzResponse findByEnterPeriseId(@Param("enterPriseId") String enterPriseId); } diff --git a/src/main/java/com/mudu/mapper/ASafeRwzqMapper.java b/src/main/java/com/mudu/mapper/ASafeRwzqMapper.java index ff5d3c4..04b1acd 100644 --- a/src/main/java/com/mudu/mapper/ASafeRwzqMapper.java +++ b/src/main/java/com/mudu/mapper/ASafeRwzqMapper.java @@ -3,6 +3,7 @@ package com.mudu.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.mudu.entity.ASafeRwzq; import com.mudu.entity.dto.response.RwzqUuidResponse; +import org.apache.ibatis.annotations.Param; /** * (ASafeRwzq)表数据库访问层 @@ -26,5 +27,15 @@ public interface ASafeRwzqMapper extends BaseMapper { * @return */ RwzqUuidResponse getZcUuid(); + + + /** + * 根据企业id和s_safe_fxd的fxdbh查询风险点的信息编号 + * + * @param enterPriseId 企业id + * @param fxdbh 风险点编号 + * @return + */ + String findByEnIdFxd(@Param("enterPriseId") String enterPriseId, @Param("fxdbh") String fxdbh); } diff --git a/src/main/java/com/mudu/quartz/AcheckTaskQuartz.java b/src/main/java/com/mudu/quartz/AcheckTaskQuartz.java index 5a2de32..5d35344 100644 --- a/src/main/java/com/mudu/quartz/AcheckTaskQuartz.java +++ b/src/main/java/com/mudu/quartz/AcheckTaskQuartz.java @@ -6,50 +6,20 @@ import cn.hutool.http.HttpRequest; import cn.hutool.json.JSONUtil; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; -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.*; 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.FxdwzResponse; import com.mudu.entity.dto.response.RwzqUuidResponse; -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.*; 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; @@ -188,35 +158,29 @@ public class AcheckTaskQuartz { .header("Authorization", token) // .timeout(60*1000*2) .execute().body(); - logger.info(responseList); JSONObject jsonResponseList = JSON.parseObject(responseList); - logger.info(responseList); String dataList = jsonResponseList.getString("data"); if (StrUtil.isEmpty(dataList)) { - logger.info("dataList没有数据"); return; } - logger.info(dataList); + List list = JSON.parseArray(dataList, ACheckQuatzRequest.class); if (CollectionUtil.isEmpty(list)) { - logger.info("list没有数据"); - logger.info(list.toString()); return; } for (ACheckQuatzRequest a : list) { //获取企业编号 - ASafeQyjcxx aSafeQyjcxx = aSafeQyjcxxService.findOneByqymcOrXybm(a.getName(), a.getEntCode()); String enterPriseId = ""; - if (aSafeQyjcxx == null) { + if (a.getXxbh() == null) { continue; } else { - enterPriseId = aSafeQyjcxx.getXxbh(); + enterPriseId = a.getXxbh(); } // todo 来自新表查询 根据企业xxbh 以及周期编号 JSONObject xcjsonObject = new JSONObject(); - xcjsonObject.put("qybh", aSafeQyjcxx.getXxbh()); + xcjsonObject.put("qybh", a.getXxbh()); xcjsonObject.put("zqbh", rwzqUuid); String xcresponse = HttpRequest.post(xczqUrl) .contentType("application/x-www-form-urlencoded;charset=UTF-8") @@ -284,7 +248,8 @@ public class AcheckTaskQuartz { String xcrwjcxzgxxUuid = UUID.randomUUID().toString().replace("-", "").toLowerCase(); String xcrwwzUuid = UUID.randomUUID().toString().replace("-", "").toLowerCase(); String yhzgxxUuid = UUID.randomUUID().toString().replace("-", "").toLowerCase(); - + //根据企业id查询a_safe_fxdwz的wzbh和xxbh + FxdwzResponse fxdwzResponse = aSafeQyjcxxService.findByEnterPeriseId(enterPriseId); /** * 巡查任务位置 a_safe_xcrwwz */ @@ -293,12 +258,14 @@ public class AcheckTaskQuartz { /** * 巡查风险点位置隐患 a_safe_yhzgxx */ - saveYhzgxx(list, a, b, yhzgxxUuid, xcrwuuid, enterPriseId, rwzqUuid, xcrwwzUuid); + saveYhzgxx(list, a, b, yhzgxxUuid, xcrwuuid, enterPriseId, rwzqUuid, xcrwwzUuid, fxdwzResponse); /** * 巡查任务检查项记录 a_safe_xcrwjcx */ - saveXcrwJcx(b, xcrwjcxUuid, yhzgxxUuid, xcrwwzUuid, enterPriseId, xcrwuuid, rwzqUuid); + //根据企业id和s_safe_fxd的fxdbh查询风险点的信息编号 + String fxdxxbh = aSafeRwzqService.findByEnIdFxd(enterPriseId, "03_20240621172152865517"); + saveXcrwJcx(b, xcrwjcxUuid, yhzgxxUuid, xcrwwzUuid, enterPriseId, xcrwuuid, rwzqUuid, fxdxxbh, fxdwzResponse); /** * 巡查任务隐患整改/隐患复查 a_safe_xcrwjcxzgxx @@ -319,24 +286,22 @@ public class AcheckTaskQuartz { * @param rwzqUuid 任务周期id * @param xcrwwzUuid 巡查任务位置id */ - private void saveYhzgxx(List list, ACheckQuatzRequest a, ACheckQuatzEntity b, String yhzgxxUuid, String xcrwuuid, String enterPriseId, String rwzqUuid, String xcrwwzUuid) { + private void saveYhzgxx(List list, ACheckQuatzRequest a, ACheckQuatzEntity b, String yhzgxxUuid, String xcrwuuid, String enterPriseId, String rwzqUuid, String xcrwwzUuid, FxdwzResponse fxdwzResponse) { ASafeYhzgxx aSafeYhzgxx = new ASafeYhzgxx(); //信息编号 aSafeYhzgxx.setXxbh(yhzgxxUuid); //任务编号 aSafeYhzgxx.setRwbh(xcrwuuid); - //位置编号 - aSafeYhzgxx.setWzbh(b.getWzxxbh()); + //todo 位置编号 + if (fxdwzResponse != null) { + aSafeYhzgxx.setWzbh(fxdwzResponse.getWzbh()); + } //企业编号 aSafeYhzgxx.setQybh(enterPriseId); //周期编号 aSafeYhzgxx.setZqbh(rwzqUuid); //企业风险点编号 对应a_safe_fxd的信息编号 - if (b.getFxdxxbh() == null) { - aSafeYhzgxx.setQyfxdbh("03_20240617093239130405"); - } else { - aSafeYhzgxx.setQyfxdbh(b.getFxdxxbh()); - } + aSafeYhzgxx.setQyfxdbh("03_20240621172152865517"); //隐患来源 aSafeYhzgxx.setYhly("1"); //检查时间 @@ -389,9 +354,9 @@ public class AcheckTaskQuartz { //任务编号 aSafeXcrwwz.setRwbh(xcrwuuid); //位置编号 - aSafeXcrwwz.setWzbh(b.getWzxxbh()); + aSafeXcrwwz.setWzbh(null); //位置名称 - aSafeXcrwwz.setWzmc(b.getWzmc()); + aSafeXcrwwz.setWzmc(null); //周期编号 aSafeXcrwwz.setZqbh(rwzqUuid); //完成状态 todo 1 @@ -453,7 +418,7 @@ public class AcheckTaskQuartz { * @param xcrwuuid 巡查任务id * @param rwzqUuid 任务周期id */ - private void saveXcrwJcx(ACheckQuatzEntity b, String xcrwjcxUuid, String yhzgxxUuid, String xcrwwzUuid, String enterPriseId, String xcrwuuid, String rwzqUuid) { + private void saveXcrwJcx(ACheckQuatzEntity b, String xcrwjcxUuid, String yhzgxxUuid, String xcrwwzUuid, String enterPriseId, String xcrwuuid, String rwzqUuid, String fxdxxbh, FxdwzResponse fxdwzResponse) { ASafeXcrwjcx aSafeXcrwjcx = new ASafeXcrwjcx(); //信息编号 aSafeXcrwjcx.setXxbh(xcrwjcxUuid); @@ -463,12 +428,7 @@ public class AcheckTaskQuartz { aSafeXcrwjcx.setRwbh(xcrwuuid); //企业风险点编号 对应a_safe_fxd的信息编号 //todo - if (b.getFxdxxbh() == null) { - aSafeXcrwjcx.setQyfxdbh("03_20240617093239130405"); - } else { - aSafeXcrwjcx.setQyfxdbh(b.getFxdxxbh()); - } - + aSafeXcrwjcx.setQyfxdbh("03_20240621172152865517"); //周期编号 aSafeXcrwjcx.setZqbh(rwzqUuid); //完成状态 @@ -502,9 +462,9 @@ public class AcheckTaskQuartz { //是否重点检查项 aSafeXcrwjcx.setSfzdjcx(1); //检查要点 todo 检查要点要传中文描述内容 - aSafeXcrwjcx.setJcyd(b.getJcyd()); + aSafeXcrwjcx.setJcyd("请网格员认真核查企业基本信息、历史记录、委外作业、安全投入等内容，并反馈在此风险点上。"); // 检查要点编号 - aSafeXcrwjcx.setJcydbh(b.getJcydId()); + aSafeXcrwjcx.setJcydbh("9b46ab79101844f58843cbcc41156b67"); //是否展示 aSafeXcrwjcx.setSfzs(1); //历史整改逾期 @@ -513,12 +473,14 @@ public class AcheckTaskQuartz { aSafeXcrwjcx.setFclsyq(0); //复查信息 aSafeXcrwjcx.setFcxx(b.getReviewContent()); - //位置编号 todo 企业风险点位置的位置编号即 企业风险位置的xxbh - aSafeXcrwjcx.setWzbh(b.getWzxxbh()); + //位置编号 todo 位置编号 + if (fxdwzResponse != null) { + aSafeXcrwjcx.setWzbh(fxdwzResponse.getWzbh()); + } //巡查位置编号 aSafeXcrwjcx.setXcwzbh(xcrwwzUuid); //巡查风险点编号 todo默认木渎通用检查点,检查要点 - aSafeXcrwjcx.setXcfxdbh(b.getFxdxxbh()); + aSafeXcrwjcx.setXcfxdbh(fxdxxbh); //任务类型 aSafeXcrwjcx.setRwlx(3); //入库人员 @@ -679,10 +641,10 @@ public class AcheckTaskQuartz { } - @Scheduled(cron = "0 0 4 * * ? ") + // @Scheduled(cron = "0 0 4 * * ? ") // @Scheduled(cron = "0 0/5 * * * ?") -// @PostMapping("/zicha") -// @ApiOperation(value = "自查") + @PostMapping("/zicha") + @ApiOperation(value = "自查") public void zicha() throws ParseException { // 获取token getToken(); @@ -697,7 +659,6 @@ public class AcheckTaskQuartz { String dataList = jsonResponseList.getString("data"); logger.info(JSONUtil.toJsonStr(responseList)); if (StrUtil.isEmpty(dataList)) { - logger.info("dataList没有数据"); return; } List list = JSON.parseArray(dataList, ACheckQuatzZichaRequest.class); @@ -705,9 +666,7 @@ public class AcheckTaskQuartz { return; } for (ACheckQuatzZichaRequest a : list) { - if (a.getEnterpriseID() == null) { - logger.info("getEnterpriseID为空"); continue; } JSONObject zcjsonObject = new JSONObject(); @@ -769,14 +728,16 @@ public class AcheckTaskQuartz { */ saveZczgqTp(zc, zcrwUuid, xxsx); } + //根据企业id查询a_safe_fxdwz的wzbh和xxbh + FxdwzResponse fxdwzResponse = aSafeQyjcxxService.findByEnterPeriseId(a.getEnterpriseID()); /** *自查任务位置表a_safe_zcrwwz */ - saveZcRwwz(a, b, zcrwwzUuid, zcrwUuid, rwzqUuid); + saveZcRwwz(a, b, zcrwwzUuid, zcrwUuid, rwzqUuid, fxdwzResponse); /** * 自查任务检查项记录 a_safe_zcrwjl */ - saveZcrwjl(b, zcrwjlUuid, zcrwUuid, rwzqUuid, zcrwwzUuid); + saveZcrwjl(b, zcrwjlUuid, zcrwUuid, rwzqUuid, zcrwwzUuid, fxdwzResponse); /** * 自查任务隐患/整改 szs_a_safe_zcyhxx同巡查信息 */ @@ -836,7 +797,7 @@ public class AcheckTaskQuartz { * @param rwzqUuid 任务周期id * @param zcrwwzUuid 自查任务位置id */ - private void saveZcrwjl(ACheckQuatzZichaEntity b, String zcrwjlUuid, String zcrwUuid, String rwzqUuid, String zcrwwzUuid) { + private void saveZcrwjl(ACheckQuatzZichaEntity b, String zcrwjlUuid, String zcrwUuid, String rwzqUuid, String zcrwwzUuid, FxdwzResponse fxdwzResponse) { ASafeZcrwjl aSafeZcrwjl = new ASafeZcrwjl(); //信息编号 aSafeZcrwjl.setXxbh(zcrwjlUuid); @@ -845,13 +806,12 @@ public class AcheckTaskQuartz { //任务编号 aSafeZcrwjl.setRwbh(zcrwUuid); //企业风险点编号 - if (b.getFxdxxbh() == null) { - aSafeZcrwjl.setQyfxdbh("03_20240617093239130405"); - } else { - aSafeZcrwjl.setQyfxdbh(b.getFxdxxbh()); - } + aSafeZcrwjl.setQyfxdbh("03_20240621172152865517"); //企业风险点位置编号 - aSafeZcrwjl.setQyfxdwzbh(b.getFxbh()); + // TODO 企业风险点位置编号 + if (fxdwzResponse != null) { + aSafeZcrwjl.setQyfxdwzbh(fxdwzResponse.getXxbh()); + } //是否发现隐患 aSafeZcrwjl.setSffxyh(0); //完成状态 @@ -861,7 +821,10 @@ public class AcheckTaskQuartz { //周期编号 aSafeZcrwjl.setZqbh(rwzqUuid); //位置编号 - aSafeZcrwjl.setWzbh(b.getWzbh()); + //todo 位置编号 + if (fxdwzResponse != null) { + aSafeZcrwjl.setWzbh(fxdwzResponse.getWzbh()); + } //自查任务位置编号 aSafeZcrwjl.setZcrwwzbh(zcrwwzUuid); //设备数量 @@ -896,7 +859,7 @@ public class AcheckTaskQuartz { * @param zcrwUuid 自查任务id * @param rwzqUuid 任务周期id */ - private void saveZcRwwz(ACheckQuatzZichaRequest a, ACheckQuatzZichaEntity b, String zcrwwzUuid, String zcrwUuid, String rwzqUuid) { + private void saveZcRwwz(ACheckQuatzZichaRequest a, ACheckQuatzZichaEntity b, String zcrwwzUuid, String zcrwUuid, String rwzqUuid, FxdwzResponse fxdwzResponse) { ASafeZcrwwz aSafeZcrwwz = new ASafeZcrwwz(); //信息编号 aSafeZcrwwz.setXxbh(zcrwwzUuid); @@ -909,7 +872,10 @@ public class AcheckTaskQuartz { //市风险点编号 aSafeZcrwwz.setSfxdbh(b.getSfxdbh()); //位置编号 - aSafeZcrwwz.setWzbh(b.getWzbh()); + //todo 位置编号 + if (fxdwzResponse != null) { + aSafeZcrwwz.setWzbh(fxdwzResponse.getWzbh()); + } //入库人员 aSafeZcrwwz.setRkry(b.getAddUserID()); //入库时间 @@ -1029,17 +995,15 @@ public class AcheckTaskQuartz { //任务编号 aSafeYhzgxx.setRwbh(zcrwUuid); //位置编号 - aSafeYhzgxx.setWzbh(b.getWzbh()); + if (b.getWzbh() != null) { + aSafeYhzgxx.setWzbh(b.getWzbh()); + } //企业编号 aSafeYhzgxx.setQybh(b.getEnterpriseID()); //周期编号 aSafeYhzgxx.setZqbh(rwzqUuid); //企业风险点编号 对应a_safe_fxd的信息编号 - if (b.getFxdxxbh() == null) { - aSafeYhzgxx.setQyfxdbh("03_20240617093239130405"); - } else { - aSafeYhzgxx.setQyfxdbh(b.getFxdxxbh()); - } + aSafeYhzgxx.setQyfxdbh("03_20240621172152865517"); //隐患来源 aSafeYhzgxx.setYhly("2"); //检查时间 diff --git a/src/main/java/com/mudu/service/ASafeQyjcxxService.java b/src/main/java/com/mudu/service/ASafeQyjcxxService.java index 0afedca..021f25e 100644 --- a/src/main/java/com/mudu/service/ASafeQyjcxxService.java +++ b/src/main/java/com/mudu/service/ASafeQyjcxxService.java @@ -2,6 +2,7 @@ package com.mudu.service; import com.baomidou.mybatisplus.extension.service.IService; import com.mudu.entity.ASafeQyjcxx; +import com.mudu.entity.dto.response.FxdwzResponse; import java.util.List; @@ -33,5 +34,14 @@ public interface ASafeQyjcxxService extends IService { * @param tyshxybmList 企业信用代码 */ void updateByTyshxybm(List tyshxybmList); + + + /** + * 根据企业id查询a_safe_fxdwz的wzbh和xxbh + * + * @param enterPriseId 企业id + * @return + */ + FxdwzResponse findByEnterPeriseId(String enterPriseId); } diff --git a/src/main/java/com/mudu/service/ASafeRwzqService.java b/src/main/java/com/mudu/service/ASafeRwzqService.java index a89c3c2..b15fc9e 100644 --- a/src/main/java/com/mudu/service/ASafeRwzqService.java +++ b/src/main/java/com/mudu/service/ASafeRwzqService.java @@ -21,13 +21,21 @@ public interface ASafeRwzqService extends IService { RwzqUuidResponse getXcUuid(); - - /** * 获取自查任务周期的最新一条id * * @return */ RwzqUuidResponse getZcUuid(); + + + /** + * 根据企业id和s_safe_fxd的fxdbh查询风险点的信息编号 + * + * @param enterPriseId 企业id + * @param fxdbh 风险点编号 + * @return + */ + String findByEnIdFxd(String enterPriseId, String fxdbh); } diff --git a/src/main/java/com/mudu/service/impl/ASafeQyjcxxServiceImpl.java b/src/main/java/com/mudu/service/impl/ASafeQyjcxxServiceImpl.java index fc575cc..d6ee685 100644 --- a/src/main/java/com/mudu/service/impl/ASafeQyjcxxServiceImpl.java +++ b/src/main/java/com/mudu/service/impl/ASafeQyjcxxServiceImpl.java @@ -7,6 +7,7 @@ import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.mudu.entity.ASafeQyjcxx; import com.mudu.entity.dto.response.EnterpriseResponse; +import com.mudu.entity.dto.response.FxdwzResponse; import com.mudu.entity.dto.response.GeneralResponse; import com.mudu.mapper.ASafeQyjcxxMapper; import com.mudu.service.ASafeQyjcxxService; @@ -95,5 +96,10 @@ public class ASafeQyjcxxServiceImpl extends ServiceImpl tyshxybmList) { baseMapper.updateByTyshxybm(tyshxybmList); } + + @Override + public FxdwzResponse findByEnterPeriseId(String enterPriseId) { + return baseMapper.findByEnterPeriseId(enterPriseId); + } } diff --git a/src/main/java/com/mudu/service/impl/ASafeRwzqServiceImpl.java b/src/main/java/com/mudu/service/impl/ASafeRwzqServiceImpl.java index 49c5bb9..cf1233e 100644 --- a/src/main/java/com/mudu/service/impl/ASafeRwzqServiceImpl.java +++ b/src/main/java/com/mudu/service/impl/ASafeRwzqServiceImpl.java @@ -29,5 +29,10 @@ public class ASafeRwzqServiceImpl extends ServiceImpl + \ No newline at end of file diff --git a/src/main/resources/mapper/mudu/ASafeRwzqMapper.xml b/src/main/resources/mapper/mudu/ASafeRwzqMapper.xml index 1c926dc..28c1598 100644 --- a/src/main/resources/mapper/mudu/ASafeRwzqMapper.xml +++ b/src/main/resources/mapper/mudu/ASafeRwzqMapper.xml @@ -23,4 +23,9 @@ -- and ZQJSSJ = '2024-07-31 23:59:59' + \ No newline at end of file