修改自查巡查的xxbh从md表取得

src/main/java/com/mudu/entity/ASafeXcrwMd.java

@@ -0,0 +1,117 @@
+package com.mudu.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * (ASafeXcrwMd)表实体类
+ *
+ * @author wu
+ * @since 2024-09-03 09:18:07
+ */
+@Data
+@ApiModel("实体类")
+@TableName(value = "a_safe_xcrw_md")
+public class ASafeXcrwMd implements Serializable {
+
+    private static final long serialVersionUID = -11810439236891554L;
+    private String xxbh;
+
+    /**
+     * 周期编号
+     */
+    @ApiModelProperty(value = "周期编号")
+    private String zqbh;
+
+    /**
+     * 企业编号
+     */
+    @ApiModelProperty(value = "企业编号")
+    private String qybh;
+
+    /**
+     * 巡查项
+     */
+    @ApiModelProperty(value = "巡查项")
+    private Integer xcx;
+
+    /**
+     * 完成项
+     */
+    @ApiModelProperty(value = "完成项")
+    private Integer wcx;
+
+    /**
+     * 发现隐患树
+     */
+    @ApiModelProperty(value = "发现隐患树")
+    private Integer fxyhs;
+
+    /**
+     * 完成状态
+     */
+    @ApiModelProperty(value = "完成状态")
+    private Integer wczt;
+
+    /**
+     * 检查时间
+     */
+    @ApiModelProperty(value = "检查时间")
+    private Date jcsj;
+
+    /**
+     * 其他人员
+     */
+    @ApiModelProperty(value = "其他人员")
+    private String qtry;
+
+    /**
+     * 专家意见
+     */
+    @ApiModelProperty(value = "专家意见")
+    private String zjyj;
+
+    /**
+     * 任务类型
+     */
+    @ApiModelProperty(value = "任务类型")
+    private String rwlx;
+
+    /**
+     * 入库时间
+     */
+    @ApiModelProperty(value = "入库时间")
+    private Date rksj;
+
+    /**
+     * 入库人员
+     */
+    @ApiModelProperty(value = "入库人员")
+    private String rkry;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间")
+    private Date gxsj;
+
+    /**
+     * 更新人员
+     */
+    @ApiModelProperty(value = "更新人员")
+    private String gxry;
+
+    /**
+     * 记录状态
+     */
+    @ApiModelProperty(value = "记录状态")
+    private Integer jlzt;
+
+}
+

src/main/java/com/mudu/entity/ASafeZcrwMd.java

@@ -0,0 +1,93 @@
+package com.mudu.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * (ASafeZcrwMd)表实体类
+ *
+ * @author wu
+ * @since 2024-09-03 09:18:08
+ */
+@Data
+@ApiModel("实体类")
+@TableName(value = "a_safe_zcrw_md")
+public class ASafeZcrwMd implements Serializable {
+
+    private static final long serialVersionUID = 144775571576395268L;
+    private String xxbh;
+
+    /**
+     * 周期编号
+     */
+    @ApiModelProperty(value = "周期编号")
+    private String zqbh;
+
+    /**
+     * 企业编号
+     */
+    @ApiModelProperty(value = "企业编号")
+    private String qybh;
+
+    /**
+     * 自查项
+     */
+    @ApiModelProperty(value = "自查项")
+    private Integer zcx;
+
+    /**
+     * 完成项
+     */
+    @ApiModelProperty(value = "完成项")
+    private Integer wcx;
+
+    /**
+     * 发现隐患数
+     */
+    @ApiModelProperty(value = "发现隐患数")
+    private Integer fxyhs;
+
+    /**
+     * 完成状态
+     */
+    @ApiModelProperty(value = "完成状态")
+    private Integer wczt;
+
+    /**
+     * 入库时间
+     */
+    @ApiModelProperty(value = "入库时间")
+    private Date rksj;
+
+    /**
+     * 入库人员
+     */
+    @ApiModelProperty(value = "入库人员")
+    private String rkry;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间")
+    private Date gxsj;
+
+    /**
+     * 更新人员
+     */
+    @ApiModelProperty(value = "更新人员")
+    private String gxry;
+
+    /**
+     * 记录状态
+     */
+    @ApiModelProperty(value = "记录状态")
+    private Integer jlzt;
+
+}
+

src/main/java/com/mudu/entity/dto/request/XcRequest.java

@@ -0,0 +1,20 @@
+package com.mudu.entity.dto.request;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * @author dong
+ * @since 2024/6/5 16:28
+ */
+
+@Data
+@ApiModel("巡查任务周期id请求类")
+public class XcRequest {
+
+
+    private String qybh;
+
+
+    private String zqbh;
+}

src/main/java/com/mudu/entity/dto/request/ZcRequest.java

@@ -0,0 +1,20 @@
+package com.mudu.entity.dto.request;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * @author dong
+ * @since 2024/6/5 16:28
+ */
+
+@Data
+@ApiModel("自查任务周期id请求类")
+public class ZcRequest {
+
+
+    private String qybh;
+
+
+    private String zqbh;
+}

src/main/java/com/mudu/mapper/ASafeXcrwMdMapper.java

@@ -0,0 +1,22 @@
+package com.mudu.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mudu.entity.ASafeXcrwMd;
+import com.mudu.entity.dto.request.XcRequest;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * (ASafeXcrwMd)表数据库访问层
+ *
+ * @author wu
+ * @since 2024-09-03 09:18:07
+ */
+public interface ASafeXcrwMdMapper extends BaseMapper<ASafeXcrwMd> {
+
+
+    /**
+     * 根据企业xxbh以及周期编号查询巡查任务id
+     */
+    String getByxxbh(@Param("req") XcRequest req);
+}
+

src/main/java/com/mudu/mapper/ASafeZcrwMdMapper.java

@@ -0,0 +1,22 @@
+package com.mudu.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mudu.entity.ASafeZcrwMd;
+import com.mudu.entity.dto.request.ZcRequest;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * (ASafeZcrwMd)表数据库访问层
+ *
+ * @author wu
+ * @since 2024-09-03 09:18:08
+ */
+public interface ASafeZcrwMdMapper extends BaseMapper<ASafeZcrwMd> {
+
+    /**
+     * 根据企业xxbh以及周期编号查询自查任务id
+     */
+    String getByxxbh(@Param("req") ZcRequest req);
+
+}
+

src/main/java/com/mudu/quartz/AcheckTaskQuartz.java

@@ -22,6 +22,8 @@ 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.request.XcRequest;
+import com.mudu.entity.dto.request.ZcRequest;
 import com.mudu.entity.dto.response.ACheckXcTpResponse;
 import com.mudu.entity.dto.response.FxdwzResponse;
 import com.mudu.entity.dto.response.RwzqUuidResponse;
@@ -30,11 +32,13 @@ import com.mudu.service.ASafeRwfjService;
 import com.mudu.service.ASafeRwzqService;
 import com.mudu.service.ASafeTfgService;
 import com.mudu.service.ASafeTfgshService;
+import com.mudu.service.ASafeXcrwMdService;
 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.ASafeZcrwMdService;
 import com.mudu.service.ASafeZcrwService;
 import com.mudu.service.ASafeZcrwjlService;
 import com.mudu.service.ASafeZcrwwzService;
@@ -143,15 +147,14 @@ public class AcheckTaskQuartz {
     @Value("${zcXxUrl}")
     private String zcXxUrl;
 
-    @Value("${zczqUrl}")
-    private String zczqUrl;
-
-    @Value("${xczqUrl}")
-    private String xczqUrl;
-
     @Value("${tfgUrl}")
     private String tfgUrl;
 
+    @Resource
+    private ASafeZcrwMdService zcrwMdService;
+
+    @Resource
+    private ASafeXcrwMdService xcrwMdService;
     /**
      * 木渎二期token
      */
@@ -203,22 +206,14 @@ public class AcheckTaskQuartz {
                 enterPriseId = a.getXxbh();
             }
 
-
             // todo 来自新表查询 根据企业xxbh 以及周期编号
-            JSONObject xcjsonObject = new JSONObject();
-            xcjsonObject.put("qybh", a.getXxbh());
-            xcjsonObject.put("zqbh", rwzqUuid);
-            String xcresponse = HttpRequest.post(xczqUrl)
-                    .contentType("application/x-www-form-urlencoded;charset=UTF-8")
-                    .header("Authorization", token)
-                    .body(xcjsonObject.toJSONString())
-                    .execute().body();
-            JSONObject xcjsonResponse = JSON.parseObject(xcresponse);
-            if (xcjsonResponse.getString("msg") == null) {
+            XcRequest xcRequest = new XcRequest();
+            xcRequest.setQybh(a.getXxbh());
+            xcRequest.setZqbh(rwzqUuid);
+            String xcrwuuid = xcrwMdService.getByxxbh(xcRequest);
+            if (StrUtil.isEmpty(xcrwuuid)) {
                 continue;
             }
-            String xcrwuuid = xcjsonResponse.getString("msg");
-
             //根据工单获取巡查图片
             JSONObject jsonObject = new JSONObject();
             jsonObject.put("improvingNo", a.getImprovingNo());
@@ -560,7 +555,7 @@ public class AcheckTaskQuartz {
         aSafeXcrw.setRksj(new Date());
         //更新时间
         if (a.getReportDateTime() != null) {
-            aSafeXcrw.setGxsj(a.getReportDateTime());
+            aSafeXcrw.setGxsj(a.getFinalDateTime());
         }
         //更新人员
         aSafeXcrw.setGxry(a.getRybh());
@@ -680,21 +675,13 @@ public class AcheckTaskQuartz {
             //根据企业id和s_safe_fxd的fxdbh查询风险点的信息编号
             String fxdxxbh = aSafeRwzqService.findByEnIdFxd(a.getEnterpriseID(), "03_20240621172152865517");
             String sfxdbh = aSafeRwzqService.findSfxdbhByEnIdFxd(a.getEnterpriseID(), "03_20240621172152865517");
-            JSONObject zcjsonObject = new JSONObject();
-            zcjsonObject.put("qybh", a.getEnterpriseID());
-            zcjsonObject.put("zqbh", rwzqUuid);
-            String zcresponse = HttpRequest.post(zczqUrl)
-                    .contentType("application/x-www-form-urlencoded;charset=UTF-8")
-                    .header("Authorization", token)
-                    .body(zcjsonObject.toJSONString())
-                    .execute().body();
-            JSONObject zcjsonResponse = JSON.parseObject(zcresponse);
-
-            if (zcjsonResponse.getString("msg") == null) {
+            ZcRequest zcRequest = new ZcRequest();
+            zcRequest.setQybh(a.getEnterpriseID());
+            zcRequest.setZqbh(rwzqUuid);
+            String zcrwUuid = zcrwMdService.getByxxbh(zcRequest);
+            if (StrUtil.isEmpty(zcrwUuid)) {
                 continue;
             }
-            String zcrwUuid = zcjsonResponse.getString("msg");
-
             // 自查任务 a_safe_zcrw
             try {
                 saveZcrw(a, zcrwUuid, rwzqUuid);

src/main/java/com/mudu/service/ASafeXcrwMdService.java

@@ -0,0 +1,20 @@
+package com.mudu.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.mudu.entity.ASafeXcrwMd;
+import com.mudu.entity.dto.request.XcRequest;
+
+/**
+ * (ASafeXcrwMd)表服务接口
+ *
+ * @author wu
+ * @since 2024-09-03 09:18:08
+ */
+public interface ASafeXcrwMdService extends IService<ASafeXcrwMd> {
+
+    /**
+     * 根据企业xxbh以及周期编号查询巡查任务id
+     */
+    String getByxxbh(XcRequest req);
+}
+

src/main/java/com/mudu/service/ASafeZcrwMdService.java

@@ -0,0 +1,20 @@
+package com.mudu.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.mudu.entity.ASafeZcrwMd;
+import com.mudu.entity.dto.request.ZcRequest;
+
+/**
+ * (ASafeZcrwMd)表服务接口
+ *
+ * @author wu
+ * @since 2024-09-03 09:18:08
+ */
+public interface ASafeZcrwMdService extends IService<ASafeZcrwMd> {
+
+    /**
+     * 根据企业xxbh以及周期编号查询自查任务id
+     */
+    String getByxxbh(ZcRequest req);
+}
+

src/main/java/com/mudu/service/impl/ASafeXcrwMdServiceImpl.java

@@ -0,0 +1,29 @@
+package com.mudu.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mudu.entity.ASafeXcrwMd;
+import com.mudu.entity.dto.request.XcRequest;
+import com.mudu.mapper.ASafeXcrwMdMapper;
+import com.mudu.service.ASafeXcrwMdService;
+import org.springframework.stereotype.Service;
+
+/**
+ * (ASafeXcrwMd)表服务实现类
+ *
+ * @author wu
+ * @since 2024-09-03 09:18:08
+ */
+@Service("aSafeXcrwMdService")
+public class ASafeXcrwMdServiceImpl extends ServiceImpl<ASafeXcrwMdMapper, ASafeXcrwMd> implements ASafeXcrwMdService {
+
+    /**
+     * 根据企业xxbh以及周期编号查询巡查任务id
+     *
+     * @param req
+     */
+    @Override
+    public String getByxxbh(XcRequest req) {
+        return baseMapper.getByxxbh(req);
+    }
+}
+

src/main/java/com/mudu/service/impl/ASafeZcrwMdServiceImpl.java

@@ -0,0 +1,29 @@
+package com.mudu.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mudu.entity.ASafeZcrwMd;
+import com.mudu.entity.dto.request.ZcRequest;
+import com.mudu.mapper.ASafeZcrwMdMapper;
+import com.mudu.service.ASafeZcrwMdService;
+import org.springframework.stereotype.Service;
+
+/**
+ * (ASafeZcrwMd)表服务实现类
+ *
+ * @author wu
+ * @since 2024-09-03 09:18:08
+ */
+@Service("aSafeZcrwMdService")
+public class ASafeZcrwMdServiceImpl extends ServiceImpl<ASafeZcrwMdMapper, ASafeZcrwMd> implements ASafeZcrwMdService {
+
+    /**
+     * 根据企业xxbh以及周期编号查询自查任务id
+     *
+     * @param req
+     */
+    @Override
+    public String getByxxbh(ZcRequest req) {
+        return baseMapper.getByxxbh(req);
+    }
+}
+

src/main/resources/mapper/mudu/ASafeXcrwMdMapper.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mudu.mapper.ASafeXcrwMdMapper">
+
+
+    <select id="getByxxbh" resultType="java.lang.String">
+        select xxbh
+        from a_safe_xcrw_md
+        <where>
+            <if test="req.zqbh != null and req.zqbh != ''">
+                and zqbh = #{req.zqbh}
+            </if>
+            <if test="req.qybh != null and req.qybh != ''">
+                and qybh = #{req.qybh}
+            </if>
+        </where>
+
+    </select>
+
+</mapper>
+

src/main/resources/mapper/mudu/ASafeZcrwMdMapper.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mudu.mapper.ASafeZcrwMdMapper">
+
+
+    <select id="getByxxbh" resultType="java.lang.String">
+        select xxbh
+        from a_safe_zcrw_md
+        <where>
+            <if test="req.qybh != null and req.qybh != ''">
+                and qybh = #{req.qybh}
+            </if>
+            <if test="req.zqbh != null and req.zqbh != ''">
+                and zqbh = #{req.zqbh}
+            </if>
+        </where>
+    </select>
+
+</mapper>
+