隐患治理档案

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

@@ -7,6 +7,7 @@ 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.AmountConverter;
 import com.hxjt.dataupload.utils.HttpUtils;
 import com.xxl.job.core.context.XxlJobHelper;
 import com.xxl.job.core.handler.annotation.XxlJob;
@@ -60,6 +61,7 @@ public class YhzldaJobHandler {
 
             //对本页数据进行上传
             for (int x = 0; x < pageInfo.getList().size(); x++) {
+                pageInfo.getList().get(x).setZijinwanyuan(AmountConverter.convertToTenThousandYuan(pageInfo.getList().get(x).getZijinwanyuan()));
 
 
                 if (x == pageInfo.getList().size() - 1) {
@@ -73,14 +75,14 @@ public class YhzldaJobHandler {
 
 
                 String company = pageInfo.getList().get(x).getQiyemingcheng();
-                String url = "https://www.ny-fxfk.com/space-ningyanghuagongchany/sapi/qpaas/tiga/dys/keyAuthentication/yinhuanpaicharenwu/v1/yinhuanpaicharenwu";
+                String url = "https://www.ny-fxfk.com/space-ningyanghuagongchany/sapi/qpaas/tiga/dys/keyAuthentication/yinhuanzhilidangan/v1/yinhuanzhilidangan";
                 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");
+                            post = HttpUtils.sendDataUpload(url, jsonObject, HTTP.UTF_8, "Tk4xNbES1nIUaIzEOPnc29269B98C15B1EE4");
                             success++;
 
                             System.out.println(jsonObject);

src/main/resources/mapper/FxfxdxMapper.xml

@@ -431,7 +431,9 @@
 				ELSE '一般隐患'
 			END) AS yinhuanjibie,
 			h.EMPNAME AS paicharenyuan,
-			a.FREGISTTIME AS tijiaoriq1,
+			--a.FREGISTTIME AS tijiaoriq1,
+			FORMAT(a.FREGISTTIME,
+			'yyyy-MM-dd HH:mm:ss') AS tijiaoriq1,
 			a.FSRC AS jianchaleixing,
 			-- 根据管理类型代码判断治理类型
 			(CASE