youxiw2000 / trash · Commits

Commit 5bb0d1b63430f73b6d9f8262988e6b4a12808929

Authored by youxiw2000
1 parent 31bf7358
build: skipped

m

Inline Side-by-side
Showing 29 changed files with 221 additions and 59 deletions
trash-activiti/src/main/java/com/trash/activiti/service/impl/FormHistoryDataServiceImpl.java
  View file @5bb0d1b
... ... @@ -72,13 +72,17 @@ public class FormHistoryDataServiceImpl implements IFormHistoryDataService {
72 72 actWorkflowFormData.addAll( actWorkflowFormDataService.selectActWorkflowFormDataByBusinessKey( "workflow_constructsite:" + id));
73 73  
74 74 actWorkflowFormData.addAll( actWorkflowFormDataService.selectActWorkflowFormDataByBusinessKey("workflow_constructsite_edit:" + id));
75   -
76   -
  75 + }else if(businessKey.contains("earthsites")){
  76 + String id = businessKey.split(":")[1];
  77 +
  78 + actWorkflowFormData.addAll( actWorkflowFormDataService.selectActWorkflowFormDataByBusinessKey( "workflow_earthsites:" + id));
  79 +
  80 + actWorkflowFormData.addAll( actWorkflowFormDataService.selectActWorkflowFormDataByBusinessKey("workflow_earthsites_edit:" + id));
77 81 }else{
78 82  
79 83 actWorkflowFormData = actWorkflowFormDataService.selectActWorkflowFormDataByBusinessKey(businessKey);
80 84 }
81   -
  85 +
82 86  
83 87  
84 88 for(int i =0;i<actWorkflowFormData.size();i++){
... ...
trash-ui/dist.zip
View file @5bb0d1b
No preview for this file type
trash-ui/src/api/caseOfflineInfo.js
  View file @5bb0d1b
... ... @@ -195,7 +195,7 @@ export default {
195 195 if(response.data.status == 0){
196 196 historyFromData(this.workflow + ":" + id).then(response => {
197 197  
198   - let obj = response.data[response.data.length-1];
  198 + let obj = response.data[0];
199 199 let data = {
200 200 reply:obj.controlValue,
201 201 replyPeople:obj.createBy,
... ...
trash-ui/src/api/taskhismethod.js
  View file @5bb0d1b
... ... @@ -153,7 +153,7 @@ export default {
153 153 this.construct = true;
154 154 return;
155 155 }
156   - if (this.definitionKey == "workflow_earthsites") {
  156 + if (this.definitionKey == "workflow_earthsites" || this.definitionKey == "workflow_earthsites_edit") {
157 157 this.earthsites = true;
158 158 return;
159 159 }
... ...
trash-ui/src/api/taskmethod.js
  View file @5bb0d1b
... ... @@ -236,7 +236,7 @@ export default {
236 236 this.construct = true;
237 237 return;
238 238 }
239   - if (this.definitionKey == "workflow_earthsites") {
  239 + if (this.definitionKey == "workflow_earthsites" || this.definitionKey == "workflow_earthsites_edit") {
240 240 this.earthsites = true;
241 241 return;
242 242 }
... ... @@ -524,7 +524,8 @@ export default {
524 524 this.definitionKey == "workflow_vehicle" ||
525 525 this.definitionKey == "workflow_earthsites" ||
526 526 this.definitionKey == "workflow_conract" ||
527   - this.definitionKey == "workflow_constructsite_edit") {
  527 + this.definitionKey == "workflow_constructsite_edit" ||
  528 + this.definitionKey == "workflow_earthsites_edit") {
528 529 formDataSave(this.id, this.form.formData).then(response => {
529 530 this.msgSuccess("审批成功");
530 531 this.cancel();
... ...
trash-ui/src/api/three_step.js
  View file @5bb0d1b
... ... @@ -346,6 +346,10 @@ export default {
346 346  
347 347 this.remoteQueryData.limitStatus = 0;
348 348 constructionsitesLedgerList(this.remoteQueryData).then(res => {
  349 + if(this.form.type != "0"){
  350 + return;
  351 + }
  352 + this.remoteData = [];
349 353 for(let i in res.result.list){
350 354 this.remoteData.push(res.result.list[i]);
351 355  
... ... @@ -364,12 +368,15 @@ export default {
364 368 // this.rules.trucks[0].required = true;
365 369  
366 370 });
367   - } else {
368   - debugger;
  371 + } else if (this.form.type == "0") {
369 372 if(this.remoteQueryData.areaCode)
370 373 this.remoteQueryData.areaCode = [this.remoteQueryData.areaCode+""];
371 374 this.remoteQueryData.overdue = 0;
372 375 earthsitesLedgerList(this.remoteQueryData).then(res => {
  376 + if(this.form.type != "1"){
  377 + return;
  378 + }
  379 + this.remoteData = [];
373 380 for(let i in res.result.list){
374 381 this.remoteData.push(res.result.list[i]);
375 382 if(res.result.list[i].name == this.form.name){
... ...
trash-ui/src/api/truck_active.js
  View file @5bb0d1b
... ... @@ -291,7 +291,7 @@ export default {
291 291 let list = tres.result.list;
292 292  
293 293 let qr = {
294   - constructionId:item.objectId,
  294 + company:value,
295 295 status:0
296 296 }
297 297  
... ...
trash-ui/src/api/vio_casefile_info.js
  View file @5bb0d1b
... ... @@ -57,18 +57,36 @@ export default {
57 57 })
58 58  
59 59 });
60   - listReplyApprovalProcess({tableName: "workflow_casefile" + ":" + this.idInfo}).then(response => {
61   - this.replyApprovalProcessList = response.rows;
  60 + listReplyApprovalProcess({tableName: "workflow_casefile" + ":" + this.idInfo}).then(response => {
  61 + let array = response.rows;
62 62 if(this.form.status == 0){
63 63 historyFromData("workflow_casefile" + ":" + this.idInfo).then(response => {
64   -
65   - let obj = response.data[response.data.length-1];
  64 + let newRep = [];
  65 + let obj = response.data[0];
66 66 let data = {
67 67 reply:obj.controlValue,
68 68 replyPeople:obj.createBy,
  69 + replyTime:obj.createTime
69 70 };
70 71  
71   - this.replyApprovalProcessList.push(data);
  72 + newRep.push(data);
  73 +
  74 + for(let j in array){
  75 + newRep.push(array[j]);
  76 + }
  77 +
  78 + if(response.data.length - array.length == 2){
  79 + let obj = response.data[response.data.length -1];
  80 + let data = {
  81 + reply:obj.controlValue,
  82 + replyPeople:obj.createBy,
  83 + replyTime:obj.createTime
  84 + };
  85 + newRep.push(data);
  86 + }
  87 +
  88 + this.replyApprovalProcessList = newRep;
  89 + this.$forceUpdate();
72 90 });
73 91 }
74 92 });
... ... @@ -100,4 +118,4 @@ export default {
100 118 return process.env.VUE_APP_BASE_API + path;
101 119 },
102 120 }
103   -}
104 121 \ No newline at end of file
  122 +}
... ...
trash-ui/src/api/vio_warning_info.js
  View file @5bb0d1b
... ... @@ -59,17 +59,35 @@ export default {
59 59 });
60 60  
61 61 listReplyApprovalProcess({tableName: "violation_warning" + ":" + this.idInfo}).then(response => {
62   - this.replyApprovalProcessList = response.rows;
  62 + let array = response.rows;
63 63 if(this.form.status == 0){
64 64 historyFromData("violation_warning" + ":" + this.idInfo).then(response => {
65   -
66   - let obj = response.data[response.data.length-1];
  65 + let newRep = [];
  66 + let obj = response.data[0];
67 67 let data = {
68 68 reply:obj.controlValue,
69 69 replyPeople:obj.createBy,
  70 + replyTime:obj.createTime
70 71 };
71 72  
72   - this.replyApprovalProcessList.push(data);
  73 + newRep.push(data);
  74 +
  75 + for(let j in array){
  76 + newRep.push(array[j]);
  77 + }
  78 +
  79 + if(response.data.length - array.length == 2){
  80 + let obj = response.data[response.data.length -1];
  81 + let data = {
  82 + reply:obj.controlValue,
  83 + replyPeople:obj.createBy,
  84 + replyTime:obj.createTime
  85 + };
  86 + newRep.push(data);
  87 + }
  88 +
  89 + this.replyApprovalProcessList = newRep;
  90 + this.$forceUpdate();
73 91 });
74 92 }
75 93 });
... ... @@ -100,4 +118,4 @@ export default {
100 118 return process.env.VUE_APP_BASE_API + path;
101 119 },
102 120 }
103   -}
104 121 \ No newline at end of file
  122 +}
... ...
trash-ui/src/utils/request.js
  View file @5bb0d1b
... ... @@ -14,7 +14,7 @@ const service = axios.create({
14 14 // axios中请求配置有baseURL选项，表示请求URL公共部分
15 15 baseURL: process.env.VUE_APP_BASE_API,
16 16 // 超时
17   - timeout: 20000
  17 + timeout: 180000
18 18 })
19 19 // request拦截器
20 20 service.interceptors.request.use(config => {
... ...
trash-ui/src/utils/requestRemote.js
  View file @5bb0d1b
... ... @@ -12,7 +12,7 @@ axios.defaults.headers[&#39;Content-Type&#39;] = &#39;application/json;charset=utf-8&#39;
12 12 // 创建axios实例
13 13 const service = axios.create({
14 14 // 超时
15   - timeout: 10000
  15 + timeout: 180000
16 16 })
17 17 // request拦截器
18 18 service.interceptors.request.use(config => {
... ...
trash-ui/src/views/casefile/violationCaseFile/index.vue
  View file @5bb0d1b
... ... @@ -217,6 +217,13 @@
217 217 <el-radio label="区管理部门">区管理部门</el-radio>
218 218 <el-radio label="运输企业">运输企业</el-radio>
219 219 </el-radio-group>
  220 + </el-form-item>
  221 +
  222 + <el-form-item label="推送对象">
  223 + <el-radio-group v-model="form.needUpload">
  224 + <el-radio label="0" checked="checked" >否</el-radio>
  225 + <el-radio label="1">是</el-radio>
  226 + </el-radio-group>
220 227 </el-form-item>
221 228 <el-form-item label="附件预览" v-if="slide1.length!=0">
222 229 <el-image v-for="item in slide1"
... ...
trash-ui/src/views/h5/dayWorkReport/index.vue
  View file @5bb0d1b
... ... @@ -62,14 +62,20 @@
62 62 <el-row>
63 63 <el-form-item label="开始时间" v-if="this.queryParams.his > 0">
64 64 <el-date-picker
65   - v-model="queryParams.timeRange"
  65 + v-model="queryParams.workStartTime"
66 66 value-format="yyyy-MM-dd HH:mm:ss"
67   - type="datetimerange"
68   - range-separator="至"
69   - start-placeholder="开始日期"
70   - end-placeholder="结束日期">
  67 + type="datetime"
  68 + placeholder="开始日期">
71 69 </el-date-picker>
72   - </el-form-item>
  70 + </el-form-item>
  71 + <el-form-item label="结束日期" v-if="this.queryParams.his > 0">
  72 + <el-date-picker
  73 + v-model="queryParams.workEndTime"
  74 + value-format="yyyy-MM-dd HH:mm:ss"
  75 + type="datetime"
  76 + placeholder="结束日期">
  77 + </el-date-picker>
  78 + </el-form-item>
73 79 </el-row>
74 80 <el-form-item>
75 81 <el-button type="primary" size="mini" @click="handleQuery">搜索</el-button>
... ...
trash-ui/src/views/h5/truckActivate/index.vue
  View file @5bb0d1b
... ... @@ -32,14 +32,25 @@
32 32 <el-option label="未激活" value="0"/>
33 33 <el-option label="已激活" value="1"/>
34 34 </el-select>
35   - </el-form-item>
36   - <el-form-item label="激活时间" prop="createTime" v-if="openActivateTime">
37   - <el-date-picker v-model="queryParams.createTime" type="datetimerange"
38   - start-placeholder="开始日期"
39   - value-format="yyyy-MM-dd HH:mm:ss"
40   - end-placeholder="结束日期">
41   - </el-date-picker>
42   - </el-form-item>
  35 + </el-form-item>
  36 + <el-form-item label="开始时间" v-if="openActivateTime">
  37 + <el-date-picker
  38 + v-model="queryParams.startTime"
  39 + value-format="yyyy-MM-dd HH:mm:ss"
  40 + type="datetime"
  41 + placeholder="开始日期">
  42 + </el-date-picker>
  43 + </el-form-item>
  44 + <el-form-item label="结束时间" v-if="openActivateTime">
  45 + <el-date-picker
  46 + v-model="queryParams.endTime"
  47 + value-format="yyyy-MM-dd HH:mm:ss"
  48 + type="datetime"
  49 + placeholder="结束日期">
  50 + </el-date-picker>
  51 + </el-form-item>
  52 +
  53 +
43 54 <el-form-item>
44 55 <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
45 56 <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
... ...
trash-workFlow/src/main/java/com/trash/business/mapper/TruckCreditMapper.java
  View file @5bb0d1b
... ... @@ -65,4 +65,6 @@ public interface TruckCreditMapper
65 65 List<TruckCredit> selectTruckCreditHistory(TruckCredit truckCredit);
66 66  
67 67 public List<String> getCompanys(TruckCredit truckCredit);
  68 +
  69 + TruckCredit selectTruckCreditByObjectId(String objectId);
68 70 }
69 71 \ No newline at end of file
... ...
trash-workFlow/src/main/java/com/trash/business/service/impl/CompanyCreditServiceImpl.java
  View file @5bb0d1b
... ... @@ -150,6 +150,7 @@ public class CompanyCreditServiceImpl implements ICompanyCreditService {
150 150  
151 151 map.put("companyID", companyId);
152 152 map.put("valid", 0);
  153 + map.put("size", 99999);
153 154 JSONArray turckList = null;
154 155 if (token == null) {
155 156 RemoteServerUtils.updateCompanyList(cpcList);
... ...
trash-workFlow/src/main/java/com/trash/business/service/impl/TruckCreditServiceImpl.java
  View file @5bb0d1b
... ... @@ -129,6 +129,7 @@ public class TruckCreditServiceImpl implements ITruckCreditService
129 129 if(old.size() > 0){
130 130 i = 1;
131 131 }else{
  132 + cc.setTime(new Date());
132 133 i = truckCreditMapper.insertTruckCredit(truckCredit);
133 134 }
134 135  
... ... @@ -145,8 +146,16 @@ public class TruckCreditServiceImpl implements ITruckCreditService
145 146 @Override
146 147 @Transactional
147 148 public int updateTruckCredit(TruckCredit truckCredit)
148   - {
149   - TruckCredit cc = truckCreditMapper.selectTruckCreditById(truckCredit.getId());
  149 + {
  150 + TruckCredit cc = null;
  151 + if(truckCredit.getObjectId() != null){
  152 + cc = truckCreditMapper.selectTruckCreditByObjectId(truckCredit.getObjectId());
  153 + }else{
  154 + cc = truckCreditMapper.selectTruckCreditById(truckCredit.getId());
  155 + }
  156 +
  157 + if(cc == null)
  158 + return 0;
150 159  
151 160 cc.setStatus(1L);
152 161  
... ... @@ -155,7 +164,17 @@ public class TruckCreditServiceImpl implements ITruckCreditService
155 164  
156 165 cc.setReason(truckCredit.getReason());
157 166 cc.setLostCredit(0L);
  167 +
  168 + List<Map> listParam = new ArrayList<>();
  169 + Map param = new HashMap<>();
  170 +
  171 + param.put("id", cc.getObjectId());
  172 + param.put("creditStatus", 0);
  173 +
  174 + listParam.add(param);
158 175  
  176 + RemoteServerUtils.updateTruckList(listParam);
  177 +
159 178 return insertTruckCredit(cc);
160 179  
161 180 } catch (Exception e) {
... ...
trash-workFlow/src/main/java/com/trash/casefile/controller/ViolationCaseFileController.java
  View file @5bb0d1b
... ... @@ -133,10 +133,10 @@ public class ViolationCaseFileController extends BaseController {
133 133 "其他2", "其他3", "其他4", "其他5" };
134 134  
135 135 @GetMapping(value = "/caseTable")
136   - public AjaxResult getTable(String owningRegion, String startDate, String endDate) {
  136 + public AjaxResult getTable(String owningRegion, String startDate, String endDate,String violationObjectType) {
137 137 List<HashMap<String, String>> maps = new ArrayList<HashMap<String, String>>();
138 138  
139   - if (owningRegion.equals("长沙市")) {
  139 + if (owningRegion == null || owningRegion.equals("长沙市")) {
140 140 owningRegion = "";
141 141 }
142 142  
... ... @@ -146,7 +146,7 @@ public class ViolationCaseFileController extends BaseController {
146 146 }
147 147  
148 148 List<ViolationCaseFile> list = violationCaseFileService.selectViolationCaseFileListByTable(owningRegion,
149   - startDate, endDate);
  149 + startDate, endDate,violationObjectType);
150 150  
151 151 for (String type : caseType) {
152 152  
... ...
trash-workFlow/src/main/java/com/trash/casefile/controller/ViolationWarningInformationController.java
  View file @5bb0d1b
... ... @@ -141,17 +141,17 @@ public class ViolationWarningInformationController extends BaseController
141 141 "闯禁行驶", "失信车辆作业", "卫星定位异常"};
142 142  
143 143 @GetMapping(value = "/caseTable")
144   - public AjaxResult getTable(String owningRegion,String startDate,String endDate){
  144 + public AjaxResult getTable(String owningRegion,String startDate,String endDate,String violationObjectType){
145 145 List<HashMap<String, String>> maps = new ArrayList<HashMap<String,String>>();
146 146  
147   - if(owningRegion.equals("长沙市")){
  147 + if(owningRegion == null || owningRegion.equals("长沙市")){
148 148 owningRegion = "";
149 149 }
150 150 if(startDate != null && endDate != null&&startDate!=""&&endDate!=""){
151 151 startDate = startDate.substring(0,10);
152 152 endDate = endDate.substring(0,10);
153 153 }
154   - List<ViolationWarningInformation> list = violationWarningInformationService.selectViolationWarningInformationListByTable(owningRegion,startDate,endDate);
  154 + List<ViolationWarningInformation> list = violationWarningInformationService.selectViolationWarningInformationListByTable(owningRegion,startDate,endDate,violationObjectType);
155 155  
156 156 for(String type:caseType){
157 157  
... ...
trash-workFlow/src/main/java/com/trash/casefile/domain/ViolationCaseFile.java
  View file @5bb0d1b
... ... @@ -87,8 +87,19 @@ public class ViolationCaseFile extends BaseEntity
87 87  
88 88 private List<String> names;
89 89  
  90 + private short needUpload;
90 91  
91   - public List<String> getNames() {
  92 +
  93 +
  94 + public short getNeedUpload() {
  95 + return needUpload;
  96 + }
  97 +
  98 + public void setNeedUpload(short needUpload) {
  99 + this.needUpload = needUpload;
  100 + }
  101 +
  102 + public List<String> getNames() {
92 103 return names;
93 104 }
94 105  
... ...
trash-workFlow/src/main/java/com/trash/casefile/mapper/ViolationCaseFileMapper.java
  View file @5bb0d1b
... ... @@ -28,7 +28,7 @@ public interface ViolationCaseFileMapper
28 28 */
29 29 List<ViolationCaseFile> selectViolationCaseFileList(ViolationCaseFile violationCaseFile);
30 30  
31   - List<ViolationCaseFile> selectViolationCaseFileListByTable(@Param("owningRegion") String owningRegion, @Param("startDate")String startDate, @Param("endDate")String endDate);
  31 + List<ViolationCaseFile> selectViolationCaseFileListByTable(@Param("owningRegion") String owningRegion, @Param("startDate")String startDate, @Param("endDate")String endDate, @Param("violationObjectType")String violationObjectType);
32 32  
33 33 /**
34 34 * 新增平台违规案卷
... ...
trash-workFlow/src/main/java/com/trash/casefile/mapper/ViolationWarningInformationMapper.java
  View file @5bb0d1b
... ... @@ -37,7 +37,7 @@ public interface ViolationWarningInformationMapper
37 37 * @return 违规预警信息集合
38 38 */
39 39 List<ViolationWarningInformation> selectViolationWarningInformationList(ViolationWarningInformation violationWarningInformation);
40   - List<ViolationWarningInformation> selectViolationWarningInformationListByTable(@Param("owningRegion") String owningRegion,@Param("startDate")String startDate,@Param("endDate")String endDate);
  40 + List<ViolationWarningInformation> selectViolationWarningInformationListByTable(@Param("owningRegion") String owningRegion,@Param("startDate")String startDate,@Param("endDate")String endDate, @Param("violationObjectType")String violationObjectType);
41 41 /**
42 42 * 新增违规预警信息
43 43 *
... ...
trash-workFlow/src/main/java/com/trash/casefile/service/IViolationCaseFileService.java
  View file @5bb0d1b
... ... @@ -30,7 +30,7 @@ public interface IViolationCaseFileService
30 30 */
31 31 List<ViolationCaseFile> selectViolationCaseFileList(ViolationCaseFile violationCaseFile);
32 32  
33   - List<ViolationCaseFile> selectViolationCaseFileListByTable(String owningRegion,String startDate,String endDate);
  33 + List<ViolationCaseFile> selectViolationCaseFileListByTable(String owningRegion,String startDate,String endDate,String violationObjectType);
34 34  
35 35 /**
36 36 * 新增平台违规案卷
... ...
trash-workFlow/src/main/java/com/trash/casefile/service/IViolationWarningInformationService.java
  View file @5bb0d1b
... ... @@ -32,7 +32,7 @@ public interface IViolationWarningInformationService {
32 32 */
33 33 List<ViolationWarningInformation> selectViolationWarningInformationList(ViolationWarningInformation violationWarningInformation);
34 34  
35   - List<ViolationWarningInformation> selectViolationWarningInformationListByTable(String owningRegion,String startDate,String endDate);
  35 + List<ViolationWarningInformation> selectViolationWarningInformationListByTable(String owningRegion,String startDate,String endDate,String violationObjectType);
36 36  
37 37 /**
38 38 * 新增违规预警信息
... ...
trash-workFlow/src/main/java/com/trash/casefile/service/impl/ViolationCaseFileServiceImpl.java
  View file @5bb0d1b
... ... @@ -16,6 +16,7 @@ import org.springframework.transaction.annotation.Transactional;
16 16 import org.springframework.web.multipart.MultipartFile;
17 17  
18 18 import com.trash.casefile.domain.ViolationCaseFile;
  19 +import com.trash.casefile.domain.ViolationWarningInformation;
19 20 import com.trash.casefile.domain.vo.ViolationCaseFileVo;
20 21 import com.trash.casefile.mapper.ViolationCaseFileMapper;
21 22 import com.trash.casefile.service.IViolationCaseFileService;
... ... @@ -135,10 +136,32 @@ public class ViolationCaseFileServiceImpl implements IViolationCaseFileService
135 136 return violationCaseFileMapper.selectViolationCaseFileList(violationCaseFile);
136 137 }
137 138  
  139 +
  140 + String cString = "工地预警-未报开工作业,工地预警-视频设备离线超时报警,工地预警-三无车辆进入工地,工地预警-未按时间作业,";
  141 + String eString = "处理场所预警-未报开工作业,处理场所预警-视频设备离线超时报警,处理场所预警-三无车辆进入处理场所,处理场所预警-未到指定的处理场所作业";
  142 + String tString = "离线运输报警(工),离线运输报警(消),未激活车辆作业,未核准作业车辆作业,未按线路行驶,闯禁行驶,失信车辆作业,卫星定位异常";
  143 +
138 144 @Override
139   - public List<ViolationCaseFile> selectViolationCaseFileListByTable(String owningRegion,String startDate,String endDate)
140   - {
141   - return violationCaseFileMapper.selectViolationCaseFileListByTable(owningRegion,startDate,endDate);
  145 + public List<ViolationCaseFile> selectViolationCaseFileListByTable(String owningRegion,String startDate,String endDate,String violationObjectType)
  146 + {
  147 +
  148 +
  149 + List<ViolationCaseFile> list = violationCaseFileMapper.selectViolationCaseFileListByTable(owningRegion,startDate,endDate,violationObjectType);
  150 +
  151 + if(violationObjectType != null && !violationObjectType.isEmpty()){
  152 + List<ViolationCaseFile> newList = new ArrayList<>();
  153 + for(ViolationCaseFile v:list){
  154 + if(violationObjectType.equals("0") && cString.contains(v.getViolationType())
  155 + || (violationObjectType.equals("1") && eString.contains(v.getViolationType()))
  156 + || (violationObjectType.equals("2") && tString.contains(v.getViolationType()))){
  157 + newList.add(v);
  158 + }
  159 + }
  160 + return newList;
  161 + }else{
  162 + return list;
  163 + }
  164 +
142 165 }
143 166  
144 167 /**
... ...
trash-workFlow/src/main/java/com/trash/casefile/service/impl/ViolationWarningInformationServiceImpl.java
  View file @5bb0d1b
... ... @@ -24,6 +24,8 @@ import com.trash.common.utils.file.FileUploadUtils;
24 24 import com.trash.office.domain.UploadFile;
25 25 import com.trash.office.mapper.UploadFileMapper;
26 26 import com.trash.workflow.service.IWorkflowService;
  27 +
  28 +import org.apache.ibatis.javassist.expr.NewArray;
27 29 import org.slf4j.Logger;
28 30 import org.slf4j.LoggerFactory;
29 31 import org.springframework.beans.factory.annotation.Autowired;
... ... @@ -135,11 +137,32 @@ public class ViolationWarningInformationServiceImpl implements IViolationWarning
135 137 return violationWarningInformationMapper.selectViolationWarningInformationList(violationWarningInformation);
136 138 }
137 139  
  140 +
  141 + String cString = "工地预警-未报开工作业,工地预警-视频设备离线超时报警,工地预警-三无车辆进入工地,工地预警-未按时间作业,";
  142 + String eString = "处理场所预警-未报开工作业,处理场所预警-视频设备离线超时报警,处理场所预警-三无车辆进入处理场所,处理场所预警-未到指定的处理场所作业";
  143 + String tString = "离线运输报警(工),离线运输报警(消),未激活车辆作业,未核准作业车辆作业,未按线路行驶,闯禁行驶,失信车辆作业,卫星定位异常";
  144 +
138 145 @Override
139   - public List<ViolationWarningInformation> selectViolationWarningInformationListByTable(String owningRegion,
140   - String startDate, String endDate) {
141   - return violationWarningInformationMapper.selectViolationWarningInformationListByTable(owningRegion, startDate,
142   - endDate);
  146 + public List<ViolationWarningInformation> selectViolationWarningInformationListByTable(String owningRegion,String startDate, String endDate,String violationObjectType) {
  147 +
  148 +
  149 + List<ViolationWarningInformation> list = violationWarningInformationMapper.selectViolationWarningInformationListByTable(owningRegion, startDate,endDate,violationObjectType);
  150 +
  151 + if(violationObjectType != null && !violationObjectType.isEmpty()){
  152 + List<ViolationWarningInformation> newList = new ArrayList<>();
  153 + for(ViolationWarningInformation v:list){
  154 + if(violationObjectType.equals("0") && cString.contains(v.getViolationType())
  155 + || (violationObjectType.equals("1") && eString.contains(v.getViolationType()))
  156 + || (violationObjectType.equals("2") && tString.contains(v.getViolationType()))){
  157 + newList.add(v);
  158 + }
  159 + }
  160 + return newList;
  161 + }else{
  162 + return list;
  163 + }
  164 +
  165 +
143 166 }
144 167  
145 168 /**
... ...
trash-workFlow/src/main/resources/mapper/CompanyCreditMapper.xml
  View file @5bb0d1b
... ... @@ -40,7 +40,7 @@
40 40 </where>
41 41 order by time DESC
42 42 </select>
43   -
  43 +
44 44 <select id="selectCompanyCreditById" parameterType="Long" resultMap="CompanyCreditResult">
45 45 <include refid="selectCompanyCreditVo"/>
46 46 where id = #{id}
... ...
trash-workFlow/src/main/resources/mapper/TruckCreditMapper.xml
  View file @5bb0d1b
... ... @@ -42,6 +42,11 @@
42 42 </where>
43 43 order by time DESC
44 44 </select>
  45 +
  46 + <select id="selectTruckCreditByObjectId" parameterType="String" resultMap="TruckCreditResult">
  47 + <include refid="selectTruckCreditVo"/>
  48 + where object_id = #{objectId} and status = 0
  49 + </select>
45 50  
46 51 <select id="selectTruckCreditById" parameterType="Long" resultMap="TruckCreditResult">
47 52 <include refid="selectTruckCreditVo"/>
... ...
trash-workFlow/src/main/resources/mapper/casefile/ViolationCaseFileMapper.xml
  View file @5bb0d1b
... ... @@ -25,10 +25,12 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
25 25 <result property="readBy" column="read_by" />
26 26 <result property="readTime" column="read_time" />
27 27 <result property="abbreviation" column="abbreviation" />
  28 + <result property="needUpload" column="need_upload" />
  29 +
28 30 </resultMap>
29 31  
30 32 <sql id="selectViolationCaseFileVo">
31   - select id, `number`, violation_object_type, owning_region, violation_type, violation_grade, project_name, company_name, `describe`, send_object, create_time, create_by, update_time, update_by, status, receive, receive_status, read_by, read_time,abbreviation from casefile_violation
  33 + select id, `number`, violation_object_type, owning_region, violation_type, violation_grade, project_name, company_name, `describe`, send_object, create_time, create_by, update_time, update_by, status, receive, receive_status, read_by, read_time,abbreviation,need_upload from casefile_violation
32 34 </sql>
33 35  
34 36 <select id="selectViolationCaseFileList" parameterType="violationCaseFile" resultMap="violationCaseFileResult">
... ... @@ -93,6 +95,8 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
93 95 <if test="readBy != null">read_by,</if>
94 96 <if test="readTime != null">read_time,</if>
95 97 <if test="abbreviation != null">abbreviation,</if>
  98 + <if test="needUpload != null">need_upload,</if>
  99 +
96 100 </trim>
97 101 <trim prefix="values (" suffix=")" suffixOverrides=",">
98 102 now(),
... ... @@ -112,6 +116,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
112 116 <if test="readBy != null">#{readBy},</if>
113 117 <if test="readTime != null">#{readTime},</if>
114 118 <if test="abbreviation != null">#{abbreviation},</if>
  119 + <if test="needUpload != null">need_upload = #{needUpload},</if>
115 120 </trim>
116 121 </insert>
117 122  
... ... @@ -135,6 +140,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
135 140 <if test="readBy != null">read_by = #{readBy},</if>
136 141 <if test="readTime != null">read_time = #{readTime},</if>
137 142 <if test="abbreviation != null">abbreviation = #{abbreviation},</if>
  143 + <if test="needUpload != null">need_upload = #{needUpload},</if>
138 144 </trim>
139 145 where id = #{id}
140 146 </update>
... ...