1.高处作业票

2.吊装安全作业票

src/main/java/com/hxjt/dataupload/jobhandler/specialassignments/DzaqzyJobHandler.java

@@ -0,0 +1,184 @@
+package com.hxjt.dataupload.jobhandler.specialassignments;
+import com.alibaba.fastjson.JSONObject;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.hxjt.dataupload.model.entity.tszy.aqcs.Aqcs;
+import com.hxjt.dataupload.model.entity.tszy.upload.Dzaqzy;
+import com.hxjt.dataupload.model.entity.tszy.upload.Gczy;
+import com.hxjt.dataupload.service.FxfxdxService;
+import com.hxjt.dataupload.utils.HttpUtils;
+import com.hxjt.dataupload.utils.JingWeiDuConverter;
+import com.hxjt.dataupload.utils.tszy.DzaqzyUtil;
+import com.hxjt.dataupload.utils.tszy.GczyUtil;
+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.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+@Component
+public class DzaqzyJobHandler {
+
+
+
+    private Logger log = LoggerFactory.getLogger(DzaqzyJobHandler.class);
+
+    @Autowired
+    FxfxdxService fxfxdxService;
+
+    @XxlJob(value = "DzaqzyJobHandler", 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 {
+            List<Dzaqzy> onePage = new ArrayList<>();
+            // 1. 启动分页（必须紧邻查询语句）
+            PageHelper.startPage(pageNum, pageSize);
+            // 2. 执行查询（此时SQL已被自动拦截并添加分页逻辑）
+            if (jobParam.equals("全量")) {
+                onePage = fxfxdxService.getOneDzaqzysPage("N");
+            } else {
+                onePage = fxfxdxService.getOneDzaqzysPage("Y");
+            }
+
+            // 3. 封装分页结果
+            PageInfo<Dzaqzy> pageInfo = new PageInfo<>(onePage);
+            //设置总数
+            total = pageInfo.getTotal();
+            System.out.println("总条数:" + total);
+            System.out.println("第" + pageNum + "页");
+            System.out.println("本页条数:" + pageInfo.getList().size());
+            //处理经纬度
+            for (int x = 0; x < pageInfo.getList().size(); x++) {
+                pageInfo.getList().get(x).setJingweidu(JingWeiDuConverter.createGeoPoint(pageInfo.getList().get(x).getJingweidu()));
+            }
+            //对本页数据进行上传
+            for (int x = 0; x < pageInfo.getList().size(); x++) {
+
+                String qiyebianma = pageInfo.getList().get(x).getQiyebianma();
+                String url = "https://www.ny-fxfk.com/space-ningyanghuagongchany/sapi/qpaas/tiga/dys/keyAuthentication/diaozhuanganquanzuoy/v1/diaozhuanganquanzuoy";
+                switch (qiyebianma) {
+                    case "370910170":
+                        //恒信高科
+                        //查询安全措施
+                        ArrayList<Aqcs> aqcsList = fxfxdxService.queryDhAqcsByBianhao(pageInfo.getList().get(x).getBianhao());
+                        //根据安全措施列表便利处理给当前上传对象赋值相关字段
+                        for (Aqcs aqcs: aqcsList) {
+                            DzaqzyUtil.handle(pageInfo.getList().get(x),aqcs);
+                            System.out.println(aqcs);
+                        }
+                        JSONObject jsonObject = (JSONObject) JSONObject.toJSON(pageInfo.getList().get(x));
+                        String post = null;
+
+                        System.out.println(jsonObject);
+
+
+                        try {
+                            post = HttpUtils.sendDataUpload(url, jsonObject, HTTP.UTF_8, "TgFxv5xVQwYvJ3pb4hKVD7FCB38C89FCDC7A");
+                            boolean thisFailFlag = false;
+                            boolean postIsNull = false;
+                            boolean postNoMsgs = false;
+                            if(!StringUtils.isBlank(post)){
+                                JSONObject postJsonObj = JSONObject.parseObject(post);
+                                if(postJsonObj.get("msg")!=null && postJsonObj.get("code")!=null && postJsonObj.get("status")!=null && !StringUtils.isBlank(postJsonObj.get("msg").toString())&&!StringUtils.isBlank(postJsonObj.get("code").toString())&&!StringUtils.isBlank(postJsonObj.get("status").toString())){
+                                    if(postJsonObj.get("msg").equals("成功")&&postJsonObj.get("code").toString().equals("1000000")&&postJsonObj.get("status").toString().equals("200")){//status
+                                        //成功
+                                        System.out.println("成功"+(x+1)+",");
+
+
+                                        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+                                        String formattedDate = LocalDateTime.now().format(formatter);
+                                        System.out.println(" 当前时间: " + formattedDate);  // 示例输出：2025-03-12 08:29:25
+                                        System.out.println(jsonObject);
+                                        System.out.println("post:" + post.toString());
+
+                                        success++;
+                                    }else{
+                                        thisFailFlag = true;
+                                    }
+                                }else{
+                                    thisFailFlag = true;
+                                    postNoMsgs = true;
+                                }
+                            }else{
+                                postIsNull = true;
+                                thisFailFlag = true;
+                            }
+                            if(thisFailFlag){//异常情况
+                                DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+                                String formattedDate = LocalDateTime.now().format(formatter);
+                                System.out.println(" 当前时间: " + formattedDate);  // 示例输出：2025-03-12 08:29:25
+                                System.out.println("失败"+(x+1)+",吊装安全作业");
+                                if(!postIsNull){
+                                    System.out.println("post:" + post.toString());
+                                    XxlJobHelper.log("执行日志:(恒信高科)" + post.toString());
+                                }
+
+                                System.out.println(jsonObject);
+
+                                fail++;
+                                Thread.sleep(120000);
+                            }
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                            XxlJobHelper.log("错误信息:" + e);
+                            XxlJobHelper.log("请求体:" + jsonObject);
+                            try {
+                                TimeUnit.MINUTES.sleep(2);  // 直接指定分钟
+                            } catch (InterruptedException ie) {
+                                Thread.currentThread().interrupt();
+                            }
+
+                        }
+                        break;
+                    case "370980326":
+                        //中碳氢能源
+                        System.out.println(1);
+                }
+
+
+            }
+            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/jobhandler/specialassignments/GczyJobHandler.java

@@ -3,11 +3,13 @@ import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.hxjt.dataupload.model.entity.tszy.aqcs.Aqcs;
+import com.hxjt.dataupload.model.entity.tszy.upload.Gczy;
 import com.hxjt.dataupload.model.entity.tszy.upload.Mbcdzy;
 import com.hxjt.dataupload.model.entity.tszy.upload.Sxkjzy;
 import com.hxjt.dataupload.service.FxfxdxService;
 import com.hxjt.dataupload.utils.HttpUtils;
 import com.hxjt.dataupload.utils.JingWeiDuConverter;
+import com.hxjt.dataupload.utils.tszy.GczyUtil;
 import com.hxjt.dataupload.utils.tszy.MbcdzyUtil;
 import com.hxjt.dataupload.utils.tszy.SxkjzyUtil;
 import com.xxl.job.core.context.XxlJobHelper;
@@ -45,22 +47,25 @@ public class GczyJobHandler {
         int success = 0;
         int fail = 0;
         long total = 0;
+        /*
+
+        */
 
 
         int pageNum = 1;
         do {
-            List<Mbcdzy> onePage = new ArrayList<>();
+            List<Gczy> onePage = new ArrayList<>();
             // 1. 启动分页（必须紧邻查询语句）
             PageHelper.startPage(pageNum, pageSize);
             // 2. 执行查询（此时SQL已被自动拦截并添加分页逻辑）
             if (jobParam.equals("全量")) {
-                onePage = fxfxdxService.getOneMbcdzysPage("N");
+                onePage = fxfxdxService.getOneGczysPage("N");
             } else {
-                onePage = fxfxdxService.getOneMbcdzysPage("Y");
+                onePage = fxfxdxService.getOneGczysPage("Y");
             }
 
             // 3. 封装分页结果
-            PageInfo<Mbcdzy> pageInfo = new PageInfo<>(onePage);
+            PageInfo<Gczy> pageInfo = new PageInfo<>(onePage);
             //设置总数
             total = pageInfo.getTotal();
             System.out.println("总条数:" + total);
@@ -74,25 +79,25 @@ public class GczyJobHandler {
             for (int x = 0; x < pageInfo.getList().size(); x++) {
 
                 String qiyebianma = pageInfo.getList().get(x).getQiyebianma();
-                String url = "https://www.ny-fxfk.com/space-ningyanghuagongchany/sapi/qpaas/tiga/dys/keyAuthentication/mangbanchouduanquanz/v1/mangbanchouduanquanz";
+                String url = "https://www.ny-fxfk.com/space-ningyanghuagongchany/sapi/qpaas/tiga/dys/keyAuthentication/gaochuanquanzuoyebao/v1/gaochuanquanzuoyebao";
                 switch (qiyebianma) {
                     case "370910170":
                         //恒信高科
                         //查询安全措施
-                        ArrayList<Aqcs> aqcsList = fxfxdxService.queryDhAqcsByBianhao(pageInfo.getList().get(x).getZuoyepiaobianhao());
+                        ArrayList<Aqcs> aqcsList = fxfxdxService.queryDhAqcsByBianhao(pageInfo.getList().get(x).getBianhao());
                         //根据安全措施列表便利处理给当前上传对象赋值相关字段
                         for (Aqcs aqcs: aqcsList) {
-                            MbcdzyUtil.handle(pageInfo.getList().get(x),aqcs);
+                            GczyUtil.handle(pageInfo.getList().get(x),aqcs);
-                            //System.out.println(aqcs);
+                            System.out.println(aqcs);
                         }
                         JSONObject jsonObject = (JSONObject) JSONObject.toJSON(pageInfo.getList().get(x));
                         String post = null;
 
-                        //System.out.println(jsonObject);
+                        System.out.println(jsonObject);
 
 
-                        /*try {
+                        try {
-                            post = HttpUtils.sendDataUpload(url, jsonObject, HTTP.UTF_8, "v3N8M5tIrV7wroWdO4fmCD2897D9726FD394");
+                            post = HttpUtils.sendDataUpload(url, jsonObject, HTTP.UTF_8, "zaIDuL6BDCJRpciQpiTZDF739F2837E3D0BF");
                             boolean thisFailFlag = false;
                             boolean postIsNull = false;
                             boolean postNoMsgs = false;
@@ -104,11 +109,11 @@ public class GczyJobHandler {
                                         System.out.println("成功"+(x+1)+",");
 
 
-                                        *//*DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+                                        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
                                         String formattedDate = LocalDateTime.now().format(formatter);
                                         System.out.println(" 当前时间: " + formattedDate);  // 示例输出：2025-03-12 08:29:25
                                         System.out.println(jsonObject);
-                                        System.out.println("post:" + post.toString());*//*
+                                        System.out.println("post:" + post.toString());
 
                                         success++;
                                     }else{
@@ -126,7 +131,7 @@ public class GczyJobHandler {
                                 DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
                                 String formattedDate = LocalDateTime.now().format(formatter);
                                 System.out.println(" 当前时间: " + formattedDate);  // 示例输出：2025-03-12 08:29:25
-                                System.out.println("失败"+(x+1)+",盲板抽堵作业");
+                                System.out.println("失败"+(x+1)+",高处作业");
                                 if(!postIsNull){
                                     System.out.println("post:" + post.toString());
                                     XxlJobHelper.log("执行日志:(恒信高科)" + post.toString());
@@ -147,7 +152,7 @@ public class GczyJobHandler {
                                 Thread.currentThread().interrupt();
                             }
 
-                        }*/
+                        }
                         break;
                     case "370980326":
                         //中碳氢能源

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

@@ -2,9 +2,7 @@ package com.hxjt.dataupload.mapper;
 
 import com.hxjt.dataupload.model.entity.doubleprevent.*;
 import com.hxjt.dataupload.model.entity.tszy.aqcs.Aqcs;
-import com.hxjt.dataupload.model.entity.tszy.upload.Dhzy;
+import com.hxjt.dataupload.model.entity.tszy.upload.*;
-import com.hxjt.dataupload.model.entity.tszy.upload.Mbcdzy;
-import com.hxjt.dataupload.model.entity.tszy.upload.Sxkjzy;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -38,4 +36,8 @@ public interface FxfxdxMapper {
     List<Sxkjzy> getOneSxkjzysPage(@Param("isSingleDay")String isSingleDay);
 
     List<Mbcdzy> getOneMbcdzysPage(@Param("isSingleDay")String isSingleDay);
+
+    List<Gczy> getOneGczysPage(@Param("isSingleDay")String isSingleDay);
+
+    List<Dzaqzy> getOneDzaqzysPage(@Param("isSingleDay")String isSingleDay);
 }

src/main/java/com/hxjt/dataupload/model/entity/tszy/upload/Dzaqzy.java

@@ -76,4 +76,581 @@ public class Dzaqzy {
     private String querenren19;
     private String shifousheji20;
     private String querenren20;
+
+
+    public String getBianhao() {
+        return bianhao;
+    }
+
+    public void setBianhao(String bianhao) {
+        this.bianhao = bianhao;
+    }
+
+    public String getZuoyeshenqingdanwei() {
+        return zuoyeshenqingdanwei;
+    }
+
+    public void setZuoyeshenqingdanwei(String zuoyeshenqingdanwei) {
+        this.zuoyeshenqingdanwei = zuoyeshenqingdanwei;
+    }
+
+    public String getQiyebianma() {
+        return qiyebianma;
+    }
+
+    public void setQiyebianma(String qiyebianma) {
+        this.qiyebianma = qiyebianma;
+    }
+
+    public String getDiaowuzhiliangtjizuo() {
+        return diaowuzhiliangtjizuo;
+    }
+
+    public void setDiaowuzhiliangtjizuo(String diaowuzhiliangtjizuo) {
+        this.diaowuzhiliangtjizuo = diaowuzhiliangtjizuo;
+    }
+
+    public String getZuoyeshishikaishishi() {
+        return zuoyeshishikaishishi;
+    }
+
+    public void setZuoyeshishikaishishi(String zuoyeshishikaishishi) {
+        this.zuoyeshishikaishishi = zuoyeshishikaishishi;
+    }
+
+    public String getZuoyeshishijieshushi() {
+        return zuoyeshishijieshushi;
+    }
+
+    public void setZuoyeshishijieshushi(String zuoyeshishijieshushi) {
+        this.zuoyeshishijieshushi = zuoyeshishijieshushi;
+    }
+
+    public String getDiaozhuangdidian() {
+        return diaozhuangdidian;
+    }
+
+    public void setDiaozhuangdidian(String diaozhuangdidian) {
+        this.diaozhuangdidian = diaozhuangdidian;
+    }
+
+    public String getDiaowuneirong() {
+        return diaowuneirong;
+    }
+
+    public void setDiaowuneirong(String diaowuneirong) {
+        this.diaowuneirong = diaowuneirong;
+    }
+
+    public String getJingweidu() {
+        return jingweidu;
+    }
+
+    public void setJingweidu(String jingweidu) {
+        this.jingweidu = jingweidu;
+    }
+
+    public String getZuoyezhuangtai() {
+        return zuoyezhuangtai;
+    }
+
+    public void setZuoyezhuangtai(String zuoyezhuangtai) {
+        this.zuoyezhuangtai = zuoyezhuangtai;
+    }
+
+    public String getJianhuren() {
+        return jianhuren;
+    }
+
+    public void setJianhuren(String jianhuren) {
+        this.jianhuren = jianhuren;
+    }
+
+    public String getZuoyeren() {
+        return zuoyeren;
+    }
+
+    public void setZuoyeren(String zuoyeren) {
+        this.zuoyeren = zuoyeren;
+    }
+
+    public String getZuoyedanwei() {
+        return zuoyedanwei;
+    }
+
+    public void setZuoyedanwei(String zuoyedanwei) {
+        this.zuoyedanwei = zuoyedanwei;
+    }
+
+    public String getShifouchengbaoshangz() {
+        return shifouchengbaoshangz;
+    }
+
+    public void setShifouchengbaoshangz(String shifouchengbaoshangz) {
+        this.shifouchengbaoshangz = shifouchengbaoshangz;
+    }
+
+    public String getZuoyefuzeren() {
+        return zuoyefuzeren;
+    }
+
+    public void setZuoyefuzeren(String zuoyefuzeren) {
+        this.zuoyefuzeren = zuoyefuzeren;
+    }
+
+    public String getFuzerenlianxifangshi() {
+        return fuzerenlianxifangshi;
+    }
+
+    public void setFuzerenlianxifangshi(String fuzerenlianxifangshi) {
+        this.fuzerenlianxifangshi = fuzerenlianxifangshi;
+    }
+
+    public String getZuoyeshifoubiangengg() {
+        return zuoyeshifoubiangengg;
+    }
+
+    public void setZuoyeshifoubiangengg(String zuoyeshifoubiangengg) {
+        this.zuoyeshifoubiangengg = zuoyeshifoubiangengg;
+    }
+
+    public String getZuoyebiangengyuanyin() {
+        return zuoyebiangengyuanyin;
+    }
+
+    public void setZuoyebiangengyuanyin(String zuoyebiangengyuanyin) {
+        this.zuoyebiangengyuanyin = zuoyebiangengyuanyin;
+    }
+
+    public String getZuoyeshifouquxiao() {
+        return zuoyeshifouquxiao;
+    }
+
+    public void setZuoyeshifouquxiao(String zuoyeshifouquxiao) {
+        this.zuoyeshifouquxiao = zuoyeshifouquxiao;
+    }
+
+    public String getZuoyezuofeiyuanyin() {
+        return zuoyezuofeiyuanyin;
+    }
+
+    public void setZuoyezuofeiyuanyin(String zuoyezuofeiyuanyin) {
+        this.zuoyezuofeiyuanyin = zuoyezuofeiyuanyin;
+    }
+
+    public String getZuoyepiao() {
+        return zuoyepiao;
+    }
+
+    public void setZuoyepiao(String zuoyepiao) {
+        this.zuoyepiao = zuoyepiao;
+    }
+
+    public String getZuoyeshenqingshijian() {
+        return zuoyeshenqingshijian;
+    }
+
+    public void setZuoyeshenqingshijian(String zuoyeshenqingshijian) {
+        this.zuoyeshenqingshijian = zuoyeshenqingshijian;
+    }
+
+    public String getZhihuirenyuan() {
+        return zhihuirenyuan;
+    }
+
+    public void setZhihuirenyuan(String zhihuirenyuan) {
+        this.zhihuirenyuan = zhihuirenyuan;
+    }
+
+    public String getSisuoren() {
+        return sisuoren;
+    }
+
+    public void setSisuoren(String sisuoren) {
+        this.sisuoren = sisuoren;
+    }
+
+    public String getDiaojumingcheng() {
+        return diaojumingcheng;
+    }
+
+    public void setDiaojumingcheng(String diaojumingcheng) {
+        this.diaojumingcheng = diaojumingcheng;
+    }
+
+    public String getJieshoujiaodiren() {
+        return jieshoujiaodiren;
+    }
+
+    public void setJieshoujiaodiren(String jieshoujiaodiren) {
+        this.jieshoujiaodiren = jieshoujiaodiren;
+    }
+
+    public String getAnquanjiaodiren() {
+        return anquanjiaodiren;
+    }
+
+    public void setAnquanjiaodiren(String anquanjiaodiren) {
+        this.anquanjiaodiren = anquanjiaodiren;
+    }
+
+    public String getBianzhiren() {
+        return bianzhiren;
+    }
+
+    public void setBianzhiren(String bianzhiren) {
+        this.bianzhiren = bianzhiren;
+    }
+
+    public String getQitaanquancuoshi() {
+        return qitaanquancuoshi;
+    }
+
+    public void setQitaanquancuoshi(String qitaanquancuoshi) {
+        this.qitaanquancuoshi = qitaanquancuoshi;
+    }
+
+    public String getFengxianbianshijiegu() {
+        return fengxianbianshijiegu;
+    }
+
+    public void setFengxianbianshijiegu(String fengxianbianshijiegu) {
+        this.fengxianbianshijiegu = fengxianbianshijiegu;
+    }
+
+    public String getGuanlianqitateshuzuo() {
+        return guanlianqitateshuzuo;
+    }
+
+    public void setGuanlianqitateshuzuo(String guanlianqitateshuzuo) {
+        this.guanlianqitateshuzuo = guanlianqitateshuzuo;
+    }
+
+    public String getShifouweiqiyetuisong() {
+        return shifouweiqiyetuisong;
+    }
+
+    public void setShifouweiqiyetuisong(String shifouweiqiyetuisong) {
+        this.shifouweiqiyetuisong = shifouweiqiyetuisong;
+    }
+
+    public String getShifousheji1() {
+        return shifousheji1;
+    }
+
+    public void setShifousheji1(String shifousheji1) {
+        this.shifousheji1 = shifousheji1;
+    }
+
+    public String getQuerenren1() {
+        return querenren1;
+    }
+
+    public void setQuerenren1(String querenren1) {
+        this.querenren1 = querenren1;
+    }
+
+    public String getShifousheji2() {
+        return shifousheji2;
+    }
+
+    public void setShifousheji2(String shifousheji2) {
+        this.shifousheji2 = shifousheji2;
+    }
+
+    public String getQuerenren2() {
+        return querenren2;
+    }
+
+    public void setQuerenren2(String querenren2) {
+        this.querenren2 = querenren2;
+    }
+
+    public String getShifousheji3() {
+        return shifousheji3;
+    }
+
+    public void setShifousheji3(String shifousheji3) {
+        this.shifousheji3 = shifousheji3;
+    }
+
+    public String getQuerenren3() {
+        return querenren3;
+    }
+
+    public void setQuerenren3(String querenren3) {
+        this.querenren3 = querenren3;
+    }
+
+    public String getShifousheji4() {
+        return shifousheji4;
+    }
+
+    public void setShifousheji4(String shifousheji4) {
+        this.shifousheji4 = shifousheji4;
+    }
+
+    public String getQuerenren4() {
+        return querenren4;
+    }
+
+    public void setQuerenren4(String querenren4) {
+        this.querenren4 = querenren4;
+    }
+
+    public String getShifousheji5() {
+        return shifousheji5;
+    }
+
+    public void setShifousheji5(String shifousheji5) {
+        this.shifousheji5 = shifousheji5;
+    }
+
+    public String getQuerenren5() {
+        return querenren5;
+    }
+
+    public void setQuerenren5(String querenren5) {
+        this.querenren5 = querenren5;
+    }
+
+    public String getShifousheji6() {
+        return shifousheji6;
+    }
+
+    public void setShifousheji6(String shifousheji6) {
+        this.shifousheji6 = shifousheji6;
+    }
+
+    public String getQuerenren6() {
+        return querenren6;
+    }
+
+    public void setQuerenren6(String querenren6) {
+        this.querenren6 = querenren6;
+    }
+
+    public String getShifousheji7() {
+        return shifousheji7;
+    }
+
+    public void setShifousheji7(String shifousheji7) {
+        this.shifousheji7 = shifousheji7;
+    }
+
+    public String getQuerenren7() {
+        return querenren7;
+    }
+
+    public void setQuerenren7(String querenren7) {
+        this.querenren7 = querenren7;
+    }
+
+    public String getShifousheji8() {
+        return shifousheji8;
+    }
+
+    public void setShifousheji8(String shifousheji8) {
+        this.shifousheji8 = shifousheji8;
+    }
+
+    public String getQuerenren8() {
+        return querenren8;
+    }
+
+    public void setQuerenren8(String querenren8) {
+        this.querenren8 = querenren8;
+    }
+
+    public String getShifousheji9() {
+        return shifousheji9;
+    }
+
+    public void setShifousheji9(String shifousheji9) {
+        this.shifousheji9 = shifousheji9;
+    }
+
+    public String getQuerenren9() {
+        return querenren9;
+    }
+
+    public void setQuerenren9(String querenren9) {
+        this.querenren9 = querenren9;
+    }
+
+    public String getShifousheji10() {
+        return shifousheji10;
+    }
+
+    public void setShifousheji10(String shifousheji10) {
+        this.shifousheji10 = shifousheji10;
+    }
+
+    public String getQuerenren10() {
+        return querenren10;
+    }
+
+    public void setQuerenren10(String querenren10) {
+        this.querenren10 = querenren10;
+    }
+
+    public String getShifousheji11() {
+        return shifousheji11;
+    }
+
+    public void setShifousheji11(String shifousheji11) {
+        this.shifousheji11 = shifousheji11;
+    }
+
+    public String getQuerenren11() {
+        return querenren11;
+    }
+
+    public void setQuerenren11(String querenren11) {
+        this.querenren11 = querenren11;
+    }
+
+    public String getShifousheji12() {
+        return shifousheji12;
+    }
+
+    public void setShifousheji12(String shifousheji12) {
+        this.shifousheji12 = shifousheji12;
+    }
+
+    public String getQuerenren12() {
+        return querenren12;
+    }
+
+    public void setQuerenren12(String querenren12) {
+        this.querenren12 = querenren12;
+    }
+
+    public String getShifousheji13() {
+        return shifousheji13;
+    }
+
+    public void setShifousheji13(String shifousheji13) {
+        this.shifousheji13 = shifousheji13;
+    }
+
+    public String getQuerenren13() {
+        return querenren13;
+    }
+
+    public void setQuerenren13(String querenren13) {
+        this.querenren13 = querenren13;
+    }
+
+    public String getShifousheji14() {
+        return shifousheji14;
+    }
+
+    public void setShifousheji14(String shifousheji14) {
+        this.shifousheji14 = shifousheji14;
+    }
+
+    public String getQuerenren14() {
+        return querenren14;
+    }
+
+    public void setQuerenren14(String querenren14) {
+        this.querenren14 = querenren14;
+    }
+
+    public String getShifousheji15() {
+        return shifousheji15;
+    }
+
+    public void setShifousheji15(String shifousheji15) {
+        this.shifousheji15 = shifousheji15;
+    }
+
+    public String getQuerenren15() {
+        return querenren15;
+    }
+
+    public void setQuerenren15(String querenren15) {
+        this.querenren15 = querenren15;
+    }
+
+    public String getShifousheji16() {
+        return shifousheji16;
+    }
+
+    public void setShifousheji16(String shifousheji16) {
+        this.shifousheji16 = shifousheji16;
+    }
+
+    public String getQuerenren16() {
+        return querenren16;
+    }
+
+    public void setQuerenren16(String querenren16) {
+        this.querenren16 = querenren16;
+    }
+
+    public String getShifousheji17() {
+        return shifousheji17;
+    }
+
+    public void setShifousheji17(String shifousheji17) {
+        this.shifousheji17 = shifousheji17;
+    }
+
+    public String getQuerenren17() {
+        return querenren17;
+    }
+
+    public void setQuerenren17(String querenren17) {
+        this.querenren17 = querenren17;
+    }
+
+    public String getShifousheji18() {
+        return shifousheji18;
+    }
+
+    public void setShifousheji18(String shifousheji18) {
+        this.shifousheji18 = shifousheji18;
+    }
+
+    public String getQuerenren18() {
+        return querenren18;
+    }
+
+    public void setQuerenren18(String querenren18) {
+        this.querenren18 = querenren18;
+    }
+
+    public String getShifousheji19() {
+        return shifousheji19;
+    }
+
+    public void setShifousheji19(String shifousheji19) {
+        this.shifousheji19 = shifousheji19;
+    }
+
+    public String getQuerenren19() {
+        return querenren19;
+    }
+
+    public void setQuerenren19(String querenren19) {
+        this.querenren19 = querenren19;
+    }
+
+    public String getShifousheji20() {
+        return shifousheji20;
+    }
+
+    public void setShifousheji20(String shifousheji20) {
+        this.shifousheji20 = shifousheji20;
+    }
+
+    public String getQuerenren20() {
+        return querenren20;
+    }
+
+    public void setQuerenren20(String querenren20) {
+        this.querenren20 = querenren20;
+    }
 }

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

@@ -2,9 +2,7 @@ package com.hxjt.dataupload.service;
 
 import com.hxjt.dataupload.model.entity.doubleprevent.*;
 import com.hxjt.dataupload.model.entity.tszy.aqcs.Aqcs;
-import com.hxjt.dataupload.model.entity.tszy.upload.Dhzy;
+import com.hxjt.dataupload.model.entity.tszy.upload.*;
-import com.hxjt.dataupload.model.entity.tszy.upload.Mbcdzy;
-import com.hxjt.dataupload.model.entity.tszy.upload.Sxkjzy;
 
 
 import java.util.ArrayList;
@@ -40,5 +38,8 @@ public interface FxfxdxService {
     List<Sxkjzy> getOneSxkjzysPage(String isSingleDay);
     //盲板抽堵作业
     List<Mbcdzy> getOneMbcdzysPage(String isSingleDay);
-
+    //高处作业
+    List<Gczy> getOneGczysPage(String isSingleDay);
+    //吊装安全作业
+    List<Dzaqzy> getOneDzaqzysPage(String isSingleDay);
 }

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

@@ -3,9 +3,7 @@ package com.hxjt.dataupload.service.impl;
 import com.hxjt.dataupload.mapper.FxfxdxMapper;
 import com.hxjt.dataupload.model.entity.doubleprevent.*;
 import com.hxjt.dataupload.model.entity.tszy.aqcs.Aqcs;
-import com.hxjt.dataupload.model.entity.tszy.upload.Dhzy;
+import com.hxjt.dataupload.model.entity.tszy.upload.*;
-import com.hxjt.dataupload.model.entity.tszy.upload.Mbcdzy;
-import com.hxjt.dataupload.model.entity.tszy.upload.Sxkjzy;
 import com.hxjt.dataupload.service.FxfxdxService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -81,4 +79,14 @@ public class FxfxdxServiceImpl implements FxfxdxService {
     public List<Mbcdzy> getOneMbcdzysPage(String isSingleDay) {
         return fxfxdxMapper.getOneMbcdzysPage(isSingleDay);
     }
+
+    @Override
+    public List<Gczy> getOneGczysPage(String isSingleDay) {
+        return fxfxdxMapper.getOneGczysPage(isSingleDay);
+    }
+
+    @Override
+    public List<Dzaqzy> getOneDzaqzysPage(String isSingleDay) {
+        return fxfxdxMapper.getOneDzaqzysPage(isSingleDay);
+    }
 }

src/main/java/com/hxjt/dataupload/utils/tszy/DzaqzyUtil.java

@@ -0,0 +1,73 @@
+package com.hxjt.dataupload.utils.tszy;
+
+import com.hxjt.dataupload.model.entity.tszy.aqcs.Aqcs;
+import com.hxjt.dataupload.model.entity.tszy.upload.Dzaqzy;
+import com.hxjt.dataupload.model.entity.tszy.upload.Gczy;
+
+public class DzaqzyUtil {
+    public static void handle(Dzaqzy dzaqzy, Aqcs aqcs) {
+
+        if(aqcs.getAncuoneirong().startsWith("一、二级吊装作业已编制")){
+            dzaqzy.setShifousheji1(aqcs.getShifousheji().equals("Y")?"是":"否");
+            dzaqzy.setQuerenren1(aqcs.getQuerenren());
+        }else if(aqcs.getAncuoneirong().startsWith("吊装场所如有含危险物")){
+            dzaqzy.setShifousheji2(aqcs.getShifousheji().equals("Y")?"是":"否");
+            dzaqzy.setQuerenren2(aqcs.getQuerenren());
+        }else if(aqcs.getAncuoneirong().startsWith("作业人员已按规定佩戴")){
+            dzaqzy.setShifousheji3(aqcs.getShifousheji().equals("Y")?"是":"否");
+            dzaqzy.setQuerenren3(aqcs.getQuerenren());
+        }else if(aqcs.getAncuoneirong().startsWith("已对起重吊装设备")){
+            dzaqzy.setShifousheji4(aqcs.getShifousheji().equals("Y")?"是":"否");
+            dzaqzy.setQuerenren4(aqcs.getQuerenren());
+        }else if(aqcs.getAncuoneirong().startsWith("已明确各自分工")){
+            dzaqzy.setShifousheji5(aqcs.getShifousheji().equals("Y")?"是":"否");
+            dzaqzy.setQuerenren5(aqcs.getQuerenren());
+        }else if(aqcs.getAncuoneirong().startsWith("将建筑物")){
+            dzaqzy.setShifousheji6(aqcs.getShifousheji().equals("Y")?"是":"否");
+            dzaqzy.setQuerenren6(aqcs.getQuerenren());
+        }else if(aqcs.getAncuoneirong().startsWith("吊装绳索")){
+            dzaqzy.setShifousheji7(aqcs.getShifousheji().equals("Y")?"是":"否");
+            dzaqzy.setQuerenren7(aqcs.getQuerenren());
+        }else if(aqcs.getAncuoneirong().startsWith("吊物捆扎坚固")){
+            dzaqzy.setShifousheji8(aqcs.getShifousheji().equals("Y")?"是":"否");
+            dzaqzy.setQuerenren8(aqcs.getQuerenren());
+        }else if(aqcs.getAncuoneirong().startsWith("吊物捆扎坚固")){
+            dzaqzy.setShifousheji9(aqcs.getShifousheji().equals("Y")?"是":"否");
+            dzaqzy.setQuerenren9(aqcs.getQuerenren());
+        }else if(aqcs.getAncuoneirong().startsWith("起重机安全")){
+            dzaqzy.setShifousheji10(aqcs.getShifousheji().equals("Y")?"是":"否");
+            dzaqzy.setQuerenren10(aqcs.getQuerenren());
+        }else if(aqcs.getAncuoneirong().startsWith("吊装作业人员持有有效的法定")){
+            dzaqzy.setShifousheji11(aqcs.getShifousheji().equals("Y")?"是":"否");
+            dzaqzy.setQuerenren11(aqcs.getQuerenren());
+        }else if(aqcs.getAncuoneirong().startsWith("地下通信电")){
+            dzaqzy.setShifousheji12(aqcs.getShifousheji().equals("Y")?"是":"否");
+            dzaqzy.setQuerenren12(aqcs.getQuerenren());
+        }else if(aqcs.getAncuoneirong().startsWith("起吊物的质量")){
+            dzaqzy.setShifousheji13(aqcs.getShifousheji().equals("Y")?"是":"否");
+            dzaqzy.setQuerenren13(aqcs.getQuerenren());
+        }else if(aqcs.getAncuoneirong().startsWith("在吊装高度的管线")){
+            dzaqzy.setShifousheji14(aqcs.getShifousheji().equals("Y")?"是":"否");
+            dzaqzy.setQuerenren14(aqcs.getQuerenren());
+        }else if(aqcs.getAncuoneirong().startsWith("作业现场围栏")){
+            dzaqzy.setShifousheji15(aqcs.getShifousheji().equals("Y")?"是":"否");
+            dzaqzy.setQuerenren15(aqcs.getQuerenren());
+        }else if(aqcs.getAncuoneirong().startsWith("作业高度和转臂范围")){
+            dzaqzy.setShifousheji16(aqcs.getShifousheji().equals("Y")?"是":"否");
+            dzaqzy.setQuerenren16(aqcs.getQuerenren());
+        }else if(aqcs.getAncuoneirong().startsWith("在爆炸危险场所内的作业")){
+            dzaqzy.setShifousheji17(aqcs.getShifousheji().equals("Y")?"是":"否");
+            dzaqzy.setQuerenren17(aqcs.getQuerenren());
+        }else if(aqcs.getAncuoneirong().startsWith("露天作业")){
+            dzaqzy.setShifousheji18(aqcs.getShifousheji().equals("Y")?"是":"否");
+            dzaqzy.setQuerenren18(aqcs.getQuerenren());
+        }else if(aqcs.getAncuoneirong().startsWith("其他相关特殊作业")){
+            dzaqzy.setShifousheji19(aqcs.getShifousheji().equals("Y")?"是":"否");
+            dzaqzy.setQuerenren19(aqcs.getQuerenren());
+        }else if(aqcs.getAncuoneirong().startsWith("其他安全措施")){
+            dzaqzy.setQitaanquancuoshi(DhAqcsUtil.processSecurityMeasures(aqcs.getAncuoneirong()));
+            dzaqzy.setBianzhiren(aqcs.getQuerenren());
+            dzaqzy.setQuerenren20(aqcs.getQuerenren());
+        }
+    }
+}

src/main/java/com/hxjt/dataupload/utils/tszy/GczyUtil.java

@@ -0,0 +1,57 @@
+package com.hxjt.dataupload.utils.tszy;
+
+import com.hxjt.dataupload.model.entity.tszy.aqcs.Aqcs;
+import com.hxjt.dataupload.model.entity.tszy.upload.Gczy;
+
+public class GczyUtil {
+    public static void handle(Gczy gczy, Aqcs aqcs) {
+
+        if(aqcs.getAncuoneirong().startsWith("作业人员身体条件")){
+            gczy.setShentitiaojianfuheya(aqcs.getShifousheji().equals("Y")?"是":"否");
+            gczy.setQuerenren1(aqcs.getQuerenren());
+        }else if(aqcs.getAncuoneirong().startsWith("作业人员着装符合")){
+            gczy.setZhuozhuangfuhezuoyey(aqcs.getShifousheji().equals("Y")?"是":"否");
+            gczy.setQuerenren2(aqcs.getQuerenren());
+        }else if(aqcs.getAncuoneirong().startsWith("作业人员佩戴符合标准要")){
+            gczy.setPeidaianquanmaoanqua(aqcs.getShifousheji().equals("Y")?"是":"否");
+            gczy.setQuerenren3(aqcs.getQuerenren());
+        }else if(aqcs.getAncuoneirong().startsWith("作业人员携带有工具袋")){
+            gczy.setXiedaigongjudaijianq(aqcs.getShifousheji().equals("Y")?"是":"否");
+            gczy.setQuerenren4(aqcs.getQuerenren());
+        }else if(aqcs.getAncuoneirong().startsWith("现场搭设的脚手架")){
+            gczy.setJiaoshoujiafuheanqua(aqcs.getShifousheji().equals("Y")?"是":"否");
+            gczy.setQuerenren5(aqcs.getQuerenren());
+        }else if(aqcs.getAncuoneirong().startsWith("垂直分层作业中间")){
+            gczy.setYougelisheshi(aqcs.getShifousheji().equals("Y")?"是":"否");
+            gczy.setQuerenren6(aqcs.getQuerenren());
+        }else if(aqcs.getAncuoneirong().startsWith("梯子、绳子符合")){
+            gczy.setShengzifuheanquangui(aqcs.getShifousheji().equals("Y")?"是":"否");
+            gczy.setQuerenren7(aqcs.getQuerenren());
+        }else if(aqcs.getAncuoneirong().startsWith("轻型棚的承重梁")){
+            gczy.setZuidafuhedeyaoqiu(aqcs.getShifousheji().equals("Y")?"是":"否");
+            gczy.setQuerenren8(aqcs.getQuerenren());
+        }else if(aqcs.getAncuoneirong().startsWith("作业人员在不承重物处作业")){
+            gczy.setChengzhongbanwending(aqcs.getShifousheji().equals("Y")?"是":"否");
+            gczy.setQuerenren9(aqcs.getQuerenren());
+        }else if(aqcs.getAncuoneirong().startsWith("采光、夜间作业照明")){
+            gczy.setZhaomingfuhezuoyeyao(aqcs.getShifousheji().equals("Y")?"是":"否");
+            gczy.setQuerenren10(aqcs.getQuerenren());
+        }else if(aqcs.getAncuoneirong().startsWith("30")){
+            gczy.setPeibeitongxinlianluo(aqcs.getShifousheji().equals("Y")?"是":"否");
+            gczy.setQuerenren11(aqcs.getQuerenren());
+        }else if(aqcs.getAncuoneirong().startsWith("作业现场四周已设")){
+            gczy.setSizhouyishejingjiequ(aqcs.getShifousheji().equals("Y")?"是":"否");
+            gczy.setQuerenren12(aqcs.getQuerenren());
+        }else if(aqcs.getAncuoneirong().startsWith("露天作业")){
+            gczy.setFenglimanzuzuoyeanqu(aqcs.getShifousheji().equals("Y")?"是":"否");
+            gczy.setQuerenren13(aqcs.getQuerenren());
+        }else if(aqcs.getAncuoneirong().startsWith("其他相关特殊作业已办")){
+            gczy.setXiangyinganquanzuoye(aqcs.getShifousheji().equals("Y")?"是":"否");
+            gczy.setQuerenren14(aqcs.getQuerenren());
+        }else if(aqcs.getAncuoneirong().startsWith("其他相关特殊作业已办")){
+            gczy.setQitaanquancuoshi(DhAqcsUtil.processSecurityMeasures(aqcs.getAncuoneirong()));
+            gczy.setBianzhiren(aqcs.getQuerenren());
+            gczy.setQuerenren15(aqcs.getQuerenren());
+        }
+    }
+}

src/main/resources/mapper/FxfxdxMapper.xml

@@ -920,4 +920,219 @@
 		order by
 			a.APPLYTIME desc
 	</select>
+
+	<select id="getOneGczysPage" resultType="com.hxjt.dataupload.model.entity.tszy.upload.Gczy">
+		SELECT
+			a.ID as bianhao,
+			--zuoyeshenqingdanwei
+			(CASE
+				WHEN C.FNAME like '%中碳%' THEN '恒信中碳氢能源科技（山东）有限公司'
+				ELSE '山东恒信高科能源有限公司'
+			END) AS zuoyeshenqingdanwei,
+			--qiyebianma
+			(CASE
+				WHEN C.FNAME like '%中碳%' THEN '370980326'
+				ELSE '370910170'
+			END) AS qiyebianma,
+			(CASE
+				WHEN A.FIREGRADE = '1' THEN 'A类IV级'
+				WHEN A.FIREGRADE = '2' THEN 'A类I级'
+				WHEN A.FIREGRADE = '3' THEN 'A类II级'
+				WHEN A.FIREGRADE = '4' THEN 'A类III级'
+				ELSE 'A类III级'
+			END) AS gaochuzuoyejibie,
+			FORMAT(A.PBDATE,
+			'yyyy-MM-dd HH:mm:ss')as zuoyeshishikaishishi,
+			FORMAT(A.PEDATE,
+			'yyyy-MM-dd HH:mm:ss')as zuoyeshishijieshushi,
+			A.OTLOCARION AS zuoyedidian,
+			A.OTCONTENT AS zuoyeneirong,
+			--经纬度
+			STUFF( COALESCE(',' + NULLIF(REPLACE( CAST(B.XVAL AS VARCHAR(255)), ';', ','),
+			''),
+			'') +
+			COALESCE(',' + NULLIF(CAST(B.YVAL AS VARCHAR(255)),
+			''),
+			''),
+			1,
+			1,
+			'' ) AS jingweidu,
+			 '已验收' AS zuoyezhuangtai,
+			 A.GUARDNAME AS jianhuren,
+			 CONCAT(a.elecname, a.firewrite) AS zuoyeren,
+			 A.SDUNITNAME AS zuoyedanwei,
+			-- 通过机构路径改进
+			(case
+				when A.UNITID is null then '是'
+				else '否'
+			end) as shifouchengbaoshangz,
+			 D.FIREPERSONNAME1 AS zuoyefuzeren,
+			(CASE
+				WHEN (F.MOBILE IS NULL
+				OR F.MOBILE = '') THEN '13053831533'
+				ELSE F.MOBILE
+			END) as fuzerenlianxifangshi,
+			-- 是否变更
+			 '否' AS zuoyeshifoubiangengg,
+			--是否取消
+			 '否' AS zuoyeshifouquxiao,
+			--作业票附件需要改进
+			--申请时间
+			FORMAT(a.APPLYTIME,
+			'yyyy-MM-dd HH:mm:ss') AS zuoyeshenqingshijian,
+			--作业高度
+			a.FIREWORKTYPE AS zuoyegaodu,
+			-- 风险辨识结果需改进
+			REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE
+				 (a.haziden, 'BS01', '物体打击'), 'BS02', '机械伤害'), 'BS03', '起重伤害'), 'BS04', '触电'), 'BS05', '灼烫'), 'BS06', '火灾'),
+				 'BS07', '坍塌'), 'BS08', '高处坠落'), 'BS09', '中毒和窒息'), 'BS10', '锅炉爆炸'), 'BS11', '容器爆炸'), 'BS12', '淹溺'), 'BS13', '其它爆炸'), 'BS14', '其它伤害') AS fengxianbianshijiegu,
+			--a.otherhaziden,
+			-- 关联其他作业票需改进
+			A.NAME08 AS guanlianqitateshuzuo,
+			 d.personname9 AS jieshoujiaodiren,
+			 '是' as shifouweiqiyetuisong,
+			 d.firepersonname2 AS anquanjiaodiren
+			--添加安措
+		FROM
+			OTM_OPERATICK A
+		LEFT JOIN ISM_AREA B ON
+			A.otlocarionid = B.id
+		LEFT JOIN OTM_OTKIND C ON
+			A.OTKIND = C.ID
+		LEFT JOIN OTM_OTMSUB D ON
+			A.ID = D.PID
+		LEFT JOIN PF_EMPLOYEE F ON
+			D.FIREPERSONID1 = F.ID
+		LEFT JOIN PF_ORGAN G ON
+			a.otunit = G.ORGANCODE
+		where
+			a.isdelete = 'N'
+			and d.showflag = '1'
+			--and a.APPLYTIME >= '2025-01-01 00:00:00.000'
+			and c.id in('0dc5370dda5248e69db924de402b6639', 'e05c6ca6921f4900af3d6d85cdd9337c')
+			<choose>
+				<when test='isSingleDay == "Y"'>
+
+					AND (DATEDIFF(dd, a.APPLYTIME, GETDATE() - 1) = 0)
+				</when>
+				<otherwise>
+
+					and a.APPLYTIME >= '2024-01-01 00:00:00.000'
+				</otherwise>
+			</choose>
+			--AND OTBILLID='DH20250213197'
+		order by
+			a.APPLYTIME desc
+	</select>
+
+	<select id="getOneDzaqzysPage" resultType="com.hxjt.dataupload.model.entity.tszy.upload.Dzaqzy">
+		SELECT
+			a.ID as bianhao,
+			--zuoyeshenqingdanwei
+			(CASE
+				WHEN C.FNAME like '%中碳%' THEN '恒信中碳氢能源科技（山东）有限公司'
+				ELSE '山东恒信高科能源有限公司'
+			END) AS zuoyeshenqingdanwei,
+			--qiyebianma
+			(CASE
+				WHEN C.FNAME like '%中碳%' THEN '370980326'
+				ELSE '370910170'
+			END) AS qiyebianma,
+			(CASE
+				WHEN A.FIREGRADE = '1' THEN '一级吊装作业'
+				WHEN A.FIREGRADE = '2' THEN '二级吊装作业'
+				ELSE '三级吊装作业'
+			END) AS diaowuzhiliangtjizuo,
+			FORMAT(A.PBDATE,
+			'yyyy-MM-dd HH:mm:ss')as zuoyeshishikaishishi,
+			FORMAT(A.PEDATE,
+			'yyyy-MM-dd HH:mm:ss')as zuoyeshishijieshushi,
+			A.OTLOCARION AS zuoyedidian,
+			A.OTCONTENT AS zuoyeneirong,
+			--经纬度需改进
+			STUFF( COALESCE(',' + NULLIF(REPLACE( CAST(B.XVAL AS VARCHAR(255)), ';', ','),
+			''),
+			'') +
+			COALESCE(',' + NULLIF(CAST(B.YVAL AS VARCHAR(255)),
+			''),
+			''),
+			1,
+			1,
+			'' ) AS jingweidu,
+			 '已验收' AS zuoyezhuangtai,
+			 A.GUARDNAME AS jianhuren,
+			 (CASE
+				WHEN a.firewrite IS NULL THEN '赵西雨'
+				ELSE a.firewrite
+			END) AS zuoyeren,
+			 A.SDUNITNAME AS zuoyedanwei,
+			-- 通过机构路径改进
+			(case
+				when A.UNITID is null then '是'
+				else '否'
+			end) as shifouchengbaoshangz,
+			 D.FIREPERSONNAME1 AS zuoyefuzeren,
+			(CASE
+				WHEN (F.MOBILE IS NULL
+				OR F.MOBILE = '') THEN '13053831355'
+				ELSE F.MOBILE
+			END) as fuzerenlianxifangshi,
+			-- 是否变更
+			 '否' AS zuoyeshifoubiangengg,
+			--是否取消
+			 '否' AS zuoyeshifouquxiao,
+			--作业票附件需要改进
+			--申请时间
+			FORMAT(a.APPLYTIME,
+			'yyyy-MM-dd HH:mm:ss') AS zuoyeshenqingshijian,
+			--指挥人
+			d.firepersonname1 AS zhihuirenyuan,
+			--司索人
+			a.fsso AS sisuoren,
+			--吊具名称
+			a.fireworktype AS diaojumingcheng,
+			--接受交底人
+			d.personname9 AS jieshoujiaodiren,
+			--交底人
+			d.firepersonname2 AS anquanjiaodiren,
+			-- 风险辨识结果需改进
+			REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE
+				 (a.haziden, 'BS01', '物体打击'), 'BS02', '机械伤害'), 'BS03', '起重伤害'), 'BS04', '触电'), 'BS05', '灼烫'), 'BS06', '火灾'),
+				 'BS07', '坍塌'), 'BS08', '高处坠落'), 'BS09', '中毒和窒息'), 'BS10', '锅炉爆炸'), 'BS11', '容器爆炸'), 'BS12', '淹溺'), 'BS13', '其它爆炸'), 'BS14', '其它伤害') AS fengxianbianshijiegu,
+			--a.otherhaziden,
+				 '是' as shifouweiqiyetuisong,
+			-- 关联其他作业票需改进
+			A.NAME08 AS guanlianqitateshuzuo
+			--添加安措
+		FROM
+			OTM_OPERATICK A
+		LEFT JOIN ISM_AREA B ON
+			A.otlocarionid = B.id
+		LEFT JOIN OTM_OTKIND C ON
+			A.OTKIND = C.ID
+		LEFT JOIN OTM_OTMSUB D ON
+			A.ID = D.PID
+		LEFT JOIN PF_EMPLOYEE F ON
+			D.FIREPERSONID1 = F.ID
+		LEFT JOIN PF_ORGAN G ON
+			a.otunit = G.ORGANCODE
+		where
+			a.isdelete = 'N'
+			and d.showflag = '1'
+			--and a.APPLYTIME >= '2024-01-01 00:00:00.000'
+			and c.id in('e7671c99bca845e49aad9baab1084331', '2ce56e004e114f5a9c4b010392780abe')
+			<choose>
+				<when test='isSingleDay == "Y"'>
+
+					AND (DATEDIFF(dd, a.APPLYTIME, GETDATE() - 1) = 0)
+				</when>
+				<otherwise>
+
+					and a.APPLYTIME >= '2023-01-01 00:00:00.000'
+				</otherwise>
+			</choose>
+			--AND OTBILLID='DH20250213197'
+		order by
+			a.APPLYTIME desc
+	</select>
 </mapper>