youxiw2000 / trash · Commits

Commit 6d4662afa33f5410c98c3a6ddd71657a688394a8

Authored by youxiw2000
1 parent a783e5ba
build: skipped

m

Inline Side-by-side
Showing 12 changed files with 113 additions and 56 deletions
trash-ui/src/api/dayWorkReport.js
  View file @6d4662a
... ... @@ -227,19 +227,7 @@ export default {
227 227  
228 228 this.threestepList = response.rows;
229 229  
230   -
231   - for (let i = 0; i < this.threestepList.length; i++) {
232   - if (this.outside.indexOf(this.threestepList[i].place) > -1) {
233   - if (this.threestepList[i].status == "开工") {
234   - this.threestepList[i].estatus = "开工";
235   - this.threestepList[i].eselfCheckTime = this.threestepList[i].selfCheckTime;
236   - this.threestepList[i].descript = "开工";
237   - }
238   - }
239   -
240   - }
241   -
242   - this.loading = false;
  230 + this.loading = false;
243 231 this.dayWorkCount = response.msg;
244 232 this.total = response.total;
245 233 });
... ...
trash-ui/src/api/three_step.js
  View file @6d4662a
... ... @@ -13,6 +13,7 @@
13 13 import threestepInfo from "@/views/business/threestep/threestepInfo";
14 14  
15 15 import h5Info from "@/views/h5/task/threestepInfo";
  16 + import h5Page from '@/views/h5/Pagination';
16 17  
17 18 import {
18 19 Upload
... ... @@ -37,7 +38,9 @@
37 38 name: "Threestep",
38 39 components: {
39 40 threestepInfo,
40   - h5Info
  41 + h5Info,
  42 +
  43 + h5Page
41 44 },
42 45 data() {
43 46 return {
... ... @@ -189,6 +192,12 @@
189 192 };
190 193 },
191 194 created() {
  195 + if(window.location.search){
  196 + let arr = window.location.search.split("&");
  197 + this.queryParams.pageStatus = arr[0].split("=")[1];
  198 + }
  199 +
  200 +
192 201 getArea().then(res => {
193 202 this.areas = res.result;
194 203 for(let i =0;i< this.threestepList.length;i++){
... ... @@ -196,7 +205,7 @@
196 205 }
197 206 });
198 207  
199   - this.getList(0);
  208 + this.getList(this.queryParams.pageStatus);
200 209  
201 210 },
202 211 methods: {
... ...
trash-ui/src/layout/index3.vue renamed to trash-ui/src/layout/index333.vue
  View file @6d4662a
trash-ui/src/views/activiti/task/constructsiteInfo.vue
  View file @6d4662a
... ... @@ -129,21 +129,16 @@
129 129 <el-col :span="6" class="bd_right bd_padding">消纳场地</el-col>
130 130 <el-col :span="18" class="bd_padding">{{infoData.earthSiteNames}}</el-col>
131 131 </el-row>
132   - <el-row >
  132 + <el-row class="bd_bottom">
133 133 <el-col :span="6" class="bd_right bd_padding">行驶路线</el-col>
134 134 <el-col :span="18" class="bd_padding">{{infoData.routeNames}}</el-col>
135 135 </el-row>
136   - </el-col>
137   - </el-row>
138   -
139   -
140   - <el-row class="bd_left bd_right bd_bottom" v-if="signData && signData.sign1">
141   - <el-col :span="1" class="bd_padding bd_right" >部门意见</el-col>
142   - <el-col :span="23" >
143   - <el-row class="bd_padding">{{signData.sign1Text}}</el-row>
144   - <el-row >
145   - <label style="float: right;">勘察人:<img :src="signData.sign1" width="100px" height="40px" v-if="signData.sign1"/></label>
146   - </el-row>
  136 + <el-col :span="24" >
  137 + <el-row class="bd_padding">{{infoData.applyOpinion}}</el-row>
  138 + <el-row class="bd_padding">
  139 + <label style="float: right;">勘察人:{{infoData.surveyor}}</label>
  140 + </el-row>
  141 + </el-col>
147 142 </el-col>
148 143 </el-row>
149 144  
... ...
trash-ui/src/views/activiti/task/index.vue
  View file @6d4662a
... ... @@ -198,8 +198,7 @@
198 198 <el-dialog :title="title" :visible.sync="construct" width="800px" append-to-body>
199 199 <constructsiteInfo :businessKey="businessKey" :signData="signData" v-if="construct"/>
200 200 <el-row>
201   -
202   - <el-input v-model="signDataInfo" type="textarea" :rows="4" style="margin-top: 10px;"></el-input>
  201 + <el-input v-model="signDataInfo" type="textarea" :rows="4" style="margin-top: 10px;" ></el-input>
203 202 </el-row>
204 203 <div slot="footer" class="dialog-footer">
205 204 <el-button type="danger" @click="submitForm(form.formData[0].controlId ,1)">驳回</el-button>
... ...
trash-ui/src/views/business/DriverCredit/index.vue
  View file @6d4662a
... ... @@ -90,6 +90,7 @@
90 90 placeholder="驾驶员姓名"
91 91 @change="getObjId">
92 92 <el-option
  93 + v-if="dictNames.indexOf(item.name) == -1"
93 94 v-for="item in driverList"
94 95 :key="item.id"
95 96 :label="item.name"
... ...
trash-ui/src/views/business/threestep/threestepInfo.vue
  View file @6d4662a
... ... @@ -455,7 +455,6 @@
455 455 window.location.href = process.env.VUE_APP_BASE_API + "/business/threestep/download?path=" + encodeURI(path);
456 456 },
457 457 getInfo() {
458   - debugger;
459 458 let id;
460 459 if(this.businessKey.split(":").length == 2){
461 460 id = this.businessKey.split(":")[1];
... ...
trash-ui/src/views/h5/DriverCredit/index.vue
  View file @6d4662a
... ... @@ -95,6 +95,7 @@
95 95 placeholder="驾驶员姓名"
96 96 @change="getObjId">
97 97 <el-option
  98 + v-if="dictNames.indexOf(item.name) == -1"
98 99 v-for="item in driverList"
99 100 :key="item.id"
100 101 :label="item.name"
... ...
trash-ui/src/views/h5/task/constructsiteInfo.vue
  View file @6d4662a
... ... @@ -132,17 +132,13 @@
132 132 <el-col :span="6" class="bd_right bd_padding">行驶路线</el-col>
133 133 <el-col :span="18" class="bd_padding">{{infoData.routeNames}}</el-col>
134 134 </el-row>
135   - </el-col>
136   - </el-row>
137   -
138   -
139   - <el-row class="bd_left bd_right bd_bottom" v-if="signData.sign1">
140   - <el-col :span="2" class="bd_padding bd_right" >部门意见</el-col>
141   - <el-col :span="22" >
142   - <el-row class="bd_padding">{{signData.sign1Text}}</el-row>
143   - <el-row >
144   - <label style="float: right;">勘察人:<img :src="signData.sign1" width="100px" height="40px" v-if="signData.sign1"/></label>
145   - </el-row>
  135 + <el-col :span="24" >
  136 + <el-row class="bd_padding">{{infoData.applyOpinion}}</el-row>
  137 + <el-row class="bd_padding">
  138 + <label style="float: right;">勘察人:{{infoData.surveyor}}</label>
  139 + </el-row>
  140 + </el-col>
  141 + </el-col>
146 142 </el-col>
147 143 </el-row>
148 144  
... ...
trash-ui/src/views/h5/threestep/index.vue
  View file @6d4662a
... ... @@ -71,7 +71,7 @@
71 71  
72 72 </el-card>
73 73  
74   - <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
  74 + <h5Page v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
75 75 @pagination="getList" />
76 76  
77 77 <el-dialog :title="title" :visible.sync="open" width="330px" append-to-body v-loading="loading">
... ... @@ -273,7 +273,7 @@
273 273  
274 274 <el-dialog title="查看详情" width="400px" append-to-body :visible.sync="info2" >
275 275 <h5Info :businessKey="businessKey" v-if="info2"/>
276   -
  276 +
277 277 </el-dialog>
278 278  
279 279 <el-dialog title="附件" :visible.sync="uploadImageDialog" append-to-body :beforeClose="handleClose" width="330px">
... ... @@ -296,8 +296,6 @@
296 296  
297 297 <script>
298 298  
299   -import pagination from '../Pagination';
300   -
301 299 </script>
302 300  
303 301 <script src="../../../api/three_step.js" />
... ... @@ -305,4 +303,8 @@ import pagination from &#39;../Pagination&#39;;
305 303 .el-select-dropdown__item{
306 304 width:300px;
307 305 }
308   -</style>
309 306 \ No newline at end of file
  307 +
  308 + .card_title{
  309 + word-break: break-all;
  310 + }
  311 +</style>
... ...
trash-workFlow/src/main/java/com/trash/business/service/impl/SupervisionThreestepServiceImpl.java
  View file @6d4662a
... ... @@ -178,6 +178,9 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
178 178  
179 179 SimpleDateFormat dateTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
180 180  
  181 +
  182 + String[] outside = {"长沙县", "望城区", "浏阳市", "宁乡市", "株洲市", "湘潭市", "汩罗市", "湘阴县"};
  183 +
181 184 @SuppressWarnings("unchecked")
182 185 @Override
183 186 public List<Map<String,String>> selectDayWorkList(SupervisionThreestep supervisionThreestep) {
... ... @@ -582,6 +585,7 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
582 585 * @return 结果
583 586 */
584 587 @Override
  588 + @Transactional
585 589 public int updateSupervisionThreestep(SupervisionThreestep supervisionThreestep) {
586 590 return supervisionThreestepMapper.updateSupervisionThreestep(supervisionThreestep);
587 591 }
... ... @@ -591,15 +595,62 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
591 595 @Override
592 596 public int activeSupervisionThreestep(SupervisionThreestep supervisionThreestep) {
593 597  
594   - int i = supervisionThreestepMapper.updateSupervisionThreestep(supervisionThreestep);
  598 + int j = supervisionThreestepMapper.updateSupervisionThreestep(supervisionThreestep);
595 599  
596   -
597 600 supervisionThreestep = supervisionThreestepMapper.selectSupervisionThreestepById(supervisionThreestep.getId());
598 601  
  602 +
  603 + JSONArray areas = RemoteServerUtils.getAreas();
  604 +
  605 + for(int i =0;i< outside.length;i++){
  606 +
  607 + for(Object object:areas){
  608 +
  609 + JSONObject area = (JSONObject)object;
  610 +
  611 + if(outside[i].equals(area.getString("name"))){
  612 + outside[i] = area.getString("code");
  613 + }
  614 +
  615 + }
  616 +
  617 + }
  618 +
  619 +
  620 +
  621 + if(supervisionThreestep.getStatus() == 1 && supervisionThreestep.getType() == 0){
  622 + for(String out:outside){
  623 + if(out.equals(supervisionThreestep.getPlace())){
  624 +
  625 +
  626 + supervisionThreestep.setId(null);
  627 + String name = supervisionThreestep.getName();
  628 + String objId = supervisionThreestep.getObjectId();
  629 + String eName = supervisionThreestep.getEarthsitesName();
  630 + String eId = supervisionThreestep.getEarthsitesId();
  631 + supervisionThreestep.setCompanys(null);
  632 + supervisionThreestep.setCompanyTrucks(null);
  633 + supervisionThreestep.setType(1L);
  634 +
  635 + supervisionThreestep.setEarthsitesId(objId);
  636 + supervisionThreestep.setEarthsitesName(name);
  637 + supervisionThreestep.setName(eName);
  638 + supervisionThreestep.setObjectId(eId);
  639 +
  640 + supervisionThreestepMapper.insertSupervisionThreestep(supervisionThreestep);
  641 +
  642 + return j;
  643 + }
  644 + }
  645 +
  646 +
  647 + }
  648 +
  649 +
599 650 // if(supervisionThreestep.getType() == 0 && supervisionThreestep.getStatus() == 1)
600 651 // checkDataToActiveTruck(supervisionThreestep,null);
601 652  
602   - return i;
  653 + return j;
603 654 }
604 655  
605 656 @Override
... ... @@ -607,13 +658,32 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
607 658  
608 659 String trucks = construct.getCompanyTrucks();
609 660  
610   - if(trucks != null){
611 661  
612   - String[] truckArray = trucks.split(",");
  662 + String[] truckArray = trucks.split(",");
  663 +
  664 + String unActiveTruck = "";
  665 +
  666 + for(String truckId:truckArray){
  667 +
  668 + TruckActivate truckActivate = new TruckActivate();
  669 + truckActivate.setObjectId(truckId); //设置ID
  670 + truckActivate.setCreateTime(construct.getCheckTime());
  671 +
  672 + List<TruckActivate> taList = truckActivateService.selectTruckActivateList(truckActivate);
  673 +
  674 + if(taList.get(0).getActivateTime() == null){
  675 + unActiveTruck += truckId + ",";
  676 + }
  677 + }
  678 +
  679 +
  680 + if(!unActiveTruck.isEmpty()){
  681 +
  682 + unActiveTruck = unActiveTruck.substring(0,unActiveTruck.length()-1);
613 683  
614 684 Map<String,Object> params = new HashedMap<>();
615 685  
616   - params.put("vehicleIds", truckArray);
  686 + params.put("vehicleIds", unActiveTruck.split(","));
617 687 params.put("page", 1);
618 688 params.put("size", 9999);
619 689 JSONArray array = null;
... ... @@ -657,10 +727,6 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
657 727 truckActivate.setActivateTime(new Date());
658 728 }
659 729  
660   -
661   - System.out.println(truckObject.getString("licenseplateNo") + " " + truckObject.getInteger("vehicleStatus"));
662   -
663   -
664 730 if(taList.size() > 0){
665 731 truckActivate.setId(taList.get(0).getId());
666 732 truckActivateMapper.updateTruckActivate(truckActivate);
... ...
trash-workFlow/src/main/resources/mapper/TruckActivateMapper.xml
  View file @6d4662a
... ... @@ -38,6 +38,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
38 38 <if test="activateDate != null "> and activate_time like concat('%',#{activateDate},'%')</if>
39 39 <if test="activateStatus == 0 "> and activate_time is null</if>
40 40 <if test="activateStatus == 1 "> and activate_time is not null</if>
  41 + <if test="createTime != null "> and DATE_FORMAT(create_time,("%y%m%d")) = DATE_FORMAT(#{createTime},("%y%m%d"))</if>
41 42 </where>
42 43 </select>
43 44  
... ...