m

youxiw2000
1 parent 96a9eb07
Showing 7 changed files with 34 additions and 15 deletions
trash-framework/src/main/java/com/trash/framework/web/service/SysLoginService.java
trash-ui/src/api/three_step.js
trash-ui/src/views/business/threestep/index.vue
trash-ui/src/views/h5/threestep/index.vue
trash-workFlow/src/main/java/com/trash/business/domain/SupervisionThreestep.java
trash-workFlow/src/main/java/com/trash/business/service/impl/SupervisionThreestepServiceImpl.java
trash-workFlow/src/main/resources/mapper/SupervisionThreestepMapper.xml
@@ -227,12 +227,10 @@ public class SysLoginService {
 		for(Object obj:streets){
 			JSONObject jsonObject = (JSONObject) obj;
 			if(jsonObject.getString("level").equals("4")){
-				streetsMap.get(jsonObject.getString("pid")).add(jsonObject.getString("name"));
+				streetsMap.get(jsonObject.getString("pid")).add(jsonObject.getString("id"));
 			}
 		}
-		
-		
 		if (jsonArray != null) {
@@ -278,14 +276,8 @@ public class SysLoginService {
 					if (json.getJSONArray("sourceIds") != null) {
 						List<String> companyIds = json.getJSONArray("sourceIds").toJavaList(String.class);
-						for(String id:companyIds){
-							for(Object sObj:streets){
-								JSONObject jsonObject = (JSONObject) sObj;
-								if(jsonObject.getString("id").equals(id)){
-									user.getStreetsList().add(jsonObject.getString("name"));
-								}
-							}
-						}
+						user.getStreetsList().addAll(companyIds);
+				
 					}
 					if (json.getJSONArray("adCodes") != null) {
 						List<String> areas = json.getJSONArray("adCodes").toJavaList(String.class);
@@ -109,7 +109,8 @@ export default {
           companyTrucks: null,
           status:null,
           workStartTime:null,
-          workEndTime:null,
+          workEndTime:null,
+          checkStatus:null
         },
         // 表单参数
         form: {
@@ -605,6 +606,7 @@ export default {
         this.queryParams.pageStatus = tabIdx;
         this.queryParams.status = null;
         this.queryParams.his = null;
+        this.queryParams.checkStatus = null;
         getNames(this.queryParams).then(res => {
@@ -48,6 +48,12 @@
           value-format="yyyy-MM-dd HH:mm:ss" placeholder="开始时间">
         </el-date-picker>
       </el-form-item>
+      <el-form-item label="抽查状态" prop="checkStatus" v-if="this.queryParams.his==1">
+         <el-select v-model="queryParams.checkStatus" placeholder="请选择抽查状态"  size="small">
+          <el-option label="未抽查" value="0" />
+          <el-option label="已抽查" value="1" />
+         </el-select>
+      </el-form-item>
       <el-form-item>
@@ -34,6 +34,12 @@
       <el-form-item>
         <el-button type="primary" size="mini" @click="handleQuery">搜索</el-button>
         <el-button size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+      <el-form-item label="抽查状态" prop="checkStatus" v-if="this.queryParams.his==1">
+         <el-select v-model="queryParams.checkStatus" placeholder="请选择抽查状态"  size="small">
+          <el-option label="未抽查" value="0" />
+          <el-option label="已抽查" value="1" />
+         </el-select>
       </el-form-item>
     </el-form>
@@ -138,10 +138,20 @@ public class SupervisionThreestep extends BaseEntity
     private String attchItem2;
     private String attchItem3;
+    private String checkStatus;
+    
     private String[] places;
-    public String[] getPlaces() {
+    public String getCheckStatus() {
+		return checkStatus;
+	}
+
+	public void setCheckStatus(String checkStatus) {
+		this.checkStatus = checkStatus;
+	}
+
+	public String[] getPlaces() {
 		return places;
 	}
@@ -196,7 +196,7 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 		if (ids.size() == 0) {
 			return list;
 		}
-
+		
 		list = supervisionThreestepMapper.selectSupervisionThreestepList(supervisionThreestep);
 		if (supervisionThreestep.getHis() != null && supervisionThreestep.getHis().equals("2")) {
@@ -133,6 +133,9 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 			<if test="phone != null  and phone != ''"> and phone = #{phone}</if>
 			<if test="status != null"> and status = #{status}</if>
 			<if test="createBy != null  and createBy != ''"> and create_by = #{createBy}</if>
+			<if test="checkStatus != null and checkStatus==1 "> and check_end_time is not null</if>
+			<if test="checkStatus != null and checkStatus==0 "> and check_end_time is null</if>
+			
 			<if test="workStartTime != null"> and self_check_time BETWEEN #{workStartTime} and
 				#{workEndTime}</if>
@@ -149,7 +152,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 					close=")">
 					#{id}
 				</foreach>
-			</if>
+			</if> 
 		</where>
 		ORDER BY create_time desc
 	</select>