水源坐标，同比，环比

mhfire-mapping/src/main/java/com/bizmatics/mhfire/persistence/mapper/po/FireWaterPO.java

@@ -68,4 +68,12 @@ public class FireWaterPO {
      */
     private String waterGage;
 
+    private String gisX;
+
+    private String gisY;
+
+    private String gisBaiDuX;
+
+    private String gisBaiDuY;
+
 }

mhfire-mapping/src/main/resources/mapper/mysql/BsSupervisionAll.xml

@@ -13,10 +13,10 @@
                 and `项目分类型二` = #{typeTwoLetter}
             </if>
             <if test="startTime != null">
-                and `项目创建时间` >= #{startTime}
+                and `项目创建日期` >= #{startTime}
             </if>
             <if test="endTime != null">
-                and `项目创建时间` &lt;= #{endTime}
+                and `项目创建日期` &lt;= #{endTime}
             </if>
             <if test="unitId != null and unitId != ''">
                 and `项目单位ID` = #{unitId}

mhfire-mapping/src/main/resources/mapper/mysql/SiAeAllMapper.xml

@@ -3,14 +3,14 @@
 <mapper namespace="com.bizmatics.mhfire.persistence.mapper.SiAeAllMapper">
     <select id="selectAeAllCollect" resultType="java.util.Map">
         select
-        COALESCE(sum(`检查单位（家、次）`),0) as checkUnit,
-        COALESCE(sum(`发现火灾隐患或违法行为（处）`),0) as findFireDanger,
-        COALESCE(sum(`督促整改火灾隐患或违法行为`),0) as rectifyFireDanger,
-        COALESCE(sum(`当场处罚罚款金额`),0) as fineMoney,
-        COALESCE(sum(`发责令改正通知书`),0) as beganChange,
-        COALESCE(sum(`发处罚决定书（份）`),0) as punish,
-        COALESCE(sum(`责令“三停”`),0) threeStop,
-        COALESCE(sum(`发临时查封决定书（份）`),0) as seal
+        COALESCE(sum(`检查单位（家、次）`),0) as `检查单位（家、次）`,
+        COALESCE(sum(`发现火灾隐患或违法行为（处）`),0) as `发现火灾隐患或违法行为（处）`,
+        COALESCE(sum(`督促整改火灾隐患或违法行为`),0) as `督促整改火灾隐患或违法行为`,
+        COALESCE(sum(`当场处罚罚款金额`),0) as `当场处罚罚款金额`,
+        COALESCE(sum(`发责令改正通知书`),0) as `发责令改正通知书`,
+        COALESCE(sum(`发处罚决定书（份）`),0) as `发处罚决定书（份）`,
+        COALESCE(sum(`责令“三停”`),0) `责令“三停”`,
+        COALESCE(sum(`发临时查封决定书（份）`),0) as `发临时查封决定书（份）`
         FROM `jdjc-xzzftj-all`
         <where>
             <if test="startTime !=null">

mhfire-service/src/main/java/com/bizmatics/mhfire/service/impl/AlFsdAllServiceImpl.java

@@ -34,7 +34,7 @@ public class AlFsdAllServiceImpl implements AlFsdAllService {
         AlFsdAllVO alFsdAllVo = new AlFsdAllVO();
         alFsdAllVo.setAcceptNumber(alFsdVoucherMapper.selectCount(startTime,endTime));
         alFsdAllVo.setCheckNumber(bsSupervisionAllMapper.selectCount
-                (BsSaOneCode.SAFETY_CHECK.getLetter(), BsSaTwoCode.R_C_C.getLetter(),startTime,endTime,null));
+                (BsSaOneCode.SAFETY_CHECK.getLetter(), BsSaTwoCode.C_S.getLetter(),startTime,endTime,null));
         //行政许可安全检查合格证
         Integer seqCount = alFsdSeqMapper.selectCount(startTime, endTime);
         //行政许可-消防安检申报不同意

mhfire-service/src/main/java/com/bizmatics/mhfire/service/impl/FireWaterServiceImpl.java

@@ -82,6 +82,10 @@ public class FireWaterServiceImpl implements FireWaterService {
         fireWaterPo.setStatus(fireWaterMap.get("可用状态"));
         fireWaterPo.setWaterUnit(fireWaterMap.get("供水单位"));
         fireWaterPo.setWaterGage(fireWaterMap.get("管网压力"));
+        fireWaterPo.setGisX(fireWaterMap.get("GIS_X"));
+        fireWaterPo.setGisY(fireWaterMap.get("GIS_Y"));
+        fireWaterPo.setGisBaiDuX(fireWaterMap.get("GIS_X百度坐标"));
+        fireWaterPo.setGisBaiDuY(fireWaterMap.get("GIS_Y百度坐标"));
         return fireWaterPo;
     }
 }

mhfire-service/src/main/java/com/bizmatics/mhfire/service/impl/SiAeAllServiceImpl.java

@@ -35,7 +35,7 @@ public class SiAeAllServiceImpl implements SiAeAllService {
         startTime.setYear(Integer.parseInt(DateUtils.getYear(startTime)) + 1 - 1900);
         endTime.setYear(Integer.parseInt(DateUtils.getYear(endTime)) + 1 - 1900);
         //获取两个时间天数之差
-        int distanceOfTwoDate = DateUtils.getDistanceOfTwoDate(startTime, endTime);
+        int distanceOfTwoDate = DateUtils.getDistanceOfTwoDateNew(startTime, endTime);
         Date linkEndTime = DateUtils.addDays(startTime, -1);
         Date linkStartTime = DateUtils.addDays(linkEndTime, -distanceOfTwoDate);
         Map<String, Double> linkAllCollect = siAeAllMapper.selectAeAllCollect(linkStartTime,linkEndTime);
@@ -63,4 +63,7 @@ public class SiAeAllServiceImpl implements SiAeAllService {
         });
         return allVoS;
     }
+
+
+
 }