youxiw2000 / trash · Commits

Commit 7199c582a045948cae9e8fd64f7258f67ffea768

Authored by youxiw2000
1 parent 6d2ba61c

m

Inline Side-by-side
Showing 29 changed files with 2987 additions and 372 deletions
trash-framework/src/main/java/com/trash/framework/security/filter/JwtAuthenticationTokenFilter.java
  View file @7199c58
@@ -46,6 +46,7 @@ public class JwtAuthenticationTokenFilter extends OncePerRequestFilter @@ -46,6 +46,7 @@ public class JwtAuthenticationTokenFilter extends OncePerRequestFilter
46 throws ServletException, IOException 46 throws ServletException, IOException
47 { 47 {
48 48
  49 +
49 if(RemoteServerUtils.remote == null){ 50 if(RemoteServerUtils.remote == null){
50 RemoteServerUtils.remote = trashConfig.getRemotePath(); 51 RemoteServerUtils.remote = trashConfig.getRemotePath();
51 } 52 }
trash-quartz/pom.xml
  View file @7199c58
@@ -44,6 +44,11 @@ @@ -44,6 +44,11 @@
44 <artifactId>trash-workflow</artifactId> 44 <artifactId>trash-workflow</artifactId>
45 </dependency> 45 </dependency>
46 46
  47 + <dependency>
  48 + <groupId>org.apache.kafka</groupId>
  49 + <artifactId>kafka-clients</artifactId>
  50 + <version>2.4.1</version>
  51 + </dependency>
47 </dependencies> 52 </dependencies>
48 53
49 </project> 54 </project>
50 \ No newline at end of file 55 \ No newline at end of file
trash-ui/src/api/dict.js
  View file @7199c58
@@ -7,6 +7,19 @@ export function constructionById(id) { @@ -7,6 +7,19 @@ export function constructionById(id) {
7 }); 7 });
8 } 8 }
9 9
  10 +export function earthsitesById(id) {
  11 + return requestRemote({
  12 + url: '/api/siteservice/cs/earthsites/'+id,
  13 + method: 'get',
  14 + });
  15 +}
  16 +export function contractById(id) {
  17 + return requestRemote({
  18 + url: '/api/siteservice/cs/sitecontract/'+id,
  19 + method: 'get',
  20 + });
  21 +}
  22 +
10 export function constructionsitesList(data) { 23 export function constructionsitesList(data) {
11 return requestRemote({ 24 return requestRemote({
12 url: '/api/siteservice/cs/constructionsites/search', 25 url: '/api/siteservice/cs/constructionsites/search',
trash-ui/src/router/index.js
  View file @7199c58
@@ -202,24 +202,40 @@ export const constantRoutes = [ @@ -202,24 +202,40 @@ export const constantRoutes = [
202 name: '资源化利用情况', 202 name: '资源化利用情况',
203 meta: { title: '资源化利用情况' } 203 meta: { title: '资源化利用情况' }
204 }, 204 },
  205 + ],
  206 + }, {
  207 + path: '/h5',
  208 + component: Layout,
  209 + hidden: false,
  210 + children: [
  211 + {
  212 + path: 'task',
  213 + component: (resolve) => require(['@/views/h5/task/index'], resolve),
  214 + name: '待办',
  215 + meta: { title: '待办' }
  216 + } ,
  217 + {
  218 + path: 'taskhistory',
  219 + component: (resolve) => require(['@/views/h5/taskhistory/index'], resolve),
  220 + name: '经办',
  221 + meta: { title: '经办' }
  222 + },
  223 + {
  224 + path: 'taskend',
  225 + component: (resolve) => require(['@/views/h5/taskhistory/end'], resolve),
  226 + name: '已办',
  227 + meta: { title: '已办' }
  228 + },
205 229
  230 + ],
206 231
207 - ],  
208 }, 232 },
209 -  
210 { 233 {
211 path: '/daily', 234 path: '/daily',
212 component: Layout, 235 component: Layout,
213 hidden: false, 236 hidden: false,
214 children: [ 237 children: [
215 { 238 {
216 - path: 'other/otherData',  
217 - component: (resolve) => require(['@/views/otherData/otherData'], resolve),  
218 - name: '日开工报表',  
219 - meta: { title: '日开工报表' }  
220 - },  
221 -  
222 - {  
223 path: 'report/index', 239 path: 'report/index',
224 component: (resolve) => require(['@/views/daily/report/index'], resolve), 240 component: (resolve) => require(['@/views/daily/report/index'], resolve),
225 name: '工作报表', 241 name: '工作报表',
trash-ui/src/utils/requestRemote.js
  View file @7199c58
1 import axios from 'axios' 1 import axios from 'axios'
2 import { Notification, MessageBox, Message } from 'element-ui' 2 import { Notification, MessageBox, Message } from 'element-ui'
3 import store from '@/store' 3 import store from '@/store'
4 -import { getToken } from '@/utils/auth' 4 +import { getToken,removeToken } from '@/utils/auth'
5 import errorCode from '@/utils/errorCode' 5 import errorCode from '@/utils/errorCode'
  6 +import { loginByToken } from '@/api/login'
6 7
7 axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8' 8 axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
8 9
@@ -33,16 +34,8 @@ service.interceptors.response.use(res =&gt; { @@ -33,16 +34,8 @@ service.interceptors.response.use(res =&gt; {
33 // 获取错误信息 34 // 获取错误信息
34 const msg = errorCode[code] || res.data.msg || errorCode['default'] 35 const msg = errorCode[code] || res.data.msg || errorCode['default']
35 if (code === 401) { 36 if (code === 401) {
36 - MessageBox.confirm('登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示', {  
37 - confirmButtonText: '重新登录',  
38 - cancelButtonText: '取消',  
39 - type: 'warning'  
40 - }  
41 - ).then(() => {  
42 - store.dispatch('LogOut').then(() => {  
43 - location.href = '/index';  
44 - })  
45 - }) 37 +
  38 +
46 } else if (code === 500) { 39 } else if (code === 500) {
47 Message({ 40 Message({
48 message: msg, 41 message: msg,
@@ -70,6 +63,16 @@ service.interceptors.response.use(res =&gt; { @@ -70,6 +63,16 @@ service.interceptors.response.use(res =&gt; {
70 else if (message.includes("Request failed with status code")) { 63 else if (message.includes("Request failed with status code")) {
71 message = "系统接口" + message.substr(message.length - 3) + "异常"; 64 message = "系统接口" + message.substr(message.length - 3) + "异常";
72 } 65 }
  66 +
  67 + if(message.indexOf("401") > -1){
  68 + removeToken();
  69 +
  70 + location.reload();
  71 +
  72 + return;
  73 + }
  74 +
  75 +
73 Message({ 76 Message({
74 message: message, 77 message: message,
75 type: 'error', 78 type: 'error',
trash-ui/src/views/activiti/task/contractInfo.vue 0 → 100644
  View file @7199c58
  1 +<template>
  2 + <div v-loading="loading" style="border: 1px solid black;">
  3 + <el-row >
  4 + <el-col :span="6" class="bd">消纳场名称</el-col>
  5 + <el-col :span="6" class="bd">{{infoData.earthSiteName}}</el-col>
  6 + <el-col :span="6" class="bd bd_left">工程名称</el-col>
  7 + <el-col :span="6" class="bd">{{infoData.constructionSiteName}}</el-col>
  8 + </el-row>
  9 + <el-row >
  10 + <el-col :span="6" class="bd">消纳容量</el-col>
  11 + <el-col :span="6" class="bd">{{infoData.absorbCapacity}}</el-col>
  12 + <el-col :span="6" class="bd bd_left">垃圾类型</el-col>
  13 + <el-col :span="6" class="bd">{{infoData.typeName}}</el-col>
  14 + </el-row>
  15 + <el-row >
  16 + <el-col :span="6" class="bd">有效期开始时间</el-col>
  17 + <el-col :span="6" class="bd">{{infoData.startTime}}</el-col>
  18 + <el-col :span="6" class="bd bd_left">有效期结束时间</el-col>
  19 + <el-col :span="6" class="bd">{{infoData.endTime}}</el-col>
  20 + </el-row>
  21 + <el-row >
  22 + <el-col :span="6" class="bd">消纳场名称</el-col>
  23 + <el-col :span="6" class="bd">{{infoData.earthSiteName}}</el-col>
  24 + <el-col :span="6" class="bd bd_left">工程名称</el-col>
  25 + <el-col :span="6" class="bd">{{infoData.constructionSiteName}}</el-col>
  26 + </el-row>
  27 +
  28 +
  29 + <el-row >
  30 + <el-col :span="6" class="bd">消纳合同编号</el-col>
  31 + <el-col :span="6" class="bd">{{infoData.contractNo}}</el-col>
  32 + <el-col :span="6" class="bd bd_left">合同状态</el-col>
  33 + <el-col :span="6" class="bd">{{infoData.contractStatusName}}</el-col>
  34 + </el-row>
  35 + <el-row >
  36 + <el-col :span="6" class="bd">线路名称</el-col>
  37 + <el-col :span="6" class="bd">{{infoData.routeName}}</el-col>
  38 + <el-col :span="6" class="bd bd_left">线路宽度</el-col>
  39 + <el-col :span="6" class="bd">{{infoData.routeWidth}}</el-col>
  40 + </el-row>
  41 + <el-row >
  42 + <el-col :span="6" class="bd">线路信息</el-col>
  43 + <el-col :span="6" class="bd">{{infoData.routePoints}}</el-col>
  44 + <el-col :span="6" class="bd bd_left">审核状态</el-col>
  45 + <el-col :span="6" class="bd">{{infoData.auditStatusName}}</el-col>
  46 + </el-row>
  47 +
  48 + </div>
  49 +</template>
  50 +
  51 +<script>
  52 +
  53 +
  54 +import store from "@/store";
  55 + import {
  56 + getToken
  57 + } from "@/utils/auth";
  58 +
  59 +
  60 + import {
  61 + contractById,
  62 + getArea
  63 + } from "@/api/dict";
  64 +
  65 +
  66 + export default {
  67 + name: "ThreestepInfo",
  68 + props: {
  69 + businessKey: {
  70 + type: String
  71 + },
  72 + },
  73 + data() {
  74 + return {
  75 + sign: store.getters.avatar, //裁剪图片的地址
  76 + areas: [],
  77 + loading: null,
  78 + objectDict: {
  79 + constructionSiteID:"工地ID",
  80 + constructionSiteName:"工地名称",
  81 + earthSiteID:"消纳场ID",
  82 + earthSiteName:"消纳场名称",
  83 + absorbCapacity:"消纳容量",
  84 + startTime:"有效期开始时间 yyyy-mM-dd",
  85 + endTime:"有效期结束时间 yyyy-mM-dd",
  86 + type:"建筑垃圾类型ID",
  87 + typeName:"垃圾类型名称",
  88 + contractNo:"消纳合同编号",
  89 + routeName:"线路名称",
  90 + routeWidth:"线路宽度",
  91 + auditStatus:"审核状态 0-审核中 1-审核通过 2-审核驳回",
  92 + auditStatusName:"审核状态名称",
  93 + contractStatus:"合同状态",
  94 + contractStatusName:"合同状态名称",
  95 + routePoints:"线路信息"},
  96 +
  97 + infoData: {},
  98 + }
  99 + },
  100 + created() {
  101 + this.loading = true;
  102 + this.getInfo();
  103 +
  104 + },
  105 + methods: {
  106 + getInfo() {
  107 + let id;
  108 + if (this.businessKey.split(":").length == 2) {
  109 + id = this.businessKey.split(":")[1];
  110 + } else {
  111 + id = this.businessKey;
  112 + }
  113 +
  114 + contractById(id).then(response => {
  115 +
  116 + this.infoData = response.result;
  117 + // getArea().then(res => {
  118 + // this.areas = res.result;
  119 + // this.loading = false;
  120 + // for (let i = 0; i < this.areas.length; i++) {
  121 + // if (Number(this.infoData.place) == this.areas[i].code) {
  122 + // this.infoData.place = this.areas[i].name;
  123 + // }
  124 + // }
  125 + // });
  126 +
  127 + // for(let i in obj){
  128 + // if(this.objectDict[i]){
  129 + // this.infoData.push({label:this.objectDict[i] ,value:obj[i]})
  130 + // }
  131 + // }
  132 + this.loading = false;
  133 + });
  134 + },
  135 + }
  136 +
  137 + }
  138 +</script>
  139 +<style>
  140 + .bd{
  141 + padding:5px;
  142 + }
  143 +
  144 +
  145 +
  146 +</style>
trash-ui/src/views/activiti/task/earthsitesInfo.vue 0 → 100644
  View file @7199c58
  1 +<template>
  2 + <div v-loading="loading" style="border:1px solid black;">
  3 + <el-row class="bd_bottom" >
  4 + <el-col :span="6" class="bd_right bd_padding">消纳场编号</el-col>
  5 + <el-col :span="6" class="bd_padding">{{infoData.number}}</el-col>
  6 + <el-col :span="6" class="bd_left bd_right bd_padding">设计消纳场容量(m³)</el-col>
  7 + <el-col :span="6" class="bd_padding">{{infoData.capacity}}</el-col>
  8 + </el-row>
  9 + <el-row class="bd_bottom" >
  10 + <el-col :span="6" class="bd_right bd_padding">消纳场类型</el-col>
  11 + <el-col :span="6" class="bd_padding">{{infoData.typeName}}</el-col>
  12 + <el-col :span="6" class="bd_left bd_right bd_padding">区属</el-col>
  13 + <el-col :span="6" class="bd_padding">{{infoData.areaName}}</el-col>
  14 + </el-row>
  15 +
  16 +
  17 + <el-row class="bd_bottom" >
  18 + <el-col :span="6" class="bd_right bd_padding">消纳场面积(㎡)</el-col>
  19 + <el-col :span="6" class="bd_padding">{{infoData.area}}</el-col>
  20 + <el-col :span="6" class="bd_left bd_right bd_padding">日处理能力(m³)</el-col>
  21 + <el-col :span="6" class="bd_padding">{{infoData.dayAbility}}</el-col>
  22 + </el-row>
  23 + <el-row class="bd_bottom">
  24 + <el-col :span="6" class="bd_right bd_padding">处置类型</el-col>
  25 + <el-col :span="6" class="bd_padding">{{infoData.disposalType}}</el-col>
  26 + <el-col :span="6" class="bd_left bd_right bd_padding">建筑垃圾类型</el-col>
  27 + <el-col :span="6" class="bd_padding">{{infoData.buildWasteTypeName}}</el-col>
  28 + </el-row>
  29 + <el-row class="bd_bottom" >
  30 + <el-col :span="6" class="bd_right bd_padding">卸土费金额</el-col>
  31 + <el-col :span="6" class="bd_padding">{{infoData.unloadingPrice}}</el-col>
  32 + <el-col :span="6" class="bd_left bd_right bd_padding">证书编号</el-col>
  33 + <el-col :span="6" class="bd_padding">{{infoData.certificateNo}}</el-col>
  34 + </el-row>
  35 + <el-row class="bd_bottom" >
  36 + <el-col :span="6" class="bd_right bd_padding">工程类型</el-col>
  37 + <el-col :span="6" class="bd_padding">{{infoData.projectType}}</el-col>
  38 + <el-col :span="6" class="bd_left bd_right bd_padding">作业区域</el-col>
  39 + <el-col :span="6" class="bd_padding">{{infoData.workAreaName}}</el-col>
  40 + </el-row>
  41 + <el-row class="bd_bottom">
  42 + <el-col :span="6" class="bd_right bd_padding">线路名称</el-col>
  43 + <el-col :span="6" class="bd_padding">{{infoData.routeName}}</el-col>
  44 + <el-col :span="6" class="bd_left bd_right bd_padding">线路宽度</el-col>
  45 + <el-col :span="6" class="bd_padding">{{infoData.routeWidth}}</el-col>
  46 + </el-row>
  47 + <el-row class="bd_bottom">
  48 + <el-col :span="6" class="bd_right bd_padding">建设单位名称</el-col>
  49 + <el-col :span="6" class="bd_padding">{{infoData.buildCompany}}</el-col>
  50 + <el-col :span="6" class="bd_left bd_right bd_padding">建设单位地址</el-col>
  51 + <el-col :span="6" class="bd_padding">{{infoData.buildCompanyAddress}}</el-col>
  52 + </el-row>
  53 + <el-row class="bd_bottom">
  54 + <el-col :span="6" class="bd_right bd_padding">洗车平台</el-col>
  55 + <el-col :span="6" class="bd_padding">{{infoData.washingPlatform}}</el-col>
  56 + <el-col :span="6" class="bd_left bd_right bd_padding">出口道路状况</el-col>
  57 + <el-col :span="6" class="bd_padding">{{infoData.exitRoadConditions}}</el-col>
  58 + </el-row>
  59 + <el-row class="bd_bottom">
  60 + <el-col :span="6" class="bd_right bd_padding">安全警示</el-col>
  61 + <el-col :span="6" class="bd_padding">{{infoData.safetyAlertName}}</el-col>
  62 + <el-col :span="6" class="bd_left bd_right bd_padding">洗车水枪数</el-col>
  63 + <el-col :span="6" class="bd_padding">{{infoData.washingGunNum}}</el-col>
  64 + </el-row>
  65 + <el-row class="bd_bottom">
  66 + <el-col :span="6" class="bd_right bd_padding">排水沟</el-col>
  67 + <el-col :span="6" class="bd_padding">{{infoData.drainageDitch}}</el-col>
  68 + <el-col :span="6" class="bd_left bd_right bd_padding">沉淀池</el-col>
  69 + <el-col :span="6" class="bd_padding">{{infoData.sedimentationTank}}</el-col>
  70 + </el-row>
  71 + <el-row class="bd_bottom">
  72 + <el-col :span="6" class="bd_right bd_padding">电动栏杆</el-col>
  73 + <el-col :span="6" class="bd_padding">{{infoData.electricRailings}}</el-col>
  74 + <el-col :span="6" class="bd_left bd_right bd_padding">水电</el-col>
  75 + <el-col :span="6" class="bd_padding">{{infoData.hydroelectricity}}</el-col>
  76 + </el-row>
  77 + <el-row class="bd_bottom">
  78 + <el-col :span="6" class="bd_right bd_padding">其他情形</el-col>
  79 + <el-col :span="6" class="bd_padding">{{infoData.otherSituations}}</el-col>
  80 + <el-col :span="6" class="bd_left bd_right bd_padding">填表人名称</el-col>
  81 + <el-col :span="6" class="bd_padding">{{infoData.filledByName}}</el-col>
  82 + </el-row>
  83 + <el-row >
  84 + <el-col :span="6" class="bd_right bd_padding">申请意见</el-col>
  85 + <el-col :span="18" class="bd_padding">{{infoData.applyOpinion}}</el-col>
  86 + </el-row>
  87 + </div>
  88 +</template>
  89 +
  90 +<script>
  91 +
  92 +
  93 +import store from "@/store";
  94 + import {
  95 + getToken
  96 + } from "@/utils/auth";
  97 +
  98 +
  99 + import {
  100 + earthsitesById,
  101 + getArea,
  102 + getDict
  103 + } from "@/api/dict";
  104 +
  105 +
  106 + export default {
  107 + name: "ThreestepInfo",
  108 + props: {
  109 + businessKey: {
  110 + type: String
  111 + },
  112 + },
  113 + data() {
  114 + return {
  115 + sign: store.getters.avatar, //裁剪图片的地址
  116 + areas: [],
  117 + loading: null,
  118 +
  119 + infoData: {},
  120 + }
  121 + },
  122 + created() {
  123 + this.loading = true;
  124 + this.getInfo();
  125 +
  126 + },
  127 + methods: {
  128 + getInfo() {
  129 + let id;
  130 + if (this.businessKey.split(":").length == 2) {
  131 + id = this.businessKey.split(":")[1];
  132 + } else {
  133 + id = this.businessKey;
  134 + }
  135 +
  136 + earthsitesById(id).then(response => {
  137 +
  138 + this.infoData = response.result;
  139 +
  140 + let type = {"type":"CSDisSiteType"};
  141 + getDict(type).then(res=>{
  142 + debugger;
  143 + for(var i in res.result){
  144 +
  145 + if(this.infoData.disposalType == res.result[i].code){
  146 + this.infoData.disposalType = res.result[i].name;
  147 + }
  148 + }
  149 + });
  150 +
  151 + type = {"type":"CSDisSiteProjectType"};
  152 + getDict(type).then(res=>{
  153 + for(var i in res.result){
  154 + if(this.infoData.projectType == res.result[i].code){
  155 + this.infoData.projectType = res.result[i].name;
  156 + }
  157 +
  158 + }
  159 + });
  160 +
  161 + // type = {"type":"CSDisSiteType"};
  162 + // getDict(type).then(res=>{
  163 + // for(var i in res.result){
  164 +
  165 + // // for(let j in this.infoData.buildWasteType.split(,)){
  166 +
  167 +
  168 +
  169 + // // }
  170 +
  171 + // // if(this.infoData.buildWasteType == res.result[i].code){
  172 +
  173 + // // this.infoDate.buildWasteType = res.result[i].name;
  174 + // // }
  175 +
  176 + // }
  177 +
  178 + // });
  179 +
  180 + this.loading = false;
  181 + });
  182 + },
  183 + }
  184 +
  185 + }
  186 +</script>
trash-ui/src/views/activiti/task/index.vue
  View file @7199c58
@@ -200,6 +200,23 @@ @@ -200,6 +200,23 @@
200 </div> 200 </div>
201 </el-dialog> 201 </el-dialog>
202 202
  203 +
  204 + <el-dialog :title="title" :visible.sync="earthsites" width="800px" append-to-body>
  205 + <earthsitesInfo :businessKey="businessKey" v-if="earthsites" />
  206 + <div slot="footer" class="dialog-footer">
  207 + <el-button type="danger" @click="submitForm(form.formData[0].controlId ,1)">驳回</el-button>
  208 + <el-button type="primary" @click="submitForm(form.formData[0].controlId ,0)">通过</el-button>
  209 + </div>
  210 + </el-dialog>
  211 +
  212 + <el-dialog :title="title" :visible.sync="contract" width="800px" append-to-body>
  213 + <contractInfo :businessKey="businessKey" v-if="contract" />
  214 + <div slot="footer" class="dialog-footer">
  215 + <el-button type="danger" @click="submitForm(form.formData[0].controlId ,1)">驳回</el-button>
  216 + <el-button type="primary" @click="submitForm(form.formData[0].controlId ,0)">通过</el-button>
  217 + </div>
  218 + </el-dialog>
  219 +
203 </div> 220 </div>
204 </template> 221 </template>
205 222
@@ -216,7 +233,6 @@ @@ -216,7 +233,6 @@
216 233
217 234
218 import { getSignByObjId, addSign, updateSign } from "@/api/sign/sign"; 235 import { getSignByObjId, addSign, updateSign } from "@/api/sign/sign";
219 -import constructsiteInfo from "@/views/activiti/task/constructsiteInfo";  
220 236
221 import { 237 import {
222 getArea, 238 getArea,
@@ -236,6 +252,9 @@ import constructsiteInfo from &quot;@/views/activiti/task/constructsiteInfo&quot;; @@ -236,6 +252,9 @@ import constructsiteInfo from &quot;@/views/activiti/task/constructsiteInfo&quot;;
236 } from "@/utils/auth"; 252 } from "@/utils/auth";
237 import conferenceInfo from "@/views/office/conference/conferenceInfo"; 253 import conferenceInfo from "@/views/office/conference/conferenceInfo";
238 import leaveApplicationInfo from "@/views/office/leaveApplication/leaveApplicationInfo"; 254 import leaveApplicationInfo from "@/views/office/leaveApplication/leaveApplicationInfo";
  255 + import constructsiteInfo from "@/views/activiti/task/constructsiteInfo";
  256 + import earthsitesInfo from "@/views/activiti/task/earthsitesInfo";
  257 + import contractInfo from "@/views/activiti/task/contractInfo";
239 258
240 export default { 259 export default {
241 name: "task", 260 name: "task",
@@ -246,6 +265,8 @@ import constructsiteInfo from &quot;@/views/activiti/task/constructsiteInfo&quot;; @@ -246,6 +265,8 @@ import constructsiteInfo from &quot;@/views/activiti/task/constructsiteInfo&quot;;
246 conferenceInfo, 265 conferenceInfo,
247 leaveApplicationInfo, 266 leaveApplicationInfo,
248 constructsiteInfo, 267 constructsiteInfo,
  268 + earthsitesInfo,
  269 + contractInfo,
249 }, 270 },
250 data() { 271 data() {
251 return { 272 return {
@@ -320,6 +341,8 @@ import constructsiteInfo from &quot;@/views/activiti/task/constructsiteInfo&quot;; @@ -320,6 +341,8 @@ import constructsiteInfo from &quot;@/views/activiti/task/constructsiteInfo&quot;;
320 roles:[], 341 roles:[],
321 depts:[], 342 depts:[],
322 signDataInfo:null, 343 signDataInfo:null,
  344 + earthsites:false,
  345 + contract:false,
323 }; 346 };
324 }, 347 },
325 created() { 348 created() {
@@ -457,6 +480,15 @@ import constructsiteInfo from &quot;@/views/activiti/task/constructsiteInfo&quot;; @@ -457,6 +480,15 @@ import constructsiteInfo from &quot;@/views/activiti/task/constructsiteInfo&quot;;
457 }); 480 });
458 return; 481 return;
459 } 482 }
  483 + if(this.definitionKey == "workflow_earthsites"){
  484 + this.earthsites = true;
  485 + return;
  486 + }
  487 + if(this.definitionKey == "workflow_conract"){
  488 + this.contract = true;
  489 + return;
  490 + }
  491 +
460 492
461 this.open = true; 493 this.open = true;
462 this.title = "审批"; 494 this.title = "审批";
@@ -548,11 +580,21 @@ import constructsiteInfo from &quot;@/views/activiti/task/constructsiteInfo&quot;; @@ -548,11 +580,21 @@ import constructsiteInfo from &quot;@/views/activiti/task/constructsiteInfo&quot;;
548 }); 580 });
549 } 581 }
550 return; 582 return;
551 -  
552 } 583 }
553 -  
554 -  
555 - 584 + if(this.definitionKey == "workflow_conract"){
  585 + formDataSave(this.id, this.form.formData).then(response => {
  586 + this.msgSuccess("审批成功");
  587 + this.contract = false;
  588 + this.getList();
  589 + });
  590 + }
  591 + if(this.definitionKey == "workflow_earthsites"){
  592 + formDataSave(this.id, this.form.formData).then(response => {
  593 + this.msgSuccess("审批成功");
  594 + this.earthsites = false;
  595 + this.getList();
  596 + });
  597 + }
556 }, 598 },
557 conferenceSubmitForm(value){ 599 conferenceSubmitForm(value){
558 return; 600 return;
trash-ui/src/views/activiti/taskhistory/end.vue
  View file @7199c58
@@ -37,6 +37,23 @@ @@ -37,6 +37,23 @@
37 </div> 37 </div>
38 </div> 38 </div>
39 </el-dialog> 39 </el-dialog>
  40 +
  41 +
  42 + <el-dialog :title="title" :visible.sync="earthsites" width="800px" append-to-body>
  43 + <earthsitesInfo :businessKey="businessKey" v-if="earthsites" />
  44 + <div slot="footer" class="dialog-footer">
  45 + <el-button type="danger" @click="submitForm(form.formData[0].controlId ,1)">驳回</el-button>
  46 + <el-button type="primary" @click="submitForm(form.formData[0].controlId ,0)">通过</el-button>
  47 + </div>
  48 + </el-dialog>
  49 +
  50 + <el-dialog :title="title" :visible.sync="contract" width="800px" append-to-body>
  51 + <contractInfo :businessKey="businessKey" v-if="contract" />
  52 + <div slot="footer" class="dialog-footer">
  53 + <el-button type="danger" @click="submitForm(form.formData[0].controlId ,1)">驳回</el-button>
  54 + <el-button type="primary" @click="submitForm(form.formData[0].controlId ,0)">通过</el-button>
  55 + </div>
  56 + </el-dialog>
40 </div> 57 </div>
41 </template> 58 </template>
42 59
@@ -60,6 +77,8 @@ import { getSignByObjId, addSign, updateSign } from &quot;@/api/sign/sign&quot;; @@ -60,6 +77,8 @@ import { getSignByObjId, addSign, updateSign } from &quot;@/api/sign/sign&quot;;
60 import constructsiteInfo from "@/views/activiti/task/constructsiteInfo"; 77 import constructsiteInfo from "@/views/activiti/task/constructsiteInfo";
61 import conferenceInfo from "@/views/office/conference/conferenceInfo"; 78 import conferenceInfo from "@/views/office/conference/conferenceInfo";
62 import leaveApplicationInfo from "@/views/office/leaveApplication/leaveApplicationInfo"; 79 import leaveApplicationInfo from "@/views/office/leaveApplication/leaveApplicationInfo";
  80 + import earthsitesInfo from "@/views/activiti/task/earthsitesInfo";
  81 + import contractInfo from "@/views/activiti/task/contractInfo";
63 82
64 83
65 export default { 84 export default {
@@ -109,13 +128,15 @@ import constructsiteInfo from &quot;@/views/activiti/task/constructsiteInfo&quot;; @@ -109,13 +128,15 @@ import constructsiteInfo from &quot;@/views/activiti/task/constructsiteInfo&quot;;
109 needShow:false, 128 needShow:false,
110 // 表单校验 129 // 表单校验
111 rules: {}, 130 rules: {},
112 - 131 +
113 uploadImageDialog: false, 132 uploadImageDialog: false,
114 conferenceOpen: false, 133 conferenceOpen: false,
115 construct:false, 134 construct:false,
116 idInfo:null, 135 idInfo:null,
117 leaveApplicationOpen:false, 136 leaveApplicationOpen:false,
118 signData:null, 137 signData:null,
  138 + earthsites:false,
  139 + contract:false,
119 }; 140 };
120 }, 141 },
121 created() { 142 created() {
@@ -147,6 +168,15 @@ import constructsiteInfo from &quot;@/views/activiti/task/constructsiteInfo&quot;; @@ -147,6 +168,15 @@ import constructsiteInfo from &quot;@/views/activiti/task/constructsiteInfo&quot;;
147 this.resetForm("form"); 168 this.resetForm("form");
148 }, 169 },
149 showTask(row) { 170 showTask(row) {
  171 +
  172 + this.needShow = false;
  173 + this.reset();
  174 + this.definitionKey = row.definitionKey;
  175 + this.businessKey = row.businessKey;
  176 + this.id = row.id;
  177 +
  178 + this.title = "详情";
  179 +
150 if(this.definitionKey == "conference"){ 180 if(this.definitionKey == "conference"){
151 this.idInfo = row.businessKey.substring(row.businessKey.indexOf(":")+1); 181 this.idInfo = row.businessKey.substring(row.businessKey.indexOf(":")+1);
152 this.conferenceOpen = true; 182 this.conferenceOpen = true;
@@ -165,22 +195,21 @@ import constructsiteInfo from &quot;@/views/activiti/task/constructsiteInfo&quot;; @@ -165,22 +195,21 @@ import constructsiteInfo from &quot;@/views/activiti/task/constructsiteInfo&quot;;
165 }); 195 });
166 return; 196 return;
167 } 197 }
  198 + if(this.definitionKey == "workflow_earthsites"){
  199 + this.earthsites = true;
  200 + return;
  201 + }
  202 + if(this.definitionKey == "workflow_conract"){
  203 + this.contract = true;
  204 + return;
  205 + }
168 206
169 207
170 - this.needShow = false;  
171 - this.reset();  
172 - this.definitionKey = row.definitionKey;  
173 - this.businessKey = row.businessKey;  
174 - this.id = row.id;  
175 -  
176 - this.title = "详情";  
177 -  
178 if(this.definitionKey == "workflow_threestep"){ 208 if(this.definitionKey == "workflow_threestep"){
179 this.open2 = true; 209 this.open2 = true;
180 return; 210 return;
181 } 211 }
182 212
183 - this.open = true;  
184 }, 213 },
185 } 214 }
186 }; 215 };
trash-ui/src/views/activiti/taskhistory/index.vue
  View file @7199c58
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 <el-dialog :title="title" :visible.sync="open2" width="800px" append-to-body> 8 <el-dialog :title="title" :visible.sync="open2" width="800px" append-to-body>
9 <threestepInfo :businessKey="businessKey" v-if="open2"/> 9 <threestepInfo :businessKey="businessKey" v-if="open2"/>
10 </el-dialog> 10 </el-dialog>
11 - 11 +
12 <el-dialog :title="title" :visible.sync="construct" width="800px" append-to-body> 12 <el-dialog :title="title" :visible.sync="construct" width="800px" append-to-body>
13 <constructsiteInfo :businessKey="businessKey" :signData="signData" v-if="construct" /> 13 <constructsiteInfo :businessKey="businessKey" :signData="signData" v-if="construct" />
14 </el-dialog> 14 </el-dialog>
@@ -21,6 +21,23 @@ @@ -21,6 +21,23 @@
21 <el-dialog :title="title" :visible.sync="leaveApplicationOpen" width="500px" append-to-body> 21 <el-dialog :title="title" :visible.sync="leaveApplicationOpen" width="500px" append-to-body>
22 <leaveApplicationInfo :idInfo="idInfo" v-if="leaveApplicationOpen"/> 22 <leaveApplicationInfo :idInfo="idInfo" v-if="leaveApplicationOpen"/>
23 </el-dialog> 23 </el-dialog>
  24 +
  25 +
  26 + <el-dialog :title="title" :visible.sync="earthsites" width="800px" append-to-body>
  27 + <earthsitesInfo :businessKey="businessKey" v-if="earthsites" />
  28 + <div slot="footer" class="dialog-footer">
  29 + <el-button type="danger" @click="submitForm(form.formData[0].controlId ,1)">驳回</el-button>
  30 + <el-button type="primary" @click="submitForm(form.formData[0].controlId ,0)">通过</el-button>
  31 + </div>
  32 + </el-dialog>
  33 +
  34 + <el-dialog :title="title" :visible.sync="contract" width="800px" append-to-body>
  35 + <contractInfo :businessKey="businessKey" v-if="contract" />
  36 + <div slot="footer" class="dialog-footer">
  37 + <el-button type="danger" @click="submitForm(form.formData[0].controlId ,1)">驳回</el-button>
  38 + <el-button type="primary" @click="submitForm(form.formData[0].controlId ,0)">通过</el-button>
  39 + </div>
  40 + </el-dialog>
24 </div> 41 </div>
25 </template> 42 </template>
26 43
@@ -47,6 +64,8 @@ import constructsiteInfo from &quot;@/views/activiti/task/constructsiteInfo&quot;; @@ -47,6 +64,8 @@ import constructsiteInfo from &quot;@/views/activiti/task/constructsiteInfo&quot;;
47 64
48 import conferenceInfo from "@/views/office/conference/conferenceInfo"; 65 import conferenceInfo from "@/views/office/conference/conferenceInfo";
49 import leaveApplicationInfo from "@/views/office/leaveApplication/leaveApplicationInfo"; 66 import leaveApplicationInfo from "@/views/office/leaveApplication/leaveApplicationInfo";
  67 + import earthsitesInfo from "@/views/activiti/task/earthsitesInfo";
  68 + import contractInfo from "@/views/activiti/task/contractInfo";
50 69
51 70
52 71
@@ -103,6 +122,8 @@ import constructsiteInfo from &quot;@/views/activiti/task/constructsiteInfo&quot;; @@ -103,6 +122,8 @@ import constructsiteInfo from &quot;@/views/activiti/task/constructsiteInfo&quot;;
103 idInfo:null, 122 idInfo:null,
104 leaveApplicationOpen:false, 123 leaveApplicationOpen:false,
105 signData:null, 124 signData:null,
  125 + earthsites:false,
  126 + contract:false,
106 }; 127 };
107 }, 128 },
108 created() { 129 created() {
@@ -134,6 +155,14 @@ import constructsiteInfo from &quot;@/views/activiti/task/constructsiteInfo&quot;; @@ -134,6 +155,14 @@ import constructsiteInfo from &quot;@/views/activiti/task/constructsiteInfo&quot;;
134 this.resetForm("form"); 155 this.resetForm("form");
135 }, 156 },
136 showTask(row,idx) { 157 showTask(row,idx) {
  158 +
  159 + this.needShow = false;
  160 + this.reset();
  161 + this.definitionKey = row.definitionKey;
  162 + this.businessKey = row.businessKey;
  163 + this.id = row.id;
  164 +
  165 +
137 if(this.definitionKey == "conference"){ 166 if(this.definitionKey == "conference"){
138 this.idInfo = row.businessKey.substring(row.businessKey.indexOf(":")+1); 167 this.idInfo = row.businessKey.substring(row.businessKey.indexOf(":")+1);
139 this.conferenceOpen = true; 168 this.conferenceOpen = true;
@@ -153,15 +182,29 @@ import constructsiteInfo from &quot;@/views/activiti/task/constructsiteInfo&quot;; @@ -153,15 +182,29 @@ import constructsiteInfo from &quot;@/views/activiti/task/constructsiteInfo&quot;;
153 return; 182 return;
154 } 183 }
155 184
  185 + if(this.definitionKey == "workflow_constructsite"){
  186 + getSignByObjId(this.businessKey.split(":")[1]).then(res=>{
  187 + this.signData = res;
  188 + this.construct = true;
  189 + });
  190 + return;
  191 + }
  192 + if(this.definitionKey == "workflow_earthsites"){
  193 + this.earthsites = true;
  194 + return;
  195 + }
  196 + if(this.definitionKey == "workflow_conract"){
  197 + this.contract = true;
  198 + return;
  199 + }
  200 +
  201 +
  202 + if(this.definitionKey == "workflow_threestep"){
  203 + this.open2 = true;
  204 + return;
  205 + }
156 206
157 207
158 - this.needShow = false;  
159 - this.reset();  
160 - this.definitionKey = row.definitionKey;  
161 - this.businessKey = row.businessKey;  
162 - this.id = row.id;  
163 - this.open2 = true;  
164 -  
165 208
166 209
167 210
trash-ui/src/views/business/threestep/index.vue
  View file @7199c58
@@ -541,7 +541,7 @@ @@ -541,7 +541,7 @@
541 } 541 }
542 542
543 } 543 }
544 - 544 + this.form.contractId = item.id;
545 this.bindname = this.form.earthsitesName; 545 this.bindname = this.form.earthsitesName;
546 }, 546 },
547 checkCompany(item){ 547 checkCompany(item){
trash-ui/src/views/business/truckActivate/index.vue
  View file @7199c58
@@ -114,7 +114,7 @@ @@ -114,7 +114,7 @@
114 </el-form-item> 114 </el-form-item>
115 <el-form-item label="车牌号" prop="licensePlate"> 115 <el-form-item label="车牌号" prop="licensePlate">
116 <el-select v-model="form.licensePlate" placeholder="请选择车辆"> 116 <el-select v-model="form.licensePlate" placeholder="请选择车辆">
117 - <el-option v-if="construction.companyTrucks.indexOf(item.id) == -1" 117 + <el-option v-if="!construction.companyTrucks || construction.companyTrucks.indexOf(item.id) == -1"
118 v-for="item in companyTruckList" 118 v-for="item in companyTruckList"
119 :label="item.licenseplateNo" 119 :label="item.licenseplateNo"
120 :value="item.licenseplateNo" 120 :value="item.licenseplateNo"
@@ -189,14 +189,14 @@ export default { @@ -189,14 +189,14 @@ export default {
189 message: '请填写完整', 189 message: '请填写完整',
190 trigger: 'blur' 190 trigger: 'blur'
191 }, ], 191 }, ],
192 - 192 +
193 company: [{ 193 company: [{
194 required: true, 194 required: true,
195 message: '请填写完整', 195 message: '请填写完整',
196 trigger: 'blur' 196 trigger: 'blur'
197 }, ], 197 }, ],
198 -  
199 - 198 +
  199 +
200 licensePlate: [{ 200 licensePlate: [{
201 required: true, 201 required: true,
202 message: '请填写完整', 202 message: '请填写完整',
@@ -331,7 +331,6 @@ export default { @@ -331,7 +331,6 @@ export default {
331 handleUpdate(row) { 331 handleUpdate(row) {
332 this.reset(); 332 this.reset();
333 this.form.id = row.id; 333 this.form.id = row.id;
334 - this.form.activateTime = new Date();  
335 updateTruckActivate(this.form).then(response => { 334 updateTruckActivate(this.form).then(response => {
336 this.msgSuccess("修改成功"); 335 this.msgSuccess("修改成功");
337 this.open = false; 336 this.open = false;
trash-ui/src/views/h5/task/constructsiteInfo.vue 0 → 100644
  View file @7199c58
  1 +<template>
  2 + <div v-loading="loading">
  3 +
  4 + <el-row style="border: 1px solid black;" type="flex" align="middle" justify="center">
  5 + <el-col :span="1" class="bd_padding">
  6 + 勘察人员填写
  7 + </el-col>
  8 + <el-col :span="23" class="bd_left">
  9 + <el-row class="bd_bottom" >
  10 + <el-col :span="6" class="bd_right bd_padding">工程名称</el-col>
  11 + <el-col :span="6" class="bd_right bd_padding">{{infoData.name}}</el-col>
  12 + <el-col :span="6" class="bd_right bd_padding">施工地点</el-col>
  13 + <el-col :span="6">{{infoData.address}}</el-col>
  14 + </el-row>
  15 + <el-row class="bd_bottom">
  16 + <el-col :span="6" class="bd_right bd_padding">所在区域</el-col>
  17 + <el-col :span="6" class="bd_right bd_padding">{{infoData.areaCodeName}}</el-col>
  18 + <el-col :span="6" class="bd_right bd_padding">作业区域</el-col>
  19 + <el-col :span="6">{{infoData.workAreaCodeName}}</el-col>
  20 + </el-row>
  21 +
  22 + <el-row class="bd_bottom">
  23 + <el-col :span="6" class="bd_right bd_padding">建设单位</el-col>
  24 + <el-col :span="6" class="bd_right bd_padding">{{infoData.constructionCompany}}</el-col>
  25 + <el-col :span="6" class="bd_right bd_padding">负责人</el-col>
  26 + <el-col :span="6">{{infoData.constructionCompanyPerson}}</el-col>
  27 + </el-row>
  28 + <el-row class="bd_bottom">
  29 + <el-col :span="6" class="bd_right bd_padding">施工单位</el-col>
  30 + <el-col :span="6" class="bd_right bd_padding">{{infoData.projectCompany}}</el-col>
  31 + <el-col :span="6" class="bd_right bd_padding">现场责任人</el-col>
  32 + <el-col :span="6">{{infoData.projectCompanyPerson}}</el-col>
  33 + </el-row>
  34 + <el-row class="bd_bottom">
  35 + <el-col :span="6" class="bd_right bd_padding">运输单位</el-col>
  36 + <el-col :span="6" class="bd_right bd_padding">{{infoData.transportCompany}}</el-col>
  37 + <el-col :span="6" class="bd_right bd_padding">负责人</el-col>
  38 + <el-col :span="6">{{infoData.transportCompanyPerson}}</el-col>
  39 + </el-row>
  40 +
  41 + <el-row class="bd_bottom">
  42 + <el-col :span="6" class="bd_right bd_padding">申报处置量</el-col>
  43 + <el-col :span="18" class="bd_padding">{{infoData.reportingCapacity}}</el-col>
  44 + </el-row>
  45 +
  46 +
  47 + <el-row class="bd_bottom">
  48 + <el-col :span="6" class="bd_right bd_padding">施工期限</el-col>
  49 + <el-col :span="18" class="bd_padding">{{infoData.effectiveFrom}} 至 {{infoData.effectiveEnd}}</el-col>
  50 + </el-row>
  51 +
  52 + <el-row class="bd_bottom">
  53 + <el-col :span="6" class="bd_right bd_padding">视频监控设施设备</el-col>
  54 + <el-col :span="18" class="bd_padding">球机({{infoData.monitorBall}})台 枪机({{infoData.monitorGun}})台</el-col>
  55 + </el-row>
  56 + <el-row class="bd_bottom">
  57 + <el-col :span="6" >洗车作业平台及配套设施设备情况</el-col>
  58 + <el-col :span="18" class="bd_left">
  59 + <el-row class="bd_bottom">
  60 + <el-col :span="6" class="bd_right bd_padding">过水槽</el-col>
  61 + <el-col :span="18" class="bd_padding">
  62 + 长度({{infoData.waterTroughLength}}米)
  63 + 宽度({{infoData.waterTroughWidth}}米)
  64 + </el-col>
  65 + </el-row>
  66 + <el-row class="bd_bottom">
  67 + <el-col :span="6" class="bd_right bd_padding">自动洗车机</el-col>
  68 + <el-col :span="18" class="bd_padding">
  69 + 长度({{infoData.carWasherLength}}米)
  70 + 宽度({{infoData.carWasherWidth}}米)
  71 + 挡板高度({{infoData.carWasherHeight}}米)
  72 + 自动感应装置({{infoData.carWasherResponseName}})
  73 + </el-col>
  74 + </el-row>
  75 + <el-row class="bd_bottom">
  76 + <el-col :span="6" class="bd_right bd_padding">人工冲洗</el-col>
  77 + <el-col :span="18" class="bd_padding">
  78 + 长度({{infoData.ManualFlushingLength}}米)
  79 + 水枪({{infoData.waterGun}}把)
  80 + </el-col>
  81 + </el-row>
  82 + <el-row class="bd_bottom">
  83 + <el-col :span="6" class="bd_right bd_padding">缓冲区</el-col>
  84 + <el-col :span="18" class="bd_padding">
  85 + 缓冲区({{infoData.buffer}}米)
  86 + </el-col>
  87 + </el-row>
  88 + <el-row >
  89 + <el-col :span="6" class="bd_right bd_padding">照明设施</el-col>
  90 + <el-col :span="18" class="bd_padding">
  91 + 照明设施({{infoData.lightingFacilities}}盏)
  92 + </el-col>
  93 + </el-row>
  94 + </el-col>
  95 + </el-row>
  96 + <el-row class="bd_bottom">
  97 + <el-col :span="6" >申报资料</el-col>
  98 + <el-col :span="18" class="bd_left">
  99 + <el-row class="bd_bottom">
  100 + <el-col :span="6" class="bd_right bd_padding">《长沙市城市营理和综合执法局政务服务事项办理申清表》</el-col>
  101 + <el-col :span="6" class="bd_padding">√
  102 + </el-col>
  103 + <el-col :span="6" class="bd_left bd_right" style="height: 80px;">用地证明材料</el-col>
  104 + <el-col :span="6" class="bd_padding">√
  105 + </el-col>
  106 + </el-row>
  107 + <el-row class="bd_bottom">
  108 + <el-col :span="6" class="bd_right bd_padding">建筑垃圾处置方案</el-col>
  109 + <el-col :span="6" class="bd_right bd_padding">√
  110 + </el-col>
  111 + <el-col :span="6" class="bd_right bd_padding">建设工程施工合同</el-col>
  112 + <el-col :span="6" class="bd_padding">√
  113 + </el-col>
  114 + </el-row>
  115 + <el-row >
  116 + <el-col :span="6" class="bd_right bd_padding">消纳处置合同</el-col>
  117 + <el-col :span="6" class="bd_right bd_padding">√
  118 + </el-col>
  119 + <el-col :span="6" class="bd_right bd_padding">建设垃圾运输合同</el-col>
  120 + <el-col :span="6" class="bd_padding">√
  121 + </el-col>
  122 + </el-row>
  123 +
  124 + </el-col>
  125 + </el-row>
  126 + <el-row class="bd_bottom">
  127 + <el-col :span="6" class="bd_right bd_padding">消纳场地</el-col>
  128 + <el-col :span="18" class="bd_padding">{{infoData.earthName}}</el-col>
  129 + </el-row>
  130 + <el-row >
  131 + <el-col :span="6" class="bd_right bd_padding">行驶路线</el-col>
  132 + <el-col :span="18" class="bd_padding"></el-col>
  133 + </el-row>
  134 + </el-col>
  135 + </el-row>
  136 +
  137 +
  138 + <el-row class="bd_left bd_right bd_bottom" v-if="signData.sign1">
  139 + <el-col :span="1" class="bd_padding bd_right" >部门意见</el-col>
  140 + <el-col :span="23" >
  141 + <el-row class="bd_padding">{{signData.sign1Text}}</el-row>
  142 + <el-row >
  143 + <label style="float: right;">勘察人:<img :src="signData.sign1" /></label>
  144 + </el-row>
  145 + </el-col>
  146 + </el-row>
  147 +
  148 + <el-row class="bd_left bd_right bd_bottom" v-if="signData.sign2">
  149 + <el-col :span="1" class="bd_padding bd_right">主管领导意见</el-col>
  150 + <el-col :span="23" >
  151 + <el-row class="bd_padding">{{signData.sign2Text}}</el-row>
  152 + <el-row >
  153 + <label style="float: right;">签字:<img :src="signData.sign2" />{{signData.sign2Time}}</label>
  154 + </el-row>
  155 + </el-col>
  156 + </el-row>
  157 +
  158 + <el-row class="bd_left bd_right" v-if="signData.sign3">
  159 + <el-col :span="1" class="bd_padding bd_right">分管领导意见</el-col>
  160 + <el-col :span="23" >
  161 + <el-row class="bd_padding">{{signData.sign3Text}}</el-row>
  162 + <el-row >
  163 + <label style="float: right;">签字:<img :src="signData.sign3" />{{signData.sign3Time}}</label>
  164 + </el-row>
  165 + </el-col>
  166 + </el-row>
  167 +
  168 + <el-row class="bd_left bd_right" style="border: 1px solid black;" v-if="signData.sign4">
  169 + <el-col :span="1" class="bd_right bd_padding">渣土事务中心负责人意见</el-col>
  170 + <el-col :span="23" >
  171 + <el-row class="bd_padding">{{signData.sign4Text}}</el-row>
  172 + <el-row >
  173 + <label style="float: right;">签字:<img :src="signData.sign4" />{{signData.sign4Time}}</label>
  174 + </el-row>
  175 + </el-col>
  176 + </el-row>
  177 +
  178 + </div>
  179 +</template>
  180 +
  181 +<script>
  182 +
  183 +
  184 +import store from "@/store";
  185 + import {
  186 + getToken
  187 + } from "@/utils/auth";
  188 +
  189 +
  190 + import {
  191 + constructionById,
  192 + getArea
  193 + } from "@/api/dict";
  194 +
  195 +
  196 + export default {
  197 + name: "ThreestepInfo",
  198 + props: {
  199 + businessKey: {
  200 + type: String
  201 + },
  202 + signData:{},
  203 + },
  204 + data() {
  205 + return {
  206 + sign: store.getters.avatar, //裁剪图片的地址
  207 + areas: [],
  208 + loading: null,
  209 + objectDict: {
  210 + id: "工地id",
  211 + name: "工地名称",
  212 + certificateNo: "证书编号",
  213 + address: "施工地址",
  214 + monitorModel: "监控模式",
  215 + workAreaCode: "作业区域",
  216 + areaCode: "管辖区",
  217 + projectType: "工程类型",
  218 + cargoId: "建筑垃圾类型",
  219 + constructionCompany: "建设单位",
  220 + constructionCompanyAddress: "建设单位地址",
  221 + constructionCompanyPerson: "建设单位责任人",
  222 + constructionCompanyPhone: "建设单位联系电话",
  223 + transportCompanyId: "运输企业单位",
  224 + transportCompany: "运输企业单位",
  225 + transportCompanyAddress: "运输单位地址",
  226 + transportCompanyPerson: "运输单位负责人",
  227 + transportCompanyPhone: "运输单位联系电话",
  228 + projectCompany: "施工单位",
  229 + projectCompanyAddress: "施工单位地址",
  230 + projectCompanyPerson: "施工单位责任人",
  231 + projectnCompanyPhone: "施工单位联系电话",
  232 + principal: "现场负责人",
  233 + reportingCapacity: "申报容量(m³)",
  234 + effectiveFrom: "有效期开始时间",
  235 + effectiveEnd: "有效期结束时间",
  236 + transportStartTime: "运输开始时间",
  237 + transportEndTime: "运输结束时间",
  238 + monitorBall: "视频监控设施设备 球机(台)",
  239 + monitorGun: "视频监控设施设备 枪机(台)",
  240 + waterTroughLength: "过水槽 长度(米)",
  241 + waterTroughWidth: "过水槽 宽度(米)",
  242 + carWasherLength: "自动洗车机 长度(米)",
  243 + carWasherWidth: "自动洗车机 宽度(米)",
  244 + carWasherHeight: "自动洗车机 挡板高度(米)",
  245 + carWasherResponse: "自动洗车机 感应装置",
  246 + ManualFlushingLength: "人工冲洗 长度(米)",
  247 + waterGun: "水枪(把)",
  248 + buffer: "缓冲区(米)",
  249 + lightingFacilities: "照明设施(盏)",
  250 + washingPlatform: "洗车平台",
  251 + washingGunNum: "洗车水枪数",
  252 + electricRailings: "电动栏杆",
  253 + hydroelectricity: "水电情况",
  254 + exitRoadConditions: "出口道路状况",
  255 + projectProgress: "工程进度情况",
  256 + constructionEnclosure: "施工围挡",
  257 + siteInvestmentType: "工地投资类型",
  258 + deductionPercentage: "减免百分比",
  259 + deductionBasis: "减免依据",
  260 + circuitId: "线路图",
  261 + polygonId: "电子围栏ID",
  262 + earthId: "消纳场地ID",
  263 + earthName: "消纳场地",
  264 + applyOpinion: "申请意见",
  265 + surveyor: "勘察人员",
  266 + candidates: "待选人员"
  267 + },
  268 + infoData: [],
  269 + }
  270 + },
  271 + created() {
  272 + this.loading = true;
  273 + this.getInfo();
  274 +
  275 + },
  276 + methods: {
  277 + getInfo() {
  278 + let id;
  279 + if (this.businessKey.split(":").length == 2) {
  280 + id = this.businessKey.split(":")[1];
  281 + } else {
  282 + id = this.businessKey;
  283 + }
  284 +
  285 + constructionById(id).then(response => {
  286 +
  287 + this.infoData = response.result;
  288 + getArea().then(res => {
  289 + this.areas = res.result;
  290 + this.loading = false;
  291 + for (let i = 0; i < this.areas.length; i++) {
  292 + if (Number(this.infoData.place) == this.areas[i].code) {
  293 + this.infoData.place = this.areas[i].name;
  294 + }
  295 + }
  296 + });
  297 +
  298 + // for(let i in obj){
  299 + // if(this.objectDict[i]){
  300 + // this.infoData.push({label:this.objectDict[i] ,value:obj[i]})
  301 + // }
  302 + // }
  303 + this.loading = false;
  304 + });
  305 + },
  306 + }
  307 +
  308 + }
  309 +</script>
  310 +<style>
  311 + .bd_padding{
  312 +
  313 + padding:5px;
  314 + }
  315 +
  316 + .bd_right {
  317 + border-right: 1px solid black;
  318 + height: 100%;
  319 + }
  320 +
  321 + .bd_left {
  322 + border-left: 1px solid black;
  323 + }
  324 +
  325 + .bd_top {
  326 + border-top: 1px solid black;
  327 + }
  328 +
  329 + .bd_bottom {
  330 + border-bottom: 1px solid black;
  331 + }
  332 +</style>
trash-ui/src/views/h5/task/contractInfo.vue 0 → 100644
  View file @7199c58
  1 +<template>
  2 + <div v-loading="loading" style="border: 1px solid black;">
  3 + <el-row >
  4 + <el-col :span="6" class="bd">消纳场名称</el-col>
  5 + <el-col :span="6" class="bd">{{infoData.earthSiteName}}</el-col>
  6 + <el-col :span="6" class="bd bd_left">工程名称</el-col>
  7 + <el-col :span="6" class="bd">{{infoData.constructionSiteName}}</el-col>
  8 + </el-row>
  9 + <el-row >
  10 + <el-col :span="6" class="bd">消纳容量</el-col>
  11 + <el-col :span="6" class="bd">{{infoData.absorbCapacity}}</el-col>
  12 + <el-col :span="6" class="bd bd_left">垃圾类型</el-col>
  13 + <el-col :span="6" class="bd">{{infoData.typeName}}</el-col>
  14 + </el-row>
  15 + <el-row >
  16 + <el-col :span="6" class="bd">有效期开始时间</el-col>
  17 + <el-col :span="6" class="bd">{{infoData.startTime}}</el-col>
  18 + <el-col :span="6" class="bd bd_left">有效期结束时间</el-col>
  19 + <el-col :span="6" class="bd">{{infoData.endTime}}</el-col>
  20 + </el-row>
  21 + <el-row >
  22 + <el-col :span="6" class="bd">消纳场名称</el-col>
  23 + <el-col :span="6" class="bd">{{infoData.earthSiteName}}</el-col>
  24 + <el-col :span="6" class="bd bd_left">工程名称</el-col>
  25 + <el-col :span="6" class="bd">{{infoData.constructionSiteName}}</el-col>
  26 + </el-row>
  27 +
  28 +
  29 + <el-row >
  30 + <el-col :span="6" class="bd">消纳合同编号</el-col>
  31 + <el-col :span="6" class="bd">{{infoData.contractNo}}</el-col>
  32 + <el-col :span="6" class="bd bd_left">合同状态</el-col>
  33 + <el-col :span="6" class="bd">{{infoData.contractStatusName}}</el-col>
  34 + </el-row>
  35 + <el-row >
  36 + <el-col :span="6" class="bd">线路名称</el-col>
  37 + <el-col :span="6" class="bd">{{infoData.routeName}}</el-col>
  38 + <el-col :span="6" class="bd bd_left">线路宽度</el-col>
  39 + <el-col :span="6" class="bd">{{infoData.routeWidth}}</el-col>
  40 + </el-row>
  41 + <el-row >
  42 + <el-col :span="6" class="bd">线路信息</el-col>
  43 + <el-col :span="6" class="bd">{{infoData.routePoints}}</el-col>
  44 + <el-col :span="6" class="bd bd_left">审核状态</el-col>
  45 + <el-col :span="6" class="bd">{{infoData.auditStatusName}}</el-col>
  46 + </el-row>
  47 +
  48 + </div>
  49 +</template>
  50 +
  51 +<script>
  52 +
  53 +
  54 +import store from "@/store";
  55 + import {
  56 + getToken
  57 + } from "@/utils/auth";
  58 +
  59 +
  60 + import {
  61 + contractById,
  62 + getArea
  63 + } from "@/api/dict";
  64 +
  65 +
  66 + export default {
  67 + name: "ThreestepInfo",
  68 + props: {
  69 + businessKey: {
  70 + type: String
  71 + },
  72 + },
  73 + data() {
  74 + return {
  75 + sign: store.getters.avatar, //裁剪图片的地址
  76 + areas: [],
  77 + loading: null,
  78 + objectDict: {
  79 + constructionSiteID:"工地ID",
  80 + constructionSiteName:"工地名称",
  81 + earthSiteID:"消纳场ID",
  82 + earthSiteName:"消纳场名称",
  83 + absorbCapacity:"消纳容量",
  84 + startTime:"有效期开始时间 yyyy-mM-dd",
  85 + endTime:"有效期结束时间 yyyy-mM-dd",
  86 + type:"建筑垃圾类型ID",
  87 + typeName:"垃圾类型名称",
  88 + contractNo:"消纳合同编号",
  89 + routeName:"线路名称",
  90 + routeWidth:"线路宽度",
  91 + auditStatus:"审核状态 0-审核中 1-审核通过 2-审核驳回",
  92 + auditStatusName:"审核状态名称",
  93 + contractStatus:"合同状态",
  94 + contractStatusName:"合同状态名称",
  95 + routePoints:"线路信息"},
  96 +
  97 + infoData: {},
  98 + }
  99 + },
  100 + created() {
  101 + this.loading = true;
  102 + this.getInfo();
  103 +
  104 + },
  105 + methods: {
  106 + getInfo() {
  107 + let id;
  108 + if (this.businessKey.split(":").length == 2) {
  109 + id = this.businessKey.split(":")[1];
  110 + } else {
  111 + id = this.businessKey;
  112 + }
  113 +
  114 + contractById(id).then(response => {
  115 +
  116 + this.infoData = response.result;
  117 + // getArea().then(res => {
  118 + // this.areas = res.result;
  119 + // this.loading = false;
  120 + // for (let i = 0; i < this.areas.length; i++) {
  121 + // if (Number(this.infoData.place) == this.areas[i].code) {
  122 + // this.infoData.place = this.areas[i].name;
  123 + // }
  124 + // }
  125 + // });
  126 +
  127 + // for(let i in obj){
  128 + // if(this.objectDict[i]){
  129 + // this.infoData.push({label:this.objectDict[i] ,value:obj[i]})
  130 + // }
  131 + // }
  132 + this.loading = false;
  133 + });
  134 + },
  135 + }
  136 +
  137 + }
  138 +</script>
  139 +<style>
  140 + .bd{
  141 + padding:5px;
  142 + }
  143 +
  144 +
  145 +
  146 +</style>
trash-ui/src/views/h5/task/earthsitesInfo.vue 0 → 100644
  View file @7199c58
  1 +<template>
  2 + <div v-loading="loading" style="border:1px solid black;">
  3 + <el-row class="bd_bottom" >
  4 + <el-col :span="6" class="bd_right bd_padding">消纳场编号</el-col>
  5 + <el-col :span="6" class="bd_padding">{{infoData.number}}</el-col>
  6 + <el-col :span="6" class="bd_left bd_right bd_padding">设计消纳场容量(m³)</el-col>
  7 + <el-col :span="6" class="bd_padding">{{infoData.capacity}}</el-col>
  8 + </el-row>
  9 + <el-row class="bd_bottom" >
  10 + <el-col :span="6" class="bd_right bd_padding">消纳场类型</el-col>
  11 + <el-col :span="6" class="bd_padding">{{infoData.typeName}}</el-col>
  12 + <el-col :span="6" class="bd_left bd_right bd_padding">区属</el-col>
  13 + <el-col :span="6" class="bd_padding">{{infoData.areaName}}</el-col>
  14 + </el-row>
  15 +
  16 +
  17 + <el-row class="bd_bottom" >
  18 + <el-col :span="6" class="bd_right bd_padding">消纳场面积(㎡)</el-col>
  19 + <el-col :span="6" class="bd_padding">{{infoData.area}}</el-col>
  20 + <el-col :span="6" class="bd_left bd_right bd_padding">日处理能力(m³)</el-col>
  21 + <el-col :span="6" class="bd_padding">{{infoData.dayAbility}}</el-col>
  22 + </el-row>
  23 + <el-row class="bd_bottom">
  24 + <el-col :span="6" class="bd_right bd_padding">处置类型</el-col>
  25 + <el-col :span="6" class="bd_padding">{{infoData.disposalType}}</el-col>
  26 + <el-col :span="6" class="bd_left bd_right bd_padding">建筑垃圾类型</el-col>
  27 + <el-col :span="6" class="bd_padding">{{infoData.buildWasteTypeName}}</el-col>
  28 + </el-row>
  29 + <el-row class="bd_bottom" >
  30 + <el-col :span="6" class="bd_right bd_padding">卸土费金额</el-col>
  31 + <el-col :span="6" class="bd_padding">{{infoData.unloadingPrice}}</el-col>
  32 + <el-col :span="6" class="bd_left bd_right bd_padding">证书编号</el-col>
  33 + <el-col :span="6" class="bd_padding">{{infoData.certificateNo}}</el-col>
  34 + </el-row>
  35 + <el-row class="bd_bottom" >
  36 + <el-col :span="6" class="bd_right bd_padding">工程类型</el-col>
  37 + <el-col :span="6" class="bd_padding">{{infoData.projectType}}</el-col>
  38 + <el-col :span="6" class="bd_left bd_right bd_padding">作业区域</el-col>
  39 + <el-col :span="6" class="bd_padding">{{infoData.workAreaName}}</el-col>
  40 + </el-row>
  41 + <el-row class="bd_bottom">
  42 + <el-col :span="6" class="bd_right bd_padding">线路名称</el-col>
  43 + <el-col :span="6" class="bd_padding">{{infoData.routeName}}</el-col>
  44 + <el-col :span="6" class="bd_left bd_right bd_padding">线路宽度</el-col>
  45 + <el-col :span="6" class="bd_padding">{{infoData.routeWidth}}</el-col>
  46 + </el-row>
  47 + <el-row class="bd_bottom">
  48 + <el-col :span="6" class="bd_right bd_padding">建设单位名称</el-col>
  49 + <el-col :span="6" class="bd_padding">{{infoData.buildCompany}}</el-col>
  50 + <el-col :span="6" class="bd_left bd_right bd_padding">建设单位地址</el-col>
  51 + <el-col :span="6" class="bd_padding">{{infoData.buildCompanyAddress}}</el-col>
  52 + </el-row>
  53 + <el-row class="bd_bottom">
  54 + <el-col :span="6" class="bd_right bd_padding">洗车平台</el-col>
  55 + <el-col :span="6" class="bd_padding">{{infoData.washingPlatform}}</el-col>
  56 + <el-col :span="6" class="bd_left bd_right bd_padding">出口道路状况</el-col>
  57 + <el-col :span="6" class="bd_padding">{{infoData.exitRoadConditions}}</el-col>
  58 + </el-row>
  59 + <el-row class="bd_bottom">
  60 + <el-col :span="6" class="bd_right bd_padding">安全警示</el-col>
  61 + <el-col :span="6" class="bd_padding">{{infoData.safetyAlertName}}</el-col>
  62 + <el-col :span="6" class="bd_left bd_right bd_padding">洗车水枪数</el-col>
  63 + <el-col :span="6" class="bd_padding">{{infoData.washingGunNum}}</el-col>
  64 + </el-row>
  65 + <el-row class="bd_bottom">
  66 + <el-col :span="6" class="bd_right bd_padding">排水沟</el-col>
  67 + <el-col :span="6" class="bd_padding">{{infoData.drainageDitch}}</el-col>
  68 + <el-col :span="6" class="bd_left bd_right bd_padding">沉淀池</el-col>
  69 + <el-col :span="6" class="bd_padding">{{infoData.sedimentationTank}}</el-col>
  70 + </el-row>
  71 + <el-row class="bd_bottom">
  72 + <el-col :span="6" class="bd_right bd_padding">电动栏杆</el-col>
  73 + <el-col :span="6" class="bd_padding">{{infoData.electricRailings}}</el-col>
  74 + <el-col :span="6" class="bd_left bd_right bd_padding">水电</el-col>
  75 + <el-col :span="6" class="bd_padding">{{infoData.hydroelectricity}}</el-col>
  76 + </el-row>
  77 + <el-row class="bd_bottom">
  78 + <el-col :span="6" class="bd_right bd_padding">其他情形</el-col>
  79 + <el-col :span="6" class="bd_padding">{{infoData.otherSituations}}</el-col>
  80 + <el-col :span="6" class="bd_left bd_right bd_padding">填表人名称</el-col>
  81 + <el-col :span="6" class="bd_padding">{{infoData.filledByName}}</el-col>
  82 + </el-row>
  83 + <el-row >
  84 + <el-col :span="6" class="bd_right bd_padding">申请意见</el-col>
  85 + <el-col :span="18" class="bd_padding">{{infoData.applyOpinion}}</el-col>
  86 + </el-row>
  87 + </div>
  88 +</template>
  89 +
  90 +<script>
  91 +
  92 +
  93 +import store from "@/store";
  94 + import {
  95 + getToken
  96 + } from "@/utils/auth";
  97 +
  98 +
  99 + import {
  100 + earthsitesById,
  101 + getArea,
  102 + getDict
  103 + } from "@/api/dict";
  104 +
  105 +
  106 + export default {
  107 + name: "ThreestepInfo",
  108 + props: {
  109 + businessKey: {
  110 + type: String
  111 + },
  112 + },
  113 + data() {
  114 + return {
  115 + sign: store.getters.avatar, //裁剪图片的地址
  116 + areas: [],
  117 + loading: null,
  118 +
  119 + infoData: {},
  120 + }
  121 + },
  122 + created() {
  123 + this.loading = true;
  124 + this.getInfo();
  125 +
  126 + },
  127 + methods: {
  128 + getInfo() {
  129 + let id;
  130 + if (this.businessKey.split(":").length == 2) {
  131 + id = this.businessKey.split(":")[1];
  132 + } else {
  133 + id = this.businessKey;
  134 + }
  135 +
  136 + earthsitesById(id).then(response => {
  137 +
  138 + this.infoData = response.result;
  139 +
  140 + let type = {"type":"CSDisSiteType"};
  141 + getDict(type).then(res=>{
  142 + debugger;
  143 + for(var i in res.result){
  144 +
  145 + if(this.infoData.disposalType == res.result[i].code){
  146 + this.infoData.disposalType = res.result[i].name;
  147 + }
  148 + }
  149 + });
  150 +
  151 + type = {"type":"CSDisSiteProjectType"};
  152 + getDict(type).then(res=>{
  153 + for(var i in res.result){
  154 + if(this.infoData.projectType == res.result[i].code){
  155 + this.infoData.projectType = res.result[i].name;
  156 + }
  157 +
  158 + }
  159 + });
  160 +
  161 + // type = {"type":"CSDisSiteType"};
  162 + // getDict(type).then(res=>{
  163 + // for(var i in res.result){
  164 +
  165 + // // for(let j in this.infoData.buildWasteType.split(,)){
  166 +
  167 +
  168 +
  169 + // // }
  170 +
  171 + // // if(this.infoData.buildWasteType == res.result[i].code){
  172 +
  173 + // // this.infoDate.buildWasteType = res.result[i].name;
  174 + // // }
  175 +
  176 + // }
  177 +
  178 + // });
  179 +
  180 + this.loading = false;
  181 + });
  182 + },
  183 + }
  184 +
  185 + }
  186 +</script>
trash-ui/src/views/h5/task/index.vue 0 → 100644
  View file @7199c58
  1 +<template>
  2 + <div class="app-container">
  3 + <el-select v-model="queryParams.dept" filterable clearable reserve-keyword @change="getList">
  4 + <el-option v-for="item in depts" :label="item.name"
  5 + :value="item.code" :key="item.code" >
  6 + </el-option>
  7 + </el-select>
  8 + <el-select v-model="queryParams.role" filterable clearable reserve-keyword @change="getList">
  9 + <el-option v-for="item in roles" :label="item.name"
  10 + :value="item.code" :key="item.code" >
  11 + </el-option>
  12 + </el-select>
  13 +
  14 +
  15 + <taskCard :task="task" v-for="task in taskList" @sendToParent="showTask" />
  16 +
  17 + <pagination :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
  18 + @pagination="getList" />
  19 +
  20 + <!-- 审批对话框 -->
  21 + <el-dialog :title="title" :visible.sync="open" v-if="open" width="500px" append-to-body>
  22 +
  23 + <div slot="footer" class="dialog-footer">
  24 + <el-button type="danger" @click="submitForm(form.formData[0].controlId ,1)">驳回</el-button>
  25 + <el-button type="primary" @click="submitForm(form.formData[0].controlId ,0)">通过</el-button>
  26 + </div>
  27 + </el-dialog>
  28 +
  29 + <el-dialog :title="title" :visible.sync="open2" width="800px" append-to-body>
  30 + <threestepInfo :businessKey="businessKey" v-if="open2" />
  31 + <el-form v-if="taskName == '巡查'" :rules="rules" label-width="120px">
  32 + <el-row type="flex" justify="center">
  33 + <el-col>
  34 + <el-form-item label="补充说明">
  35 + <el-input type="textarea" v-model="form.subReason" />
  36 + </el-form-item>
  37 + </el-col>
  38 + </el-row>
  39 + <el-row type="flex" justify="center">
  40 + <el-col :span="12">
  41 + <el-form-item label="渣管负责人">
  42 + <el-input v-model="form.earthPipPerson" />
  43 + </el-form-item>
  44 + </el-col>
  45 + <el-col :span="12">
  46 + <el-form-item label="执法负责人">
  47 + <el-input v-model="form.enforcePerson" />
  48 + </el-form-item>
  49 + </el-col>
  50 + </el-row>
  51 + <el-row type="flex" justify="center">
  52 + <el-col>
  53 + 上传补充材料:<a style="color:blue;font-size: 12px;" @click="picSample=true">示意图</a>
  54 + </el-col>
  55 + </el-row>
  56 + <el-row type="flex" justify="center" style="margin-top: 20px;">
  57 + <el-col :span="6">
  58 + <a style="color:blue;font-size: 12px;" @click="showFileUpload(0)">履职情况照片</a>
  59 + <el-input v-model="form.sub_img0" type="hidden"></el-input>
  60 + <p v-for="img in form.sub_img0">{{img.split(":")[0]}}<a @click="removeImage(0,img)" style="color:red"> x</a>
  61 + </p>
  62 + </el-col>
  63 + <el-col :span="6">
  64 + <a style="color:blue;font-size: 12px;" @click="showFileUpload(1)">水枪水嘴照片</a>
  65 + <el-input v-model="form.sub_img1" type="hidden"></el-input>
  66 + <p v-for="img in form.sub_img1">{{img.split(":")[0]}}<a @click="removeImage(1,img)" style="color:red"> x</a>
  67 + </p>
  68 + </el-col>
  69 + <el-col :span="6">
  70 + <a style="color:blue;font-size: 12px;" @click="showFileUpload(2)">照明照片</a>
  71 + <el-input v-model="form.sub_img2" type="hidden"></el-input>
  72 + <p v-for="img in form.sub_img2">{{img.split(":")[0]}}<a @click="removeImage(2,img)" style="color:red"> x</a>
  73 + </p>
  74 + </el-col>
  75 + <el-col :span="6">
  76 + <a style="color:blue;font-size: 12px;" @click="showFileUpload(3)">视频监控照片</a>
  77 + <el-input v-model="form.sub_img3" type="hidden"></el-input>
  78 + <p v-for="img in form.sub_img3">{{img.split(":")[0]}}<a @click="removeImage(3,img)" style="color:red"> x</a>
  79 + </p>
  80 + </el-col>
  81 + </el-row>
  82 + <el-row type="flex" justify="center">
  83 + <el-col :span="6">
  84 + <a style="color:blue;font-size: 12px;" @click="showFileUpload(4)">洗车机照片</a>
  85 + <el-input v-model="form.sub_img4" type="hidden"></el-input>
  86 + <p v-for="img in form.sub_img4">{{img.split(":")[0]}}<a @click="removeImage(4,img)" style="color:red"> x</a>
  87 + </p>
  88 + </el-col>
  89 + <el-col :span="6">
  90 + <a style="color:blue;font-size: 12px;" @click="showFileUpload(5)">摄像头视频截图1</a>
  91 + <el-input v-model="form.sub_img5" type="hidden"></el-input>
  92 + <p v-for="img in form.sub_img5">{{img.split(":")[0]}}<a @click="removeImage(5,img)" style="color:red"> x</a>
  93 + </p>
  94 + </el-col>
  95 + <el-col :span="6">
  96 + <a style="color:blue;font-size: 12px;" @click="showFileUpload(6)">摄像头视频截图2</a>
  97 + <el-input v-model="form.sub_img6" type="hidden"></el-input>
  98 + <p v-for="img in form.sub_img6">{{img.split(":")[0]}}<a @click="removeImage(6,img)" style="color:red"> x</a>
  99 + </p>
  100 + </el-col>
  101 + <el-col :span="6">
  102 + <a style="color:blue;font-size: 12px;" @click="showFileUpload(7)">摄像头视频截图3</a>
  103 + <el-input v-model="form.sub_img7" type="hidden"></el-input>
  104 + <p v-for="img in form.sub_img7">{{img.split(":")[0]}}<a @click="removeImage(7,img)" style="color:red"> x</a>
  105 + </p>
  106 + </el-col>
  107 + </el-row>
  108 + <el-row type="flex" justify="center">
  109 + <el-col :span="5">
  110 + <a style="color:blue;font-size: 12px;" @click="showFileUpload(8)">其他1</a>
  111 + <el-input v-model="form.sub_img8" type="hidden"></el-input>
  112 + <p v-for="img in form.sub_img8">{{img.split(":")[0]}}<a @click="removeImage(8,img)" style="color:red"> x</a>
  113 + </p>
  114 + </el-col>
  115 + <el-col :span="5">
  116 + <a style="color:blue;font-size: 12px;" @click="showFileUpload(9)">其他2</a>
  117 + <el-input v-model="form.sub_img9" type="hidden"></el-input>
  118 + <p v-for="img in form.sub_img9">{{img.split(":")[0]}}<a @click="removeImage(9,img)" style="color:red"> x</a>
  119 + </p>
  120 + </el-col>
  121 + <el-col :span="5">
  122 + <a style="color:blue;font-size: 12px;" @click="showFileUpload(10)">其他3</a>
  123 + <el-input v-model="form.sub_img10" type="hidden"></el-input>
  124 + <p v-for="img in form.sub_img10">{{img.split(":")[0]}}<a @click="removeImage(10,img)" style="color:red">
  125 + x</a>
  126 + </p>
  127 + </el-col>
  128 + <el-col :span="5">
  129 + <a style="color:blue;font-size: 12px;" @click="showFileUpload(11)">其他4</a>
  130 + <el-input v-model="form.sub_img11" type="hidden"></el-input>
  131 + <p v-for="img in form.sub_img11">{{img.split(":")[0]}}<a @click="removeImage(11,img)" style="color:red">
  132 + x</a>
  133 + </p>
  134 + </el-col>
  135 + <el-col :span="4">
  136 + <a style="color:blue;font-size: 12px;" @click="showFileUpload(12)">其他5</a>
  137 + <el-input v-model="form.sub_img12" type="hidden"></el-input>
  138 + <p v-for="img in form.sub_img12">{{img.split(":")[0]}}<a @click="removeImage(12,img)" style="color:red">
  139 + x</a>
  140 + </p>
  141 + </el-col>
  142 + </el-row>
  143 + </el-form>
  144 +
  145 +
  146 + <div slot="footer" class="dialog-footer">
  147 + <el-button type="danger" @click="submitForm(form.formData[0].controlId ,1)">驳回</el-button>
  148 + <el-button type="primary" @click="submitForm(form.formData[0].controlId ,0)">通过</el-button>
  149 + </div>
  150 + </el-dialog>
  151 +
  152 +
  153 +
  154 + <el-dialog title="附件" :visible.sync="uploadImageDialog" append-to-body :beforeClose="handleClose">
  155 + <el-upload multiple :headers="upload.headers" :action="upload.url" :file-list="fileList"
  156 + :on-success="uploadSuccess" :before-upload="beforeUpload">
  157 + <el-button size="small" type="primary">选择附件</el-button>
  158 + <div slot="tip" class="el-upload__tip">只能上传不超过 20MB 的jpg pdf word文件</div>
  159 + </el-upload>
  160 + <div style="height: 40px;width:100%;">
  161 + <el-button type="primary" style="margin-top: 20px;float:right;" @click="handleClose">关闭</el-button>
  162 + </div>
  163 + </el-dialog>
  164 +
  165 + <el-dialog title="示意图" :visible.sync="picSample" append-to-body>
  166 + <img src="../../../assets/logo/logo.jpg" width="100%" height="800px" />
  167 + </el-dialog>
  168 + <!-- 会议管理 -->
  169 + <el-dialog :title="title" :visible.sync="conferenceOpen" width="850px" append-to-body>
  170 + <conferenceInfo :idInfo="idInfo" v-if="conferenceOpen"/>
  171 + <div slot="footer" class="dialog-footer">
  172 + <div slot="footer" class="dialog-footer">
  173 + <el-button type="danger" @click="conferenceSubmitForm(1)">驳回</el-button>
  174 + <el-button type="primary" @click="conferenceSubmitForm(0)">通过</el-button>
  175 + </div>
  176 + </div>
  177 + </el-dialog>
  178 +
  179 + <!-- 请假申请 -->
  180 + <el-dialog :title="title" :visible.sync="leaveApplicationOpen" width="500px" append-to-body>
  181 + <leaveApplicationInfo :idInfo="idInfo" v-if="leaveApplicationOpen"/>
  182 + <div slot="footer" class="dialog-footer">
  183 + <div slot="footer" class="dialog-footer">
  184 + <el-button type="danger" @click="leaveApplicationSubmitForm(1)">驳回</el-button>
  185 + <el-button type="primary" @click="leaveApplicationSubmitForm(0)">通过</el-button>
  186 + </div>
  187 + </div>
  188 + </el-dialog>
  189 +
  190 +
  191 + <el-dialog :title="title" :visible.sync="construct" width="800px" append-to-body>
  192 + <constructsiteInfo :businessKey="businessKey" :signData="signData" v-if="construct" />
  193 + <el-row>
  194 +
  195 + <el-input v-model="signDataInfo" type="textarea" :rows="4" style="margin-top: 10px;"></el-input>
  196 + </el-row>
  197 + <div slot="footer" class="dialog-footer">
  198 + <el-button type="danger" @click="submitForm(form.formData[0].controlId ,1)">驳回</el-button>
  199 + <el-button type="primary" @click="submitForm(form.formData[0].controlId ,0)">通过</el-button>
  200 + </div>
  201 + </el-dialog>
  202 +
  203 +
  204 + <el-dialog :title="title" :visible.sync="earthsites" width="800px" append-to-body>
  205 + <earthsitesInfo :businessKey="businessKey" v-if="earthsites" />
  206 + <div slot="footer" class="dialog-footer">
  207 + <el-button type="danger" @click="submitForm(form.formData[0].controlId ,1)">驳回</el-button>
  208 + <el-button type="primary" @click="submitForm(form.formData[0].controlId ,0)">通过</el-button>
  209 + </div>
  210 + </el-dialog>
  211 +
  212 + <el-dialog :title="title" :visible.sync="contract" width="800px" append-to-body>
  213 + <contractInfo :businessKey="businessKey" v-if="contract" />
  214 + <div slot="footer" class="dialog-footer">
  215 + <el-button type="danger" @click="submitForm(form.formData[0].controlId ,1)">驳回</el-button>
  216 + <el-button type="primary" @click="submitForm(form.formData[0].controlId ,0)">通过</el-button>
  217 + </div>
  218 + </el-dialog>
  219 +
  220 + </div>
  221 +</template>
  222 +
  223 +<style>
  224 + @import '../../../assets/css/task.css'
  225 +</style>
  226 +
  227 +<script>
  228 + import {
  229 + listTask,
  230 + formDataShow,
  231 + formDataSave
  232 + } from "@/api/activiti/task";
  233 +
  234 +
  235 +import { getSignByObjId, addSign, updateSign } from "@/api/sign/sign";
  236 +
  237 + import {
  238 + getArea,
  239 + getDict,
  240 + } from "@/api/dict";
  241 +
  242 + import {
  243 + updateThreestep,
  244 + activeThreestep
  245 + } from "@/api/business/threestep";
  246 +
  247 + import leaveHistoryForm from "@/views/workflow/leaveHistoryForm";
  248 + import threestepInfo from "@/views/business/threestep/threestepInfo";
  249 + import taskCard from "@/views/h5/task/taskCard";
  250 + import {
  251 + getToken
  252 + } from "@/utils/auth";
  253 + import conferenceInfo from "@/views/office/conference/conferenceInfo";
  254 + import leaveApplicationInfo from "@/views/office/leaveApplication/leaveApplicationInfo";
  255 + import constructsiteInfo from "@/views/activiti/task/constructsiteInfo";
  256 + import earthsitesInfo from "@/views/activiti/task/earthsitesInfo";
  257 + import contractInfo from "@/views/activiti/task/contractInfo";
  258 +
  259 + export default {
  260 + name: "task",
  261 + components: {
  262 + taskCard,
  263 + leaveHistoryForm,
  264 + threestepInfo,
  265 + conferenceInfo,
  266 + leaveApplicationInfo,
  267 + constructsiteInfo,
  268 + earthsitesInfo,
  269 + contractInfo,
  270 + },
  271 + data() {
  272 + return {
  273 + id: '',
  274 + definitionKey: '',
  275 + businessKey: '',
  276 + // 遮罩层
  277 + loading: true,
  278 + // 选中数组
  279 + ids: [],
  280 + // 非单个禁用
  281 + single: true,
  282 + // 非多个禁用
  283 + multiple: true,
  284 + // 显示搜索条件
  285 + showSearch: true,
  286 + // 总条数
  287 + total: 0,
  288 + // 请假表格数据
  289 + taskList: [],
  290 + // 弹出层标题
  291 + title: "",
  292 + // 是否显示弹出层
  293 + open: false,
  294 + open2: false,
  295 + picSample: false,
  296 + taskName: null,
  297 + // 查询参数
  298 + queryParams: {
  299 + pageNum: 1,
  300 + pageSize: 10,
  301 + role:null,
  302 + dept:null,
  303 + },
  304 + // 表单参数
  305 + form: {
  306 + formData: []
  307 + },
  308 + needShow: false,
  309 + // 表单校验
  310 + rules: {
  311 + subReason: [{
  312 + required: true,
  313 + message: '请填写补充说明',
  314 + trigger: 'blur'
  315 + }, ],
  316 +
  317 + },
  318 + picIndex: 0,
  319 + fileList: [],
  320 + upload: {
  321 + // 是否显示弹出层（用户导入）
  322 + open: false,
  323 + // 弹出层标题（用户导入）
  324 + title: "",
  325 + // 是否禁用上传
  326 + isUploading: false,
  327 + // 设置上传的请求头部
  328 + headers: {
  329 + Authorization: "Bearer " + getToken()
  330 + },
  331 + // 上传的地址
  332 + url: process.env.VUE_APP_BASE_API + "/business/threestep/upload",
  333 + },
  334 + uploadImageDialog: false,
  335 + conferenceOpen: false,
  336 + construct:false,
  337 + idInfo:null,
  338 + leaveApplicationOpen:false,
  339 + signData:null,
  340 + areas:[],
  341 + roles:[],
  342 + depts:[],
  343 + signDataInfo:null,
  344 + earthsites:false,
  345 + contract:false,
  346 + };
  347 + },
  348 + created() {
  349 + let dep = {type:"CSUserDepartmentType"};
  350 +
  351 + getDict(dep).then(res=>{
  352 + this.depts = res.result;
  353 + });
  354 +
  355 + let role = {type:"CSUserPostType"};
  356 +
  357 + getDict(role).then(res=>{
  358 + this.roles = res.result;
  359 + });
  360 +
  361 + this.getList();
  362 + },
  363 + methods: {
  364 + handleClose() {
  365 + this.uploadImageDialog = false;
  366 + this.fileList = [];
  367 + },
  368 + removeImage(index, img) {
  369 + let target = "sub_img" + this.picIndex;
  370 + this.form[target].splice(this.form[target].indexOf(img), 1);
  371 + },
  372 + uploadSuccess(res, file, fileList) {
  373 + let target = "sub_img" + this.picIndex;
  374 + if (!this.form[target]) {
  375 + this.form[target] = [];
  376 + }
  377 + this.form[target].push(file.name + ':' + res);
  378 +
  379 + },
  380 + showFileUpload(i) {
  381 + this.uploadImageDialog = true;
  382 + this.picIndex = i;
  383 + },
  384 + beforeUpload(file) {
  385 + let isRightSize = file.size / 1024 / 1024 < 20
  386 + if (!isRightSize) {
  387 + this.$message.error('文件大小超过 20MB')
  388 + return isRightSize;
  389 + }
  390 + let isAccept = false;
  391 + if (file.name.indexOf('.docx') > -1 || file.name.indexOf(".jpg") > -1 || file.name.indexOf('.doc') > -1 || file
  392 + .name.indexOf('.pdf') > -1) {
  393 + isAccept = true;
  394 + }
  395 + if (!isAccept) {
  396 + this.$message.error('应该选择PDF、JPG、WORD类型的文件')
  397 + return isAccept;
  398 + }
  399 + },
  400 + getList() {
  401 + this.loading = true;
  402 + listTask(this.queryParams).then(response => {
  403 + this.taskList = response.rows;
  404 + this.total = response.total;
  405 + this.loading = false;
  406 + });
  407 + },
  408 +
  409 + // 取消按钮
  410 + cancel() {
  411 + this.open = false;
  412 + this.open2 = false;
  413 + this.leaveApplicationOpen= false;
  414 + this.conferenceOpen = false;
  415 + this.construct = false;
  416 + this.reset();
  417 + },
  418 + // 表单重置
  419 + reset() {
  420 + this.definitionKey = '',
  421 + this.businessKey = '',
  422 + this.form = {
  423 + formData: [],
  424 + };
  425 + this.resetForm("form");
  426 + },
  427 + showTask(row, idx) {
  428 + this.reset();
  429 + this.definitionKey = row.definitionKey;
  430 + this.businessKey = row.businessKey;
  431 + this.id = row.id;
  432 + this.taskName = row.name;
  433 + formDataShow(row.id).then(response => {
  434 + let datas = response.data;
  435 + let formData = []
  436 + for (let i = 0; i < datas.length; i++) {
  437 + let strings = datas[i].split('--__!!')
  438 + let controlValue = null
  439 + let controlDefault = null
  440 + switch (strings[1]) {
  441 + case 'radio':
  442 + controlValue = idx;
  443 + controlDefault = strings[4]
  444 + break;
  445 + // default:
  446 + }
  447 + formData.push({
  448 + controlId: strings[0],
  449 + controlType: strings[1],
  450 + controlLable: strings[2],
  451 + controlIsParam: strings[3],
  452 + controlValue: controlValue,
  453 + controlDefault: controlDefault
  454 + })
  455 + }
  456 + this.form.formData = formData;
  457 +
  458 + if (this.definitionKey == "workflow_threestep") {
  459 + this.open2 = true;
  460 + return;
  461 + }
  462 + if(this.definitionKey == "conference"){
  463 + this.idInfo = row.businessKey.substring(row.businessKey.indexOf(":")+1);
  464 + this.conferenceOpen = true;
  465 + return;
  466 + }
  467 + if(this.definitionKey == "workflow_leave"){
  468 + this.idInfo = row.businessKey.substring(row.businessKey.lastIndexOf(":")+1);
  469 + this.leaveApplicationOpen = true;
  470 + return;
  471 + }
  472 +
  473 + if(this.definitionKey == "workflow_constructsite"){
  474 + getSignByObjId(this.businessKey.split(":")[1]).then(res=>{
  475 +
  476 + this.signDataInfo = "经现场查勘及核对资料，现场设施基本达到净车出场标准，建议按程序办理相关手续，妥否，请批示。";
  477 +
  478 + this.signData = res.data;
  479 + this.construct = true;
  480 + });
  481 + return;
  482 + }
  483 + if(this.definitionKey == "workflow_earthsites"){
  484 + this.earthsites = true;
  485 + return;
  486 + }
  487 + if(this.definitionKey == "workflow_conract"){
  488 + this.contract = true;
  489 + return;
  490 + }
  491 +
  492 +
  493 + this.open = true;
  494 + this.title = "审批";
  495 + });
  496 + },
  497 + /** 提交按钮 */
  498 + submitForm(formid, value) {
  499 +
  500 + this.form.formData[0].controlValue = value;
  501 + this.form.formData[0].controlId = formid;
  502 + this.form.id = this.businessKey.split(":")[1];
  503 + if (this.form.formData[0].controlValue == 0) {
  504 + this.form.status = 1;
  505 + } else {
  506 + this.form.status = 2;
  507 + }
  508 +
  509 + if (this.definitionKey == "workflow_threestep") {
  510 +
  511 +
  512 + for (let i = 0; i < 13; i++) {
  513 + if (this.form["sub_img" + i]) {
  514 + let paths = "";
  515 + for (var j = 0; j < this.form["sub_img" + i].length; j++) {
  516 + paths += this.form["sub_img" + i][j].split(":")[1] + ",";
  517 + }
  518 + this.form["sub_img" + i] = paths.substring(0, paths.length - 1);
  519 + }
  520 + }
  521 +
  522 + this.form.checkTime = new Date();
  523 + if (this.form.status == 1) {
  524 + activeThreestep(this.form).then(res => {
  525 + formDataSave(this.id, this.form.formData).then(response => {
  526 + this.msgSuccess("审批成功");
  527 + this.open2 = false;
  528 + this.taskList = [];
  529 + this.getList();
  530 + });
  531 + });
  532 + } else {
  533 + updateThreestep(this.form).then(res => {
  534 + formDataSave(this.id, this.form.formData).then(response => {
  535 + this.msgSuccess("审批成功");
  536 + this.open2 = false;
  537 + this.taskList = [];
  538 + this.getList();
  539 + });
  540 + });
  541 + }
  542 + return;
  543 + }
  544 +
  545 + if(this.definitionKey == "workflow_constructsite"){
  546 + if(this.form.status == 1){
  547 + let objId = this.businessKey.split(":")[1];
  548 + let query = {
  549 + objectId : objId,
  550 + };
  551 + if(this.taskName == "勘察科员"){
  552 + query.idx = 0;
  553 + query.sign1Text = this.signDataInfo;
  554 + }else if(this.taskName == "堪察部长"){
  555 + query.idx = 1;
  556 + query.sign2Text = this.signDataInfo;
  557 + }else if(this.taskName == "堪察分管领导"){
  558 + query.idx = 2;
  559 + query.sign3Text = this.signDataInfo;
  560 + }else if(this.taskName == "中心负责人"){
  561 + query.idx = 3;
  562 + query.sign4Text = this.signDataInfo;
  563 + }
  564 +
  565 + addSign(query).then(res=>{
  566 + formDataSave(this.id, this.form.formData).then(response => {
  567 + this.msgSuccess("审批成功");
  568 + this.open = false;
  569 + this.construct = false;
  570 + this.getList();
  571 + });
  572 + })
  573 +
  574 + }else{
  575 +
  576 + formDataSave(this.id, this.form.formData).then(response => {
  577 + this.msgSuccess("审批成功");
  578 + this.construct = false;
  579 + this.getList();
  580 + });
  581 + }
  582 + return;
  583 + }
  584 + if(this.definitionKey == "workflow_conract"){
  585 + formDataSave(this.id, this.form.formData).then(response => {
  586 + this.msgSuccess("审批成功");
  587 + this.contract = false;
  588 + this.getList();
  589 + });
  590 + }
  591 + if(this.definitionKey == "workflow_earthsites"){
  592 + formDataSave(this.id, this.form.formData).then(response => {
  593 + this.msgSuccess("审批成功");
  594 + this.earthsites = false;
  595 + this.getList();
  596 + });
  597 + }
  598 + },
  599 + conferenceSubmitForm(value){
  600 + return;
  601 + this.form.formData[0].controlValue = value;
  602 + if(value==0){
  603 + this.form.status = 1;
  604 + }else{
  605 + this.form.status = 2;
  606 + }
  607 + //审批or驳回
  608 + formDataSave(this.id, this.form.formData).then(response => {
  609 + this.msgSuccess("审批成功");
  610 + this.conferenceOpen = false;
  611 + this.taskList = [];
  612 + this.getList();
  613 + });
  614 + },
  615 + leaveApplicationSubmitForm(value){
  616 + if(value==0){
  617 + this.form.status = 1;
  618 + }else{
  619 + this.form.status = 2;
  620 + }
  621 + this.form.formData[0].controlValue = value;
  622 + //审批or驳回
  623 + formDataSave(this.id, this.form.formData).then(response => {
  624 + this.msgSuccess("审批成功");
  625 + this.leaveApplicationOpen = false;
  626 + this.taskList = [];
  627 + this.getList();
  628 + });
  629 + }
  630 + }
  631 + };
  632 +</script>
  633 +
  634 +
  635 +<style scoped>
  636 + div{
  637 + font-size:12px;
  638 + }
  639 +
  640 +</style>
trash-ui/src/views/h5/task/taskCard.vue 0 → 100644
  View file @7199c58
  1 +<template>
  2 + <a @click="sendToParent(task)"><el-card class="box-card">
  3 + <div :class="{card_status:true,notcheck:!task.checkStatus,dismiss:task.checkStatus=='1',agree:task.checkStatus=='0'}">
  4 + {{task.checkStatus? task.checkStatus=="0"?"已同意":"已拒绝" : "待审批"}}</div>
  5 +
  6 + <el-row class="card_row">
  7 + <div class="card_title">{{task.instanceName}}</div>
  8 + </el-row>
  9 +
  10 + <el-row class="card_row">
  11 + <el-col :span="24" class="card_grid">
  12 + <div>时间: {{task.startTime}} - {{task.endTime}}</div>
  13 + </el-col>
  14 +
  15 + </el-row>
  16 + <el-row class="card_row">
  17 + <el-col :span="24" class="card_grid">
  18 + <div>申请类型: {{task.type}}</div>
  19 + </el-col>
  20 + </el-row>
  21 + <el-row class="card_row">
  22 + <el-col :span="24">
  23 + <div>申请理由: {{task.reason}}</div>
  24 + </el-col>
  25 + </el-row>
  26 + </el-card></a>
  27 +</template>
  28 +
  29 +<script>
  30 + export default {
  31 + name: "taskCard",
  32 + props: {
  33 + task: {
  34 + type: Object
  35 + },
  36 + },
  37 +
  38 + data() {
  39 + return {
  40 +
  41 + threestep_type:{
  42 + "0":"工地",
  43 + "1":"消纳场",
  44 + },
  45 + }
  46 + },
  47 + created() {
  48 +
  49 + if (this.task.definitionKey == "workflow_threestep") {
  50 + this.task.type = this.threestep_type[this.task.type];
  51 + }
  52 + },
  53 + methods: {
  54 + sendToParent(task) {
  55 + this.$emit("sendToParent", task);
  56 + },
  57 +
  58 + }
  59 + }
  60 +</script>
  61 +
  62 +<style scoped>
  63 +
  64 +.card_row{
  65 + margin-top: 5px;
  66 + margin-bottom: 5px;
  67 +}
  68 +
  69 +</style>
trash-ui/src/views/h5/taskhistory/end.vue 0 → 100644
  View file @7199c58
  1 +<template>
  2 + <div class="app-container">
  3 +
  4 + <taskCard :task="task" v-for="task in taskList" @sendToParent="showTask"/>
  5 +
  6 + <pagination :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
  7 +
  8 + <el-dialog :title="title" :visible.sync="open2" width="800px" append-to-body>
  9 + <threestepInfo :businessKey="businessKey" v-if="open2"/>
  10 +
  11 + </el-dialog>
  12 + <el-dialog :title="title" :visible.sync="construct" width="800px" append-to-body>
  13 + <constructsiteInfo :businessKey="businessKey" :signData="signData" v-if="construct" />
  14 + <div slot="footer" class="dialog-footer">
  15 + <el-button type="danger" @click="submitForm(form.formData[0].controlId ,1)">驳回</el-button>
  16 + <el-button type="primary" @click="submitForm(form.formData[0].controlId ,0)">通过</el-button>
  17 + </div>
  18 + </el-dialog>
  19 + <!-- 会议管理 -->
  20 + <el-dialog :title="title" :visible.sync="conferenceOpen" width="850px" append-to-body>
  21 + <conferenceInfo :idInfo="idInfo" v-if="conferenceOpen"/>
  22 + <div slot="footer" class="dialog-footer">
  23 + <div slot="footer" class="dialog-footer">
  24 + <el-button type="danger" @click="conferenceSubmitForm(1)">驳回</el-button>
  25 + <el-button type="primary" @click="conferenceSubmitForm(0)">通过</el-button>
  26 + </div>
  27 + </div>
  28 + </el-dialog>
  29 +
  30 + <!-- 请假申请 -->
  31 + <el-dialog :title="title" :visible.sync="leaveApplicationOpen" width="500px" append-to-body>
  32 + <leaveApplicationInfo :idInfo="idInfo" v-if="leaveApplicationOpen"/>
  33 + <div slot="footer" class="dialog-footer">
  34 + <div slot="footer" class="dialog-footer">
  35 + <el-button type="danger" @click="leaveApplicationSubmitForm(1)">驳回</el-button>
  36 + <el-button type="primary" @click="leaveApplicationSubmitForm(0)">通过</el-button>
  37 + </div>
  38 + </div>
  39 + </el-dialog>
  40 +
  41 +
  42 + <el-dialog :title="title" :visible.sync="earthsites" width="800px" append-to-body>
  43 + <earthsitesInfo :businessKey="businessKey" v-if="earthsites" />
  44 + <div slot="footer" class="dialog-footer">
  45 + <el-button type="danger" @click="submitForm(form.formData[0].controlId ,1)">驳回</el-button>
  46 + <el-button type="primary" @click="submitForm(form.formData[0].controlId ,0)">通过</el-button>
  47 + </div>
  48 + </el-dialog>
  49 +
  50 + <el-dialog :title="title" :visible.sync="contract" width="800px" append-to-body>
  51 + <contractInfo :businessKey="businessKey" v-if="contract" />
  52 + <div slot="footer" class="dialog-footer">
  53 + <el-button type="danger" @click="submitForm(form.formData[0].controlId ,1)">驳回</el-button>
  54 + <el-button type="primary" @click="submitForm(form.formData[0].controlId ,0)">通过</el-button>
  55 + </div>
  56 + </el-dialog>
  57 + </div>
  58 +</template>
  59 +
  60 +
  61 +<style>
  62 + @import '../../../assets/css/task.css'
  63 +</style>
  64 +
  65 +<script>
  66 + import {
  67 + listEndTask,
  68 + formDataShow
  69 + } from "@/api/activiti/taskhistory";
  70 +
  71 + import taskCard from "@/views/activiti/task/taskCard";
  72 + import earthSitesForm from "@/views/workflow/earthSitesForm";
  73 + import threestepInfo from "@/views/business/threestep/threestepInfo";
  74 +
  75 +
  76 +import { getSignByObjId, addSign, updateSign } from "@/api/sign/sign";
  77 +import constructsiteInfo from "@/views/activiti/task/constructsiteInfo";
  78 + import conferenceInfo from "@/views/office/conference/conferenceInfo";
  79 + import leaveApplicationInfo from "@/views/office/leaveApplication/leaveApplicationInfo";
  80 + import earthsitesInfo from "@/views/activiti/task/earthsitesInfo";
  81 + import contractInfo from "@/views/activiti/task/contractInfo";
  82 +
  83 +
  84 + export default {
  85 + name: "taskHistory",
  86 + components: {
  87 + taskCard,
  88 + threestepInfo,
  89 + earthSitesForm,
  90 + leaveApplicationInfo,
  91 + conferenceInfo,
  92 + constructsiteInfo
  93 + },
  94 + data() {
  95 + return {
  96 + id: '',
  97 + definitionKey: '',
  98 + businessKey: '',
  99 + // 遮罩层
  100 + loading: true,
  101 + // 选中数组
  102 + ids: [],
  103 + // 非单个禁用
  104 + single: true,
  105 + // 非多个禁用
  106 + multiple: true,
  107 + // 显示搜索条件
  108 + showSearch: true,
  109 + // 总条数
  110 + total: 0,
  111 + // 请假表格数据
  112 + taskList: [],
  113 + // 弹出层标题
  114 + title: "",
  115 + // 是否显示弹出层
  116 + open: false,
  117 + // 查询参数
  118 + queryParams: {
  119 + pageNum: 1,
  120 + pageSize: 10,
  121 + },
  122 +
  123 + open2:false,
  124 + // 表单参数
  125 + form: {
  126 + formData: []
  127 + },
  128 + needShow:false,
  129 + // 表单校验
  130 + rules: {},
  131 +
  132 + uploadImageDialog: false,
  133 + conferenceOpen: false,
  134 + construct:false,
  135 + idInfo:null,
  136 + leaveApplicationOpen:false,
  137 + signData:null,
  138 + earthsites:false,
  139 + contract:false,
  140 + };
  141 + },
  142 + created() {
  143 + this.getList();
  144 + },
  145 + methods: {
  146 + /** 查询请假列表 */
  147 + getList() {
  148 + this.loading = true;
  149 + listEndTask(this.queryParams).then(response => {
  150 + this.taskList = response.rows;
  151 + this.total = response.total;
  152 + this.loading = false;
  153 + });
  154 + },
  155 +
  156 + // 取消按钮
  157 + cancel() {
  158 + this.open = false;
  159 + this.reset();
  160 + },
  161 + // 表单重置
  162 + reset() {
  163 + this.definitionKey = '',
  164 + this.businessKey = '',
  165 + this.form = {
  166 + formData: [],
  167 + };
  168 + this.resetForm("form");
  169 + },
  170 + showTask(row) {
  171 +
  172 + this.needShow = false;
  173 + this.reset();
  174 + this.definitionKey = row.definitionKey;
  175 + this.businessKey = row.businessKey;
  176 + this.id = row.id;
  177 +
  178 + this.title = "详情";
  179 +
  180 + if(this.definitionKey == "conference"){
  181 + this.idInfo = row.businessKey.substring(row.businessKey.indexOf(":")+1);
  182 + this.conferenceOpen = true;
  183 + return;
  184 + }
  185 + if(this.definitionKey == "workflow_leave"){
  186 + this.idInfo = row.businessKey.substring(row.businessKey.lastIndexOf(":")+1);
  187 + this.leaveApplicationOpen = true;
  188 + return;
  189 + }
  190 +
  191 + if(this.definitionKey == "workflow_constructsite"){
  192 + getSignByObjId(this.businessKey.split(":")[1]).then(res=>{
  193 + this.signData = res;
  194 + this.construct = true;
  195 + });
  196 + return;
  197 + }
  198 + if(this.definitionKey == "workflow_earthsites"){
  199 + this.earthsites = true;
  200 + return;
  201 + }
  202 + if(this.definitionKey == "workflow_conract"){
  203 + this.contract = true;
  204 + return;
  205 + }
  206 +
  207 +
  208 + if(this.definitionKey == "workflow_threestep"){
  209 + this.open2 = true;
  210 + return;
  211 + }
  212 +
  213 + },
  214 + }
  215 + };
  216 +</script>
trash-ui/src/views/h5/taskhistory/index.vue 0 → 100644
  View file @7199c58
  1 +<template>
  2 + <div class="app-container">
  3 +
  4 + <taskCard :task="task" v-for="task in taskList" @sendToParent="showTask"/>
  5 +
  6 + <pagination :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
  7 +
  8 + <el-dialog :title="title" :visible.sync="open2" width="800px" append-to-body>
  9 + <threestepInfo :businessKey="businessKey" v-if="open2"/>
  10 + </el-dialog>
  11 +
  12 + <el-dialog :title="title" :visible.sync="construct" width="800px" append-to-body>
  13 + <constructsiteInfo :businessKey="businessKey" :signData="signData" v-if="construct" />
  14 + </el-dialog>
  15 + <!-- 会议管理 -->
  16 + <el-dialog :title="title" :visible.sync="conferenceOpen" width="850px" append-to-body>
  17 + <conferenceInfo :idInfo="idInfo" v-if="conferenceOpen"/>
  18 + </el-dialog>
  19 +
  20 + <!-- 请假申请 -->
  21 + <el-dialog :title="title" :visible.sync="leaveApplicationOpen" width="500px" append-to-body>
  22 + <leaveApplicationInfo :idInfo="idInfo" v-if="leaveApplicationOpen"/>
  23 + </el-dialog>
  24 +
  25 +
  26 + <el-dialog :title="title" :visible.sync="earthsites" width="800px" append-to-body>
  27 + <earthsitesInfo :businessKey="businessKey" v-if="earthsites" />
  28 + <div slot="footer" class="dialog-footer">
  29 + <el-button type="danger" @click="submitForm(form.formData[0].controlId ,1)">驳回</el-button>
  30 + <el-button type="primary" @click="submitForm(form.formData[0].controlId ,0)">通过</el-button>
  31 + </div>
  32 + </el-dialog>
  33 +
  34 + <el-dialog :title="title" :visible.sync="contract" width="800px" append-to-body>
  35 + <contractInfo :businessKey="businessKey" v-if="contract" />
  36 + <div slot="footer" class="dialog-footer">
  37 + <el-button type="danger" @click="submitForm(form.formData[0].controlId ,1)">驳回</el-button>
  38 + <el-button type="primary" @click="submitForm(form.formData[0].controlId ,0)">通过</el-button>
  39 + </div>
  40 + </el-dialog>
  41 + </div>
  42 +</template>
  43 +
  44 +<style>
  45 + @import '../../../assets/css/task.css'
  46 +</style>
  47 +
  48 +<script>
  49 + import {
  50 + listTask,
  51 + formDataShow
  52 + } from "@/api/activiti/taskhistory";
  53 +
  54 +
  55 +
  56 +
  57 + import taskCard from "@/views/activiti/task/taskCard";
  58 + import leaveHistoryForm from "@/views/workflow/leaveHistoryForm";
  59 + import threestepInfo from "@/views/business/threestep/threestepInfo";
  60 +
  61 +
  62 +import { getSignByObjId, addSign, updateSign } from "@/api/sign/sign";
  63 +import constructsiteInfo from "@/views/activiti/task/constructsiteInfo";
  64 +
  65 + import conferenceInfo from "@/views/office/conference/conferenceInfo";
  66 + import leaveApplicationInfo from "@/views/office/leaveApplication/leaveApplicationInfo";
  67 + import earthsitesInfo from "@/views/activiti/task/earthsitesInfo";
  68 + import contractInfo from "@/views/activiti/task/contractInfo";
  69 +
  70 +
  71 +
  72 + export default {
  73 + name: "taskHistory",
  74 + components: {
  75 + taskCard,
  76 + leaveHistoryForm,
  77 + threestepInfo,
  78 + leaveApplicationInfo,
  79 + conferenceInfo,
  80 + constructsiteInfo,
  81 + },
  82 + data() {
  83 + return {
  84 + id: '',
  85 + definitionKey: '',
  86 + businessKey: '',
  87 + // 遮罩层
  88 + loading: true,
  89 + // 选中数组
  90 + ids: [],
  91 + // 非单个禁用
  92 + single: true,
  93 + // 非多个禁用
  94 + multiple: true,
  95 + // 显示搜索条件
  96 + showSearch: true,
  97 + // 总条数
  98 + total: 0,
  99 + // 请假表格数据
  100 + taskList: [],
  101 + // 弹出层标题
  102 + title: "",
  103 + // 是否显示弹出层
  104 + open: false,
  105 + open2:false,
  106 + // 查询参数
  107 + queryParams: {
  108 + pageNum: 1,
  109 + pageSize: 10,
  110 + },
  111 + // 表单参数
  112 + form: {
  113 + formData: []
  114 + },
  115 + needShow:false,
  116 + // 表单校验
  117 + rules: {},
  118 +
  119 + uploadImageDialog: false,
  120 + conferenceOpen: false,
  121 + construct:false,
  122 + idInfo:null,
  123 + leaveApplicationOpen:false,
  124 + signData:null,
  125 + earthsites:false,
  126 + contract:false,
  127 + };
  128 + },
  129 + created() {
  130 + this.getList();
  131 + },
  132 + methods: {
  133 + /** 查询请假列表 */
  134 + getList() {
  135 + this.loading = true;
  136 + listTask(this.queryParams).then(response => {
  137 + this.taskList = response.rows;
  138 + this.total = response.total;
  139 + this.loading = false;
  140 + });
  141 + },
  142 +
  143 + // 取消按钮
  144 + cancel() {
  145 + this.open = false;
  146 + this.reset();
  147 + },
  148 + // 表单重置
  149 + reset() {
  150 + this.definitionKey = '',
  151 + this.businessKey = '',
  152 + this.form = {
  153 + formData: [],
  154 + };
  155 + this.resetForm("form");
  156 + },
  157 + showTask(row,idx) {
  158 +
  159 + this.needShow = false;
  160 + this.reset();
  161 + this.definitionKey = row.definitionKey;
  162 + this.businessKey = row.businessKey;
  163 + this.id = row.id;
  164 +
  165 +
  166 + if(this.definitionKey == "conference"){
  167 + this.idInfo = row.businessKey.substring(row.businessKey.indexOf(":")+1);
  168 + this.conferenceOpen = true;
  169 + return;
  170 + }
  171 + if(this.definitionKey == "workflow_leave"){
  172 + this.idInfo = row.businessKey.substring(row.businessKey.lastIndexOf(":")+1);
  173 + this.leaveApplicationOpen = true;
  174 + return;
  175 + }
  176 +
  177 + if(this.definitionKey == "workflow_constructsite"){
  178 + getSignByObjId(this.businessKey.split(":")[1]).then(res=>{
  179 + this.signData = res;
  180 + this.construct = true;
  181 + });
  182 + return;
  183 + }
  184 +
  185 + if(this.definitionKey == "workflow_constructsite"){
  186 + getSignByObjId(this.businessKey.split(":")[1]).then(res=>{
  187 + this.signData = res;
  188 + this.construct = true;
  189 + });
  190 + return;
  191 + }
  192 + if(this.definitionKey == "workflow_earthsites"){
  193 + this.earthsites = true;
  194 + return;
  195 + }
  196 + if(this.definitionKey == "workflow_conract"){
  197 + this.contract = true;
  198 + return;
  199 + }
  200 +
  201 +
  202 + if(this.definitionKey == "workflow_threestep"){
  203 + this.open2 = true;
  204 + return;
  205 + }
  206 +
  207 +
  208 +
  209 +
  210 +
  211 +
  212 + },
  213 + /** 提交按钮 */
  214 + submitForm() {
  215 + formDataSave(this.id, this.form.formData).then(response => {
  216 + this.msgSuccess("审批成功");
  217 + this.open = false;
  218 + this.getList();
  219 + });
  220 + },
  221 + }
  222 + };
  223 +</script>
trash-workFlow/src/main/java/com/trash/business/controller/TruckActivateController.java
  View file @7199c58
1 package com.trash.business.controller; 1 package com.trash.business.controller;
2 2
3 import java.util.List; 3 import java.util.List;
  4 +import java.util.Map;
  5 +
4 import org.springframework.security.access.prepost.PreAuthorize; 6 import org.springframework.security.access.prepost.PreAuthorize;
  7 +import org.apache.commons.collections4.map.HashedMap;
  8 +import org.apache.tomcat.jni.Mmap;
5 import org.springframework.beans.factory.annotation.Autowired; 9 import org.springframework.beans.factory.annotation.Autowired;
6 import org.springframework.web.bind.annotation.GetMapping; 10 import org.springframework.web.bind.annotation.GetMapping;
7 import org.springframework.web.bind.annotation.PostMapping; 11 import org.springframework.web.bind.annotation.PostMapping;
@@ -88,6 +92,24 @@ public class TruckActivateController extends BaseController @@ -88,6 +92,24 @@ public class TruckActivateController extends BaseController
88 return toAjax(truckActivateService.insertTruckActivate(truckActivate)); 92 return toAjax(truckActivateService.insertTruckActivate(truckActivate));
89 } 93 }
90 94
  95 + @PostMapping(value="/getActivedTruckList")
  96 + public AjaxResult getActivedTruckList(@RequestBody TruckActivate truckActivate)
  97 + {
  98 + List<TruckActivate> list = truckActivateService.getActivedTruckList(truckActivate);
  99 +
  100 + for(TruckActivate t:list){
  101 + t.setParams(null);
  102 + if(t.getActivateTime() == null){
  103 + t.setIsAct("0");
  104 + }else{
  105 + t.setIsAct("1");
  106 + }
  107 + }
  108 +
  109 + return AjaxResult.success(list);
  110 + }
  111 +
  112 +
91 /** 113 /**
92 * 修改车辆激活 114 * 修改车辆激活
93 */ 115 */
@@ -95,9 +117,23 @@ public class TruckActivateController extends BaseController @@ -95,9 +117,23 @@ public class TruckActivateController extends BaseController
95 @Log(title = "车辆激活", businessType = BusinessType.UPDATE) 117 @Log(title = "车辆激活", businessType = BusinessType.UPDATE)
96 @PutMapping 118 @PutMapping
97 public AjaxResult edit(@RequestBody TruckActivate truckActivate) 119 public AjaxResult edit(@RequestBody TruckActivate truckActivate)
98 - { 120 + {
99 return toAjax(truckActivateService.updateTruckActivate(truckActivate)); 121 return toAjax(truckActivateService.updateTruckActivate(truckActivate));
100 } 122 }
  123 +
  124 +
  125 + @GetMapping(value = "getConractByObjectId/{id}")
  126 + public AjaxResult getConractByObjectId(@PathVariable("id") String id)
  127 + {
  128 +
  129 + AjaxResult ajaxResult = AjaxResult.success();
  130 +
  131 + ajaxResult.put("result", truckActivateService.getConractByObjectId(id));
  132 +
  133 +
  134 + return ajaxResult;
  135 + }
  136 +
101 137
102 /** 138 /**
103 * 删除车辆激活 139 * 删除车辆激活
trash-workFlow/src/main/java/com/trash/business/domain/SupervisionThreestep.java
  View file @7199c58
@@ -64,6 +64,8 @@ public class SupervisionThreestep extends BaseEntity @@ -64,6 +64,8 @@ public class SupervisionThreestep extends BaseEntity
64 /** 消纳合同编号 */ 64 /** 消纳合同编号 */
65 @Excel(name = "消纳合同编号") 65 @Excel(name = "消纳合同编号")
66 private String contract; 66 private String contract;
  67 +
  68 + private String contractId;
67 69
68 /** 运输企业 */ 70 /** 运输企业 */
69 @Excel(name = "运输企业") 71 @Excel(name = "运输企业")
@@ -140,7 +142,15 @@ public class SupervisionThreestep extends BaseEntity @@ -140,7 +142,15 @@ public class SupervisionThreestep extends BaseEntity
140 142
141 143
142 144
143 - public Date getWorkStartTime() { 145 + public String getContractId() {
  146 + return contractId;
  147 + }
  148 +
  149 + public void setContractId(String contractId) {
  150 + this.contractId = contractId;
  151 + }
  152 +
  153 + public Date getWorkStartTime() {
144 return workStartTime; 154 return workStartTime;
145 } 155 }
146 156
trash-workFlow/src/main/java/com/trash/business/domain/TruckActivate.java
  View file @7199c58
@@ -81,7 +81,7 @@ public class TruckActivate extends BaseEntity @@ -81,7 +81,7 @@ public class TruckActivate extends BaseEntity
81 } 81 }
82 82
83 public String getIsAct() { 83 public String getIsAct() {
84 - return activateTime==null?"未激活":"激活"; 84 + return isAct;
85 } 85 }
86 86
87 public void setIsAct(String isAct) { 87 public void setIsAct(String isAct) {
trash-workFlow/src/main/java/com/trash/business/mapper/SupervisionThreestepMapper.java
  View file @7199c58
@@ -70,4 +70,6 @@ public interface SupervisionThreestepMapper @@ -70,4 +70,6 @@ public interface SupervisionThreestepMapper
70 public List<Map> selectDayWorkListByType(SupervisionThreestep supervisionThreestep); 70 public List<Map> selectDayWorkListByType(SupervisionThreestep supervisionThreestep);
71 71
72 List<SupervisionThreestep> selectTodayDataList(SupervisionThreestep param); 72 List<SupervisionThreestep> selectTodayDataList(SupervisionThreestep param);
  73 +
  74 + public SupervisionThreestep selectThreestepByTruckDate(SupervisionThreestep threestep);
73 } 75 }
trash-workFlow/src/main/java/com/trash/business/mapper/TruckActivateMapper.java
  View file @7199c58
@@ -62,4 +62,10 @@ public interface TruckActivateMapper @@ -62,4 +62,10 @@ public interface TruckActivateMapper
62 public void endAllTurckUnActive(); 62 public void endAllTurckUnActive();
63 63
64 public TruckActivate selectTodayTruckActivateByObjId(String objId); 64 public TruckActivate selectTodayTruckActivateByObjId(String objId);
  65 +
  66 + public TruckActivate selectTodayTruckByObjId(String objId);
  67 +
  68 + public String getConractByObjectId(TruckActivate turck);
  69 +
  70 + public List<TruckActivate> getActivedTruckList(TruckActivate truckActivate);
65 } 71 }
trash-workFlow/src/main/java/com/trash/business/service/ITruckActivateService.java
  View file @7199c58
@@ -60,4 +60,8 @@ public interface ITruckActivateService @@ -60,4 +60,8 @@ public interface ITruckActivateService
60 public int deleteTruckActivateById(Long id); 60 public int deleteTruckActivateById(Long id);
61 61
62 public void endAllTruckUnActive(); 62 public void endAllTruckUnActive();
  63 +
  64 + public String getConractByObjectId(String id);
  65 +
  66 + public List<TruckActivate> getActivedTruckList(TruckActivate truckActivate);
63 } 67 }
trash-workFlow/src/main/java/com/trash/business/service/impl/SupervisionThreestepServiceImpl.java
  View file @7199c58
@@ -457,9 +457,9 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer @@ -457,9 +457,9 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
457 } 457 }
458 458
459 if(taList.size() > 0){ 459 if(taList.size() > 0){
460 - truckActivateService.updateTruckActivate(truckActivate); 460 + truckActivateMapper.updateTruckActivate(truckActivate);
461 }else{ 461 }else{
462 - truckActivateService.insertTruckActivate(truckActivate); 462 + truckActivateMapper.insertTruckActivate(truckActivate);
463 } 463 }
464 464
465 break; 465 break;
trash-workFlow/src/main/java/com/trash/business/service/impl/TruckActivateServiceImpl.java
  View file @7199c58
1 package com.trash.business.service.impl; 1 package com.trash.business.service.impl;
2 2
  3 +import java.text.SimpleDateFormat;
  4 +import java.util.Date;
3 import java.util.List; 5 import java.util.List;
4 import com.trash.common.utils.DateUtils; 6 import com.trash.common.utils.DateUtils;
5 import org.springframework.beans.factory.annotation.Autowired; 7 import org.springframework.beans.factory.annotation.Autowired;
6 import org.springframework.stereotype.Service; 8 import org.springframework.stereotype.Service;
  9 +
  10 +import com.trash.business.mapper.SupervisionThreestepMapper;
7 import com.trash.business.mapper.TruckActivateMapper; 11 import com.trash.business.mapper.TruckActivateMapper;
  12 +import com.trash.business.domain.SupervisionThreestep;
8 import com.trash.business.domain.TruckActivate; 13 import com.trash.business.domain.TruckActivate;
  14 +import com.trash.business.service.ISupervisionThreestepService;
9 import com.trash.business.service.ITruckActivateService; 15 import com.trash.business.service.ITruckActivateService;
10 16
11 /** 17 /**
@@ -20,6 +26,8 @@ public class TruckActivateServiceImpl implements ITruckActivateService @@ -20,6 +26,8 @@ public class TruckActivateServiceImpl implements ITruckActivateService
20 @Autowired 26 @Autowired
21 private TruckActivateMapper truckActivateMapper; 27 private TruckActivateMapper truckActivateMapper;
22 28
  29 + @Autowired
  30 + SupervisionThreestepMapper threestepMapper;
23 /** 31 /**
24 * 查询车辆激活 32 * 查询车辆激活
25 * 33 *
@@ -38,6 +46,9 @@ public class TruckActivateServiceImpl implements ITruckActivateService @@ -38,6 +46,9 @@ public class TruckActivateServiceImpl implements ITruckActivateService
38 * @param truckActivate 车辆激活 46 * @param truckActivate 车辆激活
39 * @return 车辆激活 47 * @return 车辆激活
40 */ 48 */
  49 +
  50 + SimpleDateFormat yearFomat = new SimpleDateFormat("yyyy-MM-dd");
  51 +
41 @Override 52 @Override
42 public List<TruckActivate> selectTruckActivateList(TruckActivate truckActivate) 53 public List<TruckActivate> selectTruckActivateList(TruckActivate truckActivate)
43 { 54 {
@@ -53,8 +64,132 @@ public class TruckActivateServiceImpl implements ITruckActivateService @@ -53,8 +64,132 @@ public class TruckActivateServiceImpl implements ITruckActivateService
53 @Override 64 @Override
54 public int insertTruckActivate(TruckActivate truckActivate) 65 public int insertTruckActivate(TruckActivate truckActivate)
55 { 66 {
  67 + String start, end;
  68 +
  69 + Date date = new Date();
  70 +
  71 + if (new Date().getHours() < 8) {
  72 + end = yearFomat.format(date);
  73 + date.setDate(date.getDate() - 1);
  74 + start = yearFomat.format(date);
  75 + } else {
  76 + start = yearFomat.format(date);
  77 + date.setDate(date.getDate() + 1);
  78 + end = yearFomat.format(date);
  79 + }
  80 +
  81 + end += " 4:00:00";
  82 + start += " 8:00:00";
  83 +
  84 +
56 truckActivate.setCreateTime(DateUtils.getNowDate()); 85 truckActivate.setCreateTime(DateUtils.getNowDate());
57 - return truckActivateMapper.insertTruckActivate(truckActivate); 86 + truckActivate.setActivateTime(DateUtils.getNowDate());
  87 +
  88 +
  89 + TruckActivate oldDate = truckActivateMapper.selectTodayTruckByObjId(truckActivate.getObjectId());
  90 +
  91 + if(oldDate != null){
  92 +
  93 + SupervisionThreestep threestep = new SupervisionThreestep();
  94 +
  95 + threestep.setName(oldDate.getConstruction());
  96 + threestep.setEarthsitesName(oldDate.getEarthsite());
  97 + threestep.setCompanyTrucks(oldDate.getObjectId());
  98 +
  99 + try {
  100 + threestep.setWorkStartTime(DateUtils.parseDate(start));
  101 + threestep.setWorkEndTime(DateUtils.parseDate(end));
  102 + } catch (Exception e) {
  103 + // TODO Auto-generated catch block
  104 + e.printStackTrace();
  105 + }
  106 +
  107 + threestep = threestepMapper.selectThreestepByTruckDate(threestep);
  108 +
  109 + if(threestep.getName().equals(truckActivate.getConstruction()) && threestep.getEarthsitesName().equals(truckActivate.getEarthsite())){
  110 + truckActivate.setId(oldDate.getId());
  111 + truckActivateMapper.updateTruckActivate(truckActivate);
  112 + }else{
  113 + Long threeId = threestep.getId();
  114 + String trucks = threestep.getCompanyTrucks();
  115 +
  116 + threestep = new SupervisionThreestep();
  117 +
  118 + threestep.setId(threeId);
  119 +
  120 + trucks = trucks.replace(oldDate.getObjectId(), "").replace(",,", ",");
  121 +
  122 + threestep.setCompanyTrucks(trucks);
  123 +
  124 + //去除已有三查数据的车辆绑定
  125 + threestepMapper.updateSupervisionThreestep(threestep);
  126 +
  127 + //更新绑定的三查数据
  128 + threestep = new SupervisionThreestep();
  129 +
  130 + threestep.setName(truckActivate.getConstruction());
  131 + threestep.setEarthsitesName(truckActivate.getEarthsite());
  132 + try {
  133 + threestep.setWorkStartTime(DateUtils.parseDate(start));
  134 + threestep.setWorkEndTime(DateUtils.parseDate(end));
  135 + } catch (Exception e) {
  136 + // TODO Auto-generated catch block
  137 + e.printStackTrace();
  138 + }
  139 +
  140 + threestep = threestepMapper.selectThreestepByTruckDate(threestep);
  141 +
  142 + trucks = threestep.getCompanyTrucks();
  143 +
  144 + if(trucks == null || trucks.isEmpty()){
  145 + trucks = truckActivate.getObjectId();
  146 + }else{
  147 + trucks += "," + truckActivate.getObjectId();
  148 + }
  149 +
  150 + threestep.setCompanyTrucks(trucks);
  151 +
  152 + threestepMapper.updateSupervisionThreestep(threestep);
  153 +
  154 + truckActivate.setId(oldDate.getId());//更新已有车辆激活数据
  155 +
  156 + return truckActivateMapper.updateTruckActivate(truckActivate);
  157 + }
  158 + }else{
  159 +
  160 + SupervisionThreestep threestep = new SupervisionThreestep();
  161 +
  162 + threestep.setName(truckActivate.getConstruction());
  163 + threestep.setEarthsitesName(truckActivate.getEarthsite());
  164 +
  165 + try {
  166 + threestep.setWorkStartTime(DateUtils.parseDate(start));
  167 + threestep.setWorkEndTime(DateUtils.parseDate(end));
  168 + } catch (Exception e) {
  169 + // TODO Auto-generated catch block
  170 + e.printStackTrace();
  171 + }
  172 +
  173 + threestep = threestepMapper.selectThreestepByTruckDate(threestep);
  174 +
  175 + String trucks = threestep.getCompanyTrucks();
  176 +
  177 + if(trucks == null || trucks.isEmpty()){
  178 + trucks = truckActivate.getObjectId();
  179 + }else{
  180 + trucks += "," + truckActivate.getObjectId();
  181 + }
  182 +
  183 + threestep.setCompanyTrucks(trucks);
  184 +
  185 + threestepMapper.updateSupervisionThreestep(threestep);
  186 +
  187 + return truckActivateMapper.insertTruckActivate(truckActivate);
  188 + }
  189 +
  190 +
  191 + return 0;
  192 +
58 } 193 }
59 194
60 /** 195 /**
@@ -66,6 +201,9 @@ public class TruckActivateServiceImpl implements ITruckActivateService @@ -66,6 +201,9 @@ public class TruckActivateServiceImpl implements ITruckActivateService
66 @Override 201 @Override
67 public int updateTruckActivate(TruckActivate truckActivate) 202 public int updateTruckActivate(TruckActivate truckActivate)
68 { 203 {
  204 +
  205 + truckActivate.setActivateTime(DateUtils.getNowDate());
  206 +
69 return truckActivateMapper.updateTruckActivate(truckActivate); 207 return truckActivateMapper.updateTruckActivate(truckActivate);
70 } 208 }
71 209
@@ -92,6 +230,45 @@ public class TruckActivateServiceImpl implements ITruckActivateService @@ -92,6 +230,45 @@ public class TruckActivateServiceImpl implements ITruckActivateService
92 { 230 {
93 return truckActivateMapper.deleteTruckActivateById(id); 231 return truckActivateMapper.deleteTruckActivateById(id);
94 } 232 }
  233 +
  234 +
  235 + @Override
  236 + public String getConractByObjectId(String id){
  237 +
  238 + TruckActivate turck = new TruckActivate();
  239 +
  240 + turck.setObjectId(id);
  241 +
  242 + if(turck.getStartTime() == null){
  243 + String start, end;
  244 +
  245 + Date date = new Date();
  246 +
  247 + if (new Date().getHours() < 8) {
  248 + end = yearFomat.format(date);
  249 + date.setDate(date.getDate() - 1);
  250 + start = yearFomat.format(date);
  251 + } else {
  252 + start = yearFomat.format(date);
  253 + date.setDate(date.getDate() + 1);
  254 + end = yearFomat.format(date);
  255 + }
  256 +
  257 + end += " 4:00:00";
  258 + start += " 8:00:00";
  259 +
  260 + try {
  261 + turck.setStartTime(start);
  262 + turck.setEndTime(end);
  263 + } catch (Exception e) {
  264 + // TODO Auto-generated catch block
  265 + e.printStackTrace();
  266 + }
  267 + }
  268 +
  269 +
  270 + return truckActivateMapper.getConractByObjectId(turck);
  271 + }
95 272
96 @Override 273 @Override
97 public void endAllTruckUnActive() { 274 public void endAllTruckUnActive() {
@@ -99,4 +276,11 @@ public class TruckActivateServiceImpl implements ITruckActivateService @@ -99,4 +276,11 @@ public class TruckActivateServiceImpl implements ITruckActivateService
99 truckActivateMapper.endAllTurckUnActive(); 276 truckActivateMapper.endAllTurckUnActive();
100 277
101 } 278 }
  279 +
  280 + @Override
  281 + public List<TruckActivate> getActivedTruckList(TruckActivate truckActivate) {
  282 +
  283 + return truckActivateMapper.getActivedTruckList(truckActivate);
  284 +
  285 + }
102 } 286 }
trash-workFlow/src/main/resources/mapper/SupervisionThreestepMapper.xml
  View file @7199c58
@@ -3,323 +3,366 @@ @@ -3,323 +3,366 @@
3 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 3 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
4 "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> 4 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
5 <mapper namespace="com.trash.business.mapper.SupervisionThreestepMapper"> 5 <mapper namespace="com.trash.business.mapper.SupervisionThreestepMapper">
6 -  
7 - <resultMap type="SupervisionThreestep" id="SupervisionThreestepResult">  
8 - <result property="id" column="id" />  
9 - <result property="name" column="name" />  
10 - <result property="type" column="type" />  
11 - <result property="place" column="place" />  
12 - <result property="selfCheckTime" column="self_check_time" />  
13 - <result property="objectId" column="object_id" />  
14 - <result property="earthsitesId" column="earthsites_id" />  
15 - <result property="createTime" column="create_time" />  
16 - <result property="checkTime" column="check_time" />  
17 - <result property="checkEndTime" column="check_end_time" />  
18 - <result property="earthsitesName" column="earthsites_name" />  
19 - <result property="contract" column="contract" />  
20 - <result property="companys" column="companys" />  
21 - <result property="companyTrucks" column="company_trucks" />  
22 - <result property="img0" column="img0" />  
23 - <result property="img1" column="img1" />  
24 - <result property="img2" column="img2" />  
25 - <result property="img3" column="img3" />  
26 - <result property="img4" column="img4" />  
27 - <result property="img5" column="img5" />  
28 - <result property="img6" column="img6" />  
29 - <result property="img7" column="img7" />  
30 - <result property="img8" column="img8" />  
31 - <result property="img9" column="img9" />  
32 - <result property="img10" column="img10" />  
33 - <result property="img11" column="img11" />  
34 - <result property="img12" column="img12" />  
35 - <result property="sub_img0" column="sub_img0" />  
36 - <result property="sub_img1" column="sub_img1" />  
37 - <result property="sub_img2" column="sub_img2" />  
38 - <result property="sub_img3" column="sub_img3" />  
39 - <result property="sub_img4" column="sub_img4" />  
40 - <result property="sub_img5" column="sub_img5" />  
41 - <result property="sub_img6" column="sub_img6" />  
42 - <result property="sub_img7" column="sub_img7" />  
43 - <result property="sub_img8" column="sub_img8" />  
44 - <result property="sub_img9" column="sub_img9" />  
45 - <result property="sub_img10" column="sub_img10" />  
46 - <result property="sub_img11" column="sub_img11" />  
47 - <result property="sub_img12" column="sub_img12" />  
48 -  
49 - <result property="subReason" column="sub_reason" />  
50 - <result property="earthPipPerson" column="earth_pip_person" />  
51 - <result property="enforcePerson" column="enforce_person" />  
52 - <result property="subSubReason" column="sub_sub_reason" />  
53 - <result property="attchItem1" column="attch_item1" />  
54 - <result property="attchItem2" column="attch_item2" />  
55 - <result property="attchItem3" column="attch_item3" />  
56 -  
57 - <result property="person" column="person" />  
58 - <result property="phone" column="phone" />  
59 - <result property="status" column="status" />  
60 - <result property="createBy" column="create_by" />  
61 -  
62 -  
63 - </resultMap>  
64 6
65 - <sql id="selectSupervisionThreestepVo">  
66 - select id, name, type, place, self_check_time, object_id, earthsites_id, create_time, check_time, earthsites_name,check_end_time, contract,  
67 - companys, company_trucks, img0, img1, img2, img3, img4, img5, img6, img7, img8, img9, img10, img11, img12, sub_img0, sub_img1,  
68 - sub_img2, sub_img3, sub_img4, sub_img5, sub_img6, sub_img7, sub_img8, sub_img9, sub_img10, sub_img11, sub_img12,  
69 - person, phone,status,create_by,sub_reason,earth_pip_person,enforce_person,sub_sub_reason,attch_item1,attch_item2,attch_item3 from supervision_threestep  
70 - </sql> 7 + <resultMap type="SupervisionThreestep" id="SupervisionThreestepResult">
  8 + <result property="id" column="id" />
  9 + <result property="name" column="name" />
  10 + <result property="type" column="type" />
  11 + <result property="place" column="place" />
  12 + <result property="selfCheckTime" column="self_check_time" />
  13 + <result property="objectId" column="object_id" />
  14 + <result property="earthsitesId" column="earthsites_id" />
  15 + <result property="createTime" column="create_time" />
  16 + <result property="checkTime" column="check_time" />
  17 + <result property="checkEndTime" column="check_end_time" />
  18 + <result property="earthsitesName" column="earthsites_name" />
  19 + <result property="contract" column="contract" />
  20 + <result property="contractId" column="contract_id" />
  21 + <result property="companys" column="companys" />
  22 + <result property="companyTrucks" column="company_trucks" />
  23 + <result property="img0" column="img0" />
  24 + <result property="img1" column="img1" />
  25 + <result property="img2" column="img2" />
  26 + <result property="img3" column="img3" />
  27 + <result property="img4" column="img4" />
  28 + <result property="img5" column="img5" />
  29 + <result property="img6" column="img6" />
  30 + <result property="img7" column="img7" />
  31 + <result property="img8" column="img8" />
  32 + <result property="img9" column="img9" />
  33 + <result property="img10" column="img10" />
  34 + <result property="img11" column="img11" />
  35 + <result property="img12" column="img12" />
  36 + <result property="sub_img0" column="sub_img0" />
  37 + <result property="sub_img1" column="sub_img1" />
  38 + <result property="sub_img2" column="sub_img2" />
  39 + <result property="sub_img3" column="sub_img3" />
  40 + <result property="sub_img4" column="sub_img4" />
  41 + <result property="sub_img5" column="sub_img5" />
  42 + <result property="sub_img6" column="sub_img6" />
  43 + <result property="sub_img7" column="sub_img7" />
  44 + <result property="sub_img8" column="sub_img8" />
  45 + <result property="sub_img9" column="sub_img9" />
  46 + <result property="sub_img10" column="sub_img10" />
  47 + <result property="sub_img11" column="sub_img11" />
  48 + <result property="sub_img12" column="sub_img12" />
71 49
72 - <select id="selectSupervisionThreestepList" parameterType="SupervisionThreestep" resultMap="SupervisionThreestepResult">  
73 - <include refid="selectSupervisionThreestepVo"/>  
74 - <where>  
75 - <if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if>  
76 - <if test="type != null "> and type = #{type}</if>  
77 - <if test="place != null and place != ''"> and place = #{place}</if>  
78 - <if test="objectId != null and objectId != ''"> and object_id = #{objectId}</if>  
79 - <if test="earthsitesId != null and earthsitesId != ''"> and earthsites_id = #{earthsitesId}</if>  
80 - <if test="checkTime != null "> and check_time = #{checkTime}</if>  
81 - <if test="earthsitesName != null and earthsitesName != ''"> and earthsites_name like concat('%', #{earthsitesName}, '%')</if>  
82 - <if test="contract != null and contract != ''"> and contract = #{contract}</if>  
83 - <if test="companys != null and companys != ''"> and companys = #{companys}</if>  
84 - <if test="companyTrucks != null and companyTrucks != ''"> and company_trucks = #{companyTrucks}</if>  
85 - <if test="img0 != null and img0 != ''"> and img0 = #{img0}</if>  
86 - <if test="img1 != null and img1 != ''"> and img1 = #{img1}</if>  
87 - <if test="img2 != null and img2 != ''"> and img2 = #{img2}</if>  
88 - <if test="img3 != null and img3 != ''"> and img3 = #{img3}</if>  
89 - <if test="img4 != null and img4 != ''"> and img4 = #{img4}</if>  
90 - <if test="img5 != null and img5 != ''"> and img5 = #{img5}</if>  
91 - <if test="img6 != null and img6 != ''"> and img6 = #{img6}</if>  
92 - <if test="img7 != null and img7 != ''"> and img7 = #{img7}</if>  
93 - <if test="img8 != null and img8 != ''"> and img8 = #{img8}</if>  
94 - <if test="img9 != null and img9 != ''"> and img9 = #{img9}</if>  
95 - <if test="img10 != null and img10 != ''"> and img10 = #{img10}</if>  
96 - <if test="img11 != null and img11 != ''"> and img11 = #{img11}</if>  
97 - <if test="img12 != null and img12 != ''"> and img12 = #{img12}</if>  
98 - <if test="person != null and person != ''"> and person = #{person}</if>  
99 - <if test="phone != null and phone != ''"> and phone = #{phone}</if>  
100 - <if test="status != null and status != ''"> and status = #{status}</if>  
101 - <if test="createBy != null and createBy != ''"> and create_by = #{createBy}</if>  
102 - <if test="workStartTime != null"> and self_check_time BETWEEN #{workStartTime} and #{workEndTime}</if>  
103 - </where>  
104 - ORDER BY create_time desc  
105 - </select>  
106 -  
107 - <select id="getNames" parameterType="TruckCredit" resultType="String">  
108 - select DISTINCT name from supervision_threestep  
109 - <where>  
110 - <if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if>  
111 - <if test="type != null "> and type = #{type}</if>  
112 - <if test="place != null and place != ''"> and place = #{place}</if>  
113 - <if test="objectId != null and objectId != ''"> and object_id = #{objectId}</if>  
114 - <if test="earthsitesId != null and earthsitesId != ''"> and earthsites_id = #{earthsitesId}</if>  
115 - <if test="checkTime != null "> and check_time = #{checkTime}</if>  
116 - <if test="earthsitesName != null and earthsitesName != ''"> and earthsites_name like concat('%', #{earthsitesName}, '%')</if>  
117 - <if test="contract != null and contract != ''"> and contract = #{contract}</if>  
118 - <if test="companys != null and companys != ''"> and companys = #{companys}</if>  
119 - <if test="companyTrucks != null and companyTrucks != ''"> and company_trucks = #{companyTrucks}</if>  
120 - <if test="img0 != null and img0 != ''"> and img0 = #{img0}</if>  
121 - <if test="img1 != null and img1 != ''"> and img1 = #{img1}</if>  
122 - <if test="img2 != null and img2 != ''"> and img2 = #{img2}</if>  
123 - <if test="img3 != null and img3 != ''"> and img3 = #{img3}</if>  
124 - <if test="img4 != null and img4 != ''"> and img4 = #{img4}</if>  
125 - <if test="img5 != null and img5 != ''"> and img5 = #{img5}</if>  
126 - <if test="img6 != null and img6 != ''"> and img6 = #{img6}</if>  
127 - <if test="img7 != null and img7 != ''"> and img7 = #{img7}</if>  
128 - <if test="img8 != null and img8 != ''"> and img8 = #{img8}</if>  
129 - <if test="img9 != null and img9 != ''"> and img9 = #{img9}</if>  
130 - <if test="img10 != null and img10 != ''"> and img10 = #{img10}</if>  
131 - <if test="img11 != null and img11 != ''"> and img11 = #{img11}</if>  
132 - <if test="img12 != null and img12 != ''"> and img12 = #{img12}</if>  
133 - <if test="person != null and person != ''"> and person = #{person}</if>  
134 - <if test="phone != null and phone != ''"> and phone = #{phone}</if>  
135 - <if test="status != null and status != ''"> and status = #{status}</if>  
136 - <if test="createBy != null and createBy != ''"> and create_by = #{createBy}</if>  
137 - <if test="workStartTime != null"> and self_check_time BETWEEN #{workStartTime} and #{workEndTime}</if>  
138 - </where>  
139 - ORDER BY create_time desc  
140 - </select>  
141 -  
142 -  
143 - <select id="selectDayWorkList" parameterType="SupervisionThreestep" resultType="java.util.HashMap">  
144 - select a.*,b.* from( select x.* from (select * from supervision_threestep a where type = 0  
145 - and self_check_time BETWEEN #{workStartTime} and #{workEndTime}  
146 - ORDER BY self_check_time DESC) x GROUP BY object_id) a  
147 - LEFT JOIN  
148 - (select name ename,object_id eobject_id,sub_reason esub_reason,place eplace,status estatus,self_check_time eself_check_time from supervision_threestep where type = 1) b  
149 - on a.earthsites_id = b.eobject_id  
150 - and DATE_FORMAT(a.self_check_time,("%y%m%d")) = DATE_FORMAT(b.eself_check_time,("%y%m%d"))  
151 - ORDER BY a.create_time DESC  
152 - </select>  
153 -  
154 -  
155 - <select id="selectDayWorkListByType" parameterType="SupervisionThreestep" resultType="java.util.HashMap">  
156 - select object_id id,name,earthsites_id relationSiteId,company_trucks from supervision_threestep  
157 - <where>  
158 - <if test="type != null"> and type = #{type} </if>  
159 - <if test="objectId != null and objectId != ''"> and object_id = #{objectId} </if>  
160 - and self_check_time BETWEEN #{workStartTime} and #{workEndTime}  
161 - and status = 1  
162 - </where>  
163 - ORDER BY self_check_time DESC  
164 - </select>  
165 -  
166 -  
167 -  
168 - <select id="selectSupervisionThreestepById" parameterType="Long" resultMap="SupervisionThreestepResult">  
169 - <include refid="selectSupervisionThreestepVo"/>  
170 - where id = #{id}  
171 - </select>  
172 -  
173 -  
174 - <select id="selectTodayData" parameterType="SupervisionThreestep" resultMap="SupervisionThreestepResult">  
175 - <include refid="selectSupervisionThreestepVo"/>  
176 - <where>  
177 - and object_id = #{objectId}  
178 - and type = ${type}  
179 - and self_check_time BETWEEN #{workStartTime} and #{workEndTime}  
180 - </where>  
181 - </select>  
182 -  
183 - <select id="selectTodayDataList" parameterType="SupervisionThreestep" resultMap="SupervisionThreestepResult">  
184 - <include refid="selectSupervisionThreestepVo"/>  
185 - <where>  
186 - <if test="status != null"> status = #{status}</if>  
187 - and type = ${type}  
188 - and self_check_time BETWEEN #{workStartTime} and #{workEndTime}  
189 - </where>  
190 - </select>  
191 -  
192 - <insert id="insertSupervisionThreestep" parameterType="SupervisionThreestep" useGeneratedKeys="true" keyProperty="id">  
193 - insert into supervision_threestep  
194 - <trim prefix="(" suffix=")" suffixOverrides=",">  
195 - <if test="name != null">name,</if>  
196 - <if test="type != null">type,</if>  
197 - <if test="place != null">place,</if>  
198 - <if test="selfCheckTime != null">self_check_time,</if>  
199 - <if test="objectId != null">object_id,</if>  
200 - <if test="earthsitesId != null">earthsites_id,</if>  
201 - <if test="createTime != null">create_time,</if>  
202 - <if test="earthsitesName != null">earthsites_name,</if>  
203 - <if test="contract != null">contract,</if>  
204 - <if test="companys != null">companys,</if>  
205 - <if test="companyTrucks != null">company_trucks,</if>  
206 - <if test="img0 != null">img0,</if>  
207 - <if test="img1 != null">img1,</if>  
208 - <if test="img2 != null">img2,</if>  
209 - <if test="img3 != null">img3,</if>  
210 - <if test="img4 != null">img4,</if>  
211 - <if test="img5 != null">img5,</if>  
212 - <if test="img6 != null">img6,</if>  
213 - <if test="img7 != null">img7,</if>  
214 - <if test="img8 != null">img8,</if>  
215 - <if test="img9 != null">img9,</if>  
216 - <if test="img10 != null">img10,</if>  
217 - <if test="img11 != null">img11,</if>  
218 - <if test="img12 != null">img12,</if>  
219 - <if test="person != null">person,</if>  
220 - <if test="phone != null">phone,</if>  
221 - <if test="status != null">status,</if>  
222 - <if test="createBy != null">create_by,</if>  
223 - </trim>  
224 - <trim prefix="values (" suffix=")" suffixOverrides=",">  
225 - <if test="name != null">#{name},</if>  
226 - <if test="type != null">#{type},</if>  
227 - <if test="place != null">#{place},</if>  
228 - <if test="selfCheckTime != null">#{selfCheckTime},</if>  
229 - <if test="objectId != null">#{objectId},</if>  
230 - <if test="earthsitesId != null">#{earthsitesId},</if>  
231 - <if test="createTime != null">#{createTime},</if>  
232 - <if test="earthsitesName != null">#{earthsitesName},</if>  
233 - <if test="contract != null">#{contract},</if>  
234 - <if test="companys != null">#{companys},</if>  
235 - <if test="companyTrucks != null">#{companyTrucks},</if>  
236 - <if test="img0 != null">#{img0},</if>  
237 - <if test="img1 != null">#{img1},</if>  
238 - <if test="img2 != null">#{img2},</if>  
239 - <if test="img3 != null">#{img3},</if>  
240 - <if test="img4 != null">#{img4},</if>  
241 - <if test="img5 != null">#{img5},</if>  
242 - <if test="img6 != null">#{img6},</if>  
243 - <if test="img7 != null">#{img7},</if>  
244 - <if test="img8 != null">#{img8},</if>  
245 - <if test="img9 != null">#{img9},</if>  
246 - <if test="img10 != null">#{img10},</if>  
247 - <if test="img11 != null">#{img11},</if>  
248 - <if test="img12 != null">#{img12},</if>  
249 - <if test="person != null">#{person},</if>  
250 - <if test="phone != null">#{phone},</if>  
251 - <if test="status != null">#{status},</if>  
252 - <if test="createBy != null"> #{createBy},</if>  
253 - </trim>  
254 - </insert> 50 + <result property="subReason" column="sub_reason" />
  51 + <result property="earthPipPerson" column="earth_pip_person" />
  52 + <result property="enforcePerson" column="enforce_person" />
  53 + <result property="subSubReason" column="sub_sub_reason" />
  54 + <result property="attchItem1" column="attch_item1" />
  55 + <result property="attchItem2" column="attch_item2" />
  56 + <result property="attchItem3" column="attch_item3" />
  57 +
  58 + <result property="person" column="person" />
  59 + <result property="phone" column="phone" />
  60 + <result property="status" column="status" />
  61 + <result property="createBy" column="create_by" />
  62 +
  63 +
  64 + </resultMap>
  65 +
  66 + <sql id="selectSupervisionThreestepVo">
  67 + select id, name, type, place, self_check_time, object_id, earthsites_id,
  68 + create_time, check_time, earthsites_name,check_end_time,
  69 + contract,contract_id,
  70 + companys, company_trucks, img0, img1, img2, img3, img4, img5, img6, img7, img8,
  71 + img9, img10, img11, img12, sub_img0, sub_img1,
  72 + sub_img2, sub_img3, sub_img4, sub_img5, sub_img6, sub_img7, sub_img8, sub_img9,
  73 + sub_img10, sub_img11, sub_img12,
  74 + person,
  75 + phone,status,create_by,sub_reason,earth_pip_person,enforce_person,sub_sub_reason,attch_item1,attch_item2,attch_item3
  76 + from supervision_threestep
  77 + </sql>
  78 +
  79 + <select id="selectSupervisionThreestepList" parameterType="SupervisionThreestep"
  80 + resultMap="SupervisionThreestepResult">
  81 + <include refid="selectSupervisionThreestepVo" />
  82 + <where>
  83 + <if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if>
  84 + <if test="type != null "> and type = #{type}</if>
  85 + <if test="place != null and place != ''"> and place = #{place}</if>
  86 + <if test="objectId != null and objectId != ''"> and object_id = #{objectId}</if>
  87 + <if test="earthsitesId != null and earthsitesId != ''"> and earthsites_id = #{earthsitesId}</if>
  88 + <if test="checkTime != null "> and check_time = #{checkTime}</if>
  89 + <if test="earthsitesName != null and earthsitesName != ''"> and earthsites_name like concat('%', #{earthsitesName},
  90 + '%')</if>
  91 + <if test="contract != null and contract != ''"> and contract = #{contract}</if>
  92 + <if test="companys != null and companys != ''"> and companys = #{companys}</if>
  93 + <if test="companyTrucks != null and companyTrucks != ''"> and company_trucks = #{companyTrucks}</if>
  94 + <if test="img0 != null and img0 != ''"> and img0 = #{img0}</if>
  95 + <if test="img1 != null and img1 != ''"> and img1 = #{img1}</if>
  96 + <if test="img2 != null and img2 != ''"> and img2 = #{img2}</if>
  97 + <if test="img3 != null and img3 != ''"> and img3 = #{img3}</if>
  98 + <if test="img4 != null and img4 != ''"> and img4 = #{img4}</if>
  99 + <if test="img5 != null and img5 != ''"> and img5 = #{img5}</if>
  100 + <if test="img6 != null and img6 != ''"> and img6 = #{img6}</if>
  101 + <if test="img7 != null and img7 != ''"> and img7 = #{img7}</if>
  102 + <if test="img8 != null and img8 != ''"> and img8 = #{img8}</if>
  103 + <if test="img9 != null and img9 != ''"> and img9 = #{img9}</if>
  104 + <if test="img10 != null and img10 != ''"> and img10 = #{img10}</if>
  105 + <if test="img11 != null and img11 != ''"> and img11 = #{img11}</if>
  106 + <if test="img12 != null and img12 != ''"> and img12 = #{img12}</if>
  107 + <if test="person != null and person != ''"> and person = #{person}</if>
  108 + <if test="phone != null and phone != ''"> and phone = #{phone}</if>
  109 + <if test="status != null and status != ''"> and status = #{status}</if>
  110 + <if test="createBy != null and createBy != ''"> and create_by = #{createBy}</if>
  111 + <if test="workStartTime != null"> and self_check_time BETWEEN #{workStartTime} and
  112 + #{workEndTime}</if>
  113 + </where>
  114 + ORDER BY create_time desc
  115 + </select>
  116 +
  117 + <select id="getNames" parameterType="TruckCredit" resultType="String">
  118 + select DISTINCT name from supervision_threestep
  119 + <where>
  120 + <if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if>
  121 + <if test="type != null "> and type = #{type}</if>
  122 + <if test="place != null and place != ''"> and place = #{place}</if>
  123 + <if test="objectId != null and objectId != ''"> and object_id = #{objectId}</if>
  124 + <if test="earthsitesId != null and earthsitesId != ''"> and earthsites_id = #{earthsitesId}</if>
  125 + <if test="checkTime != null "> and check_time = #{checkTime}</if>
  126 + <if test="earthsitesName != null and earthsitesName != ''"> and earthsites_name like concat('%', #{earthsitesName},
  127 + '%')</if>
  128 + <if test="contract != null and contract != ''"> and contract = #{contract}</if>
  129 + <if test="companys != null and companys != ''"> and companys = #{companys}</if>
  130 + <if test="companyTrucks != null and companyTrucks != ''"> and company_trucks = #{companyTrucks}</if>
  131 + <if test="img0 != null and img0 != ''"> and img0 = #{img0}</if>
  132 + <if test="img1 != null and img1 != ''"> and img1 = #{img1}</if>
  133 + <if test="img2 != null and img2 != ''"> and img2 = #{img2}</if>
  134 + <if test="img3 != null and img3 != ''"> and img3 = #{img3}</if>
  135 + <if test="img4 != null and img4 != ''"> and img4 = #{img4}</if>
  136 + <if test="img5 != null and img5 != ''"> and img5 = #{img5}</if>
  137 + <if test="img6 != null and img6 != ''"> and img6 = #{img6}</if>
  138 + <if test="img7 != null and img7 != ''"> and img7 = #{img7}</if>
  139 + <if test="img8 != null and img8 != ''"> and img8 = #{img8}</if>
  140 + <if test="img9 != null and img9 != ''"> and img9 = #{img9}</if>
  141 + <if test="img10 != null and img10 != ''"> and img10 = #{img10}</if>
  142 + <if test="img11 != null and img11 != ''"> and img11 = #{img11}</if>
  143 + <if test="img12 != null and img12 != ''"> and img12 = #{img12}</if>
  144 + <if test="person != null and person != ''"> and person = #{person}</if>
  145 + <if test="phone != null and phone != ''"> and phone = #{phone}</if>
  146 + <if test="status != null and status != ''"> and status = #{status}</if>
  147 + <if test="createBy != null and createBy != ''"> and create_by = #{createBy}</if>
  148 + <if test="workStartTime != null"> and self_check_time BETWEEN #{workStartTime} and
  149 + #{workEndTime}</if>
  150 + </where>
  151 + ORDER BY create_time desc
  152 + </select>
  153 +
  154 +
  155 + <select id="selectDayWorkList" parameterType="SupervisionThreestep"
  156 + resultType="java.util.HashMap">
  157 + select a.*,b.* from( select x.* from (select * from supervision_threestep a
  158 + where type = 0
  159 + and self_check_time BETWEEN #{workStartTime} and #{workEndTime}
  160 + ORDER BY self_check_time DESC) x GROUP BY object_id) a
  161 + LEFT JOIN
  162 + (select name ename,object_id eobject_id,sub_reason esub_reason,place
  163 + eplace,status estatus,self_check_time eself_check_time from
  164 + supervision_threestep where type = 1) b
  165 + on a.earthsites_id = b.eobject_id
  166 + and DATE_FORMAT(a.self_check_time,("%y%m%d")) =
  167 + DATE_FORMAT(b.eself_check_time,("%y%m%d"))
  168 + ORDER BY a.create_time DESC
  169 + </select>
  170 +
  171 +
  172 +
  173 +
  174 + <select id="selectDayWorkListByType" parameterType="SupervisionThreestep"
  175 + resultType="java.util.HashMap">
  176 + select object_id id,name,earthsites_id relationSiteId,company_trucks
  177 + from supervision_threestep
  178 + <where>
  179 + <if test="type != null"> and type = #{type} </if>
  180 + <if test="objectId != null and objectId != ''"> and object_id = #{objectId} </if>
  181 + and self_check_time BETWEEN #{workStartTime} and #{workEndTime}
  182 + and status = 1
  183 + </where>
  184 + ORDER BY self_check_time DESC
  185 + </select>
  186 +
  187 + <select id="selectThreestepByTruckDate" parameterType="SupervisionThreestep" resultMap="SupervisionThreestepResult">
  188 + select * from supervision_threestep
  189 + where name = #{name}
  190 + and earthsites_name = #{earthsitesName}
  191 + <if test="companyTrucks != null">
  192 + and company_trucks like concat('%', #{companyTrucks}, '%')
  193 + </if>
  194 + and type = 0
  195 + and status = 1
  196 + and self_check_time BETWEEN #{workStartTime} and #{workEndTime}
  197 + ORDER BY self_check_time DESC
  198 + </select>
  199 +
  200 +
  201 +
  202 +
  203 + <select id="selectSupervisionThreestepById" parameterType="Long"
  204 + resultMap="SupervisionThreestepResult">
  205 + <include refid="selectSupervisionThreestepVo" />
  206 + where id = #{id}
  207 + </select>
  208 +
  209 +
  210 + <select id="selectTodayData" parameterType="SupervisionThreestep"
  211 + resultMap="SupervisionThreestepResult">
  212 + <include refid="selectSupervisionThreestepVo" />
  213 + <where>
  214 + and object_id = #{objectId}
  215 + and type = #{type}
  216 + and self_check_time BETWEEN #{workStartTime} and #{workEndTime}
  217 + </where>
  218 + </select>
  219 +
  220 + <select id="selectTodayDataList" parameterType="SupervisionThreestep"
  221 + resultMap="SupervisionThreestepResult">
  222 + <include refid="selectSupervisionThreestepVo" />
  223 + <where>
  224 + <if test="status != null"> status = #{status}</if>
  225 + and type = #{type}
  226 + and self_check_time BETWEEN #{workStartTime} and #{workEndTime}
  227 + </where>
  228 + </select>
  229 +
  230 + <insert id="insertSupervisionThreestep" parameterType="SupervisionThreestep"
  231 + useGeneratedKeys="true" keyProperty="id">
  232 + insert into supervision_threestep
  233 + <trim prefix="(" suffix=")" suffixOverrides=",">
  234 + <if test="name != null">name,</if>
  235 + <if test="type != null">type,</if>
  236 + <if test="place != null">place,</if>
  237 + <if test="selfCheckTime != null">self_check_time,</if>
  238 + <if test="objectId != null">object_id,</if>
  239 + <if test="earthsitesId != null">earthsites_id,</if>
  240 + <if test="createTime != null">create_time,</if>
  241 + <if test="earthsitesName != null">earthsites_name,</if>
  242 + <if test="contract != null">contract,</if>
  243 + <if test="contractId != null">contract_id,</if>
  244 + <if test="companys != null">companys,</if>
  245 + <if test="companyTrucks != null">company_trucks,</if>
  246 + <if test="img0 != null">img0,</if>
  247 + <if test="img1 != null">img1,</if>
  248 + <if test="img2 != null">img2,</if>
  249 + <if test="img3 != null">img3,</if>
  250 + <if test="img4 != null">img4,</if>
  251 + <if test="img5 != null">img5,</if>
  252 + <if test="img6 != null">img6,</if>
  253 + <if test="img7 != null">img7,</if>
  254 + <if test="img8 != null">img8,</if>
  255 + <if test="img9 != null">img9,</if>
  256 + <if test="img10 != null">img10,</if>
  257 + <if test="img11 != null">img11,</if>
  258 + <if test="img12 != null">img12,</if>
  259 + <if test="person != null">person,</if>
  260 + <if test="phone != null">phone,</if>
  261 + <if test="status != null">status,</if>
  262 + <if test="createBy != null">create_by,</if>
  263 + </trim>
  264 + <trim prefix="values (" suffix=")" suffixOverrides=",">
  265 + <if test="name != null">#{name},</if>
  266 + <if test="type != null">#{type},</if>
  267 + <if test="place != null">#{place},</if>
  268 + <if test="selfCheckTime != null">#{selfCheckTime},</if>
  269 + <if test="objectId != null">#{objectId},</if>
  270 + <if test="earthsitesId != null">#{earthsitesId},</if>
  271 + <if test="createTime != null">#{createTime},</if>
  272 + <if test="earthsitesName != null">#{earthsitesName},</if>
  273 + <if test="contract != null">#{contract},</if>
  274 + <if test="contractId != null">#{contractId},</if>
  275 + <if test="companys != null">#{companys},</if>
  276 + <if test="companyTrucks != null">#{companyTrucks},</if>
  277 + <if test="img0 != null">#{img0},</if>
  278 + <if test="img1 != null">#{img1},</if>
  279 + <if test="img2 != null">#{img2},</if>
  280 + <if test="img3 != null">#{img3},</if>
  281 + <if test="img4 != null">#{img4},</if>
  282 + <if test="img5 != null">#{img5},</if>
  283 + <if test="img6 != null">#{img6},</if>
  284 + <if test="img7 != null">#{img7},</if>
  285 + <if test="img8 != null">#{img8},</if>
  286 + <if test="img9 != null">#{img9},</if>
  287 + <if test="img10 != null">#{img10},</if>
  288 + <if test="img11 != null">#{img11},</if>
  289 + <if test="img12 != null">#{img12},</if>
  290 + <if test="person != null">#{person},</if>
  291 + <if test="phone != null">#{phone},</if>
  292 + <if test="status != null">#{status},</if>
  293 + <if test="createBy != null"> #{createBy},</if>
  294 + </trim>
  295 + </insert>
  296 +
  297 + <update id="updateSupervisionThreestep" parameterType="SupervisionThreestep">
  298 + update supervision_threestep
  299 + <trim prefix="SET" suffixOverrides=",">
  300 + <if test="name != null">name = #{name},</if>
  301 + <if test="type != null">type = #{type},</if>
  302 + <if test="place != null">place = #{place},</if>
  303 + <if test="selfCheckTime != null">self_check_time = #{selfCheckTime},</if>
  304 + <if test="objectId != null">object_id = #{objectId},</if>
  305 + <if test="earthsitesId != null">earthsites_id = #{earthsitesId},</if>
  306 + <if test="createTime != null">create_time = #{createTime},</if>
  307 + <if test="checkTime != null">check_time = #{checkTime},</if>
  308 + <if test="earthsitesName != null">earthsites_name = #{earthsitesName},</if>
  309 + <if test="contract != null">contract = #{contract},</if>
  310 + <if test="contractId != null">contract_id = #{contractId},</if>
  311 + <if test="companys != null">companys = #{companys},</if>
  312 + <if test="companyTrucks != null">company_trucks = #{companyTrucks},</if>
  313 + <if test="img0 != null">img0 = #{img0},</if>
  314 + <if test="img1 != null">img1 = #{img1},</if>
  315 + <if test="img2 != null">img2 = #{img2},</if>
  316 + <if test="img3 != null">img3 = #{img3},</if>
  317 + <if test="img4 != null">img4 = #{img4},</if>
  318 + <if test="img5 != null">img5 = #{img5},</if>
  319 + <if test="img6 != null">img6 = #{img6},</if>
  320 + <if test="img7 != null">img7 = #{img7},</if>
  321 + <if test="img8 != null">img8 = #{img8},</if>
  322 + <if test="img9 != null">img9 = #{img9},</if>
  323 + <if test="img10 != null">img10 = #{img10},</if>
  324 + <if test="img11 != null">img11 = #{img11},</if>
  325 + <if test="img12 != null">img12 = #{img12},</if>
  326 + <if test="sub_img0 != null">sub_img0 = #{sub_img0},</if>
  327 + <if test="sub_img1 != null">sub_img1 = #{sub_img1},</if>
  328 + <if test="sub_img2 != null">sub_img2 = #{sub_img2},</if>
  329 + <if test="sub_img3 != null">sub_img3 = #{sub_img3},</if>
  330 + <if test="sub_img4 != null">sub_img4 = #{sub_img4},</if>
  331 + <if test="sub_img5 != null">sub_img5 = #{sub_img5},</if>
  332 + <if test="sub_img6 != null">sub_img6 = #{sub_img6},</if>
  333 + <if test="sub_img7 != null">sub_img7 = #{sub_img7},</if>
  334 + <if test="sub_img8 != null">sub_img8 = #{sub_img8},</if>
  335 + <if test="sub_img9 != null">sub_img9 = #{sub_img9},</if>
  336 + <if test="sub_img10 != null">sub_img10 = #{sub_img10},</if>
  337 + <if test="sub_img11 != null">sub_img11 = #{sub_img11},</if>
  338 + <if test="sub_img12 != null">sub_img12 = #{sub_img12},</if>
  339 + <if test="subReason != null">sub_reason = #{subReason},</if>
  340 + <if test="earthPipPerson != null">earth_pip_person = #{earthPipPerson},</if>
  341 + <if test="enforcePerson != null">enforce_person = #{enforcePerson},</if>
  342 + <if test="subSubReason != null">sub_sub_reason = #{subSubReason},</if>
  343 + <if test="attchItem1 != null">attch_item1 = #{attchItem1},</if>
  344 + <if test="attchItem2 != null">attch_item2 = #{attchItem2},</if>
  345 + <if test="attchItem3 != null">attch_item3 = #{attchItem3},</if>
  346 + <if test="person != null">person = #{person},</if>
  347 + <if test="phone != null">phone = #{phone},</if>
  348 + <if test="status != null">status = #{status},</if>
  349 + <if test="checkEndTime != null">check_end_time = #{checkEndTime},</if>
  350 + </trim>
  351 + where id = #{id}
  352 + </update>
  353 +
  354 + <delete id="deleteSupervisionThreestepById" parameterType="Long">
  355 + delete from supervision_threestep where id = #{id}
  356 + </delete>
  357 +
  358 + <delete id="deleteSupervisionThreestepByIds" parameterType="String">
  359 + delete from supervision_threestep where id in
  360 + <foreach item="id" collection="array" open="(" separator=","
  361 + close=")">
  362 + #{id}
  363 + </foreach>
  364 + </delete>
255 365
256 - <update id="updateSupervisionThreestep" parameterType="SupervisionThreestep">  
257 - update supervision_threestep  
258 - <trim prefix="SET" suffixOverrides=",">  
259 - <if test="name != null">name = #{name},</if>  
260 - <if test="type != null">type = #{type},</if>  
261 - <if test="place != null">place = #{place},</if>  
262 - <if test="selfCheckTime != null">self_check_time = #{selfCheckTime},</if>  
263 - <if test="objectId != null">object_id = #{objectId},</if>  
264 - <if test="earthsitesId != null">earthsites_id = #{earthsitesId},</if>  
265 - <if test="createTime != null">create_time = #{createTime},</if>  
266 - <if test="checkTime != null">check_time = #{checkTime},</if>  
267 - <if test="earthsitesName != null">earthsites_name = #{earthsitesName},</if>  
268 - <if test="contract != null">contract = #{contract},</if>  
269 - <if test="companys != null">companys = #{companys},</if>  
270 - <if test="companyTrucks != null">company_trucks = #{companyTrucks},</if>  
271 - <if test="img0 != null">img0 = #{img0},</if>  
272 - <if test="img1 != null">img1 = #{img1},</if>  
273 - <if test="img2 != null">img2 = #{img2},</if>  
274 - <if test="img3 != null">img3 = #{img3},</if>  
275 - <if test="img4 != null">img4 = #{img4},</if>  
276 - <if test="img5 != null">img5 = #{img5},</if>  
277 - <if test="img6 != null">img6 = #{img6},</if>  
278 - <if test="img7 != null">img7 = #{img7},</if>  
279 - <if test="img8 != null">img8 = #{img8},</if>  
280 - <if test="img9 != null">img9 = #{img9},</if>  
281 - <if test="img10 != null">img10 = #{img10},</if>  
282 - <if test="img11 != null">img11 = #{img11},</if>  
283 - <if test="img12 != null">img12 = #{img12},</if>  
284 - <if test="sub_img0 != null">sub_img0 = #{sub_img0},</if>  
285 - <if test="sub_img1 != null">sub_img1 = #{sub_img1},</if>  
286 - <if test="sub_img2 != null">sub_img2 = #{sub_img2},</if>  
287 - <if test="sub_img3 != null">sub_img3 = #{sub_img3},</if>  
288 - <if test="sub_img4 != null">sub_img4 = #{sub_img4},</if>  
289 - <if test="sub_img5 != null">sub_img5 = #{sub_img5},</if>  
290 - <if test="sub_img6 != null">sub_img6 = #{sub_img6},</if>  
291 - <if test="sub_img7 != null">sub_img7 = #{sub_img7},</if>  
292 - <if test="sub_img8 != null">sub_img8 = #{sub_img8},</if>  
293 - <if test="sub_img9 != null">sub_img9 = #{sub_img9},</if>  
294 - <if test="sub_img10 != null">sub_img10 = #{sub_img10},</if>  
295 - <if test="sub_img11 != null">sub_img11 = #{sub_img11},</if>  
296 - <if test="sub_img12 != null">sub_img12 = #{sub_img12},</if>  
297 - <if test="subReason != null">sub_reason = #{subReason},</if>  
298 - <if test="earthPipPerson != null">earth_pip_person = #{earthPipPerson},</if>  
299 - <if test="enforcePerson != null">enforce_person = #{enforcePerson},</if>  
300 - <if test="subSubReason != null">sub_sub_reason = #{subSubReason},</if>  
301 - <if test="attchItem1 != null">attch_item1 = #{attchItem1},</if>  
302 - <if test="attchItem2 != null">attch_item2 = #{attchItem2},</if>  
303 - <if test="attchItem3 != null">attch_item3 = #{attchItem3},</if>  
304 - <if test="person != null">person = #{person},</if>  
305 - <if test="phone != null">phone = #{phone},</if>  
306 - <if test="status != null">status = #{status},</if>  
307 - <if test="checkEndTime != null">check_end_time = #{checkEndTime},</if>  
308 - </trim>  
309 - where id = #{id}  
310 - </update>  
311 366
312 - <delete id="deleteSupervisionThreestepById" parameterType="Long">  
313 - delete from supervision_threestep where id = #{id}  
314 - </delete>  
315 367
316 - <delete id="deleteSupervisionThreestepByIds" parameterType="String">  
317 - delete from supervision_threestep where id in  
318 - <foreach item="id" collection="array" open="(" separator="," close=")">  
319 - #{id}  
320 - </foreach>  
321 - </delete>  
322 -  
323 -  
324 -  
325 </mapper> 368 </mapper>
326 \ No newline at end of file 369 \ No newline at end of file
trash-workFlow/src/main/resources/mapper/TruckActivateMapper.xml
  View file @7199c58
@@ -33,12 +33,39 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot; @@ -33,12 +33,39 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
33 <if test="status != null "> and status = #{status}</if> 33 <if test="status != null "> and status = #{status}</if>
34 <if test="earthsite != null and earthsite != ''"> and earthsite = #{earthsite}</if> 34 <if test="earthsite != null and earthsite != ''"> and earthsite = #{earthsite}</if>
35 <if test="objectId != null and objectId != ''"> and object_id = #{objectId}</if> 35 <if test="objectId != null and objectId != ''"> and object_id = #{objectId}</if>
36 - <if test="createType != null "> and create_type = #{createType}</if>  
37 - <if test="activateTime != null "> and activate_time = #{activateTime}</if>  
38 - <if test="startTime != null "> and activate_time BETWEEN #{startTime} and ${endTime}</if> 36 + <if test="createType != null "> and create_type = #{createType}</if>
  37 + <if test="startTime != null "> and activate_time BETWEEN #{startTime} and #{endTime}</if>
39 </where> 38 </where>
40 </select> 39 </select>
41 40
  41 + <select id="getActivedTruckList" parameterType="TruckActivate" resultMap="TruckActivateResult">
  42 + select object_id,time as create_time,activate_time from truck_activate
  43 + <where>
  44 + <if test="startTime != null "> and time BETWEEN #{startTime} and #{endTime}</if>
  45 + </where>
  46 + </select>
  47 +
  48 +
  49 + <select id="getConractByObjectId" parameterType="TruckActivate" resultType="String">
  50 + select three.contract_id from(
  51 + select id, company, license_plate, time, construction, status,
  52 + earthsite, object_id, create_by, create_type, activate_time, create_time
  53 + from truck_activate
  54 + where
  55 + object_id = #{objectId} and
  56 + activate_time between #{startTime} and #{endTime}) truck
  57 + LEFT JOIN (select * from supervision_threestep WHERE company_trucks LIKE CONCAT("%",#{objectId},"%")) three
  58 + on
  59 + truck.construction = three.name
  60 + and truck.earthsite = three.earthsites_name
  61 + </select>
  62 +
  63 + <select id="selectTodayTruckByObjId" parameterType="String" resultMap="TruckActivateResult">
  64 + <include refid="selectTruckActivateVo"/>
  65 + where object_id = #{objId} and status = 0
  66 + </select>
  67 +
  68 +
42 <select id="selectTruckActivateById" parameterType="Long" resultMap="TruckActivateResult"> 69 <select id="selectTruckActivateById" parameterType="Long" resultMap="TruckActivateResult">
43 <include refid="selectTruckActivateVo"/> 70 <include refid="selectTruckActivateVo"/>
44 where id = #{id} 71 where id = #{id}
@@ -48,6 +75,14 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot; @@ -48,6 +75,14 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
48 <include refid="selectTruckActivateVo"/> 75 <include refid="selectTruckActivateVo"/>
49 where object_id = #{objId} and activate_time is not null and status = 0 76 where object_id = #{objId} and activate_time is not null and status = 0
50 </select> 77 </select>
  78 +
  79 +
  80 + <select id="selectActivatedTruck" parameterType="String" resultMap="TruckActivateResult">
  81 + <include refid="selectTruckActivateVo"/>
  82 + <where>
  83 + <if test="startTime != null "> and activate_time BETWEEN #{startTime} and #{endTime}</if>
  84 + </where>
  85 + </select>
51 86
52 87
53 <insert id="insertTruckActivate" parameterType="TruckActivate" useGeneratedKeys="true" keyProperty="id"> 88 <insert id="insertTruckActivate" parameterType="TruckActivate" useGeneratedKeys="true" keyProperty="id">