m

youxiw2000
1 parent 92b780cb
Showing 9 changed files with 58 additions and 75 deletions
trash-framework/src/main/java/com/trash/framework/web/service/SysLoginService.java
trash-ui/dist.zip
trash-ui/src/api/caseoffline.js
trash-ui/src/api/truck_active.js
trash-ui/src/api/vio_casefile.js
trash-ui/src/api/warningInfo.js
trash-ui/src/views/business/truckActivate/index.vue
trash-workFlow/src/main/java/com/trash/business/service/impl/SupervisionThreestepServiceImpl.java
trash-workFlow/src/main/resources/mapper/TruckActivateMapper.xml
@@ -199,22 +199,7 @@ public class SysLoginService
               		rolStrings.add(uId.getString("departmentType"));
-              		if(user.getCompanyName() == null){
-              			for(Object object :depts){
-                         	JSONObject depart = (JSONObject) object;
-                  		
-    	              		if(depart.getString("code").equals(uId.getString("departmentType"))){
-    	              			if(depart.getString("name").equals("事务中心")){
-    	              				user.setCompanyName("事务中心");
-    	              				break;
-    	              			}
-    	              			if(depart.getString("name").contains("渣土办")){
-    	              				user.setCompanyName("渣土办");
-    	              				user.setAreaCode(depart.getString("code"));
-    	              			}
-    	              		}
-                        }
-              		}
+              	
               	}
                   user.setPostIds(poStrings);
@@ -231,7 +216,6 @@ public class SysLoginService
         }
-        if(user.getCompanyName() == null){
             JSONArray compnayList = redisCache.getCacheObject("companyList");
             for(Object obj:compnayList){
        		 JSONObject con = (JSONObject) obj;
@@ -243,7 +227,6 @@ public class SysLoginService
             }
-        }
         JSONArray jsonArray = (JSONArray)RemoteServerUtils.getAuth(token);
         if(jsonArray != null){
@@ -328,13 +328,24 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      const queryParams = this.queryParams;
+      if(this.queryParams.createTime){
+        this.queryParams.startTime = this.queryParams.createTime[0];
+        this.queryParams.endTime = this.queryParams.createTime[1];
+      }
+      
+      const query = {};
+      
+      for(var i in this.queryParams){
+        query[i] = this.queryParams[i];
+      }
+      
+      query.createTime = null;
       this.$confirm('是否确认导出所有线下交办案卷数据项?', "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
         }).then(function() {
-          return exportCaseOffline(queryParams);
+          return exportCaseOffline(query);
         }).then(response => {
           this.download(response.message);
         })
@@ -124,17 +124,17 @@ export default {
         }
       }
     }
-    
+
     let query = {
       page:1,
       size:99999
     }
-    
+
     companyList(query).then(res=>{
       this.remoteCompanys = res.result.list;
-      
+
     });
-    
+
     this.getList(0);
   },
   methods: {
@@ -358,11 +358,7 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加车辆激活";
-      if(this.$store.getters.user.companyName && this.$store.getters.user.companyName != "渣土办" && this.$store.getters.user.companyName != "事务中心"){
-        this.simpleName = this.$store.getters.user.companyName;
-        this.form.company = this.simpleName;
-      }
+      this.title = "添加车辆激活";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -400,13 +400,25 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      const queryParams = this.queryParams;
+      if(this.queryParams.createTime){
+        this.queryParams.startTime = this.queryParams.createTime[0];
+        this.queryParams.endTime = this.queryParams.createTime[1];
+      }
+      
+      const query = {};
+      
+      for(var i in this.queryParams){
+        query[i] = this.queryParams[i];
+      }
+      
+      query.createTime = null;
+      
       this.$confirm('是否确认导出所有平台违规案卷数据项?', "警告", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
       }).then(function () {
-        return exportViolationCaseFile(queryParams);
+        return exportViolationCaseFile(query);
       }).then(response => {
         this.download(response.message);
       })
@@ -439,14 +439,27 @@ export default {
       })
     },
     /** 导出按钮操作 */
-    handleExport() {
-      const queryParams = this.queryParams;
+    handleExport() {
+      
+      if(this.queryParams.createTime){
+        this.queryParams.startTime = this.queryParams.createTime[0];
+        this.queryParams.endTime = this.queryParams.createTime[1];
+      }
+      
+      const query = {};
+      
+      for(var i in this.queryParams){
+        query[i] = this.queryParams[i];
+      }
+      
+      query.createTime = null;
+      
       this.$confirm('是否确认导出所有违规预警信息数据项?', "警告", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
       }).then(function() {
-        return exportViolationWarningInformation(queryParams);
+        return exportViolationWarningInformation(query);
       }).then(response => {
         this.download(response.message);
       })
@@ -129,13 +129,12 @@
               :label="item.name"
               :value="item.name"
               :title="item.name"
-              v-if="!simpleName || simpleName == item.name"
               />
             </el-select>
         </el-form-item>
         <el-form-item label="车牌号" prop="licensePlate">
           <el-input v-model="truckName" />
-          <el-checkbox-group v-model="form.licensePlate">
+          <el-checkbox-group v-model="form.licensePlate" v-if="truckList.length > 0">
             <el-checkbox @change="selectAll">全选</el-checkbox>
              <el-checkbox v-if="(!truckName || item.licenseplateNo.indexOf(truckName) > -1) && (form.company && form.company == item.companyName)"
@@ -619,29 +619,16 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 		List<SupervisionThreestep> data = new ArrayList<>();
 		String companyName = SecurityUtils.getLoginUser().getUser().getCompanyName();
-
-		List<SupervisionThreestep> threesteps = supervisionThreestepMapper.selectTodayDataList(supervisionThreestep);
-			
-			if (SecurityUtils.getLoginUser().getUser().getConAreas().size() > 0 || SecurityUtils.getLoginUser().getUser().getConList().size() > 0) {
- 				
-				
- 				List<String> idList = SecurityUtils.getLoginUser().getUser().getConList();
- 				 
- 				for(SupervisionThreestep ts :threesteps){
+		if(companyName != null){
+			supervisionThreestep.setCompanys(companyName);
+		}
+		
+		List<SupervisionThreestep> threesteps = supervisionThreestepMapper.selectTodayDataList(supervisionThreestep);
-					List<String> cArea = SecurityUtils.getLoginUser().getUser().getConAreas();
- 					
- 						if(cArea.indexOf(ts.getPlace()) > -1 || idList.indexOf(ts.getObjectId()) > -1){
- 							data.add(ts);
- 						}
- 					
- 				}
- 				
- 			}
-			return data;
+			return threesteps;
 	}
@@ -57,26 +57,8 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="activateStatus == 0 "> and activate_time is null</if>
             <if test="activateStatus == 1 "> and activate_time is not null</if>
             <if test="createTime != null "> and DATE_FORMAT(create_time,("%y%m%d")) = DATE_FORMAT(#{createTime},("%y%m%d"))</if>
-                        
-              <if test="cIds != null and ids != null and cIds.size() > 0 and ids.size() > 0">and (
-	              		construction_id in 
-				        <foreach item="id" collection="cIds" open="(" separator="," close=")">
-				            #{id}
-				        </foreach>
-	              		or object_id in 
-				        <foreach item="id" collection="ids" open="(" separator="," close=")">
-				            #{id}
-				        </foreach>
-			        )
-			        
-	        </if>
-	        <if test="cIds != null and ids != null and cIds.size() > 0 and ids.size() == 0">
-	              		and construction_id in 
-				        <foreach item="id" collection="cIds" open="(" separator="," close=")">
-				            #{id}
-				        </foreach>
-	        </if>
-	        <if test="cIds != null and ids != null and cIds.size() == 0 and ids.size() > 0">
+ 
+	        <if test="ids != null and ids.size() > 0">
 	              		and object_id in 
 				        <foreach item="id" collection="ids" open="(" separator="," close=")">
 				            #{id}