m

youxiw2000
1 parent 1e3b15f9
Showing 19 changed files with 731 additions and 636 deletions
trash-activiti/src/main/java/com/trash/activiti/service/impl/ActTaskServiceImpl.java
trash-admin/src/main/resources/application-dev.yml
trash-framework/src/main/java/com/trash/framework/web/service/SysLoginService.java
trash-ui/dist.7z
trash-ui/src/api/caseOfflineInfo.js
trash-ui/src/api/caseoffline.js
trash-ui/src/api/taskmethod.js
trash-ui/src/api/three_step.js
trash-ui/src/views/caseOffline/caseOffline/caseOfflineInfo.vue
trash-ui/src/views/caseOffline/caseOffline/index.vue
trash-ui/src/views/h5/caseOffline/caseOfflineInfo.vue
trash-ui/src/views/h5/threestep/index.vue
trash-workFlow/src/main/java/com/trash/business/service/impl/ConstructionCreditServiceImpl.java
trash-workFlow/src/main/java/com/trash/business/service/impl/EarthsitesCreditServiceImpl.java
trash-workFlow/src/main/java/com/trash/business/service/impl/TruckActivateServiceImpl.java
trash-workFlow/src/main/java/com/trash/caseOffline/domain/CaseOffline.java
trash-workFlow/src/main/java/com/trash/caseOffline/service/impl/CaseOfflineServiceImpl.java
trash-workFlow/src/main/java/com/trash/casefile/service/impl/ViolationWarningInformationServiceImpl.java
trash-workFlow/src/main/resources/mapper/caseOffline/CaseOfflineMapper.xml
@@ -33,6 +33,7 @@ import org.apache.commons.collections4.map.HashedMap;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.Page;
 import com.trash.activiti.domain.ActWorkflowFormData;
 import com.trash.activiti.domain.dto.ActTaskDTO;
@@ -44,6 +45,7 @@ import com.trash.activiti.service.IActWorkflowFormDataService;
 import com.trash.activiti.service.myTaskService;
 import com.trash.common.core.page.PageDomain;
 import com.trash.common.core.redis.RedisCache;
+import com.trash.common.utils.RemoteServerUtils;
 import com.trash.common.utils.SecurityUtils;
 import com.trash.common.utils.ServletUtils;
 import com.trash.common.utils.StringUtils;
@@ -454,35 +456,49 @@ public class ActTaskServiceImpl implements IActTaskService {
 		if(task != null){
-            List<Mobile> mobileList=new ArrayList<Mobile>();
-    		
+			try{
+				
-    		String number = actMapper.getPhoneNumber(processInstance.getProcessDefinitionKey(),task.getName());
-    				
-            
-    		if(number != null){
-    			String smsString = "工作提醒：您有新的工作流程，请及时处理。";
-    			Mobile mobile=new Mobile();
-                mobile.setMobile(number);
-                mobileList.add(mobile);
-                
-                if(processInstance.getProcessDefinitionKey().equals("workflow_caseoffline")){
-                	
-                	String dname = actMapper.getCaseTypeName("case_offline_type",processInstance.getBusinessKey().split(":")[1]);
-                	smsString  = "案卷提醒：有一条"+ dname +"的案卷，请及时处理。";
-                }
-                
-                JsonSmsSend jsonSmsSend= PostSms.sendSms(mobileList,smsString);
-                if(jsonSmsSend!=null){
-                    if(jsonSmsSend.getState()==0){
-                    	System.out.println("发送成功");
-                    }else{
-                    	System.out.println(jsonSmsSend.getMessage());
-                    }
-                }else{
-                	System.out.println("发送返回空");
-                }
-    		}
+	            List<Mobile> mobileList=new ArrayList<Mobile>();
+	    		
+	
+	    		String number = actMapper.getPhoneNumber(processInstance.getProcessDefinitionKey(),task.getName());
+	    				
+	            
+	    		if(number != null){
+	    			String smsString = "工作提醒：您有新的工作流程，请及时处理。";
+	    			Mobile mobile=new Mobile();
+	                mobile.setMobile(number);
+	                mobileList.add(mobile);
+	                
+	                if(processInstance.getProcessDefinitionKey().equals("workflow_constructsite")){
+	                	
+	                	JSONObject json = RemoteServerUtils.getConstructionInfo(processInstance.getBusinessKey().split(":")[1]);
+	                	if(json != null)
+	                		smsString  = "审批提醒：您有新的工作流程需要审批 "+json.getString("areaCodeName")+" "+json.getString("name");
+	                	
+	                }
+	                
+	                if(processInstance.getProcessDefinitionKey().equals("workflow_caseoffline")){
+	                	
+	                	String dname = actMapper.getCaseTypeName("case_offline_type",processInstance.getBusinessKey().split(":")[1]);
+	                	smsString  = "案卷提醒：有一条"+ dname +"的案卷，请及时处理。";
+	                }
+	                
+	                JsonSmsSend jsonSmsSend= PostSms.sendSms(mobileList,smsString);
+	                if(jsonSmsSend!=null){
+	                    if(jsonSmsSend.getState()==0){
+	                    	System.out.println("发送成功");
+	                    }else{
+	                    	System.out.println(jsonSmsSend.getMessage());
+	                    }
+	                }else{
+	                	System.out.println("发送返回空");
+	                }
+	    		}
+			}catch(Exception e){
+				e.printStackTrace();
+			}
     	}
@@ -17,8 +17,8 @@ trash:
     # 验证码类型 math 数组计算 char 字符验证
     captchaType: math
     # 远程服务器地址
-    # remotePath: http://175.6.47.84:8008
-    # token: durable:auth:token:eyJhbGciOiJIUzUxMiJ9.eyJ5ZWEiOiJkdXJhYmxlIiwiZXhwIjo0MTAyNDE1OTk5LCJjcmVhdGVkIjoxNjg1NDE2NjEzMzU1fQ.58-J0KKfsK2pQhDQAzaBaUj-oFWMbYF1YzMAcshmcfidIkW16TZWIVhAVKPvCJvWfG54x7xB-ETxKCDLFnSctQ
+    #remotePath: http://175.6.47.84:8008
+    #token: durable:auth:token:eyJhbGciOiJIUzUxMiJ9.eyJ5ZWEiOiJkdXJhYmxlIiwiZXhwIjo0MTAyNDE1OTk5LCJjcmVhdGVkIjoxNjg1NDE2NjEzMzU1fQ.58-J0KKfsK2pQhDQAzaBaUj-oFWMbYF1YzMAcshmcfidIkW16TZWIVhAVKPvCJvWfG54x7xB-ETxKCDLFnSctQ
     remotePath: http://183.66.242.6:14601
     token: durable:auth:token:eyJhbGciOiJIUzUxMiJ9.eyJ5ZWEiOiJjc3poIiwiZXhwIjo0MTAyNDE1OTk5LCJjcmVhdGVkIjoxNjg0NDU5MjEzNzQ2fQ.85oIrOnU7cz7L_-IGt4Bt1LXDTkFtyrdqNt05K0v9-4nsrrzzpbjbemK-yMlbnUpe4Fx2FFES-Wbw8Yr8ML69w
@@ -126,7 +126,7 @@ public class SysLoginService
     		token = "Bearer "+ token;
     	}
-        Request request = new Request.Builder().url(RemoteServerUtils.remote + LOGIN_URL).addHeader("Authorization",token ).get().build();
+        Request request = new Request.Builder().url(RemoteServerUtils.remote + LOGIN_URL).addHeader("Authorization",token).get().build();
         try {
             okhttp3.Response response = okHttpClient.newCall(request).execute();
@@ -95,9 +95,6 @@ export default {
       this.areas = res.result;
       this.handleUpdate();
     });
-    listReplyApprovalProcess({tableName: "workflow_caseoffline:"+id}).then(response => {
-      this.replyApprovalProcessList = response.rows;
-    });
   },
   methods: {
@@ -160,7 +157,7 @@ export default {
             if (res.data.advice1) {
               this.adviceList.push({
                 name: res.data.advice1.create_by,
-                time: res.data.advice1.create_time,
+                time: res.data.create_time,
                 text: this.form.advice1
               })
             }
@@ -187,24 +184,34 @@ export default {
             }
           }
-        });
-          if(response.data.status == 0){
-            historyFromData(this.workflow + ":" + id).then(response => {
+        });
+
+
-                 let obj = response.data[0];
+          historyFromData(this.workflow + ":" + id).then(response => {
+
+               let obj = response.data[0];
                 let data  = {
                   reply:obj.controlValue,
                   replyPeople:obj.createBy,
+                  replyTime:obj.createTime
                 };
-                this.replyApprovalProcessList.push(data);
-            });
-          }
+              this.replyApprovalProcessList.push(data);
+
+              listReplyApprovalProcess({tableName: "workflow_caseoffline:"+id}).then(response => {
+                for(let i in response.rows){
+
+                    this.replyApprovalProcessList.push(response.rows[i]);
+                }
+              });
+          });
+
+
         this.open2 = true;
-      });
-
+      });
     },
   }
 };
@@ -357,9 +357,39 @@ export default {
       this.open2 = true;
     },
     /** 提交按钮 */
-    submitForm() {
+    submitForm() {
+      let that = this;
       this.$refs["form"].validate(valid => {
-        if (valid) {
+        if (valid) {
+          if(!this.form.objectId){
+            if(this.form.siteType == 0){
+                 for(let i in this.data[0]){
+                   if(this.data[0][i].name == this.form.siteName){
+                     this.form.objectId = this.data[0][i].id;
+                     break;
+                   }
+                 }
+            }else if(this.form.siteType == 1){
+                  for(let i in this.data[1]){
+                    if(this.data[1][i].name == this.form.siteName){
+                      this.form.objectId = this.data[1][i].id;
+                      break;
+                    }
+                  }
+            }else if(this.form.siteType == 2){
+                  for(let i in this.data[2]){
+                    if(res.result.list[i].licenseplateNo == this.form.siteName){
+                      this.form.objectId = this.data[2][i].id;
+                      break;
+                    }
+                  }
+            }
+          }
+
+          console.log(this.form);
+
+
+
           this.form.attach  = this.form.attach +"";
           if (this.form.id != null) {
             updateCaseOffline(this.form).then(response => {
@@ -53,9 +53,10 @@ export default {
         this.videoSrc1 = [];
       },
       removeImage(index, img) {
+        let name = img.split(":")[1];
         let target = "sub_img" + this.picIndex;
         for (let i = 0; i < this.slides[index].length; i++) {
-          if (this.slides[index][i].alt == img) {
+          if (this.slides[index][i].alt == name) {
             this.slides[index].splice(i, 1);
           }
         }
@@ -333,18 +334,6 @@ export default {
         }
         if (this.definitionKey == "workflow_threestep") {
-          if(!this.form["sub_img0"] || this.form["sub_img0"].length == 0 ||
-              !this.form["sub_img1"] || this.form["sub_img1"].length == 0 ||
-              !this.form["sub_img3"] || this.form["sub_img3"].length == 0 ||
-              !this.form["sub_img4"] || this.form["sub_img4"].length == 0 ||
-              !this.form["sub_img5"] || this.form["sub_img5"].length == 0 ||
-              (this.form.type == 0 && (!this.form["sub_img6"] || this.form["sub_img6"].length == 0)) ||
-              !this.form["sub_img7"] || this.form["sub_img7"].length == 0
-              ){
-              this.$message("缺少必要的图片");
-              return;
-          }
-
           this.$refs["form"].validate(valid => {
@@ -366,6 +355,17 @@ export default {
             }
             if (this.form.status == 1) {
+              // if(!this.form["sub_img0"] || this.form["sub_img0"].length == 0 ||
+              //     !this.form["sub_img1"] || this.form["sub_img1"].length == 0 ||
+              //     !this.form["sub_img3"] || this.form["sub_img3"].length == 0 ||
+              //     !this.form["sub_img4"] || this.form["sub_img4"].length == 0 ||
+              //     !this.form["sub_img5"] || this.form["sub_img5"].length == 0 ||
+              //     (this.form.type == 0 && (!this.form["sub_img6"] || this.form["sub_img6"].length == 0)) ||
+              //     !this.form["sub_img7"] || this.form["sub_img7"].length == 0
+              //     ){
+              //     this.$message("缺少必要的图片");
+              //     return;
+              // }
               activeThreestep(this.form).then(res => {
                 formDataSave(this.id, this.form.formData).then(response => {
                   this.msgSuccess("审批成功");
@@ -375,6 +375,8 @@ export default {
                 });
               });
             } else {
+
+
               formDataSave(this.id, this.form.formData).then(response => {
                 this.msgSuccess("审批成功");
                 this.open2 = false;
@@ -751,10 +751,8 @@ export default {
             this.form["img" + i] = this.form["img" + i].split(",");
           }
         }
-
         this.companyList = [];
         this.truckList = [];
-
         constructionById(this.form.objectId).then(response => {
           this.companyList.push({id: response.result.transportCompanyId, name: response.result.transportCompany});
           let query = {
@@ -833,19 +831,18 @@ export default {
     /** 提交按钮 */
     submitForm() {
-      if(!this.form["img0"] || this.form["img0"].length == 0 ||
-          !this.form["img1"] || this.form["img1"].length == 0 ||
-          !this.form["img2"] || this.form["img2"].length == 0 ||
-          !this.form["img3"] || this.form["img3"].length == 0 ||
-          !this.form["img4"] || this.form["img4"].length == 0 ||
-          !this.form["img5"] || this.form["img5"].length == 0 ||
-          (this.form.type == 0 && (!this.form["img6"] || this.form["img6"].length == 0)) ||
-          !this.form["img7"] || this.form["img7"].length == 0
-          ){
-          this.$message("缺少必要的图片");
-          return;
-      }
-
+      // if(!this.form["img0"] || this.form["img0"].length == 0 ||
+      //     !this.form["img1"] || this.form["img1"].length == 0 ||
+      //     !this.form["img2"] || this.form["img2"].length == 0 ||
+      //     !this.form["img3"] || this.form["img3"].length == 0 ||
+      //     !this.form["img4"] || this.form["img4"].length == 0 ||
+      //     !this.form["img5"] || this.form["img5"].length == 0 ||
+      //     (this.form.type == 0 && (!this.form["img6"] || this.form["img6"].length == 0)) ||
+      //     !this.form["img7"] || this.form["img7"].length == 0
+      //     ){
+      //     this.$message("缺少必要的图片");
+      //     return;
+      // }
@@ -858,7 +855,6 @@ export default {
             "contractStatus":1
           };
-          this.form.companys = companyNames;
           if(this.form.type == 0){
             query.constructionSiteID = [this.form.objectId];
@@ -911,8 +907,9 @@ export default {
           if (this.form.id != null) {
             if (this.queryParams.pageStatus == 1) {
-              this.form.companys = this.form.companys + "";
-              this.form.companyTrucks = this.form.companyTrucks + "";
+              this.form.companys = "";
+              this.form.companyTrucks = "";
+
               updateThreestep(this.form).then(response => {
                 this.msgSuccess("提交成功");
                 this.open = false;
@@ -933,8 +930,8 @@ export default {
                 }
               });
             } else {
-              this.form.companyTrucks = this.form.companyTrucks + "";
-
+             this.form.companys = "";
+             this.form.companyTrucks = "";
               for (let i = 0; i < 13; i++) {
                 if (this.form["img" + i]) {
                   this.form["img" + i] = this.form["img" + i] + "";
@@ -13,10 +13,11 @@
       <el-form-item label="类型" prop="siteType">
         <el-select v-model="form.siteType" placeholder="请选择类型" disabled>
           <el-option label="工地" value="0"/>
-          <el-option label="处理场所" value="1"/>
+          <el-option label="处理场所" value="1"/>
+          <el-option label="车辆" value="2" />
         </el-select>
       </el-form-item>
-      <el-form-item :label="form.siteType==0?'工地名称':'处理场所名称'" prop="siteName">
+      <el-form-item :label="form.siteType==0?'工地名称':form.siteType==1?'处理场所名称':'车牌号'" prop="siteName">
         <el-select v-model="form.siteName" placeholder="请选择类型" disabled>
           <el-option v-for="item in data[form.siteType]" :label="item.name" :value="item.name"
                      @native.click="getSite(item)" disabled/>
@@ -116,7 +116,7 @@
             :popper-append-to-body="false" class="product-style"
             v-model="form.siteName" placeholder="请选择类型"
             allow-create  filterable :filter-method="getSite">
-            <el-option v-for="item in data[form.siteType]" :label="item.name" :value="item.name" :title="item.name"/>
+            <el-option v-for="item in data[form.siteType]" :label="item.name" :value="item.name" :title="item.name" />
           </el-select>
         </el-form-item>
         <el-form-item label="问题描述" prop="caseDec">
 <template>
   <div>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        
+
         <el-form-item label="案卷类型" prop="type">
           <el-input v-model="form.type" type="textarea"  :rows="3" disabled />
         </el-form-item>
@@ -14,9 +14,10 @@
           <el-select v-model="form.siteType" placeholder="请选择类型" disabled>
               <el-option label="工地" value="0" />
               <el-option label="处理场所" value="1" />
+              <el-option label="车辆" value="2" />
           </el-select>
         </el-form-item>
-        <el-form-item :label="form.siteType==0?'工地名称':'处理场所名称'" prop="siteName">
+        <el-form-item :label="form.siteType==0?'工地名称':form.siteType==1?'处理场所名称':'车牌号'" prop="siteName">
           <el-select v-model="form.siteName" placeholder="请选择类型" disabled>
               <el-option v-for="item in data[form.siteType]" :label="item.name" :value="item.name" @native.click="getSite(item)" disabled/>
           </el-select>
@@ -41,11 +42,25 @@
         </el-form-item>
-        <el-table :data="adviceList" v-if="adviceList != null">
-          <el-table-column label="用户" width="55" align="center" prop="name"/>
-          <el-table-column label="审批内容" align="center" prop="text" />
-          <el-table-column label="时间" align="center" prop="time" />
-        </el-table>
+     <el-table :data="replyApprovalProcessList">
+       <el-table-column property="replyPeople" label="操作人" header-align="center" align="center"></el-table-column>
+       <el-table-column property="reply" label="意见" header-align="center" align="center"></el-table-column>
+       <el-table-column property="replyTime" label="操作时间" header-align="center" align="center"></el-table-column>
+       <el-table-column property="replyImg" label="预览" header-align="center" align="center">
+         <template slot-scope="scope">
+           <el-button
+             size="mini"
+             type="text"
+             icon="el-icon-view"
+             @click="openImage(scope.row.replyImg)"
+             v-if="scope.row.replyImg!=null && scope.row.replyImg!='undefined'"
+             v-hasPermi="['casefile:violationWarningInformation:edit']"
+           >查看
+           </el-button>
+           <span v-if="scope.row.replyImg==null || scope.row.replyImg=='undefined'">暂无</span>
+         </template>
+       </el-table-column>
+     </el-table>
       </el-form>
@@ -31,8 +31,6 @@
           value-format="yyyy-MM-dd HH:mm:ss" placeholder="结束时间">
         </el-date-picker>
       </el-form-item>
-
-
       <el-form-item>
         <el-button type="primary" size="mini" @click="handleQuery">搜索</el-button>
         <el-button size="mini" @click="resetQuery">重置</el-button>
@@ -135,7 +133,8 @@
             上传附件:<a style="color:blue;font-size: 12px;" @click="picSample=true">示意图</a>
         <el-row type="flex" justify="center" style="margin-top: 20px;"  v-if="form.type != null">
-          <el-col :span="12">
+          <el-col :span="12">
+            <span style="color: red;">*</span>
             <a style="color:blue;font-size: 12px;" @click="showFileUpload(0)">过水槽照片</a>
             <el-image v-for="item in slides[0]"
                       style="width: 100px; height: 100px; margin: 5px;"
@@ -19,9 +19,11 @@ import com.trash.business.service.IConstructionCreditService;
 import com.trash.common.core.redis.RedisCache;
 import com.trash.common.utils.RemoteServerUtils;
 import com.trash.common.utils.SecurityUtils;
+import com.trash.common.utils.spring.SpringUtils;
 import com.trash.common.utils.util.PostSms;
 import com.trash.common.utils.vo.mt.JsonSmsSend;
 import com.trash.common.utils.vo.mt.Mobile;
+import com.trash.system.mapper.SysTempMapper;
 /**
  * 三查机制Service业务层处理
@@ -30,311 +32,314 @@ import com.trash.common.utils.vo.mt.Mobile;
  * @date 2023-04-21
  */
 @Service
-public class ConstructionCreditServiceImpl implements IConstructionCreditService 
-{
-    @Autowired
-    private ConstructionCreditMapper constructionCreditMapper;
-    
-    @Autowired
-    SmsMapper smsMapper;
-    
-
-    @Autowired
-    RedisCache redis;
-    /**
-     * 查询三查机制
-     * 
-     * @param id 三查机制ID
-     * @return 三查机制
-     */
-    @Override
-    public ConstructionCredit selectConstructionCreditById(Long id)
-    {
-        return constructionCreditMapper.selectConstructionCreditById(id);
-    }
-
-    /**
-     * 查询三查机制列表
-     * 
-     * @param constructionCredit 三查机制
-     * @return 三查机制
-     */
-    @Override
-    public List<ConstructionCredit> selectConstructionCreditList(ConstructionCredit constructionCredit)
-    {
-    	 List<ConstructionCredit> list = new ArrayList<>();
- 			if (SecurityUtils.getLoginUser().getUser().getConAreas().size() > 0 || SecurityUtils.getLoginUser().getUser().getConList().size() > 0) {
- 				List<String> ids = new ArrayList<>();
- 				for(String str:SecurityUtils.getLoginUser().getUser().getConList()){
- 					ids.add(str);
- 				}
- 				
- 				
- 				if(SecurityUtils.getLoginUser().getUser().getConAreas().size() > 0){
-
- 					List<String> cArea = SecurityUtils.getLoginUser().getUser().getConAreas();
- 					
- 					JSONArray jsonArray = redis.getCacheObject("constructionList");
- 					
- 					for(Object obj:jsonArray){
- 						JSONObject json = (JSONObject) obj;
- 						if(cArea.indexOf(json.getString("areaCode")) > -1){
- 							ids.add(json.getString("id"));
- 						}
- 					}
- 				}
- 				
- 				constructionCredit.setIds(ids);
- 				
- 				
- 				list = constructionCreditMapper.selectConstructionCreditList(constructionCredit);
- 			}
-
-         
-        return list;
-    }
-
-    @Override
-    public List<ConstructionCredit> selectConstructionCreditHistory(ConstructionCredit constructionCredit)
-    {	
-   	 List<ConstructionCredit> list = new ArrayList<>();
-     
-			if (SecurityUtils.getLoginUser().getUser().getConAreas().size() > 0 || SecurityUtils.getLoginUser().getUser().getConList().size() > 0) {
-				List<String> ids = new ArrayList<>();
-				for(String str:SecurityUtils.getLoginUser().getUser().getConList()){
-					ids.add(str);
+public class ConstructionCreditServiceImpl implements IConstructionCreditService {
+	@Autowired
+	private ConstructionCreditMapper constructionCreditMapper;
+
+	@Autowired
+	SmsMapper smsMapper;
+
+	@Autowired
+	RedisCache redis;
+
+	/**
+	 * 查询三查机制
+	 * 
+	 * @param id
+	 *            三查机制ID
+	 * @return 三查机制
+	 */
+	@Override
+	public ConstructionCredit selectConstructionCreditById(Long id) {
+		return constructionCreditMapper.selectConstructionCreditById(id);
+	}
+
+	/**
+	 * 查询三查机制列表
+	 * 
+	 * @param constructionCredit
+	 *            三查机制
+	 * @return 三查机制
+	 */
+	@Override
+	public List<ConstructionCredit> selectConstructionCreditList(ConstructionCredit constructionCredit) {
+		List<ConstructionCredit> list = new ArrayList<>();
+		if (SecurityUtils.getLoginUser().getUser().getConAreas().size() > 0
+				|| SecurityUtils.getLoginUser().getUser().getConList().size() > 0) {
+			List<String> ids = new ArrayList<>();
+			for (String str : SecurityUtils.getLoginUser().getUser().getConList()) {
+				ids.add(str);
+			}
+
+			if (SecurityUtils.getLoginUser().getUser().getConAreas().size() > 0) {
+
+				List<String> cArea = SecurityUtils.getLoginUser().getUser().getConAreas();
+
+				JSONArray jsonArray = redis.getCacheObject("constructionList");
+
+				if (jsonArray == null) {
+					jsonArray = JSONArray
+							.parseArray(SpringUtils.getBean(SysTempMapper.class).getLocalData("constructionList"));
 				}
-				
-				
-				if(SecurityUtils.getLoginUser().getUser().getConAreas().size() > 0){
-
-					List<String> cArea = SecurityUtils.getLoginUser().getUser().getConAreas();
-					
-					JSONArray jsonArray = redis.getCacheObject("constructionList");
-					
-					for(Object obj:jsonArray){
-						JSONObject json = (JSONObject) obj;
-						if(cArea.indexOf(json.getString("areaCode")) > -1){
-							ids.add(json.getString("id"));
-						}
+
+				for (Object obj : jsonArray) {
+					JSONObject json = (JSONObject) obj;
+					if (cArea.indexOf(json.getString("areaCode")) > -1) {
+						ids.add(json.getString("id"));
 					}
 				}
-				
-				constructionCredit.setIds(ids);
-				
-				
-				list = constructionCreditMapper.selectConstructionCreditHistory(constructionCredit);
 			}
-        return list;
-    }
-    
-    
-    /**
-     * 新增三查机制
-     * 
-     * @param constructionCredit 三查机制
-     * @return 结果
-     */
-    @Override
-    public int insertConstructionCredit(ConstructionCredit constructionCredit)
-    {	
-    	
-    	List<Map> map = new ArrayList<Map>();
-    	
-    	ConstructionCredit cc = new ConstructionCredit();
-        
-        cc.setStatus(0L);
-        cc.setLostCredit(constructionCredit.getLostCredit());
-        cc.setObjectId(constructionCredit.getObjectId());
-        
-        List old = constructionCreditMapper.selectConstructionCreditList(cc);
-        
-        int i = 0;
-        
-        if(old.size() > 0){
-        	i = 1;
-        }else{
-            i = constructionCreditMapper.insertConstructionCredit(constructionCredit);
-        	Map param = new HashMap();
-        	param.put("objectId", constructionCredit.getObjectId());
-        	param.put("creditStatus", constructionCredit.getLostCredit());
-        	map.add(param);
-        	RemoteServerUtils.updateConstationCreditAndStatus(map);
-        	
-        	JSONArray array = redis.getCacheObject("constructionList");
-        	
-    		sendCreditSMS(constructionCredit.getObjectId(),
-    				constructionCredit.getName(),constructionCredit.getReason(),
-    				constructionCredit.getLostCredit(),array,"credit",smsMapper,"constructionCompanyPhone","projectnCompanyPhone");
-        }
-        
-
-
-    	
-        return  i;
-    }
-    
-
-   
-
-    public void sendCreditSMS(String objectId , String name,String reason,long lost,JSONArray array,String smsType,SmsMapper smsMapper,String phone,String phone1) {
-		
+			constructionCredit.setIds(ids);
+
+			list = constructionCreditMapper.selectConstructionCreditList(constructionCredit);
+		}
+
+		return list;
+	}
+
+	@Override
+	public List<ConstructionCredit> selectConstructionCreditHistory(ConstructionCredit constructionCredit) {
+		List<ConstructionCredit> list = new ArrayList<>();
+
+		if (SecurityUtils.getLoginUser().getUser().getConAreas().size() > 0
+				|| SecurityUtils.getLoginUser().getUser().getConList().size() > 0) {
+			List<String> ids = new ArrayList<>();
+			for (String str : SecurityUtils.getLoginUser().getUser().getConList()) {
+				ids.add(str);
+			}
+
+			if (SecurityUtils.getLoginUser().getUser().getConAreas().size() > 0) {
+
+				List<String> cArea = SecurityUtils.getLoginUser().getUser().getConAreas();
+
+				JSONArray jsonArray = redis.getCacheObject("constructionList");
+
+				if (jsonArray == null) {
+					jsonArray = JSONArray
+							.parseArray(SpringUtils.getBean(SysTempMapper.class).getLocalData("constructionList"));
+				}
+				for (Object obj : jsonArray) {
+					JSONObject json = (JSONObject) obj;
+					if (cArea.indexOf(json.getString("areaCode")) > -1) {
+						ids.add(json.getString("id"));
+					}
+				}
+			}
+
+			constructionCredit.setIds(ids);
+
+			list = constructionCreditMapper.selectConstructionCreditHistory(constructionCredit);
+		}
+
+		return list;
+	}
+
+	/**
+	 * 新增三查机制
+	 * 
+	 * @param constructionCredit
+	 *            三查机制
+	 * @return 结果
+	 */
+	@Override
+	public int insertConstructionCredit(ConstructionCredit constructionCredit) {
+
+		List<Map> map = new ArrayList<Map>();
+
+		ConstructionCredit cc = new ConstructionCredit();
+
+		cc.setStatus(0L);
+		cc.setLostCredit(constructionCredit.getLostCredit());
+		cc.setObjectId(constructionCredit.getObjectId());
+		List old = constructionCreditMapper.selectConstructionCreditList(cc);
+
+		int i = 0;
+
+		if (old.size() > 0) {
+			i = 1;
+		} else {
+			i = constructionCreditMapper.insertConstructionCredit(constructionCredit);
+			Map param = new HashMap();
+			param.put("objectId", constructionCredit.getObjectId());
+			param.put("creditStatus", constructionCredit.getLostCredit());
+			map.add(param);
+			RemoteServerUtils.updateConstationCreditAndStatus(map);
+
+			try {
+				JSONArray array = redis.getCacheObject("constructionList");
+
+				if (array == null) {
+					array = JSONArray
+							.parseArray(SpringUtils.getBean(SysTempMapper.class).getLocalData("constructionList"));
+				}
+				sendCreditSMS(constructionCredit.getObjectId(), constructionCredit.getName(),
+						constructionCredit.getReason(), constructionCredit.getLostCredit(), array, "credit", smsMapper,
+						"constructionCompanyPhone", "projectnCompanyPhone");
+			} catch (Exception e) {
+
+				e.printStackTrace();
+			}
+
+		}
+
+		return i;
+	}
+
+	public void sendCreditSMS(String objectId, String name, String reason, long lost, JSONArray array, String smsType,
+			SmsMapper smsMapper, String phone, String phone1) {
+
 		String number = null;
-		List<Mobile> mobileList=new ArrayList<Mobile>();
+		List<Mobile> mobileList = new ArrayList<Mobile>();
 		String areaCode = null;
-		
-		for(Object obj:array){
-			JSONObject json = (JSONObject)obj;
-			if(objectId.equals(json.getString("id"))){
-	            areaCode = json.getString("areaCode");
-	            
+		for (Object obj : array) {
+			JSONObject json = (JSONObject) obj;
+			if (objectId.equals(json.getString("id"))) {
+
+				areaCode = json.getString("areaCode");
+
 				String p = json.getString(phone);
-				if(p!=null){
-					Mobile mobile=new Mobile();
-		            mobile.setMobile(p);
-		            mobileList.add(mobile);
+				if (p != null) {
+					Mobile mobile = new Mobile();
+					mobile.setMobile(p);
+					mobileList.add(mobile);
 				}
-				
-				if(phone1!=null){
+
+				if (phone1 != null) {
 					String p1 = json.getString(phone1);
-		            if(p1 != null){
-		            	Mobile mobile2=new Mobile();
-			            mobile2.setMobile(p1);
-			            mobileList.add(mobile2);
-		            }
+					if (p1 != null) {
+						Mobile mobile2 = new Mobile();
+						mobile2.setMobile(p1);
+						mobileList.add(mobile2);
+					}
 				}
-	            
-				
+
 				break;
 			}
 		}
-		
-		if(mobileList.size() > 0){
-            
-            String smsString = "";
-            if(lost == 1){
-                smsString = "失信提醒："+name+"因"+reason+"原因，被纳入失信名单，将影响渣土业务办理，请及时处理。";
-            }else{
-                smsString = "失信解除提醒："+name+"现已解除失信，可以进行渣土业务办理，请知悉。";
-            }
-            
-            JsonSmsSend jsonSmsSend= PostSms.sendSms(mobileList,smsString);
-            if(jsonSmsSend!=null){
-                if(jsonSmsSend.getState()==0){
-                	System.out.println("发送成功");
-                }else{
-                	System.out.println(jsonSmsSend.getMessage());
-                }
-            }else{
-            	System.out.println("发送返回空");
-            }
+
+		if (mobileList.size() > 0) {
+
+			String smsString = "";
+			if (lost == 1) {
+				smsString = "失信提醒：" + name + "因" + reason + "原因，被纳入失信名单，将影响渣土业务办理，请及时处理。";
+			} else {
+				smsString = "失信解除提醒：" + name + "现已解除失信，可以进行渣土业务办理，请知悉。";
+			}
+
+			JsonSmsSend jsonSmsSend = PostSms.sendSms(mobileList, smsString);
+			if (jsonSmsSend != null) {
+				if (jsonSmsSend.getState() == 0) {
+					System.out.println("发送成功");
+				} else {
+					System.out.println(jsonSmsSend.getMessage());
+				}
+			} else {
+				System.out.println("发送返回空");
+			}
 		}
-		
+
 		number = smsMapper.getPhoneNumber(smsType, areaCode);
-		
-		if(number!=null){
+
+		if (number != null) {
 			String[] nums = number.split(",");
-			
-			for(String string:nums){
-				Mobile mobile=new Mobile();
-		        mobile.setMobile(number);
-		        mobileList.add(mobile);
+
+			for (String string : nums) {
+				Mobile mobile = new Mobile();
+				mobile.setMobile(number);
+				mobileList.add(mobile);
 			}
 		}
-		
-        
-		if(mobileList.size() > 0){
-            
-            String smsString = "";
-            if(lost == 1){
-                smsString = "失信提醒："+name+"因"+reason+"原因，被纳入失信名单，将影响渣土业务办理，请加强监管。";
-            }else{
-                smsString = "失信解除提醒：你辖区内"+name+"现已解除失信，可以进行渣土业务办理，请知悉。";
-            }
-            
-            JsonSmsSend jsonSmsSend= PostSms.sendSms(mobileList,smsString);
-            if(jsonSmsSend!=null){
-                if(jsonSmsSend.getState()==0){
-                	System.out.println("发送成功");
-                }else{
-                	System.out.println(jsonSmsSend.getMessage());
-                }
-            }else{
-            	System.out.println("发送返回空");
-            }
+
+		if (mobileList.size() > 0) {
+
+			String smsString = "";
+			if (lost == 1) {
+				smsString = "失信提醒：" + name + "因" + reason + "原因，被纳入失信名单，将影响渣土业务办理，请加强监管。";
+			} else {
+				smsString = "失信解除提醒：你辖区内" + name + "现已解除失信，可以进行渣土业务办理，请知悉。";
+			}
+
+			JsonSmsSend jsonSmsSend = PostSms.sendSms(mobileList, smsString);
+			if (jsonSmsSend != null) {
+				if (jsonSmsSend.getState() == 0) {
+					System.out.println("发送成功");
+				} else {
+					System.out.println(jsonSmsSend.getMessage());
+				}
+			} else {
+				System.out.println("发送返回空");
+			}
 		}
-		
+
 	}
-    
+
 	/**
-     * 修改三查机制
-     * 
-     * @param constructionCredit 三查机制
-     * @return 结果
-     */
-    @Override
-    @Transactional
-    public int updateConstructionCredit(ConstructionCredit constructionCredit)
-    {
-    	
-    	ConstructionCredit cc = constructionCreditMapper.selectConstructionCreditById(constructionCredit.getId());
-    	
-    	cc.setStatus(1L);
-    	
-    	try {
-        	constructionCreditMapper.updateConstructionCredit(cc);
-
-            cc.setTime(new Date());
-        	cc.setReason(constructionCredit.getReason());
-        	cc.setLostCredit(0L);
-        	
-            return insertConstructionCredit(cc);
-        	
+	 * 修改三查机制
+	 * 
+	 * @param constructionCredit
+	 *            三查机制
+	 * @return 结果
+	 */
+	@Override
+	@Transactional
+	public int updateConstructionCredit(ConstructionCredit constructionCredit) {
+
+		ConstructionCredit cc = constructionCreditMapper.selectConstructionCreditById(constructionCredit.getId());
+
+		cc.setStatus(1L);
+
+		try {
+			constructionCreditMapper.updateConstructionCredit(cc);
+
+			cc.setTime(new Date());
+			cc.setReason(constructionCredit.getReason());
+			cc.setLostCredit(0L);
+
+			return insertConstructionCredit(cc);
+
 		} catch (Exception e) {
-			
+
 		}
-    	
-    	return 0;
-    }
-
-    /**
-     * 批量删除三查机制
-     * 
-     * @param ids 需要删除的三查机制ID
-     * @return 结果
-     */
-    @Override
-    public int deleteConstructionCreditByIds(Long[] ids)
-    {
-        return constructionCreditMapper.deleteConstructionCreditByIds(ids);
-    }
-
-    /**
-     * 删除三查机制信息
-     * 
-     * @param id 三查机制ID
-     * @return 结果
-     */
-    @Override
-    public int deleteConstructionCreditById(Long id)
-    {
-        return constructionCreditMapper.deleteConstructionCreditById(id);
-    }
-    
-    
-
-	public List<String> getNames(ConstructionCredit constructionCredit){
-        return constructionCreditMapper.getNames(constructionCredit);
+
+		return 0;
+	}
+
+	/**
+	 * 批量删除三查机制
+	 * 
+	 * @param ids
+	 *            需要删除的三查机制ID
+	 * @return 结果
+	 */
+	@Override
+	public int deleteConstructionCreditByIds(Long[] ids) {
+		return constructionCreditMapper.deleteConstructionCreditByIds(ids);
+	}
+
+	/**
+	 * 删除三查机制信息
+	 * 
+	 * @param id
+	 *            三查机制ID
+	 * @return 结果
+	 */
+	@Override
+	public int deleteConstructionCreditById(Long id) {
+		return constructionCreditMapper.deleteConstructionCreditById(id);
+	}
+
+	public List<String> getNames(ConstructionCredit constructionCredit) {
+		return constructionCreditMapper.getNames(constructionCredit);
 	}
-	public List<String> getTypes(ConstructionCredit constructionCredit){
-        return constructionCreditMapper.getTypes(constructionCredit);
+	public List<String> getTypes(ConstructionCredit constructionCredit) {
+		return constructionCreditMapper.getTypes(constructionCredit);
 	}
-	public List<String> getPlaces(ConstructionCredit constructionCredit){
-        return constructionCreditMapper.getPlaces(constructionCredit);
+	public List<String> getPlaces(ConstructionCredit constructionCredit) {
+		return constructionCreditMapper.getPlaces(constructionCredit);
 	}
 }
@@ -28,219 +28,216 @@ import com.trash.common.utils.SecurityUtils;
  * @date 2023-04-26
  */
 @Service
-public class EarthsitesCreditServiceImpl implements IEarthsitesCreditService
-{
-    @Autowired
-    private EarthsitesCreditMapper earthsitesCreditMapper;
-
-
-    @Autowired
-    private IConstructionCreditService smsServer;
-
-    @Autowired
-    SmsMapper smsMapper;
-    
-    @Autowired
-    RedisCache redis;
-    /**
-     * 查询处理场所失信
-     *
-     * @param id 处理场所失信ID
-     * @return 处理场所失信
-     */
-    @Override
-    public EarthsitesCredit selectEarthsitesCreditById(Long id)
-    {
-        return earthsitesCreditMapper.selectEarthsitesCreditById(id);
-    }
-
-    /**
-     * 查询处理场所失信列表
-     *
-     * @param earthsitesCredit 处理场所失信
-     * @return 处理场所失信
-     */
-    @Override
-    public List<EarthsitesCredit> selectEarthsitesCreditList(EarthsitesCredit earthsitesCredit)
-    {
-    	List<EarthsitesCredit> list = new ArrayList<>();
-
-			List<String> eLish = SecurityUtils.getLoginUser().getUser().getEarthList();
-			List<String> eArea = SecurityUtils.getLoginUser().getUser().getEarthAreas();
-			
-			if (eLish.size() > 0 || eArea.size() > 0) {
-				List<String> ids = new ArrayList<>();
-				for(String str:eLish){
-					ids.add(str);
-				}
-				
-				
-				if(eArea.size() > 0){
-					
-					JSONArray jsonArray = redis.getCacheObject("earthSitesList");
-					
-					for(Object obj:jsonArray){
-						JSONObject json = (JSONObject) obj;
-						if(eArea.indexOf(json.getString("areaCode")) > -1){
-							ids.add(json.getString("id"));
-						}
+public class EarthsitesCreditServiceImpl implements IEarthsitesCreditService {
+	@Autowired
+	private EarthsitesCreditMapper earthsitesCreditMapper;
+
+	@Autowired
+	private IConstructionCreditService smsServer;
+
+	@Autowired
+	SmsMapper smsMapper;
+
+	@Autowired
+	RedisCache redis;
+
+	/**
+	 * 查询处理场所失信
+	 *
+	 * @param id
+	 *            处理场所失信ID
+	 * @return 处理场所失信
+	 */
+	@Override
+	public EarthsitesCredit selectEarthsitesCreditById(Long id) {
+		return earthsitesCreditMapper.selectEarthsitesCreditById(id);
+	}
+
+	/**
+	 * 查询处理场所失信列表
+	 *
+	 * @param earthsitesCredit
+	 *            处理场所失信
+	 * @return 处理场所失信
+	 */
+	@Override
+	public List<EarthsitesCredit> selectEarthsitesCreditList(EarthsitesCredit earthsitesCredit) {
+		List<EarthsitesCredit> list = new ArrayList<>();
+
+		List<String> eLish = SecurityUtils.getLoginUser().getUser().getEarthList();
+		List<String> eArea = SecurityUtils.getLoginUser().getUser().getEarthAreas();
+
+		if (eLish.size() > 0 || eArea.size() > 0) {
+			List<String> ids = new ArrayList<>();
+			for (String str : eLish) {
+				ids.add(str);
+			}
+
+			if (eArea.size() > 0) {
+
+				JSONArray jsonArray = redis.getCacheObject("earthSitesList");
+
+				for (Object obj : jsonArray) {
+					JSONObject json = (JSONObject) obj;
+					if (eArea.indexOf(json.getString("areaCode")) > -1) {
+						ids.add(json.getString("id"));
 					}
 				}
-				
-				earthsitesCredit.setIds(ids);
-				
-				
-				list = earthsitesCreditMapper.selectEarthsitesCreditList(earthsitesCredit);
 			}
-    	
-        return list;
-    }
-
-    /**
-     * 新增处理场所失信
-     *
-     * @param earthsitesCredit 处理场所失信
-     * @return 结果
-     */
-    @Override
-    public int insertEarthsitesCredit(EarthsitesCredit earthsitesCredit)
-    {
-
-        List<Map> map = new ArrayList<Map>();
-    	
-        EarthsitesCredit cc = new EarthsitesCredit();
-        
-        cc.setStatus(0L);
-        cc.setLostCredit(earthsitesCredit.getLostCredit());
-        cc.setObjectId(earthsitesCredit.getObjectId());
-        
-        List old = earthsitesCreditMapper.selectEarthsitesCreditList(cc);
-        
-        int i = 0;
-        
-        if(old.size() > 0){
-        	i = 1;
-        }else{
-        	
-            i = earthsitesCreditMapper.insertEarthsitesCredit(earthsitesCredit);
-        
-        
-    	Map param = new HashMap();
-    	param.put("objectId", earthsitesCredit.getObjectId());
-    	param.put("creditStatus", earthsitesCredit.getLostCredit());
-    	map.add(param);
-    	
-    	RemoteServerUtils.updateEarthSitesCreditAndStatus(map);
-    	
-    	JSONArray array = redis.getCacheObject("earthSitesList");
-    	
-    	smsServer.sendCreditSMS(earthsitesCredit.getObjectId() , earthsitesCredit.getName(),earthsitesCredit.getReason(),
-    			earthsitesCredit.getLostCredit(),array,"credit",smsMapper,"principalPhoneNo",null);;
-        }
-        return i;
-    }
-
-    /**
-     * 修改处理场所失信
-     *
-     * @param earthsitesCredit 处理场所失信
-     * @return 结果
-     */
-    @Override
-    public int updateEarthsitesCredit(EarthsitesCredit earthsitesCredit)
-    {
-
-        EarthsitesCredit cc = earthsitesCreditMapper.selectEarthsitesCreditById(earthsitesCredit.getId());
-
-        cc.setStatus(1L);
-
-        try {
-            earthsitesCreditMapper.updateEarthsitesCredit(cc);
-
-            cc.setReason(earthsitesCredit.getReason());
-            cc.setTime(new Date());
-            cc.setLostCredit(0L);
-
-            return insertEarthsitesCredit(cc);
-
-        } catch (Exception e) {
-
-        }
-
-        return 0;
-    }
-
-    /**
-     * 批量删除处理场所失信
-     *
-     * @param ids 需要删除的处理场所失信ID
-     * @return 结果
-     */
-    @Override
-    public int deleteEarthsitesCreditByIds(Long[] ids)
-    {
-        return earthsitesCreditMapper.deleteEarthsitesCreditByIds(ids);
-    }
-
-    /**
-     * 删除处理场所失信信息
-     *
-     * @param id 处理场所失信ID
-     * @return 结果
-     */
-    @Override
-    public int deleteEarthsitesCreditById(Long id)
-    {
-        return earthsitesCreditMapper.deleteEarthsitesCreditById(id);
-    }
-
-
-    public List<String> getNames(EarthsitesCredit earthsitesCredit) {
-        return earthsitesCreditMapper.getNames(earthsitesCredit);
-    }
-    
-
-	public List<String> getTypes(EarthsitesCredit earthsitesCredit){
-        return earthsitesCreditMapper.getTypes(earthsitesCredit);
+			earthsitesCredit.setIds(ids);
+
+			list = earthsitesCreditMapper.selectEarthsitesCreditList(earthsitesCredit);
+		}
+
+		return list;
+	}
+
+	/**
+	 * 新增处理场所失信
+	 *
+	 * @param earthsitesCredit
+	 *            处理场所失信
+	 * @return 结果
+	 */
+	@Override
+	public int insertEarthsitesCredit(EarthsitesCredit earthsitesCredit) {
+
+		List<Map> map = new ArrayList<Map>();
+
+		EarthsitesCredit cc = new EarthsitesCredit();
+
+		cc.setStatus(0L);
+		cc.setLostCredit(earthsitesCredit.getLostCredit());
+		cc.setObjectId(earthsitesCredit.getObjectId());
+
+		List old = earthsitesCreditMapper.selectEarthsitesCreditList(cc);
+
+		int i = 0;
+
+		if (old.size() > 0) {
+			i = 1;
+		} else {
+
+			i = earthsitesCreditMapper.insertEarthsitesCredit(earthsitesCredit);
+
+			Map param = new HashMap();
+			param.put("objectId", earthsitesCredit.getObjectId());
+			param.put("creditStatus", earthsitesCredit.getLostCredit());
+			map.add(param);
+
+			RemoteServerUtils.updateEarthSitesCreditAndStatus(map);
+			try {
+
+				JSONArray array = redis.getCacheObject("earthSitesList");
+
+				smsServer.sendCreditSMS(earthsitesCredit.getObjectId(), earthsitesCredit.getName(),
+						earthsitesCredit.getReason(), earthsitesCredit.getLostCredit(), array, "credit", smsMapper,
+						"principalPhoneNo", null);
+				;
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+		}
+		return i;
+	}
+
+	/**
+	 * 修改处理场所失信
+	 *
+	 * @param earthsitesCredit
+	 *            处理场所失信
+	 * @return 结果
+	 */
+	@Override
+	public int updateEarthsitesCredit(EarthsitesCredit earthsitesCredit) {
+
+		EarthsitesCredit cc = earthsitesCreditMapper.selectEarthsitesCreditById(earthsitesCredit.getId());
+
+		cc.setStatus(1L);
+
+		try {
+			earthsitesCreditMapper.updateEarthsitesCredit(cc);
+
+			cc.setReason(earthsitesCredit.getReason());
+			cc.setTime(new Date());
+			cc.setLostCredit(0L);
+
+			return insertEarthsitesCredit(cc);
+
+		} catch (Exception e) {
+
+		}
+
+		return 0;
+	}
+
+	/**
+	 * 批量删除处理场所失信
+	 *
+	 * @param ids
+	 *            需要删除的处理场所失信ID
+	 * @return 结果
+	 */
+	@Override
+	public int deleteEarthsitesCreditByIds(Long[] ids) {
+		return earthsitesCreditMapper.deleteEarthsitesCreditByIds(ids);
+	}
+
+	/**
+	 * 删除处理场所失信信息
+	 *
+	 * @param id
+	 *            处理场所失信ID
+	 * @return 结果
+	 */
+	@Override
+	public int deleteEarthsitesCreditById(Long id) {
+		return earthsitesCreditMapper.deleteEarthsitesCreditById(id);
+	}
+
+	public List<String> getNames(EarthsitesCredit earthsitesCredit) {
+		return earthsitesCreditMapper.getNames(earthsitesCredit);
+	}
+
+	public List<String> getTypes(EarthsitesCredit earthsitesCredit) {
+		return earthsitesCreditMapper.getTypes(earthsitesCredit);
 	}
-	public List<String> getPlaces(EarthsitesCredit earthsitesCredit){
-        return earthsitesCreditMapper.getPlaces(earthsitesCredit);
+	public List<String> getPlaces(EarthsitesCredit earthsitesCredit) {
+		return earthsitesCreditMapper.getPlaces(earthsitesCredit);
 	}
-    @Override
-    public List<EarthsitesCredit> selectEarthsitesCreditHistory(EarthsitesCredit earthsitesCredit) {
-       	List<EarthsitesCredit> list = new ArrayList<>();
-
-    			List<String> eLish = SecurityUtils.getLoginUser().getUser().getEarthList();
-    			List<String> eArea = SecurityUtils.getLoginUser().getUser().getEarthAreas();
-    			
-    			if (eLish.size() > 0 || eArea.size() > 0) {
-    				List<String> ids = new ArrayList<>();
-    				for(String str:eLish){
-    					ids.add(str);
-    				}
-    				
-    				
-    				if(eArea.size() > 0){
-    					
-    					JSONArray jsonArray = redis.getCacheObject("earthSitesList");
-    					
-    					for(Object obj:jsonArray){
-    						JSONObject json = (JSONObject) obj;
-    						if(eArea.indexOf(json.getString("areaCode")) > -1){
-    							ids.add(json.getString("id"));
-    						}
-    					}
-    				}
-    				
-    				earthsitesCredit.setIds(ids);
-    				
-    				
-    				list = earthsitesCreditMapper.selectEarthsitesCreditHistory(earthsitesCredit);
-    			}
-
-        return list;
-    }
+	@Override
+	public List<EarthsitesCredit> selectEarthsitesCreditHistory(EarthsitesCredit earthsitesCredit) {
+		List<EarthsitesCredit> list = new ArrayList<>();
+
+		List<String> eLish = SecurityUtils.getLoginUser().getUser().getEarthList();
+		List<String> eArea = SecurityUtils.getLoginUser().getUser().getEarthAreas();
+
+		if (eLish.size() > 0 || eArea.size() > 0) {
+			List<String> ids = new ArrayList<>();
+			for (String str : eLish) {
+				ids.add(str);
+			}
+
+			if (eArea.size() > 0) {
+
+				JSONArray jsonArray = redis.getCacheObject("earthSitesList");
+
+				for (Object obj : jsonArray) {
+					JSONObject json = (JSONObject) obj;
+					if (eArea.indexOf(json.getString("areaCode")) > -1) {
+						ids.add(json.getString("id"));
+					}
+				}
+			}
+
+			earthsitesCredit.setIds(ids);
+
+			list = earthsitesCreditMapper.selectEarthsitesCreditHistory(earthsitesCredit);
+		}
+
+		return list;
+	}
 }
 \ No newline at end of file
@@ -132,6 +132,27 @@ public class TruckActivateServiceImpl implements ITruckActivateService {
 		for (TruckActivate ta : list) {
 			if (ta.getAddress() == null) {
 				JSONObject construction = RemoteServerUtils.getConstructionLicenseById(ta.getConstructionId());
+				
+				String routeName = "";
+				String earthName = "";
+				JSONArray eList = construction.getJSONArray("earthList");
+				
+				
+				if(eList != null && eList.size() > 0){
+					for(Object obj:eList){
+						JSONObject earth = (JSONObject) obj;
+						if(earth.getString("earthSiteName") != null){
+							earthName += earth.getString("earthSiteName") + ",";
+						}
+						if(earth.getString("routeName") != null){
+							routeName += earth.getString("routeName") + ",";
+						}
+					}
+					if(earthName.length() > 0)
+						earthName = earthName.substring(0,earthName.length()-1);
+					if(routeName.length() > 0)
+						routeName = routeName.substring(0,routeName.length()-1);
+				}
 				ta.setAddress(construction.getString("address"));
 				ta.setEffectiveFrom(construction.getString("effectiveFrom"));
@@ -139,8 +160,8 @@ public class TruckActivateServiceImpl implements ITruckActivateService {
 				ta.setTransportStartTime(construction.getString("transportStartTime"));
 				ta.setTransportEndTime(construction.getString("transportEndTime"));
-				ta.setRouteName(construction.getString("routeName"));
-				ta.setEarthName(construction.getString("earthName"));
+				ta.setRouteName(routeName);
+				ta.setEarthName(earthName);
 				ta.setRouteInfo(construction.getString("routeInfo"));
 				ta.setEarthList(construction.getString("earthList"));
 				ta.setCoord(construction.getString("coord"));
@@ -193,6 +214,29 @@ public class TruckActivateServiceImpl implements ITruckActivateService {
 		List<TruckActivate> oldDatas = truckActivateMapper.selectTodayTruckByObjIds(objs);
 		JSONObject construction = RemoteServerUtils.getConstructionLicenseById(truckActivate.getConstructionId());
+		
+		String routeName = "";
+		String earthName = "";
+		JSONArray eList = construction.getJSONArray("earthList");
+		
+		
+		if(eList != null && eList.size() > 0){
+			for(Object obj:eList){
+				JSONObject earth = (JSONObject) obj;
+				if(earth.getString("earthSiteName") != null){
+					earthName += earth.getString("earthSiteName") + ",";
+				}
+				if(earth.getString("routeName") != null){
+					routeName += earth.getString("routeName") + ",";
+				}
+			}
+
+			if(earthName.length() > 0)
+				earthName = earthName.substring(0,earthName.length()-1);
+
+			if(routeName.length() > 0)
+				routeName = routeName.substring(0,routeName.length()-1);
+		}
 		for (int i = 0; i < objs.length; i++) {
@@ -211,8 +255,9 @@ public class TruckActivateServiceImpl implements ITruckActivateService {
 			active.setTransportStartTime(construction.getString("transportStartTime"));
 			active.setTransportEndTime(construction.getString("transportEndTime"));
-			active.setRouteName(construction.getString("routeName"));
-			active.setEarthName(construction.getString("earthName"));
+			
+			active.setRouteName(routeName);
+			active.setEarthName(earthName);
 			active.setRouteInfo(construction.getString("routeInfo"));
 			active.setEarthList(construction.getString("earthList"));
 			active.setCoord(construction.getString("coord"));
@@ -95,12 +95,32 @@ public class CaseOffline extends BaseEntity {
 	private List<String> names;
+	private List<String> tNames;
+
+	private List<String> companyArea;
+
 	private List<String> cArea;
 	private List<String> eArea;
+	public List<String> getCompanyArea() {
+		return companyArea;
+	}
+
+	public void setCompanyArea(List<String> companyArea) {
+		this.companyArea = companyArea;
+	}
+
+	public List<String> gettNames() {
+		return tNames;
+	}
+
+	public void settNames(List<String> tNames) {
+		this.tNames = tNames;
+	}
+
 	public String getStatus1() {
 		return status1;
 	}
@@ -83,24 +83,14 @@ public class CaseOfflineServiceImpl implements ICaseOfflineService
         List<CaseOffline> list = new ArrayList<>();
-		List<String> names = new ArrayList<>();
-		
-		List<String> cLish = SecurityUtils.getLoginUser().getUser().getConList();
 		List<String> cArea = SecurityUtils.getLoginUser().getUser().getConAreas();
-		List<String> eLish = SecurityUtils.getLoginUser().getUser().getEarthList();
 		List<String> eArea = SecurityUtils.getLoginUser().getUser().getEarthAreas();
+		List<String> companyArea = SecurityUtils.getLoginUser().getUser().getCompanyAreas();
 		JSONArray earthList = redisCache.getCacheObject("earthSitesList");
 		JSONArray construList = redisCache.getCacheObject("constructionList");
-		
-
-		if(earthList == null){
-			earthList = JSONArray.parseArray(SpringUtils.getBean(SysTempMapper.class).getLocalData("earthSitesList"));
-		}
+		JSONArray companyList = redisCache.getCacheObject("companyList");
-		if(construList == null){
-			construList = JSONArray.parseArray(SpringUtils.getBean(SysTempMapper.class).getLocalData("constructionList"));
-		}
 		if(caseOffline.status1 != null){
 			if(caseOffline.status1.equals("0")){
@@ -114,36 +104,14 @@ public class CaseOfflineServiceImpl implements ICaseOfflineService
 			}
 		}
-		if(cArea.size() > 0){
-			caseOffline.setcArea(cArea);
-		}else{
-			
-			for(Object obj:construList){
-				JSONObject jsonObject = (JSONObject) obj;
-				if(cLish.indexOf(jsonObject.getString("id")) > -1){
-					names.add(jsonObject.getString("name"));
-				}
-			}
-			
-		}
-		if(eArea.size() > 0){
-			caseOffline.seteArea(eArea);
-		}else{
-			for(Object obj:earthList){
-				JSONObject jsonObject = (JSONObject) obj;
-				if(eLish.indexOf(jsonObject.getString("id")) > -1){
-					names.add(jsonObject.getString("name"));
-				}
-			}
-		}
+		companyArea.add("x");
+		cArea.add("x");
+		eArea.add("x");
+		caseOffline.setCompanyArea(companyArea);
+		caseOffline.setcArea(cArea);
+		caseOffline.seteArea(eArea);
-		if(names.size() == 0 && cArea.size() == 0 && eArea.size() == 0){
-			return list;
-		}else{
-			caseOffline.setNames(names);
-		}
-        
         return caseOfflineMapper.selectCaseOfflineList(caseOffline);
     }
@@ -204,6 +172,7 @@ public class CaseOfflineServiceImpl implements ICaseOfflineService
         		credit.setObjectId(caseOffline.getObjectId());
         		credit.setLostCredit(1L);
         		credit.setName(caseOffline.getSiteName());
+        		credit.setCreateBy(SecurityUtils.getUsername());
         		for(SysDictData d:caseType){
         			if(caseOffline.getType().equals(d.getDictValue())){
@@ -215,6 +184,7 @@ public class CaseOfflineServiceImpl implements ICaseOfflineService
         		credit.setPlace(placeName);
         		credit.setType(object.getString("cargoIdName"));
         		credit.setTime(new Date());
+        		credit.setCreateBy(SecurityUtils.getUsername());
         		constructionCredit.insertConstructionCredit(credit);
         	}else if(caseOffline.getSiteType() == 1){
         		EarthsitesCredit credit = new EarthsitesCredit();
@@ -222,6 +192,7 @@ public class CaseOfflineServiceImpl implements ICaseOfflineService
         		credit.setObjectId(caseOffline.getObjectId());
         		credit.setLostCredit(1L);
         		credit.setName(caseOffline.getSiteName());
+        		credit.setCreateBy(SecurityUtils.getUsername());
         		for(SysDictData d:caseType){
         			if(caseOffline.getType().equals(d.getDictValue())){
                 		credit.setReason(d.getDictLabel());
@@ -119,6 +119,7 @@ public class ViolationWarningInformationServiceImpl implements IViolationWarning
 		List<String> eLish = SecurityUtils.getLoginUser().getUser().getEarthList();
 		List<String> eArea = SecurityUtils.getLoginUser().getUser().getEarthAreas();
+
 		JSONArray earthList = redisCache.getCacheObject("earthSitesList");
 		JSONArray construList = redisCache.getCacheObject("constructionList");
 		JSONArray companyList = redisCache.getCacheObject("companyList");
@@ -54,25 +54,14 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 				        <foreach item="name" collection="eArea" open="(" separator="," close=")">
 				            #{name}
 				        </foreach>
-				        and site_type = 1
-				        )
+				        and site_type = 1)
+				    or (place in 
+				        <foreach item="name" collection="companyArea" open="(" separator="," close=")">
+				            #{name}
+				        </foreach>
+				        and site_type = 2)
 				)
 			</if>
-			 <if test="cArea != null and cArea.size() > 0 and (eArea == null or eArea.size() == 0)"> 
-            	and place in 
-			        <foreach item="name" collection="cArea" open="(" separator="," close=")">
-			            #{name}
-			        </foreach>
-			         and site_type = 0
-	            	
-			</if>
-			<if test="eArea != null and eArea.size() > 0 and (cArea == null or cArea.size() == 0)"> 
-            	and place in 
-			        <foreach item="name" collection="cArea" open="(" separator="," close=")">
-			            #{name}
-			        </foreach>
-			         and site_type = 1
-			</if>
             <if test="createTime != null "> and create_time > #{createTime}</if>
         </where>