Merge branch 'dev' of http://192.168.168.245:8888/youxiw20000/trash into dev

guzijian
2 parents 322bf3a3 716a93a0
Showing 7 changed files with 150 additions and 38 deletions
trash-garbage/src/main/java/com/trash/garbage/pojo/domain/GarUserOrderMessageHistory.java
trash-ui/dist.7z
trash-ui/src/api/vio_casefile.js
trash-workFlow/src/main/java/com/trash/business/service/impl/TruckActivateServiceImpl.java
trash-workFlow/src/main/java/com/trash/casefile/service/impl/ViolationCaseFileServiceImpl.java
trash-workFlow/src/main/java/com/trash/casefile/service/impl/ViolationWarningInformationServiceImpl.java
trash-workFlow/src/main/java/com/trash/workflow/service/impl/WorkflowServiceImpl.java
@@ -109,7 +109,93 @@ public class GarUserOrderMessageHistory implements Serializable {
         return result;
     }
-    @Override
+    
+    
+    public String getGarId() {
+		return garId;
+	}
+
+	public void setGarId(String garId) {
+		this.garId = garId;
+	}
+
+	public String getGarContent() {
+		return garContent;
+	}
+
+	public void setGarContent(String garContent) {
+		this.garContent = garContent;
+	}
+
+	public Date getGarCreateTime() {
+		return garCreateTime;
+	}
+
+	public void setGarCreateTime(Date garCreateTime) {
+		this.garCreateTime = garCreateTime;
+	}
+
+	public Date getGarUpdateTime() {
+		return garUpdateTime;
+	}
+
+	public void setGarUpdateTime(Date garUpdateTime) {
+		this.garUpdateTime = garUpdateTime;
+	}
+
+	public String getGarCreateBy() {
+		return garCreateBy;
+	}
+
+	public void setGarCreateBy(String garCreateBy) {
+		this.garCreateBy = garCreateBy;
+	}
+
+	public String getGarUpdateBy() {
+		return garUpdateBy;
+	}
+
+	public void setGarUpdateBy(String garUpdateBy) {
+		this.garUpdateBy = garUpdateBy;
+	}
+
+	public String getGarRemark() {
+		return garRemark;
+	}
+
+	public void setGarRemark(String garRemark) {
+		this.garRemark = garRemark;
+	}
+
+	public String getGarUserId() {
+		return garUserId;
+	}
+
+	public void setGarUserId(String garUserId) {
+		this.garUserId = garUserId;
+	}
+
+	public String getGarUserTel() {
+		return garUserTel;
+	}
+
+	public void setGarUserTel(String garUserTel) {
+		this.garUserTel = garUserTel;
+	}
+
+	public Integer getGarMessageState() {
+		return garMessageState;
+	}
+
+	public void setGarMessageState(Integer garMessageState) {
+		this.garMessageState = garMessageState;
+	}
+
+	public static long getSerialversionuid() {
+		return serialVersionUID;
+	}
+
+	@Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append(getClass().getSimpleName());
@@ -62,7 +62,9 @@ export default {
         receive: null,
         receiveStatus: null,
         readBy: null,
-        readTime: null
+        readTime: null,
+        isAsc:"DESC",
+        orderByColumn:"casefile_violation desc,createTime"
       },
       // 表单参数
       form: {},
@@ -141,12 +141,15 @@ public class TruckActivateServiceImpl implements ITruckActivateService {
 				if(eList != null && eList.size() > 0){
 					for(Object obj:eList){
 						JSONObject earth = (JSONObject) obj;
-						if(earth.getString("earthSiteName") != null){
+						if(earth.getString("earthSiteName") != null && earth.getInteger("status") == 1){
 							earthName += earth.getString("earthSiteName") + ",";
+							
+							if(earth.getString("routeName") != null){
+								routeName += earth.getString("routeName") + ",";
+							}
+							
 						}
-						if(earth.getString("routeName") != null){
-							routeName += earth.getString("routeName") + ",";
-						}
+						
 					}
 					if(earthName.length() > 0)
 						earthName = earthName.substring(0,earthName.length()-1);
@@ -223,12 +226,14 @@ public class TruckActivateServiceImpl implements ITruckActivateService {
 		if(eList != null && eList.size() > 0){
 			for(Object obj:eList){
 				JSONObject earth = (JSONObject) obj;
-				if(earth.getString("earthSiteName") != null){
+				if(earth.getString("earthSiteName") != null && earth.getInteger("status") == 1){
 					earthName += earth.getString("earthSiteName") + ",";
+					
+					if(earth.getString("routeName") != null){
+						routeName += earth.getString("routeName") + ",";
+					}
 				}
-				if(earth.getString("routeName") != null){
-					routeName += earth.getString("routeName") + ",";
-				}
+				
 			}
 			if(earthName.length() > 0)
@@ -35,6 +35,7 @@ import com.trash.office.domain.UploadFile;
 import com.trash.office.mapper.UploadFileMapper;
 import com.trash.system.mapper.SysTempMapper;
 import com.trash.system.service.ISysDictTypeService;
+import com.trash.workflow.listener.casefile1Listener;
 import com.trash.workflow.service.IWorkflowService;
 /**
@@ -174,41 +175,53 @@ public class ViolationCaseFileServiceImpl implements IViolationCaseFileService {
 			sql = sql.substring(0, sql.length() - 1);
 			sql += "))";
 		}
-
-		JSONArray earthList = redisCache.getCacheObject("earthSitesList");
-		JSONArray construList = redisCache.getCacheObject("constructionList");
-		JSONArray companyList = redisCache.getCacheObject("companyList");
-		
-		if(construList == null){
-			construList = JSONArray.parseArray(SpringUtils.getBean(SysTempMapper.class).getLocalData("constructionList"));
-		}
-		if(earthList == null){
-			earthList = JSONArray.parseArray(SpringUtils.getBean(SysTempMapper.class).getLocalData("earthSitesList"));
-		}
-		if(companyList == null){
-			companyList = JSONArray.parseArray(SpringUtils.getBean(SysTempMapper.class).getLocalData("companyList"));
-		}
+		if(eLish.size() > 0){
+			JSONArray earthList = redisCache.getCacheObject("earthSitesList");
-		for (Object obj : companyList) {
-			JSONObject jsonObject = (JSONObject) obj;
-			if (companyIds.indexOf(jsonObject.getString("id")) > -1) {
-				names.add(jsonObject.getString("name"));
+			if(earthList == null){
+				earthList = JSONArray.parseArray(SpringUtils.getBean(SysTempMapper.class).getLocalData("earthSitesList"));
+			}
+
+			for (Object obj : earthList) {
+				JSONObject jsonObject = (JSONObject) obj;
+				if (eLish.indexOf(jsonObject.getString("id")) > -1) {
+					names.add(jsonObject.getString("name"));
+				}
 			}
 		}
+		
+		if(cLish.size() > 0){
+			JSONArray construList = redisCache.getCacheObject("constructionList");
+			if(construList == null){
+				construList = JSONArray.parseArray(SpringUtils.getBean(SysTempMapper.class).getLocalData("constructionList"));
+			}
-		for (Object obj : earthList) {
-			JSONObject jsonObject = (JSONObject) obj;
-			if (eLish.indexOf(jsonObject.getString("id")) > -1) {
-				names.add(jsonObject.getString("name"));
+			for (Object obj : construList) {
+				JSONObject jsonObject = (JSONObject) obj;
+				if (cLish.indexOf(jsonObject.getString("id")) > -1) {
+					names.add(jsonObject.getString("name"));
+				}
 			}
 		}
-		for (Object obj : construList) {
-			JSONObject jsonObject = (JSONObject) obj;
-			if (cLish.indexOf(jsonObject.getString("id")) > -1) {
-				names.add(jsonObject.getString("name"));
+		
+		if(companyIds.size() > 0){
+			JSONArray companyList = redisCache.getCacheObject("companyList");
+			
+			
+			if(companyList == null){
+				companyList = JSONArray.parseArray(SpringUtils.getBean(SysTempMapper.class).getLocalData("companyList"));
+			}
+
+			for (Object obj : companyList) {
+				JSONObject jsonObject = (JSONObject) obj;
+				if (companyIds.indexOf(jsonObject.getString("id")) > -1) {
+					names.add(jsonObject.getString("name"));
+				}
 			}
 		}
+
+
 		if(names.size() > 0){
 			if (sql == null) {
@@ -126,12 +126,15 @@ public class ViolationWarningInformationServiceImpl implements IViolationWarning
 		if(construList == null){
 			construList = JSONArray.parseArray(SpringUtils.getBean(SysTempMapper.class).getLocalData("constructionList"));
+			redisCache.setCacheObject("constructionList",construList);
 		}
 		if(earthList == null){
 			earthList = JSONArray.parseArray(SpringUtils.getBean(SysTempMapper.class).getLocalData("earthSitesList"));
+			redisCache.setCacheObject("earthSitesList",earthList);
 		}
 		if(companyList == null){
 			companyList = JSONArray.parseArray(SpringUtils.getBean(SysTempMapper.class).getLocalData("companyList"));
+			redisCache.setCacheObject("companyList",companyList);
 		}
@@ -159,14 +162,14 @@ public class ViolationWarningInformationServiceImpl implements IViolationWarning
 				names.add(jsonObject.getString("name"));
 			}
 		}
+		
 		if (names.size() == 0) {
 			return list;
 		} else {
 			violationWarningInformation.setNames(names);
 		}
-		list = violationWarningInformationMapper.selectViolationWarningInformationList(violationWarningInformation);
-		return list;
+		return violationWarningInformationMapper.selectViolationWarningInformationList(violationWarningInformation);
 	}
@@ -379,6 +379,7 @@ public class WorkflowServiceImpl implements IWorkflowService {
 				task.setAssignee(caseFile.getAbbreviation());
+				task.setDescription(caseFile.getAbbreviation());
 				taskService.saveTask(task);
 			} else {
 				updateProcessKafka(instance, caseFile.getOwningRegion(), trashConfig.getToken());
@@ -429,6 +430,7 @@ public class WorkflowServiceImpl implements IWorkflowService {
 				Task task = taskService.createTaskQuery().processInstanceId(processInstance.getId()).singleResult();
 				task.setAssignee(caseFile.getAbbreviation());
+				task.setDescription(caseFile.getAbbreviation());
 				taskService.saveTask(task);
 			} else {
@@ -508,6 +510,7 @@ public class WorkflowServiceImpl implements IWorkflowService {
 				Task task = taskService.createTaskQuery().processInstanceId(instance.getId()).singleResult();
 				task.setAssignee(caseFile.getAbbreviation());
+				task.setDescription(caseFile.getAbbreviation());
 				taskService.saveTask(task);
 			} else {