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

guzijian
2 parents ecd06eeb 1729275c
Showing 14 changed files with 138 additions and 56 deletions
trash-activiti/src/main/resources/mapper/activiti/ActReDeploymentMapper.xml
trash-ui/dist.zip
trash-ui/src/api/three_step.js
trash-ui/src/api/vio_casefile_info.js
trash-ui/src/api/vio_warning_info.js
trash-ui/src/views/casefile/violationCaseFile/index.vue
trash-ui/src/views/h5/violationCaseFile/index.vue
trash-workFlow/src/main/java/com/trash/business/controller/SupervisionThreestepController.java
trash-workFlow/src/main/java/com/trash/business/service/impl/CompanyCreditServiceImpl.java
trash-workFlow/src/main/java/com/trash/business/service/impl/ConstructionCreditServiceImpl.java
trash-workFlow/src/main/java/com/trash/business/service/impl/DriverCreditServiceImpl.java
trash-workFlow/src/main/java/com/trash/business/service/impl/EarthsitesCreditServiceImpl.java
trash-workFlow/src/main/java/com/trash/business/service/impl/SupervisionThreestepServiceImpl.java
trash-workFlow/src/main/java/com/trash/business/service/impl/TruckCreditServiceImpl.java
@@ -35,7 +35,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
         <foreach item="id" collection="ids" open="(" separator="," close=")">
             #{id}
         </foreach>
-        GROUP BY id ORDER BY create_time
+        ORDER BY create_time
 	</select>
@@ -368,7 +368,7 @@ export default {
               // this.rules.trucks[0].required = true;
           });
-        } else if (this.form.type == "0") {
+        } else if (this.form.type == "1") {
           if(this.remoteQueryData.areaCode)
             this.remoteQueryData.areaCode = [this.remoteQueryData.areaCode+""];
             this.remoteQueryData.overdue = 0;
@@ -853,7 +853,8 @@ export default {
           let query = {
             "page": 1,
             "size": 9999,
-            "auditStatus": 1,
+            "auditStatus": 1,
+            "contractStatus":1
           };
           this.form.companys = companyNames;
@@ -30,20 +30,20 @@ export default {
     }
   },
   created() {
-    let id = this.idInfo.split(":");
-
-    if (id.length == 2) {
-      this.idInfo = id[1];
-    } else {
-      this.idInfo = id;
-    }
-
     this.init();
   },
   methods: {
     init() {
-      getViolationCaseFile(this.idInfo).then(response => {
+
+      let id = this.idInfo.split(":");
+
+      if (id.length == 2) {
+        id = id[1];
+      }
+
+
+      getViolationCaseFile(id).then(response => {
         this.form = response.data.violationCaseFile;
         let files = JSON.stringify(response.data.uploadFiles);
         this.fileEntityList = JSON.parse(files.replaceAll("filePath", "url").replaceAll("fileName", "name"));
@@ -57,26 +57,13 @@ export default {
         })
       });
-        listReplyApprovalProcess({tableName: "workflow_casefile" + ":" + this.idInfo}).then(response => {
+        listReplyApprovalProcess({tableName: "workflow_casefile" + ":" + id}).then(response => {
           let array = response.rows;
-          if(this.form.status == 0){
-            historyFromData("workflow_casefile" + ":" + this.idInfo).then(response => {
+            historyFromData("workflow_casefile" + ":" + id).then(response => {
                 let newRep = [];
-                let obj = response.data[0];
-                let data  = {
-                  reply:obj.controlValue,
-                  replyPeople:obj.createBy,
-                  replyTime:obj.createTime
-                };
-
-                newRep.push(data);
-
-                for(let j in array){
-                    newRep.push(array[j]);
-                }
                 if(response.data.length - array.length == 2){
-                let obj = response.data[response.data.length -1];
+                  let obj = response.data[response.data.length -1];
                   let data  = {
                     reply:obj.controlValue,
                     replyPeople:obj.createBy,
@@ -85,10 +72,28 @@ export default {
                     newRep.push(data);
                 }
+
+                let obj = response.data[0];
+               if(obj){
+                 let data  = {
+                   reply:obj.controlValue,
+                   replyPeople:obj.createBy,
+                   replyTime:obj.createTime
+                 };
+                 
+                 newRep.push(data);
+               }
+
+                for(let j in array){
+                    newRep.push(array[j]);
+                }
+
+
+
                 this.replyApprovalProcessList = newRep;
                 this.$forceUpdate();
             });
-          }
+
         });
@@ -31,18 +31,17 @@ export default {
     }
   },
   created() {
-    let id = this.idInfo.split(":");
-    if (id.length == 2) {
-      this.idInfo = id[1];
-    } else {
-      this.idInfo = id;
-    }
     this.init();
   },
   methods: {
     init() {
-      getViolationWarningInformation(this.idInfo).then(response => {
+      let id = this.idInfo.split(":");
+
+      if (id.length == 2) {
+        id = id[1];
+      }
+      getViolationWarningInformation(id).then(response => {
         this.form = response.data.violationWarningInformation;
         let files = JSON.stringify(response.data.uploadFiles);
         this.fileEntityList = JSON.parse(files.replaceAll("filePath", "url").replaceAll("fileName", "name"));
@@ -58,26 +57,13 @@ export default {
       });
-        listReplyApprovalProcess({tableName: "violation_warning" + ":" + this.idInfo}).then(response => {
+        listReplyApprovalProcess({tableName: "violation_warning" + ":" + id}).then(response => {
           let array = response.rows;
-          if(this.form.status == 0){
-            historyFromData("violation_warning" + ":" + this.idInfo).then(response => {
+            historyFromData("violation_warning" + ":" + id).then(response => {
                 let newRep = [];
-                let obj = response.data[0];
-                let data  = {
-                  reply:obj.controlValue,
-                  replyPeople:obj.createBy,
-                  replyTime:obj.createTime
-                };
-
-                newRep.push(data);
-
-                for(let j in array){
-                    newRep.push(array[j]);
-                }
                 if(response.data.length - array.length == 2){
-                let obj = response.data[response.data.length -1];
+                  let obj = response.data[response.data.length -1];
                   let data  = {
                     reply:obj.controlValue,
                     replyPeople:obj.createBy,
@@ -85,11 +71,27 @@ export default {
                   };
                     newRep.push(data);
                 }
+                
+                let obj = response.data[0];
+                if(obj){
+                  let data  = {
+                    reply:obj.controlValue,
+                    replyPeople:obj.createBy,
+                    replyTime:obj.createTime
+                  };
+                  
+                  newRep.push(data);
+                }
+              
+
+                for(let j in array){
+                    newRep.push(array[j]);
+                }
                 this.replyApprovalProcessList = newRep;
                 this.$forceUpdate();
             });
-          }
+
         });
     },
@@ -219,7 +219,7 @@
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="推送对象">
+        <el-form-item label="综管服">
           <el-radio-group v-model="form.needUpload">
             <el-radio label="0" checked="checked" >否</el-radio>
             <el-radio label="1">是</el-radio>
@@ -177,6 +177,12 @@
             <el-radio label="区管理部门">区管理部门</el-radio>
             <el-radio label="运输企业">运输企业</el-radio>
           </el-radio-group>
+        </el-form-item>
+        <el-form-item label="综管服">
+          <el-radio-group v-model="form.needUpload">
+            <el-radio label="0" checked="checked" >否</el-radio>
+            <el-radio label="1">是</el-radio>
+          </el-radio-group>
         </el-form-item>
         <el-form-item label="附件预览" v-if="slide1.length!=0">
           <el-image v-for="item in slide1"
@@ -321,6 +321,14 @@ public class SupervisionThreestepController extends BaseController
     	if(i==-2){
     		return AjaxResult.error("当前时间无法报工");
     	}
+    	
+    	if(i==-3){
+    		return AjaxResult.error("项目已超期!");
+    	}
+    	if(i==-4){
+    		return AjaxResult.error("报工数据异常,请刷新页面重新提交!");
+    	}
+    	
         return toAjax(i);
     }
@@ -251,6 +251,7 @@ public class CompanyCreditServiceImpl implements ICompanyCreditService {
 		try {
 			companyCreditMapper.updateCompanyCredit(cc);
+            cc.setTime(new Date());
 			cc.setReason(companyCredit.getReason());
 			cc.setLostCredit(0L);
@@ -180,7 +180,8 @@ public class ConstructionCreditServiceImpl implements IConstructionCreditService
     	try {
         	constructionCreditMapper.updateConstructionCredit(cc);
-        	
+
+            cc.setTime(new Date());
         	cc.setReason(constructionCredit.getReason());
         	cc.setLostCredit(0L);
@@ -162,6 +162,7 @@ List&lt;String&gt; areas = SecurityUtils.getLoginUser().getUser().getCompanyAreas();
             driverCreditMapper.updateDriverCredit(cc);
             cc.setReason(driverCredit.getReason());
+            cc.setTime(new Date());
             cc.setLostCredit(0L);
             return insertDriverCredit(cc);
@@ -145,6 +145,7 @@ public class EarthsitesCreditServiceImpl implements IEarthsitesCreditService
             earthsitesCreditMapper.updateEarthsitesCredit(cc);
             cc.setReason(earthsitesCredit.getReason());
+            cc.setTime(new Date());
             cc.setLostCredit(0L);
             return insertEarthsitesCredit(cc);
@@ -713,6 +713,49 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 			return -1;
 		}
+		
+		if(supervisionThreestep.getType() == 0){
+			
+			Object object = RemoteServerUtils.getConstructionLicenseById(supervisionThreestep.getObjectId());
+			
+			if(object != null){
+				JSONObject jsonObject  =(JSONObject) object;
+				
+				long time = new Date().getTime();
+				
+				try {
+					if(dateTime.parse(jsonObject.get("effectiveFrom").toString() + " 00:00:00").getTime() > time || dateTime.parse(jsonObject.get("effectiveEnd").toString()+ " 23:59:59").getTime() < time){
+						return -3;
+					}
+				} catch (ParseException e) {
+					e.printStackTrace();
+				}
+			}else{
+				return -4;
+			}
+			
+		}else{
+			Object object = RemoteServerUtils.getEarthSitesInfo(supervisionThreestep.getObjectId());
+			
+			if(object != null){
+				JSONObject jsonObject  =(JSONObject)((JSONObject) object).getJSONObject("site");
+				
+				long time = new Date().getTime();
+				
+				try {
+					if(dateTime.parse(jsonObject.get("effectiveFrom").toString()+ " 00:00:00").getTime() > time || dateTime.parse(jsonObject.get("effectiveEnd").toString()+ " 23:59:59").getTime() < time){
+						return -3;
+					}
+				} catch (ParseException e) {
+					e.printStackTrace();
+				}
+				
+			}else{
+				return -4;
+			}
+			
+		}
+		
 		supervisionThreestep.setCreateTime(DateUtils.getNowDate());
 		supervisionThreestep.setSelfCheckTime(DateUtils.getNowDate());
@@ -163,6 +163,7 @@ public class TruckCreditServiceImpl implements ITruckCreditService
             truckCreditMapper.updateTruckCredit(cc);
             cc.setReason(truckCredit.getReason());
+            cc.setTime(new Date());
             cc.setLostCredit(0L);
             List<Map> listParam = new ArrayList<>();
@@ -227,6 +228,19 @@ public class TruckCreditServiceImpl implements ITruckCreditService
 				if(companys.size() > 0){
 					JSONArray jsonArray = redisCache.getCacheObject("truckList");
+					JSONArray delete= redisCache.getCacheObject("deletedTrucks");
+					
+					if(delete == null){
+						Map<String, Object> map = new HashMap<>();
+						map.put("size", 99999);
+						map.put("valid", 1);
+						map.put("page", 1);
+
+						delete = RemoteServerUtils.getTruckList(map);
+						redisCache.setCacheObject("deletedTrucks", delete);
+					}
+					
+					jsonArray.addAll(delete);
 					for(Object obj:jsonArray){
@@ -239,7 +253,6 @@ public class TruckCreditServiceImpl implements ITruckCreditService
 				truckCredit.setIds(ids);
-				
 				list = truckCreditMapper.selectTruckCreditHistory(truckCredit);
 			}