youxiw2000 / trash · Commits

Commit 28f7c958d2409ae22a4fa829283f693bd79aeeb6

Authored by youxiw2000
1 parent ad84fa06
build: skipped

m

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