行政执法模块完善

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

@@ -0,0 +1,18 @@
+package com.bizmatics.mhfire.persistence.mapper;
+
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.Date;
+
+/**
+ * @author yq
+ * @date 2021/5/25 17:01
+ * 行政许可-消防安检申报不同意
+ */
+@Repository
+public interface AlFsdDisagreeMapper {
+
+    Integer selectCount(@Param("startTime") Date startTime,
+                        @Param("endTime") Date endTime);
+}

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

@@ -1,11 +0,0 @@
-package com.bizmatics.mhfire.persistence.mapper;
-
-import org.springframework.stereotype.Repository;
-
-/**
- * @author yq
- * @date 2021/5/25 17:01
- */
-@Repository
-public interface AlFsdDisgreeMapper {
-}

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

@@ -1,11 +1,18 @@
 package com.bizmatics.mhfire.persistence.mapper;
 
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
+import java.util.Date;
+
 /**
  * @author yq
  * @date 2021/5/25 16:53
+ * 行政许可-安全检查合格证
  */
 @Repository
 public interface AlFsdSeqMapper {
+
+    Integer selectCount(@Param("startTime") Date startTime,
+                        @Param("endTime") Date endTime);
 }

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

@@ -0,0 +1,19 @@
+package com.bizmatics.mhfire.persistence.mapper;
+
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.Date;
+
+/**
+ * @author yq
+ * @date 2021/6/2 9:35
+ * 行政许可-安全检查凭证
+ */
+@Repository
+public interface AlFsdVoucherMapper {
+
+
+    Integer selectCount(@Param("startTime") Date startTime,
+                        @Param("endTime") Date endTime);
+}

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

@@ -0,0 +1,9 @@
+package com.bizmatics.mhfire.persistence.mapper;
+
+/**
+ * @author yq
+ * @date 2021/6/2 10:00
+ * 基本总表-监督管理项目全表
+ */
+public interface BsSupervisionAllMapper {
+}

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

@@ -0,0 +1,16 @@
+<?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.bizmatics.mhfire.persistence.mapper.AlFsdDisagreeMapper">
+
+    <select id="selectCount" resultType="java.lang.Integer">
+        select count(1) from `xzxk-bhgz`
+        <where>
+            <if test="startTime != null">
+                and `检查日期` >= #{startTime}
+            </if>
+            <if test="endTime != null">
+                and `检查日期` &lt;= #{endTime}
+            </if>
+        </where>
+    </select>
+</mapper>

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

@@ -1,5 +1,16 @@
 <?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">
+        <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.bizmatics.mhfire.persistence.mapper.AlFsdSeqMapper">
 
+    <select id="selectCount" resultType="java.lang.Integer">
+        select count(1) from `xzxk-ajhgz`
+        <where>
+            <if test="startTime != null">
+                and `创建时间` >= #{startTime}
+            </if>
+            <if test="endTime != null">
+                and `创建时间` &lt;= #{endTime}
+            </if>
+        </where>
+    </select>
 </mapper>

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

@@ -0,0 +1,16 @@
+<?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.bizmatics.mhfire.persistence.mapper.AlFsdVoucherMapper">
+
+    <select id="selectCount" resultType="java.lang.Integer">
+        select count(1) from `xzxk-aqjcpz`
+        <where>
+            <if test="startTime != null">
+                and `创建时间` >= #{startTime}
+            </if>
+            <if test="endTime != null">
+                and `创建时间` &lt;= #{endTime}
+            </if>
+        </where>
+    </select>
+</mapper>

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

@@ -1,5 +1,5 @@
 <?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.bizmatics.mhfire.persistence.mapper.AlFsdDisgreeMapper">
+<mapper namespace="com.bizmatics.mhfire.persistence.mapper.BsSupervisionAllMapper">
 
 </mapper>

mhfire-service/src/main/java/com/bizmatics/mhfire/service/AlFsdVoucherService.java

@@ -0,0 +1,9 @@
+package com.bizmatics.mhfire.service;
+
+/**
+ * @author yq
+ * @date 2021/6/2 9:21
+ * 行政许可-安全检查凭证
+ */
+public interface AlFsdVoucherService {
+}

mhfire-service/src/main/java/com/bizmatics/mhfire/service/BsSupervisionAllService.java

@@ -0,0 +1,11 @@
+package com.bizmatics.mhfire.service;
+
+/**
+ * @author yq
+ * @date 2021/6/2 9:59
+ * 基本总表-监督管理项目全表
+ */
+public interface BsSupervisionAllService {
+
+
+}

mhfire-service/src/main/java/com/bizmatics/mhfire/service/enums/BsSaOneCode.java

@@ -0,0 +1,72 @@
+package com.bizmatics.mhfire.service.enums;
+
+import org.omg.CORBA.PUBLIC_MEMBER;
+
+/**
+ * @author yq
+ * @date 2021/6/2 10:44
+ * 基本总表-监督管理项目-第一项目类型
+ */
+public enum BsSaOneCode {
+
+
+    /**
+     * 刑事案件
+     */
+    CRIMINAL("刑事案件","X"),
+
+    /**
+     * 备案抽查
+     */
+    PUT_ONE_RECORDS("备案抽查类","B"),
+
+    /**
+     * 安全检查类
+     */
+    SAFETY_CHECK("安全检查类","Q"),
+
+
+    /**
+     * 案件办理
+     */
+    CASE_MANAGE("案件办理类","C"),
+
+    /**
+     * 火灾事故调查
+     */
+    FIRE_ACCIDENT_SURVEY("火灾事故调查类","H"),
+
+    /**
+     * 火灾从新认定
+     */
+    FIRE_NEW("火灾重新认定","R"),
+
+    /**
+     * 监督检查
+     */
+    SUPERVISE_EXAMINE("监督检查类","J"),
+
+    /**
+     * 行政许可类
+     */
+    A_P("行政许可类","A");
+
+    private String value;
+
+    private String letter;
+
+    BsSaOneCode(String value,String letter){
+        this.value = value;
+        this.letter = letter;
+    }
+
+
+    public String getValue() {
+        return value;
+    }
+
+    public String getLetter(){
+        return letter;
+    }
+
+}

mhfire-service/src/main/java/com/bizmatics/mhfire/service/enums/BsSaTwoCode.java

@@ -0,0 +1,148 @@
+package com.bizmatics.mhfire.service.enums;
+
+import static com.bizmatics.mhfire.service.enums.BsSaOneCode.*;
+
+/**
+ * @author yq
+ * @date 2021/6/2 10:46
+ * 基本总表-监督管理项目-第二项目类型
+ */
+public enum BsSaTwoCode {
+
+
+    /**
+     * 举报投诉检查
+     */
+    R_C_C("举报投诉检查","J2",SUPERVISE_EXAMINE),
+
+    /**
+     * 公众聚集场所投入使用、营业前消防安全检查
+     */
+    C_S("公众聚集场所投入使用、营业前消防安全检查","J1",SUPERVISE_EXAMINE),
+
+    /**
+     * 其他检查
+     */
+    ELSE_CHECK("其他检查","J9",SUPERVISE_EXAMINE),
+
+    /**
+     * 其他检查(复查)
+     */
+    ELSE_CHECK_REVIEW("其他检查(复查)","JA",SUPERVISE_EXAMINE),
+
+    /**
+     * 大型活动举办前检查
+     */
+    BIG_ACTIVITY_CHECK("大型活动举办前检查","J3",SUPERVISE_EXAMINE),
+
+    /**
+     * 建设工程施工工地检查
+     */
+    J_G_S_G_G_D_CHECK("建设工程施工工地检查","J4",SUPERVISE_EXAMINE),
+    /**
+     * 建设工程消防设计备案抽查
+     */
+    J_G_S_G_X_F("建设工程消防设计备案抽查","B0",PUT_ONE_RECORDS),
+    /**
+     * 建设工程消防设计备案抽查(复查)
+     */
+    J_G_S_G_X_F_TWO("建设工程消防设计备案抽查(复查)","B2",PUT_ONE_RECORDS),
+
+    /**
+     * 建设工程消防设计审核
+     */
+    J_G_S_G_AUDIT("建设工程消防设计审核","A0",A_P),
+
+    /**
+     * 建设工程消防设计审核(局部变更)
+     */
+    J_G_S_G_AUDIT_CHANGE("建设工程消防设计审核(局部变更)","A2",A_P),
+
+    /**
+     * 建设工程竣工消防验收
+     */
+    J_G_S_G_ACCPET("建设工程竣工消防验收","A1",A_P),
+
+    /**
+     * 建设工程竣工消防验收(复验)
+     */
+    J_G_S_G_ACCPET_TWO("建设工程竣工消防验收(复验)","A3",A_P),
+
+    /**
+     * 建设工程竣工验收消防备案抽查
+     */
+    J_G_S_G_Y_S_B_A("建设工程竣工验收消防备案抽查","B1",PUT_ONE_RECORDS),
+
+    /**
+     * 建设工程竣工验收消防备案抽查(复查)
+     */
+    J_G_S_G_Y_S_B_A_TWO("建设工程竣工验收消防备案抽查(复查)","B3",PUT_ONE_RECORDS),
+
+    /**
+     * 消防监督抽查
+     */
+    X_F_J_D_C_C("消防监督抽查","J0",SUPERVISE_EXAMINE),
+
+    /**
+     * 火灾事故调查(一般程序)
+     */
+    FIRE_SURVEY_ORDINARY("火灾事故调查(一般程序)","H1",FIRE_ACCIDENT_SURVEY),
+    /**
+     * 火灾事故调查(不予受理)
+     */
+    FIRE_SURVEY_NO("火灾事故调查(不予受理)","H9",FIRE_ACCIDENT_SURVEY),
+    /**
+     * 火灾事故调查(简易程序)
+     */
+    FIRE_SURVEY_S("火灾事故调查(简易程序)","H2",FIRE_ACCIDENT_SURVEY),
+
+    /**
+     * 申请恢复施工、使用、生产、经营的检查
+     */
+    APPLY_BUILD("申请恢复施工、使用、生产、经营的检查","J6",SUPERVISE_EXAMINE),
+    /**
+     * 申请解除临时查封的检查
+     */
+    APPLY_DE("申请解除临时查封的检查","J7",SUPERVISE_EXAMINE),
+
+    /**
+     * 行政处罚(火灾处罚)
+     */
+    PUNISH_FIRE("行政处罚(火灾处罚)","C2",CASE_MANAGE),
+
+    /**
+     * 行政处罚(违章处罚)
+     */
+    PUNISH_WZ("行政处罚(违章处罚)","C1",CASE_MANAGE),
+
+    /**
+     * 责令限期改正复查
+     */
+    ORDER_LIMIT_CHANGE("责令限期改正复查","J5",SUPERVISE_EXAMINE);
+
+
+    private String value;
+
+    private String letter;
+
+    private BsSaOneCode bsSaOneCode;
+
+    BsSaTwoCode(String value,String letter,BsSaOneCode bsSaOneCode){
+        this.value = value;
+        this.letter = letter;
+        this.bsSaOneCode = bsSaOneCode;
+    }
+
+    public String getValue(){
+        return value;
+    }
+
+    public String getLetter(){
+        return letter;
+    }
+
+    public BsSaOneCode getBsSaOneCode(){
+        return bsSaOneCode;
+    }
+
+}

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

@@ -0,0 +1,12 @@
+package com.bizmatics.mhfire.service.impl;
+
+import com.bizmatics.mhfire.service.AlFsdVoucherService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author yq
+ * @date 2021/6/2 9:22
+ */
+@Service
+public class AlFsdVoucherServiceImpl implements AlFsdVoucherService {
+}

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

@@ -0,0 +1,10 @@
+package com.bizmatics.mhfire.service.impl;
+
+import com.bizmatics.mhfire.service.BsSupervisionAllService;
+
+/**
+ * @author yq
+ * @date 2021/6/2 10:00
+ */
+public class BsSupervisionAllServiceImpl implements BsSupervisionAllService {
+}

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

@@ -88,7 +88,9 @@ public class FireStatisticsServiceImpl implements FireStatisticsService {
             fireCount+=radio;
         }
         int finalFireCount = fireCount;
-        list.forEach(fireLevelRatioVO -> fireLevelRatioVO.setRadio(fireLevelRatioVO.getRadio()/ finalFireCount));
+        if (0 != finalFireCount){
+            list.forEach(fireLevelRatioVO -> fireLevelRatioVO.setRadio(fireLevelRatioVO.getRadio()/ finalFireCount));
+        }
         return list;
     }