m

youxiw2000
1 parent ad84fa06
Showing 6 changed files with 14 additions and 10 deletions
trash-common/src/main/java/com/trash/common/utils/util/PostSms.java
trash-ui/dist.7z
trash-ui/src/api/vio_warning_info.js
trash-ui/src/views/h5/violationWarningInformation/index.vue
trash-workFlow/src/main/java/com/trash/casefile/domain/ViolationCaseFile.java
trash-workFlow/src/main/resources/mapper/casefile/ViolationCaseFileMapper.xml
@@ -38,6 +38,7 @@ public class PostSms {
 //提交短信
 public static JsonSmsSend sendSms(List<Mobile> mobileList, String smsStr){
+	
 	String userName = SmsConf.smsUserName;
 	String password = SmsConf.smsPasswd;
 	String signTime = SmsConf.getSysTime();
@@ -31,7 +31,9 @@ export default {
     }
   },
   created() {
-
+    this.listData({dictType:"vio_warning"}).then(res=>{
+      this.caseType = res.rows;
+    });
     this.init();
   },
   methods: {
@@ -15,7 +15,9 @@
       </el-form-item>
       <el-form-item label="违规类型" prop="violationType">
         <el-select v-model="queryParams.violationType" placeholder="请选择违规类型" clearable size="small">
-          <el-option  v-for="item in caseType" :label="item.name" :value="item.name" />
+          <el-option  v-for="item in caseType" :label="item.dictLabel" :value="item.dictValue" />
+
+          getCaseType
         </el-select>
       </el-form-item>
       <el-form-item label="项目名称" prop="projectName">
@@ -43,7 +45,7 @@
             >
            <el-row class="card_row">
              <el-col :span="24" class="card_grid">
-              <div class="card_title" style="font-weight: bold;">违规类型:{{item.violationType}}</div>
+              <div class="card_title" style="font-weight: bold;">违规类型:{{getCaseType(item.violationType)}}</div>
              </el-col>
            </el-row>
            <el-row class="card_row" style="margin-top:10px;margin-bottom:10px;">
@@ -104,10 +106,8 @@
                 <el-option  v-for="item in areas" :label="item.name" :value="item.code" @click.native="selectArea(item)"/>
               </el-select>
             </el-form-item>
-            <el-form-item label="违规类型" prop="violationType">
-              <el-select v-model="form.violationType" placeholder="请选择违规类型" style="width: 100%;">
-                <el-option  v-for="item in caseType" :label="item.name" :value="item.name" />
-              </el-select>
+            <el-form-item label="违规类型" prop="violationType">
+                <el-input :value="getCaseType(form.violationType)" :disabled="true"/>
             </el-form-item>
             <el-form-item label="违规等级" prop="violationGrade">
@@ -43,7 +43,7 @@ public class ViolationCaseFile extends BaseEntity
     /** 违规类型 */
-    @Excel(name = "违规类型" ,dictType="vio_casefile")
+    @Excel(name = "违规类型")
     private String violationType;
     /** 违规等级 */
@@ -37,8 +37,9 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
     <select id="selectViolationCaseFileList" parameterType="violationCaseFile" resultMap="violationCaseFileResult">
         select a.*,c.status1 from casefile_violation a
-        left join (select b.table_name,count(*) status1 from reply_approval_process b where table_name like "%workflow_casefile%" 
-		GROUP BY b.table_name,b.reply_people) c 
+        left join (select a.table_name,count(*) status1 from 
+					(select * from reply_approval_process b where table_name like "%workflow_casefile%" GROUP BY b.table_name,b.reply_people) a
+					group by a.table_name order by a.table_name desc) c 
 		on CONCAT("workflow_casefile:",a.id) = c.table_name
         <where>
             <if test="number != null  and number != ''"> and number = #{number}</if>