修复重复上传问题

src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/YhpcrwJobHandler.java

@@ -33,15 +33,12 @@ public class YhpcrwJobHandler {
     @XxlJob(value = "YhpcrwJobHandler", init = "init", destroy = "destroy")
     public void execute(String param) {
         String jobParam = XxlJobHelper.getJobParam();
-        //PageInfo<Yhpcrw> fxgkcs = new PageInfo<>();
+
         int pageSize = 1000;
         int success = 0;
         int fail = 0;
         long total = 0;
         ArrayList<Fxfxdx> zdwxys = fxfxdxService.getZdwxys();
-        /*if (jobParam.equals("全量")) {
-            //fxgkcs = fxfxdxService.getYhpcrws("N");
-        }else if(jobParam.equals("每日")){*/
 
         int pageNum = 1;
         do {
@@ -68,7 +65,7 @@ public class YhpcrwJobHandler {
                     System.out.println("总条数:" + total);
                     System.out.println("第" + pageNum + "页");
                     System.out.println("本页条数:" + pageInfo.getList().size());
-                    System.out.println("本页最后一条:" + pageInfo.getList().get(x).getYinhuanpaicharenwuji());
+
 
                 }
                 //在此进行上传
@@ -119,43 +116,39 @@ public class YhpcrwJobHandler {
                     pageInfo.getList().get(x).setZhongdaweixianyuande(pageInfo.getList().get(x).getZhongdaweixianyuande().substring(0, 2));
                 }
 
-                //System.out.println(fxfxdxs.get(i).toString());
-
-
-                for (int i = 0; i < pageInfo.getList().size(); i++) {
-                    System.out.print(i + 1 + ",");
-                    String company = pageInfo.getList().get(x).getQiyemingcheng();
-                    String url = "https://www.ny-fxfk.com/space-ningyanghuagongchany/sapi/qpaas/tiga/dys/keyAuthentication/yinhuanpaicharenwu/v1/yinhuanpaicharenwu";
-                    switch (company) {
-                        case "山东恒信高科能源有限公司":
-                        case "恒信中碳氢能源科技（山东）有限公司":
-                            JSONObject jsonObject = (JSONObject) JSONObject.toJSON(pageInfo.getList().get(x));
-                            String post = null;
-                            try {
-                                post = HttpUtils.sendDataUpload(url, jsonObject, HTTP.UTF_8, "tp9tNKR6nGsS2mpdWzrQ02D93621E3411A0F");
-                                success++;
-                                    System.out.println(pageInfo.getList().get(x).getYinhuanpaicharenwuji()+",");
-                                    System.out.println(jsonObject);
-                                System.out.println(pageInfo.getList().get(x));
-                                System.out.println("post:"+post.toString());
-                                XxlJobHelper.log("执行日志:" + company + post.toString());
-                            } catch (IOException e) {
-                                fail++;
-                                e.printStackTrace();
-                                System.out.print(pageInfo.getList().get(x).getYinhuanpaicharenwuji() + ",");
-                                XxlJobHelper.handleFail(pageInfo.getList().get(x).getYinhuanpaicharenwuji() + "-->任务执行失败" + e.getMessage());
-                            }
-                            break;
-                    }
+
+
+                String company = pageInfo.getList().get(x).getQiyemingcheng();
+                String url = "https://www.ny-fxfk.com/space-ningyanghuagongchany/sapi/qpaas/tiga/dys/keyAuthentication/yinhuanpaicharenwu/v1/yinhuanpaicharenwu";
+                switch (company) {
+                    case "山东恒信高科能源有限公司":
+                    case "恒信中碳氢能源科技（山东）有限公司":
+                        JSONObject jsonObject = (JSONObject) JSONObject.toJSON(pageInfo.getList().get(x));
+                        String post = null;
+                        try {
+                            post = HttpUtils.sendDataUpload(url, jsonObject, HTTP.UTF_8, "tp9tNKR6nGsS2mpdWzrQ02D93621E3411A0F");
+                            success++;
+
+                            System.out.println(jsonObject);
+
+                            System.out.println("post:" + post.toString());
+                            XxlJobHelper.log("执行日志:" + company + post.toString());
+                        } catch (IOException e) {
+                            fail++;
+                            e.printStackTrace();
+                            System.out.print(pageInfo.getList().get(x).getYinhuanpaicharenwuji() + ",");
+                            XxlJobHelper.handleFail(pageInfo.getList().get(x).getYinhuanpaicharenwuji() + "-->任务执行失败" + e.getMessage());
+                        }
+                        break;
                 }
 
+
             }
             pageNum++;
-                /*System.out.println(total);
-                System.out.println(pageNum*pageSize);*/
+
         } while (total > (pageNum - 1) * pageSize);
 
-        //}
+
 
 
         if (total > 0) {

src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/YhzldaJobHandler.java

@@ -0,0 +1,121 @@
+package com.hxjt.dataupload.jobhandler.doubleprevent;
+
+import com.alibaba.fastjson.JSONObject;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.hxjt.dataupload.model.entity.doubleprevent.Fxfxdx;
+import com.hxjt.dataupload.model.entity.doubleprevent.Yhpcrw;
+import com.hxjt.dataupload.model.entity.doubleprevent.Yhzlda;
+import com.hxjt.dataupload.service.FxfxdxService;
+import com.hxjt.dataupload.utils.HttpUtils;
+import com.xxl.job.core.context.XxlJobHelper;
+import com.xxl.job.core.handler.annotation.XxlJob;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.http.protocol.HTTP;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+@Component
+public class YhzldaJobHandler {
+
+
+    private Logger log = LoggerFactory.getLogger(YhzldaJobHandler.class);
+
+    @Autowired
+    FxfxdxService fxfxdxService;
+
+    @XxlJob(value = "YhzldaJobHandler", init = "init", destroy = "destroy")
+    public void execute(String param) {
+        String jobParam = XxlJobHelper.getJobParam();
+
+        int pageSize = 1000;
+        int success = 0;
+        int fail = 0;
+        long total = 0;
+
+
+        int pageNum = 1;
+        do {
+            System.out.println("dowhile");
+            List<Yhzlda> onePage = new ArrayList<>();
+            // 1. 启动分页（必须紧邻查询语句）
+            PageHelper.startPage(pageNum, pageSize);
+            // 2. 执行查询（此时SQL已被自动拦截并添加分页逻辑）
+            if (jobParam.equals("全量")) {
+                onePage = fxfxdxService.getOneYhzldasPage("N");
+            } else {
+                onePage = fxfxdxService.getOneYhzldasPage("Y");
+            }
+
+            // 3. 封装分页结果
+            PageInfo<Yhzlda> pageInfo = new PageInfo<>(onePage);
+            //设置总数
+            total = pageInfo.getTotal();
+
+            //对本页数据进行上传
+            for (int x = 0; x < pageInfo.getList().size(); x++) {
+
+
+                if (x == pageInfo.getList().size() - 1) {
+                    System.out.println("总条数:" + total);
+                    System.out.println("第" + pageNum + "页");
+                    System.out.println("本页条数:" + pageInfo.getList().size());
+
+
+                }
+                //在此进行上传
+
+
+                String company = pageInfo.getList().get(x).getQiyemingcheng();
+                String url = "https://www.ny-fxfk.com/space-ningyanghuagongchany/sapi/qpaas/tiga/dys/keyAuthentication/yinhuanpaicharenwu/v1/yinhuanpaicharenwu";
+                switch (company) {
+                    case "山东恒信高科能源有限公司":
+                    case "恒信中碳氢能源科技（山东）有限公司":
+                        JSONObject jsonObject = (JSONObject) JSONObject.toJSON(pageInfo.getList().get(x));
+                        String post = null;
+                        try {
+                            post = HttpUtils.sendDataUpload(url, jsonObject, HTTP.UTF_8, "tp9tNKR6nGsS2mpdWzrQ02D93621E3411A0F");
+                            success++;
+
+                            System.out.println(jsonObject);
+
+                            System.out.println("post:" + post.toString());
+                            XxlJobHelper.log("执行日志:" + company + post.toString());
+                        } catch (IOException e) {
+                            fail++;
+                            e.printStackTrace();
+                            System.out.print(pageInfo.getList().get(x).getYinhuanpaicharenwuji() + ",");
+                            XxlJobHelper.handleFail(pageInfo.getList().get(x).getYinhuanpaicharenwuji() + "-->任务执行失败" + e.getMessage());
+                        }
+                        break;
+                }
+
+
+            }
+            pageNum++;
+        } while (total > (pageNum - 1) * pageSize);
+
+        if (total > 0) {
+            XxlJobHelper.log("执行日志:本次有" + total + "条需要上传,成功上传" + success + "条,失败" + fail + "条");
+        } else {
+            XxlJobHelper.log("执行日志:本次无新数据需上传");
+        }
+
+
+    }
+
+
+    private void init() {
+        log.info("init 方法调用成功");
+    }
+
+    private void destroy() {
+        log.info("destroy 方法调用成功");
+    }
+}

src/main/java/com/hxjt/dataupload/mapper/FxfxdxMapper.java

@@ -23,4 +23,6 @@ public interface FxfxdxMapper {
     ArrayList<Yhpcjh> getYhpcjhs(@Param("isSingleDay")String isSingleDay);
 
     List<Yhpcrw> getOneYhpcrwsPage(@Param("isSingleDay")String isSingleDay);
+
+    List<Yhzlda> getOneYhzldasPage(@Param("isSingleDay")String isSingleDay);
 }

src/main/java/com/hxjt/dataupload/model/entity/doubleprevent/Yhzlda.java

@@ -0,0 +1,353 @@
+package com.hxjt.dataupload.model.entity.doubleprevent;
+
+import org.springframework.stereotype.Repository;
+
+@Repository
+public class Yhzlda {
+    private String qiyemingcheng;
+    private String qiyebianma;
+    private String weixianhuaxuepindeng;
+    private String yinhuanbianhao;
+    private String yinhuanshejiduixiang;
+    private String fengxianfenxiduixia1;
+    private String suoshuqukuai;
+    private String danyuanbianma;
+    private String fengxianshijianmingc;
+    private String fengxianshijianid;
+    private String xianyoucuoshi;
+    private String guankongcuoshiid;
+    private String yinhuanpaichaneirong;
+    private String yinhuanpaicharenwuji;
+    private String yinhuanmingcheng;
+    private String yinhuanjibie;
+    private String paicharenyuan;
+    private String tijiaoriq1;
+    private String jianchaleixing;
+    private String zhilileixing;
+    private String yinhuanleixing;
+    private String yinhuanleibie;
+    private String yinhuanmiaoshu;
+    private String yuanyinfenxi;
+    private String kongzhicuoshi;
+    private String zijinwanyuan;
+    private String yinhuanzhuangtai;
+    private String zhenggairen;
+    private String zhenggaiqixia1;
+    private String zhenggaitijiaoriqi;
+    private String fucharen;
+    private String fuchariqi;
+    private String chuangjianren;
+    private String chuangjianshijian;
+
+    public String getQiyemingcheng() {
+        return qiyemingcheng;
+    }
+
+    public void setQiyemingcheng(String qiyemingcheng) {
+        this.qiyemingcheng = qiyemingcheng;
+    }
+
+    public String getQiyebianma() {
+        return qiyebianma;
+    }
+
+    public void setQiyebianma(String qiyebianma) {
+        this.qiyebianma = qiyebianma;
+    }
+
+    public String getWeixianhuaxuepindeng() {
+        return weixianhuaxuepindeng;
+    }
+
+    public void setWeixianhuaxuepindeng(String weixianhuaxuepindeng) {
+        this.weixianhuaxuepindeng = weixianhuaxuepindeng;
+    }
+
+    public String getYinhuanbianhao() {
+        return yinhuanbianhao;
+    }
+
+    public void setYinhuanbianhao(String yinhuanbianhao) {
+        this.yinhuanbianhao = yinhuanbianhao;
+    }
+
+    public String getYinhuanshejiduixiang() {
+        return yinhuanshejiduixiang;
+    }
+
+    public void setYinhuanshejiduixiang(String yinhuanshejiduixiang) {
+        this.yinhuanshejiduixiang = yinhuanshejiduixiang;
+    }
+
+    public String getFengxianfenxiduixia1() {
+        return fengxianfenxiduixia1;
+    }
+
+    public void setFengxianfenxiduixia1(String fengxianfenxiduixia1) {
+        this.fengxianfenxiduixia1 = fengxianfenxiduixia1;
+    }
+
+    public String getSuoshuqukuai() {
+        return suoshuqukuai;
+    }
+
+    public void setSuoshuqukuai(String suoshuqukuai) {
+        this.suoshuqukuai = suoshuqukuai;
+    }
+
+    public String getDanyuanbianma() {
+        return danyuanbianma;
+    }
+
+    public void setDanyuanbianma(String danyuanbianma) {
+        this.danyuanbianma = danyuanbianma;
+    }
+
+    public String getFengxianshijianmingc() {
+        return fengxianshijianmingc;
+    }
+
+    public void setFengxianshijianmingc(String fengxianshijianmingc) {
+        this.fengxianshijianmingc = fengxianshijianmingc;
+    }
+
+    public String getFengxianshijianid() {
+        return fengxianshijianid;
+    }
+
+    public void setFengxianshijianid(String fengxianshijianid) {
+        this.fengxianshijianid = fengxianshijianid;
+    }
+
+    public String getXianyoucuoshi() {
+        return xianyoucuoshi;
+    }
+
+    public void setXianyoucuoshi(String xianyoucuoshi) {
+        this.xianyoucuoshi = xianyoucuoshi;
+    }
+
+    public String getGuankongcuoshiid() {
+        return guankongcuoshiid;
+    }
+
+    public void setGuankongcuoshiid(String guankongcuoshiid) {
+        this.guankongcuoshiid = guankongcuoshiid;
+    }
+
+    public String getYinhuanpaichaneirong() {
+        return yinhuanpaichaneirong;
+    }
+
+    public void setYinhuanpaichaneirong(String yinhuanpaichaneirong) {
+        this.yinhuanpaichaneirong = yinhuanpaichaneirong;
+    }
+
+    public String getYinhuanpaicharenwuji() {
+        return yinhuanpaicharenwuji;
+    }
+
+    public void setYinhuanpaicharenwuji(String yinhuanpaicharenwuji) {
+        this.yinhuanpaicharenwuji = yinhuanpaicharenwuji;
+    }
+
+    public String getYinhuanmingcheng() {
+        return yinhuanmingcheng;
+    }
+
+    public void setYinhuanmingcheng(String yinhuanmingcheng) {
+        this.yinhuanmingcheng = yinhuanmingcheng;
+    }
+
+    public String getYinhuanjibie() {
+        return yinhuanjibie;
+    }
+
+    public void setYinhuanjibie(String yinhuanjibie) {
+        this.yinhuanjibie = yinhuanjibie;
+    }
+
+    public String getPaicharenyuan() {
+        return paicharenyuan;
+    }
+
+    public void setPaicharenyuan(String paicharenyuan) {
+        this.paicharenyuan = paicharenyuan;
+    }
+
+    public String getTijiaoriq1() {
+        return tijiaoriq1;
+    }
+
+    public void setTijiaoriq1(String tijiaoriq1) {
+        this.tijiaoriq1 = tijiaoriq1;
+    }
+
+    public String getJianchaleixing() {
+        return jianchaleixing;
+    }
+
+    public void setJianchaleixing(String jianchaleixing) {
+        this.jianchaleixing = jianchaleixing;
+    }
+
+    public String getZhilileixing() {
+        return zhilileixing;
+    }
+
+    public void setZhilileixing(String zhilileixing) {
+        this.zhilileixing = zhilileixing;
+    }
+
+    public String getYinhuanleixing() {
+        return yinhuanleixing;
+    }
+
+    public void setYinhuanleixing(String yinhuanleixing) {
+        this.yinhuanleixing = yinhuanleixing;
+    }
+
+    public String getYinhuanleibie() {
+        return yinhuanleibie;
+    }
+
+    public void setYinhuanleibie(String yinhuanleibie) {
+        this.yinhuanleibie = yinhuanleibie;
+    }
+
+    public String getYinhuanmiaoshu() {
+        return yinhuanmiaoshu;
+    }
+
+    public void setYinhuanmiaoshu(String yinhuanmiaoshu) {
+        this.yinhuanmiaoshu = yinhuanmiaoshu;
+    }
+
+    public String getYuanyinfenxi() {
+        return yuanyinfenxi;
+    }
+
+    public void setYuanyinfenxi(String yuanyinfenxi) {
+        this.yuanyinfenxi = yuanyinfenxi;
+    }
+
+    public String getKongzhicuoshi() {
+        return kongzhicuoshi;
+    }
+
+    public void setKongzhicuoshi(String kongzhicuoshi) {
+        this.kongzhicuoshi = kongzhicuoshi;
+    }
+
+    public String getZijinwanyuan() {
+        return zijinwanyuan;
+    }
+
+    public void setZijinwanyuan(String zijinwanyuan) {
+        this.zijinwanyuan = zijinwanyuan;
+    }
+
+    public String getYinhuanzhuangtai() {
+        return yinhuanzhuangtai;
+    }
+
+    public void setYinhuanzhuangtai(String yinhuanzhuangtai) {
+        this.yinhuanzhuangtai = yinhuanzhuangtai;
+    }
+
+    public String getZhenggairen() {
+        return zhenggairen;
+    }
+
+    public void setZhenggairen(String zhenggairen) {
+        this.zhenggairen = zhenggairen;
+    }
+
+    public String getZhenggaiqixia1() {
+        return zhenggaiqixia1;
+    }
+
+    public void setZhenggaiqixia1(String zhenggaiqixia1) {
+        this.zhenggaiqixia1 = zhenggaiqixia1;
+    }
+
+    public String getZhenggaitijiaoriqi() {
+        return zhenggaitijiaoriqi;
+    }
+
+    public void setZhenggaitijiaoriqi(String zhenggaitijiaoriqi) {
+        this.zhenggaitijiaoriqi = zhenggaitijiaoriqi;
+    }
+
+    public String getFucharen() {
+        return fucharen;
+    }
+
+    public void setFucharen(String fucharen) {
+        this.fucharen = fucharen;
+    }
+
+    public String getFuchariqi() {
+        return fuchariqi;
+    }
+
+    public void setFuchariqi(String fuchariqi) {
+        this.fuchariqi = fuchariqi;
+    }
+
+    public String getChuangjianren() {
+        return chuangjianren;
+    }
+
+    public void setChuangjianren(String chuangjianren) {
+        this.chuangjianren = chuangjianren;
+    }
+
+    public String getChuangjianshijian() {
+        return chuangjianshijian;
+    }
+
+    public void setChuangjianshijian(String chuangjianshijian) {
+        this.chuangjianshijian = chuangjianshijian;
+    }
+
+    @Override
+    public String toString() {
+        return "Yhzlda{" +
+                "qiyemingcheng='" + qiyemingcheng + '\'' +
+                ", qiyebianma='" + qiyebianma + '\'' +
+                ", weixianhuaxuepindeng='" + weixianhuaxuepindeng + '\'' +
+                ", yinhuanbianhao='" + yinhuanbianhao + '\'' +
+                ", yinhuanshejiduixiang='" + yinhuanshejiduixiang + '\'' +
+                ", fengxianfenxiduixia1='" + fengxianfenxiduixia1 + '\'' +
+                ", suoshuqukuai='" + suoshuqukuai + '\'' +
+                ", danyuanbianma='" + danyuanbianma + '\'' +
+                ", fengxianshijianmingc='" + fengxianshijianmingc + '\'' +
+                ", fengxianshijianid='" + fengxianshijianid + '\'' +
+                ", xianyoucuoshi='" + xianyoucuoshi + '\'' +
+                ", guankongcuoshiid='" + guankongcuoshiid + '\'' +
+                ", yinhuanpaichaneirong='" + yinhuanpaichaneirong + '\'' +
+                ", yinhuanpaicharenwuji='" + yinhuanpaicharenwuji + '\'' +
+                ", yinhuanmingcheng='" + yinhuanmingcheng + '\'' +
+                ", yinhuanjibie='" + yinhuanjibie + '\'' +
+                ", paicharenyuan='" + paicharenyuan + '\'' +
+                ", tijiaoriq1='" + tijiaoriq1 + '\'' +
+                ", jianchaleixing='" + jianchaleixing + '\'' +
+                ", zhilileixing='" + zhilileixing + '\'' +
+                ", yinhuanleixing='" + yinhuanleixing + '\'' +
+                ", yinhuanleibie='" + yinhuanleibie + '\'' +
+                ", yinhuanmiaoshu='" + yinhuanmiaoshu + '\'' +
+                ", yuanyinfenxi='" + yuanyinfenxi + '\'' +
+                ", kongzhicuoshi='" + kongzhicuoshi + '\'' +
+                ", zijinwanyuan='" + zijinwanyuan + '\'' +
+                ", yinhuanzhuangtai='" + yinhuanzhuangtai + '\'' +
+                ", zhenggairen='" + zhenggairen + '\'' +
+                ", zhenggaiqixia1='" + zhenggaiqixia1 + '\'' +
+                ", zhenggaitijiaoriqi='" + zhenggaitijiaoriqi + '\'' +
+                ", fucharen='" + fucharen + '\'' +
+                ", fuchariqi='" + fuchariqi + '\'' +
+                ", chuangjianren='" + chuangjianren + '\'' +
+                ", chuangjianshijian='" + chuangjianshijian + '\'' +
+                '}';
+    }
+}

src/main/java/com/hxjt/dataupload/service/FxfxdxService.java

@@ -21,4 +21,6 @@ public interface FxfxdxService {
     ArrayList<Yhpcjh> getYhpcjhs(String isSingleDay);
     //隐患排查任务
     List<Yhpcrw> getOneYhpcrwsPage(String isSingleDay);
+    //隐患治理档案
+    List<Yhzlda> getOneYhzldasPage(String isSingleDay);
 }

src/main/java/com/hxjt/dataupload/service/impl/FxfxdxServiceImpl.java

@@ -48,4 +48,9 @@ public class FxfxdxServiceImpl implements FxfxdxService {
     public List<Yhpcrw> getOneYhpcrwsPage(String isSingleDay) {
         return fxfxdxMapper.getOneYhpcrwsPage(isSingleDay);
     }
+
+    @Override
+    public List<Yhzlda> getOneYhzldasPage(String isSingleDay) {
+        return fxfxdxMapper.getOneYhzldasPage(isSingleDay);
+    }
 }

src/main/resources/mapper/FxfxdxMapper.xml

@@ -398,4 +398,139 @@
 		ORDER BY
 		chuangjianshijian DESC
 	</select>
+
+	<select id="getOneYhzldasPage" resultType="com.hxjt.dataupload.model.entity.doubleprevent.Yhzlda">
+		SELECT
+			(case
+				when b.ORGANID = '309_ORG' then '山东恒信高科能源有限公司'
+				else '恒信中碳氢能源科技（山东）有限公司'
+			end) AS qiyemingcheng,
+			(case
+				when b.ORGANID = '309_ORG' then '91370921328482832M'
+				else '91370921MA94AF5H3N'
+			end) AS qiyebianma,
+			(case
+				when b.ORGANID = '309_ORG' then '370910170'
+				else '370980326'
+			end) AS weixianhuaxuepindeng,
+			a.ID AS yinhuanbianhao,
+			b.NAME AS yinhuanshejiduixiang,
+			b.ID AS fengxianfenxiduixia1,
+			c.NAME AS suoshuqukuai,
+			c.ID AS danyuanbianma,
+			e.NAME AS fengxianshijianmingc,
+			e.ID AS fengxianshijianid,
+			d.FRISKMEASUREDESC AS xianyoucuoshi,
+			d.ID AS guankongcuoshiid,
+			g.FTROUBLESHOOT AS yinhuanpaichaneirong,
+			f.FCHECKTASKID AS yinhuanpaicharenwuji,
+			a.FNAME AS yinhuanmingcheng,
+			-- 根据隐患等级代码判断隐患级别
+			(CASE
+				WHEN a.FLEVEL = '1' THEN '重大隐患'
+				ELSE '一般隐患'
+			END) AS yinhuanjibie,
+			h.EMPNAME AS paicharenyuan,
+			a.FREGISTTIME AS tijiaoriq1,
+			a.FSRC AS jianchaleixing,
+			-- 根据管理类型代码判断治理类型
+			(CASE
+				WHEN a.FMANAGETYPE = '1' THEN '限期整改'
+				ELSE '即查即改'
+			END) AS zhilileixing,
+			-- 根据危险类型代码判断隐患类型
+			(CASE
+				WHEN a.fdangertype = '1' THEN '安全'
+				WHEN a.fdangertype = '2' THEN '工艺'
+				WHEN a.fdangertype = '3' THEN '电气'
+				WHEN a.fdangertype = '4' THEN '仪表'
+				WHEN a.fdangertype = '5' THEN '消防'
+				WHEN a.fdangertype = '6' THEN '总图'
+				WHEN a.fdangertype = '7' THEN '设备'
+				ELSE '其他'
+			END) AS yinhuanleixing,
+			-- 根据任务类型代码判断隐患类别
+			(CASE
+				WHEN a.ftasktype = '1' THEN '主要责任人登记隐患'
+				WHEN a.FTASKTYPE = '2' THEN '技术负责人登记隐患'
+				WHEN a.FTASKTYPE = '3' THEN '操作负责人登记隐患'
+				ELSE '其他隐患'
+			END) AS yinhuanleibie,
+			a.FDANGERDESC AS yinhuanmiaoshu,
+			a.fdangerreason AS yuanyinfenxi,
+			a.fremark AS kongzhicuoshi,
+			-- 资金万元计算（当前代码被注释，如需启用请确保逻辑正确）
+			/*(CASE
+				WHEN a.fcost IS NULL OR a.fcost = '' THEN NULL
+				WHEN a.fcost = '0' THEN '0'
+				ELSE
+					-- 将字符串转换为数值，除以10000 ，再转换回字符串并保留两位小数
+					CAST(ROUND(TRY_CONVERT(DECIMAL(18, 2), a.fcost) / 10000, 2) AS VARCHAR(20))
+			END) AS zijinwanyuan,*/
+			a.fcost AS zijinwanyuan,
+			-- 根据状态代码判断隐患状态
+			(CASE
+				WHEN a.fstate = '1' THEN '待验收'
+				WHEN a.fstate = '9' THEN '已验收'
+				ELSE '整改中'
+			END) AS yinhuanzhuangtai,
+			i.EMPNAME AS zhenggairen,
+			FORMAT(a.fmangerdeadline,
+			'yyyy-MM-dd HH:mm:ss') AS zhenggaiqixia1,
+			FORMAT(a.fliabledate,
+			'yyyy-MM-dd HH:mm:ss') AS zhenggaitijiaoriq,
+			j.EMPNAME AS fucharen,
+			FORMAT(a.fcheckpertime,
+			'yyyy-MM-dd HH:mm:ss') AS fuchariqi,
+			k.ACCOUNTDESC AS chuangjianren,
+			FORMAT(a.CREASTAMP,
+			'yyyy-MM-dd HH:mm:ss') AS chuangjianshijian
+		FROM
+			ISM_CHECKINFO A
+			-- 左连接隐患信息表
+		LEFT JOIN ISM_HAZARD b ON
+			a.FCODE = b.ID
+			-- 左连接隐患单元表
+		LEFT JOIN ISM_HAZARDUNIT c ON
+			a.FUINTID = c.ID
+			-- 左连接风险控制措施表
+		LEFT JOIN ISM_RISKMEASURE d ON
+			a.FMEASURE = d.ID
+			-- 左连接风险事件表
+		LEFT JOIN ISM_RISKEVENT e ON
+			e.RISKUNITID = c.ID
+			-- 左连接检查记录表
+		LEFT JOIN ISM_CHECKRECORD f ON
+			a.FTASKID = f.ID
+			-- 左连接故障排除表
+		LEFT JOIN ISM_TROUBLESHOOT g ON
+			f.FTROUBLESHOOTID = g.ID
+			-- 左连接员工表，关联登记人
+		LEFT JOIN PF_EMPLOYEE h ON
+			a.FREGISTRANT = h.ID
+			-- 左连接员工表，关联整改人
+		LEFT JOIN PF_EMPLOYEE i ON
+			a.fliableper = i.ID
+			-- 左连接员工表，关联复查人
+		LEFT JOIN PF_EMPLOYEE j ON
+			a.fcheckper = j.ID
+			-- 左连接账户表，关联创建人
+		LEFT JOIN PF_ACCOUNT k ON
+			a.CREATOR = k.ID
+		WHERE
+			a.ISDELETE = 'N'
+			AND e.ISDELETE = 'N'
+			<choose>
+				<when test='isSingleDay == "Y"'>
+
+					AND (DATEDIFF(dd, a.CREASTAMP, GETDATE() - 1) = 0)
+				</when>
+				<otherwise>
+
+					and a.CREASTAMP >= '2025-01-01 00:00:00.000'
+				</otherwise>
+			</choose>
+		order by
+			chuangjianshijian desc
+	</select>
 </mapper>