youxiw2000 / trash · Commits

Commit ab228c79ca8784384ee8614de0f1ea48e5ee4fa9

Authored by guzijian
2 parents ecd06eeb 1729275c
build: skipped

Merge remote-tracking branch 'origin/dev' into dev

Inline Side-by-side
Showing 14 changed files with 138 additions and 56 deletions
trash-activiti/src/main/resources/mapper/activiti/ActReDeploymentMapper.xml
  View file @ab228c7
... ... @@ -35,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
35 35 <foreach item="id" collection="ids" open="(" separator="," close=")">
36 36 #{id}
37 37 </foreach>
38   - GROUP BY id ORDER BY create_time
  38 + ORDER BY create_time
39 39 </select>
40 40  
41 41  
... ...
trash-ui/dist.zip
View file @ab228c7
No preview for this file type
trash-ui/src/api/three_step.js
  View file @ab228c7
... ... @@ -368,7 +368,7 @@ export default {
368 368 // this.rules.trucks[0].required = true;
369 369  
370 370 });
371   - } else if (this.form.type == "0") {
  371 + } else if (this.form.type == "1") {
372 372 if(this.remoteQueryData.areaCode)
373 373 this.remoteQueryData.areaCode = [this.remoteQueryData.areaCode+""];
374 374 this.remoteQueryData.overdue = 0;
... ... @@ -853,7 +853,8 @@ export default {
853 853 let query = {
854 854 "page": 1,
855 855 "size": 9999,
856   - "auditStatus": 1,
  856 + "auditStatus": 1,
  857 + "contractStatus":1
857 858 };
858 859  
859 860 this.form.companys = companyNames;
... ...
trash-ui/src/api/vio_casefile_info.js
  View file @ab228c7
... ... @@ -30,20 +30,20 @@ export default {
30 30 }
31 31 },
32 32 created() {
33   - let id = this.idInfo.split(":");
34   -
35   - if (id.length == 2) {
36   - this.idInfo = id[1];
37   - } else {
38   - this.idInfo = id;
39   - }
40   -
41 33  
42 34 this.init();
43 35 },
44 36 methods: {
45 37 init() {
46   - getViolationCaseFile(this.idInfo).then(response => {
  38 +
  39 + let id = this.idInfo.split(":");
  40 +
  41 + if (id.length == 2) {
  42 + id = id[1];
  43 + }
  44 +
  45 +
  46 + getViolationCaseFile(id).then(response => {
47 47 this.form = response.data.violationCaseFile;
48 48 let files = JSON.stringify(response.data.uploadFiles);
49 49 this.fileEntityList = JSON.parse(files.replaceAll("filePath", "url").replaceAll("fileName", "name"));
... ... @@ -57,26 +57,13 @@ export default {
57 57 })
58 58  
59 59 });
60   - listReplyApprovalProcess({tableName: "workflow_casefile" + ":" + this.idInfo}).then(response => {
  60 + listReplyApprovalProcess({tableName: "workflow_casefile" + ":" + id}).then(response => {
61 61 let array = response.rows;
62   - if(this.form.status == 0){
63   - historyFromData("workflow_casefile" + ":" + this.idInfo).then(response => {
  62 + historyFromData("workflow_casefile" + ":" + id).then(response => {
64 63 let newRep = [];
65   - let obj = response.data[0];
66   - let data = {
67   - reply:obj.controlValue,
68   - replyPeople:obj.createBy,
69   - replyTime:obj.createTime
70   - };
71   -
72   - newRep.push(data);
73   -
74   - for(let j in array){
75   - newRep.push(array[j]);
76   - }
77 64  
78 65 if(response.data.length - array.length == 2){
79   - let obj = response.data[response.data.length -1];
  66 + let obj = response.data[response.data.length -1];
80 67 let data = {
81 68 reply:obj.controlValue,
82 69 replyPeople:obj.createBy,
... ... @@ -85,10 +72,28 @@ export default {
85 72 newRep.push(data);
86 73 }
87 74  
  75 +
  76 + let obj = response.data[0];
  77 + if(obj){
  78 + let data = {
  79 + reply:obj.controlValue,
  80 + replyPeople:obj.createBy,
  81 + replyTime:obj.createTime
  82 + };
  83 +
  84 + newRep.push(data);
  85 + }
  86 +
  87 + for(let j in array){
  88 + newRep.push(array[j]);
  89 + }
  90 +
  91 +
  92 +
88 93 this.replyApprovalProcessList = newRep;
89 94 this.$forceUpdate();
90 95 });
91   - }
  96 +
92 97 });
93 98  
94 99  
... ...
trash-ui/src/api/vio_warning_info.js
  View file @ab228c7
... ... @@ -31,18 +31,17 @@ export default {
31 31 }
32 32 },
33 33 created() {
34   - let id = this.idInfo.split(":");
35 34  
36   - if (id.length == 2) {
37   - this.idInfo = id[1];
38   - } else {
39   - this.idInfo = id;
40   - }
41 35 this.init();
42 36 },
43 37 methods: {
44 38 init() {
45   - getViolationWarningInformation(this.idInfo).then(response => {
  39 + let id = this.idInfo.split(":");
  40 +
  41 + if (id.length == 2) {
  42 + id = id[1];
  43 + }
  44 + getViolationWarningInformation(id).then(response => {
46 45 this.form = response.data.violationWarningInformation;
47 46 let files = JSON.stringify(response.data.uploadFiles);
48 47 this.fileEntityList = JSON.parse(files.replaceAll("filePath", "url").replaceAll("fileName", "name"));
... ... @@ -58,26 +57,13 @@ export default {
58 57  
59 58 });
60 59  
61   - listReplyApprovalProcess({tableName: "violation_warning" + ":" + this.idInfo}).then(response => {
  60 + listReplyApprovalProcess({tableName: "violation_warning" + ":" + id}).then(response => {
62 61 let array = response.rows;
63   - if(this.form.status == 0){
64   - historyFromData("violation_warning" + ":" + this.idInfo).then(response => {
  62 + historyFromData("violation_warning" + ":" + id).then(response => {
65 63 let newRep = [];
66   - let obj = response.data[0];
67   - let data = {
68   - reply:obj.controlValue,
69   - replyPeople:obj.createBy,
70   - replyTime:obj.createTime
71   - };
72   -
73   - newRep.push(data);
74   -
75   - for(let j in array){
76   - newRep.push(array[j]);
77   - }
78 64  
79 65 if(response.data.length - array.length == 2){
80   - let obj = response.data[response.data.length -1];
  66 + let obj = response.data[response.data.length -1];
81 67 let data = {
82 68 reply:obj.controlValue,
83 69 replyPeople:obj.createBy,
... ... @@ -85,11 +71,27 @@ export default {
85 71 };
86 72 newRep.push(data);
87 73 }
  74 +
  75 + let obj = response.data[0];
  76 + if(obj){
  77 + let data = {
  78 + reply:obj.controlValue,
  79 + replyPeople:obj.createBy,
  80 + replyTime:obj.createTime
  81 + };
  82 +
  83 + newRep.push(data);
  84 + }
  85 +
  86 +
  87 + for(let j in array){
  88 + newRep.push(array[j]);
  89 + }
88 90  
89 91 this.replyApprovalProcessList = newRep;
90 92 this.$forceUpdate();
91 93 });
92   - }
  94 +
93 95 });
94 96  
95 97 },
... ...
trash-ui/src/views/casefile/violationCaseFile/index.vue
  View file @ab228c7
... ... @@ -219,7 +219,7 @@
219 219 </el-radio-group>
220 220 </el-form-item>
221 221  
222   - <el-form-item label="ๆŽจ้€ๅฏน่ฑก">
  222 + <el-form-item label="็ปผ็ฎกๆœ">
223 223 <el-radio-group v-model="form.needUpload">
224 224 <el-radio label="0" checked="checked" >ๅฆ</el-radio>
225 225 <el-radio label="1">ๆ˜ฏ</el-radio>
... ...
trash-ui/src/views/h5/violationCaseFile/index.vue
  View file @ab228c7
... ... @@ -177,6 +177,12 @@
177 177 <el-radio label="ๅŒบ็ฎก็†้ƒจ้—จ">ๅŒบ็ฎก็†้ƒจ้—จ</el-radio>
178 178 <el-radio label="่ฟ่พ“ไผไธš">่ฟ่พ“ไผไธš</el-radio>
179 179 </el-radio-group>
  180 + </el-form-item>
  181 + <el-form-item label="็ปผ็ฎกๆœ">
  182 + <el-radio-group v-model="form.needUpload">
  183 + <el-radio label="0" checked="checked" >ๅฆ</el-radio>
  184 + <el-radio label="1">ๆ˜ฏ</el-radio>
  185 + </el-radio-group>
180 186 </el-form-item>
181 187 <el-form-item label="้™„ไปถ้ข„่งˆ" v-if="slide1.length!=0">
182 188 <el-image v-for="item in slide1"
... ...
trash-workFlow/src/main/java/com/trash/business/controller/SupervisionThreestepController.java
  View file @ab228c7
... ... @@ -321,6 +321,14 @@ public class SupervisionThreestepController extends BaseController
321 321 if(i==-2){
322 322 return AjaxResult.error("ๅฝ“ๅ‰ๆ—ถ้—ดๆ— ๆณ•ๆŠฅๅทฅ");
323 323 }
  324 +
  325 + if(i==-3){
  326 + return AjaxResult.error("้กน็›ฎๅทฒ่ถ…ๆœŸ!");
  327 + }
  328 + if(i==-4){
  329 + return AjaxResult.error("ๆŠฅๅทฅๆ•ฐๆฎๅผ‚ๅธธ,่ฏทๅˆทๆ–ฐ้กต้ข้‡ๆ–ฐๆไบค!");
  330 + }
  331 +
324 332 return toAjax(i);
325 333 }
326 334  
... ...
trash-workFlow/src/main/java/com/trash/business/service/impl/CompanyCreditServiceImpl.java
  View file @ab228c7
... ... @@ -251,6 +251,7 @@ public class CompanyCreditServiceImpl implements ICompanyCreditService {
251 251  
252 252 try {
253 253 companyCreditMapper.updateCompanyCredit(cc);
  254 + cc.setTime(new Date());
254 255  
255 256 cc.setReason(companyCredit.getReason());
256 257 cc.setLostCredit(0L);
... ...
trash-workFlow/src/main/java/com/trash/business/service/impl/ConstructionCreditServiceImpl.java
  View file @ab228c7
... ... @@ -180,7 +180,8 @@ public class ConstructionCreditServiceImpl implements IConstructionCreditService
180 180  
181 181 try {
182 182 constructionCreditMapper.updateConstructionCredit(cc);
183   -
  183 +
  184 + cc.setTime(new Date());
184 185 cc.setReason(constructionCredit.getReason());
185 186 cc.setLostCredit(0L);
186 187  
... ...
trash-workFlow/src/main/java/com/trash/business/service/impl/DriverCreditServiceImpl.java
  View file @ab228c7
... ... @@ -162,6 +162,7 @@ List&lt;String&gt; areas = SecurityUtils.getLoginUser().getUser().getCompanyAreas();
162 162 driverCreditMapper.updateDriverCredit(cc);
163 163  
164 164 cc.setReason(driverCredit.getReason());
  165 + cc.setTime(new Date());
165 166 cc.setLostCredit(0L);
166 167  
167 168 return insertDriverCredit(cc);
... ...
trash-workFlow/src/main/java/com/trash/business/service/impl/EarthsitesCreditServiceImpl.java
  View file @ab228c7
... ... @@ -145,6 +145,7 @@ public class EarthsitesCreditServiceImpl implements IEarthsitesCreditService
145 145 earthsitesCreditMapper.updateEarthsitesCredit(cc);
146 146  
147 147 cc.setReason(earthsitesCredit.getReason());
  148 + cc.setTime(new Date());
148 149 cc.setLostCredit(0L);
149 150  
150 151 return insertEarthsitesCredit(cc);
... ...
trash-workFlow/src/main/java/com/trash/business/service/impl/SupervisionThreestepServiceImpl.java
  View file @ab228c7
... ... @@ -713,6 +713,49 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
713 713  
714 714 return -1;
715 715 }
  716 +
  717 + if(supervisionThreestep.getType() == 0){
  718 +
  719 + Object object = RemoteServerUtils.getConstructionLicenseById(supervisionThreestep.getObjectId());
  720 +
  721 + if(object != null){
  722 + JSONObject jsonObject =(JSONObject) object;
  723 +
  724 + long time = new Date().getTime();
  725 +
  726 + try {
  727 + if(dateTime.parse(jsonObject.get("effectiveFrom").toString() + " 00:00:00").getTime() > time || dateTime.parse(jsonObject.get("effectiveEnd").toString()+ " 23:59:59").getTime() < time){
  728 + return -3;
  729 + }
  730 + } catch (ParseException e) {
  731 + e.printStackTrace();
  732 + }
  733 + }else{
  734 + return -4;
  735 + }
  736 +
  737 + }else{
  738 + Object object = RemoteServerUtils.getEarthSitesInfo(supervisionThreestep.getObjectId());
  739 +
  740 + if(object != null){
  741 + JSONObject jsonObject =(JSONObject)((JSONObject) object).getJSONObject("site");
  742 +
  743 + long time = new Date().getTime();
  744 +
  745 + try {
  746 + if(dateTime.parse(jsonObject.get("effectiveFrom").toString()+ " 00:00:00").getTime() > time || dateTime.parse(jsonObject.get("effectiveEnd").toString()+ " 23:59:59").getTime() < time){
  747 + return -3;
  748 + }
  749 + } catch (ParseException e) {
  750 + e.printStackTrace();
  751 + }
  752 +
  753 + }else{
  754 + return -4;
  755 + }
  756 +
  757 + }
  758 +
716 759  
717 760 supervisionThreestep.setCreateTime(DateUtils.getNowDate());
718 761 supervisionThreestep.setSelfCheckTime(DateUtils.getNowDate());
... ...
trash-workFlow/src/main/java/com/trash/business/service/impl/TruckCreditServiceImpl.java
  View file @ab228c7
... ... @@ -163,6 +163,7 @@ public class TruckCreditServiceImpl implements ITruckCreditService
163 163 truckCreditMapper.updateTruckCredit(cc);
164 164  
165 165 cc.setReason(truckCredit.getReason());
  166 + cc.setTime(new Date());
166 167 cc.setLostCredit(0L);
167 168  
168 169 List<Map> listParam = new ArrayList<>();
... ... @@ -227,6 +228,19 @@ public class TruckCreditServiceImpl implements ITruckCreditService
227 228 if(companys.size() > 0){
228 229  
229 230 JSONArray jsonArray = redisCache.getCacheObject("truckList");
  231 + JSONArray delete= redisCache.getCacheObject("deletedTrucks");
  232 +
  233 + if(delete == null){
  234 + Map<String, Object> map = new HashMap<>();
  235 + map.put("size", 99999);
  236 + map.put("valid", 1);
  237 + map.put("page", 1);
  238 +
  239 + delete = RemoteServerUtils.getTruckList(map);
  240 + redisCache.setCacheObject("deletedTrucks", delete);
  241 + }
  242 +
  243 + jsonArray.addAll(delete);
230 244  
231 245  
232 246 for(Object obj:jsonArray){
... ... @@ -239,7 +253,6 @@ public class TruckCreditServiceImpl implements ITruckCreditService
239 253  
240 254 truckCredit.setIds(ids);
241 255  
242   -
243 256 list = truckCreditMapper.selectTruckCreditHistory(truckCredit);
244 257 }
245 258  
... ...