Parcourir la source

大厅 办件 高频 公安

lchao il y a 11 mois
Parent
commit
45b07d4660

+ 9 - 41
zhsq_qk-system/src/main/java/zhsq_qk/system/domain/QkZwyxBadReview.java

@@ -22,21 +22,19 @@ private static final long serialVersionUID = 1L;
                 @Excel(name = "满意度")
         private String verySatisfied;
 
-        /** 满意 */
+            public String getSatisfiedNum() {
+                return satisfiedNum;
+            }
+
+            public void setSatisfiedNum(String satisfiedNum) {
+                this.satisfiedNum = satisfiedNum;
+            }
+
+            /** 满意 */
                 @Excel(name = "数量")
         private String satisfiedNum;
 
-        /** 基本满意 */
-                @Excel(name = "基本满意")
-        private String somewhatSatisfied;
 
-        /** 不满意 */
-                @Excel(name = "不满意")
-        private String dissatisfied;
-
-        /** 非常不满意 */
-                @Excel(name = "非常不满意")
-        private String veryDissatisfied;
 
         public void setId(Long id) {
             this.id = id;
@@ -52,34 +50,7 @@ private static final long serialVersionUID = 1L;
         public String getVerySatisfied() {
             return verySatisfied;
         }
-        public void setSatisfiedNum(String satisfiedNum) {
-            this.satisfiedNum = satisfiedNum;
-        }
-
-        public String getSatisfiedNum() {
-            return satisfiedNum;
-        }
-        public void setSomewhatSatisfied(String somewhatSatisfied) {
-            this.somewhatSatisfied = somewhatSatisfied;
-        }
 
-        public String getSomewhatSatisfied() {
-            return somewhatSatisfied;
-        }
-        public void setDissatisfied(String dissatisfied) {
-            this.dissatisfied = dissatisfied;
-        }
-
-        public String getDissatisfied() {
-            return dissatisfied;
-        }
-        public void setVeryDissatisfied(String veryDissatisfied) {
-            this.veryDissatisfied = veryDissatisfied;
-        }
-
-        public String getVeryDissatisfied() {
-            return veryDissatisfied;
-        }
 
 @Override
 public String toString() {
@@ -87,9 +58,6 @@ public String toString() {
         .append("id", getId())
         .append("verySatisfied", getVerySatisfied())
         .append("satisfiedNum", getSatisfiedNum())
-        .append("somewhatSatisfied", getSomewhatSatisfied())
-        .append("dissatisfied", getDissatisfied())
-        .append("veryDissatisfied", getVeryDissatisfied())
             .toString();
 }
 }

+ 9 - 12
zhsq_qk-system/src/main/resources/mapper/system/QkZwyxBadReviewMapper.xml

@@ -8,9 +8,6 @@
             <result property="id" column="id"/>
             <result property="verySatisfied" column="very_satisfied"/>
             <result property="satisfiedNum" column="satisfied_num"/>
-            <result property="somewhatSatisfied" column="somewhat_satisfied"/>
-            <result property="dissatisfied" column="dissatisfied"/>
-            <result property="veryDissatisfied" column="very_dissatisfied"/>
         <result property="createTime" column="create_time"/>
     </resultMap>
 
@@ -25,7 +22,7 @@
                         <if test="verySatisfied != null  and verySatisfied != ''">
                             and very_satisfied = #{verySatisfied}
                         </if>
-                        <if test="satisfied != null  and satisfied != ''">
+                        <if test="satisfiedNum != null  and satisfiedNum != ''">
                             and satisfie_num = #{satisfiedNum}
                         </if>
         </where>
@@ -41,18 +38,18 @@
             keyProperty="id">
         insert into qk_zwyx_bad_review
         <trim prefix="(" suffix=")" suffixOverrides=",">
-                    <if test="verySatisfied != null">very_satisfied,
-                    </if>
-                    <if test="satisfiedNum != null">satisfied_num,
-                    </if>
+            <if test="verySatisfied != null">very_satisfied,
+            </if>
+            <if test="satisfiedNum != null">satisfied_num,
+            </if>
             <if test="createTime != null">create_time,
             </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-                    <if test="verySatisfied != null">#{verySatisfied},
-                    </if>
-                    <if test="satisfiedNum != null">#{satisfiedNum},
-                    </if>
+            <if test="verySatisfied != null">#{verySatisfied},
+            </if>
+            <if test="satisfiedNum != null">#{satisfiedNum},
+            </if>
             <if test="createTime != null">#{createTime},
             </if>
         </trim>

+ 1 - 1
zhsq_qk-system/src/main/resources/mapper/system/QkZwyxHighFrequencyMattersMapper.xml

@@ -81,6 +81,6 @@
     <select id="visualizationList" parameterType="Long"
             resultMap="QkZwyxHighFrequencyMattersResult">
         <include refid="selectQkZwyxHighFrequencyMattersVo"/>
-        ORDER BY event_count DESC
+        ORDER BY event_count ASC;
     </select>
 </mapper>

+ 11 - 2
zhsq_qk-system/src/main/resources/mapper/system/QkZwyxPublicSecurityDocumentsMapper.xml

@@ -10,10 +10,11 @@
             <result property="hongKong" column="hong_kong"/>
             <result property="taiwan" column="taiwan"/>
             <result property="foreigners" column="foreigners"/>
+            <result property="month" column="month"/>
     </resultMap>
 
     <sql id="selectQkZwyxPublicSecurityDocumentsVo">
-        select id, passport, hong_kong, taiwan, foreigners
+        select id, passport, hong_kong, taiwan, foreigners,`month`
         from qk_zwyx_public_security_documents
     </sql>
 
@@ -54,6 +55,8 @@
                     </if>
                     <if test="foreigners != null">foreigners,
                     </if>
+            <if test="month != null">month,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
                     <if test="id != null">#{id},
@@ -66,6 +69,8 @@
                     </if>
                     <if test="foreigners != null">#{foreigners},
                     </if>
+            <if test="month != null">#{month},
+            </if>
         </trim>
     </insert>
 
@@ -84,6 +89,9 @@
                     <if test="foreigners != null">foreigners =
                         #{foreigners},
                     </if>
+            <if test="month != null">month =
+                #{month},
+            </if>
         </trim>
         where id = #{id}
     </update>
@@ -106,7 +114,8 @@
             passport,
             hong_kong,
             taiwan,
-            foreigners
+            foreigners,
+            `month`
         FROM
             qk_zwyx_public_security_documents
         GROUP BY

+ 8 - 2
zhsq_qk-ui/src/views/system/pdocuments/index.vue

@@ -98,6 +98,7 @@
       <el-table-column label="港" align="center" prop="hongKong"/>
       <el-table-column label="台" align="center" prop="taiwan"/>
       <el-table-column label="外国人" align="center" prop="foreigners"/>
+      <el-table-column label="月份" align="center" prop="month"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -143,6 +144,9 @@
         <el-form-item label="外国人" prop="foreigners">
           <el-input v-model="form.foreigners" placeholder="请输入外国人" maxlength="10"/>
         </el-form-item>
+        <el-form-item label="月份" prop="month">
+          <el-input v-model="form.month" placeholder="请输入月份" maxlength="10"/>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -185,7 +189,8 @@ export default {
         passport: null,
         hongKong: null,
         taiwan: null,
-        foreigners: null
+        foreigners: null,
+        month: null,
       },
       // 表单参数
       form: {},
@@ -235,7 +240,8 @@ export default {
         passport: null,
         hongKong: null,
         taiwan: null,
-        foreigners: null
+        foreigners: null,
+        month: null
       };
       this.resetForm("form");
     },