bug修复

zh-baseversion-system/src/main/java/com/zehong/system/domain/TStaEnterpriseInfor.java

@@ -61,7 +61,7 @@ public class TStaEnterpriseInfor extends BaseEntity {
      * <p>
      * 0300-注销-燃气经营者被依法撤回、撤销、注销、吊销燃气经营许可
      */
-    @Excel(name = "管道燃气企业经营状况")
+    @Excel(name = "管道燃气企业经营状况", dictType = "sys_operating_status")
     private String fPipelineComp;
 
     /**
@@ -79,7 +79,7 @@ public class TStaEnterpriseInfor extends BaseEntity {
      * <p>
      * 0300-注销-燃气经营者被依法撤回、撤销、注销、吊销燃气经营许可
      */
-    @Excel(name = "燃气汽车加气站经营状况")
+    @Excel(name = "燃气汽车加气站经营状况", dictType = "sys_operating_status")
     private String fStationComp;
 
     /**
@@ -97,7 +97,7 @@ public class TStaEnterpriseInfor extends BaseEntity {
      * <p>
      * 0300-注销-燃气经营者被依法撤回、撤销、注销、吊销燃气经营许可
      */
-    @Excel(name = "其他经营类企业经营情况")
+    @Excel(name = "其他经营类企业经营情况", dictType = "sys_operating_status")
     private String fOtherComp;
 
     /**

zh-baseversion-system/src/main/resources/mapper/system/TEmergencyResourcesMapper.xml

@@ -26,6 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="resourceType != null  and resourceType != ''"> and resource_type = #{resourceType}</if>
             <if test="contacts != null  and contacts != ''"> and contacts = #{contacts}</if>
         </where>
+        order by id desc
     </select>
 
     <select id="selectTEmergencyResourcesById" parameterType="Long" resultMap="TEmergencyResourcesResult">

zh-baseversion-system/src/main/resources/mapper/system/TEnterpriseSystemMapper.xml

@@ -50,6 +50,7 @@
                 and create_time <  concat(#{endTime}," 23:59:59")
             </if>
         </where>
+        order by create_time desc
     </select>
 
     <select id="selectTEnterpriseSystemById" parameterType="Long" resultMap="TEnterpriseSystemResult">

zh-baseversion-system/src/main/resources/mapper/system/TPublicSentimentMapper.xml

@@ -39,6 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="region != null  and region != ''"> and region = #{region}</if>
             <if test="startTime != null  and startTime != ''"> AND date_format(start_time,'%y') &gt;= date_format(#{startTime},'%y')</if>
         </where>
+        order by create_time desc
     </select>
     
     <select id="selectTPublicSentimentById" parameterType="Long" resultMap="TPublicSentimentResult">

zh-baseversion-system/src/main/resources/mapper/system/TSecurityDisseminateMapper.xml

@@ -25,6 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="title != null  and title != ''"> and title like concat('%',#{title},'%')  </if>
             <if test="people != null  and people != ''"> and people like concat('%',#{people},'%')</if>
         </where>
+        order by create_time desc
     </select>
     
     <select id="selectTSecurityDisseminateById" parameterType="Long" resultMap="TSecurityDisseminateResult">

zh-baseversion-system/src/main/resources/mapper/system/TSupMajorHazardMapper.xml

@@ -67,6 +67,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fName != null  and fName != ''"> and f_name like concat('%', #{fName}, '%')</if>
             <if test="fResPer != null  and fResPer != ''"> and f_res_per = #{fResPer}</if>
         </where>
+        order by f_create_time desc
     </select>
 
     <select id="exportselectTSupMajorHazardList" parameterType="TSupMajorHazard" resultMap="ExportTSupMajorHazardResult">

zh-baseversion-web/src/views/examine/risk/index.vue

@@ -207,9 +207,15 @@ export default {
         enterpriseName: null,
       },
       // 表单参数
-      form: {},
+      form: {status: 1},
       // 表单校验
       rules: {
+        enterpriseName: [
+          { required: true, message: "企业名称不能为空", trigger: "blur" }
+        ],
+        indicator: [
+          { required: true, message: "不合格项不能为空", trigger: "blur" }
+        ]
       }
     };
   },
@@ -244,7 +250,7 @@ export default {
         problem: null,
         plan: null,
         fileUrl: null,
-        status: 0,
+        status: 1,
         createTime: null
       };
       this.resetForm("form");

zh-baseversion-web/src/views/regulation/staEnterpriseInfor/index.vue

@@ -162,7 +162,14 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="管道燃气企业经营状况" prop="fPipelineComp">
-              <el-input v-model="form.fPipelineComp" placeholder="请输入管道燃气企业经营状况" />
+              <el-select v-model="form.fPipelineComp" placeholder="请选择管道燃气企业经营状况" clearable style="width: 100%">
+                <el-option
+                  v-for="dict in operatingStatusOptions"
+                  :key="dict.dictValue"
+                  :label="dict.dictLabel"
+                  :value="dict.dictValue"
+                ></el-option>
+              </el-select>
             </el-form-item>
           </el-col>
         </el-row>
@@ -174,7 +181,14 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="燃气汽车加气站经营状况" prop="fStationComp">
-              <el-input v-model="form.fStationComp" placeholder="请输入燃气汽车加气站经营状况" />
+              <el-select v-model="form.fStationComp" placeholder="请选择燃气汽车加气站经营状况" clearable style="width: 100%">
+                <el-option
+                  v-for="dict in operatingStatusOptions"
+                  :key="dict.dictValue"
+                  :label="dict.dictLabel"
+                  :value="dict.dictValue"
+                ></el-option>
+              </el-select>
             </el-form-item>
           </el-col>
         </el-row>
@@ -186,7 +200,14 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="其他经营类企业经营情况" prop="fOtherComp">
-              <el-input v-model="form.fOtherComp" placeholder="请输入其他经营类企业经营情况" />
+              <el-select v-model="form.fOtherComp" placeholder="请选择其他经营类企业经营情况" clearable style="width: 100%">
+                <el-option
+                  v-for="dict in operatingStatusOptions"
+                  :key="dict.dictValue"
+                  :label="dict.dictLabel"
+                  :value="dict.dictValue"
+                ></el-option>
+              </el-select>
             </el-form-item>
           </el-col>
         </el-row>
@@ -333,7 +354,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="管道燃气企业经营状况">
-              <span>{{ viewForm.fPipelineComp }}</span>
+              <span>{{ selectDictLabel(operatingStatusOptions, viewForm.fPipelineComp) }}</span>
             </el-form-item>
           </el-col>
         </el-row>
@@ -345,7 +366,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="燃气汽车加气站经营状况">
-              <span>{{ viewForm.fStationComp }}</span>
+              <span>{{ selectDictLabel(operatingStatusOptions, viewForm.fStationComp) }}</span>
             </el-form-item>
           </el-col>
         </el-row>
@@ -357,7 +378,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="其他经营类企业经营情况">
-              <span>{{ viewForm.fOtherComp }}</span>
+              <span>{{ selectDictLabel(operatingStatusOptions, viewForm.fOtherComp) }}</span>
             </el-form-item>
           </el-col>
         </el-row>
@@ -496,6 +517,8 @@ export default {
       viewOpen: false,
       // 详情表单数据
       viewForm: {},
+      // 经营状况数据字典
+      operatingStatusOptions: [],
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -567,6 +590,9 @@ export default {
   },
   created() {
     this.getList();
+    this.getDicts("sys_operating_status").then(response => {
+      this.operatingStatusOptions = response.data;
+    });
   },
   methods: {
     /** 处理数字输入限制 */