youxiw2000 / trash · Commits

Commit 17511d1ff23783f4ed95d970ff6603fb613da158

Authored by guzijian
2 parents 322bf3a3 716a93a0

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

Inline Side-by-side
Showing 7 changed files with 150 additions and 38 deletions
trash-garbage/src/main/java/com/trash/garbage/pojo/domain/GarUserOrderMessageHistory.java
  View file @17511d1
... ... @@ -109,7 +109,93 @@ public class GarUserOrderMessageHistory implements Serializable {
109 109 return result;
110 110 }
111 111  
112   - @Override
  112 +
  113 +
  114 + public String getGarId() {
  115 + return garId;
  116 + }
  117 +
  118 + public void setGarId(String garId) {
  119 + this.garId = garId;
  120 + }
  121 +
  122 + public String getGarContent() {
  123 + return garContent;
  124 + }
  125 +
  126 + public void setGarContent(String garContent) {
  127 + this.garContent = garContent;
  128 + }
  129 +
  130 + public Date getGarCreateTime() {
  131 + return garCreateTime;
  132 + }
  133 +
  134 + public void setGarCreateTime(Date garCreateTime) {
  135 + this.garCreateTime = garCreateTime;
  136 + }
  137 +
  138 + public Date getGarUpdateTime() {
  139 + return garUpdateTime;
  140 + }
  141 +
  142 + public void setGarUpdateTime(Date garUpdateTime) {
  143 + this.garUpdateTime = garUpdateTime;
  144 + }
  145 +
  146 + public String getGarCreateBy() {
  147 + return garCreateBy;
  148 + }
  149 +
  150 + public void setGarCreateBy(String garCreateBy) {
  151 + this.garCreateBy = garCreateBy;
  152 + }
  153 +
  154 + public String getGarUpdateBy() {
  155 + return garUpdateBy;
  156 + }
  157 +
  158 + public void setGarUpdateBy(String garUpdateBy) {
  159 + this.garUpdateBy = garUpdateBy;
  160 + }
  161 +
  162 + public String getGarRemark() {
  163 + return garRemark;
  164 + }
  165 +
  166 + public void setGarRemark(String garRemark) {
  167 + this.garRemark = garRemark;
  168 + }
  169 +
  170 + public String getGarUserId() {
  171 + return garUserId;
  172 + }
  173 +
  174 + public void setGarUserId(String garUserId) {
  175 + this.garUserId = garUserId;
  176 + }
  177 +
  178 + public String getGarUserTel() {
  179 + return garUserTel;
  180 + }
  181 +
  182 + public void setGarUserTel(String garUserTel) {
  183 + this.garUserTel = garUserTel;
  184 + }
  185 +
  186 + public Integer getGarMessageState() {
  187 + return garMessageState;
  188 + }
  189 +
  190 + public void setGarMessageState(Integer garMessageState) {
  191 + this.garMessageState = garMessageState;
  192 + }
  193 +
  194 + public static long getSerialversionuid() {
  195 + return serialVersionUID;
  196 + }
  197 +
  198 + @Override
113 199 public String toString() {
114 200 StringBuilder sb = new StringBuilder();
115 201 sb.append(getClass().getSimpleName());
... ...
trash-ui/dist.7z
View file @17511d1
No preview for this file type
trash-ui/src/api/vio_casefile.js
  View file @17511d1
... ... @@ -62,7 +62,9 @@ export default {
62 62 receive: null,
63 63 receiveStatus: null,
64 64 readBy: null,
65   - readTime: null
  65 + readTime: null,
  66 + isAsc:"DESC",
  67 + orderByColumn:"casefile_violation desc,createTime"
66 68 },
67 69 // ่กจๅ•ๅ‚ๆ•ฐ
68 70 form: {},
... ...
trash-workFlow/src/main/java/com/trash/business/service/impl/TruckActivateServiceImpl.java
  View file @17511d1
... ... @@ -141,12 +141,15 @@ public class TruckActivateServiceImpl implements ITruckActivateService {
141 141 if(eList != null && eList.size() > 0){
142 142 for(Object obj:eList){
143 143 JSONObject earth = (JSONObject) obj;
144   - if(earth.getString("earthSiteName") != null){
  144 + if(earth.getString("earthSiteName") != null && earth.getInteger("status") == 1){
145 145 earthName += earth.getString("earthSiteName") + ",";
  146 +
  147 + if(earth.getString("routeName") != null){
  148 + routeName += earth.getString("routeName") + ",";
  149 + }
  150 +
146 151 }
147   - if(earth.getString("routeName") != null){
148   - routeName += earth.getString("routeName") + ",";
149   - }
  152 +
150 153 }
151 154 if(earthName.length() > 0)
152 155 earthName = earthName.substring(0,earthName.length()-1);
... ... @@ -223,12 +226,14 @@ public class TruckActivateServiceImpl implements ITruckActivateService {
223 226 if(eList != null && eList.size() > 0){
224 227 for(Object obj:eList){
225 228 JSONObject earth = (JSONObject) obj;
226   - if(earth.getString("earthSiteName") != null){
  229 + if(earth.getString("earthSiteName") != null && earth.getInteger("status") == 1){
227 230 earthName += earth.getString("earthSiteName") + ",";
  231 +
  232 + if(earth.getString("routeName") != null){
  233 + routeName += earth.getString("routeName") + ",";
  234 + }
228 235 }
229   - if(earth.getString("routeName") != null){
230   - routeName += earth.getString("routeName") + ",";
231   - }
  236 +
232 237 }
233 238  
234 239 if(earthName.length() > 0)
... ...
trash-workFlow/src/main/java/com/trash/casefile/service/impl/ViolationCaseFileServiceImpl.java
  View file @17511d1
... ... @@ -35,6 +35,7 @@ import com.trash.office.domain.UploadFile;
35 35 import com.trash.office.mapper.UploadFileMapper;
36 36 import com.trash.system.mapper.SysTempMapper;
37 37 import com.trash.system.service.ISysDictTypeService;
  38 +import com.trash.workflow.listener.casefile1Listener;
38 39 import com.trash.workflow.service.IWorkflowService;
39 40  
40 41 /**
... ... @@ -174,41 +175,53 @@ public class ViolationCaseFileServiceImpl implements IViolationCaseFileService {
174 175 sql = sql.substring(0, sql.length() - 1);
175 176 sql += "))";
176 177 }
177   -
178   - JSONArray earthList = redisCache.getCacheObject("earthSitesList");
179   - JSONArray construList = redisCache.getCacheObject("constructionList");
180   - JSONArray companyList = redisCache.getCacheObject("companyList");
181   -
182 178  
183   - if(construList == null){
184   - construList = JSONArray.parseArray(SpringUtils.getBean(SysTempMapper.class).getLocalData("constructionList"));
185   - }
186   - if(earthList == null){
187   - earthList = JSONArray.parseArray(SpringUtils.getBean(SysTempMapper.class).getLocalData("earthSitesList"));
188   - }
189   - if(companyList == null){
190   - companyList = JSONArray.parseArray(SpringUtils.getBean(SysTempMapper.class).getLocalData("companyList"));
191   - }
  179 + if(eLish.size() > 0){
  180 + JSONArray earthList = redisCache.getCacheObject("earthSitesList");
192 181  
193   - for (Object obj : companyList) {
194   - JSONObject jsonObject = (JSONObject) obj;
195   - if (companyIds.indexOf(jsonObject.getString("id")) > -1) {
196   - names.add(jsonObject.getString("name"));
  182 + if(earthList == null){
  183 + earthList = JSONArray.parseArray(SpringUtils.getBean(SysTempMapper.class).getLocalData("earthSitesList"));
  184 + }
  185 +
  186 + for (Object obj : earthList) {
  187 + JSONObject jsonObject = (JSONObject) obj;
  188 + if (eLish.indexOf(jsonObject.getString("id")) > -1) {
  189 + names.add(jsonObject.getString("name"));
  190 + }
197 191 }
198 192 }
  193 +
  194 + if(cLish.size() > 0){
  195 + JSONArray construList = redisCache.getCacheObject("constructionList");
  196 + if(construList == null){
  197 + construList = JSONArray.parseArray(SpringUtils.getBean(SysTempMapper.class).getLocalData("constructionList"));
  198 + }
199 199  
200   - for (Object obj : earthList) {
201   - JSONObject jsonObject = (JSONObject) obj;
202   - if (eLish.indexOf(jsonObject.getString("id")) > -1) {
203   - names.add(jsonObject.getString("name"));
  200 + for (Object obj : construList) {
  201 + JSONObject jsonObject = (JSONObject) obj;
  202 + if (cLish.indexOf(jsonObject.getString("id")) > -1) {
  203 + names.add(jsonObject.getString("name"));
  204 + }
204 205 }
205 206 }
206   - for (Object obj : construList) {
207   - JSONObject jsonObject = (JSONObject) obj;
208   - if (cLish.indexOf(jsonObject.getString("id")) > -1) {
209   - names.add(jsonObject.getString("name"));
  207 +
  208 + if(companyIds.size() > 0){
  209 + JSONArray companyList = redisCache.getCacheObject("companyList");
  210 +
  211 +
  212 + if(companyList == null){
  213 + companyList = JSONArray.parseArray(SpringUtils.getBean(SysTempMapper.class).getLocalData("companyList"));
  214 + }
  215 +
  216 + for (Object obj : companyList) {
  217 + JSONObject jsonObject = (JSONObject) obj;
  218 + if (companyIds.indexOf(jsonObject.getString("id")) > -1) {
  219 + names.add(jsonObject.getString("name"));
  220 + }
210 221 }
211 222 }
  223 +
  224 +
212 225  
213 226 if(names.size() > 0){
214 227 if (sql == null) {
... ...
trash-workFlow/src/main/java/com/trash/casefile/service/impl/ViolationWarningInformationServiceImpl.java
  View file @17511d1
... ... @@ -126,12 +126,15 @@ public class ViolationWarningInformationServiceImpl implements IViolationWarning
126 126  
127 127 if(construList == null){
128 128 construList = JSONArray.parseArray(SpringUtils.getBean(SysTempMapper.class).getLocalData("constructionList"));
  129 + redisCache.setCacheObject("constructionList",construList);
129 130 }
130 131 if(earthList == null){
131 132 earthList = JSONArray.parseArray(SpringUtils.getBean(SysTempMapper.class).getLocalData("earthSitesList"));
  133 + redisCache.setCacheObject("earthSitesList",earthList);
132 134 }
133 135 if(companyList == null){
134 136 companyList = JSONArray.parseArray(SpringUtils.getBean(SysTempMapper.class).getLocalData("companyList"));
  137 + redisCache.setCacheObject("companyList",companyList);
135 138 }
136 139  
137 140  
... ... @@ -159,14 +162,14 @@ public class ViolationWarningInformationServiceImpl implements IViolationWarning
159 162 names.add(jsonObject.getString("name"));
160 163 }
161 164 }
  165 +
162 166  
163 167 if (names.size() == 0) {
164 168 return list;
165 169 } else {
166 170 violationWarningInformation.setNames(names);
167 171 }
168   - list = violationWarningInformationMapper.selectViolationWarningInformationList(violationWarningInformation);
169   - return list;
  172 + return violationWarningInformationMapper.selectViolationWarningInformationList(violationWarningInformation);
170 173 }
171 174  
172 175  
... ...
trash-workFlow/src/main/java/com/trash/workflow/service/impl/WorkflowServiceImpl.java
  View file @17511d1
... ... @@ -379,6 +379,7 @@ public class WorkflowServiceImpl implements IWorkflowService {
379 379  
380 380 task.setAssignee(caseFile.getAbbreviation());
381 381  
  382 + task.setDescription(caseFile.getAbbreviation());
382 383 taskService.saveTask(task);
383 384 } else {
384 385 updateProcessKafka(instance, caseFile.getOwningRegion(), trashConfig.getToken());
... ... @@ -429,6 +430,7 @@ public class WorkflowServiceImpl implements IWorkflowService {
429 430 Task task = taskService.createTaskQuery().processInstanceId(processInstance.getId()).singleResult();
430 431  
431 432 task.setAssignee(caseFile.getAbbreviation());
  433 + task.setDescription(caseFile.getAbbreviation());
432 434  
433 435 taskService.saveTask(task);
434 436 } else {
... ... @@ -508,6 +510,7 @@ public class WorkflowServiceImpl implements IWorkflowService {
508 510 Task task = taskService.createTaskQuery().processInstanceId(instance.getId()).singleResult();
509 511  
510 512 task.setAssignee(caseFile.getAbbreviation());
  513 + task.setDescription(caseFile.getAbbreviation());
511 514  
512 515 taskService.saveTask(task);
513 516 } else {
... ...