youxiw2000 / trash · Commits

Commit 6d2ba61c3b21a489896f0325f58bed80a5351527

Authored by youxiw2000
1 parent 01d05800
build: skipped

m

Inline Side-by-side
Showing 74 changed files with 5347 additions and 956 deletions
trash-activiti/src/main/java/com/trash/activiti/mapper/ActReDeploymentMapper.java
  View file @6d2ba61
@@ -30,4 +30,7 @@ public interface ActReDeploymentMapper { @@ -30,4 +30,7 @@ public interface ActReDeploymentMapper {
30 30
31 public List<String> selectCompleteWorkByUsername(@Param("username") String username); 31 public List<String> selectCompleteWorkByUsername(@Param("username") String username);
32 32
  33 +
  34 + public Map<String, String> selectHistoryWorkByPId(String id);
  35 +
33 } 36 }
trash-activiti/src/main/java/com/trash/activiti/service/impl/ActTaskServiceImpl.java
  View file @6d2ba61
@@ -191,7 +191,7 @@ public class ActTaskServiceImpl implements IActTaskService { @@ -191,7 +191,7 @@ public class ActTaskServiceImpl implements IActTaskService {
191 } 191 }
192 192
193 public Map<String, String> getHistoryData(HistoricProcessInstance processInstance) { 193 public Map<String, String> getHistoryData(HistoricProcessInstance processInstance) {
194 - Map<String, String> map = actMapper.selectHistoryWorkById(processInstance.getBusinessKey()); 194 + Map<String, String> map = actMapper.selectHistoryWorkByPId(processInstance.getId());
195 return map; 195 return map;
196 196
197 } 197 }
@@ -274,7 +274,7 @@ public class ActTaskServiceImpl implements IActTaskService { @@ -274,7 +274,7 @@ public class ActTaskServiceImpl implements IActTaskService {
274 274
275 275
276 private void updateThreesetpTask(ProcessInstance processInstance, String placeCode) { 276 private void updateThreesetpTask(ProcessInstance processInstance, String placeCode) {
277 - 277 +
278 org.activiti.engine.task.Task task = taskService.createTaskQuery().processInstanceId(processInstance.getId()).singleResult(); 278 org.activiti.engine.task.Task task = taskService.createTaskQuery().processInstanceId(processInstance.getId()).singleResult();
279 279
280 if(task == null) 280 if(task == null)
trash-activiti/src/main/resources/mapper/activiti/ActReDeploymentMapper.xml
  View file @6d2ba61
@@ -27,8 +27,8 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot; @@ -27,8 +27,8 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
27 select start_time as startTime,end_time as endTime, reason,type from workflow where id = #{id} 27 select start_time as startTime,end_time as endTime, reason,type from workflow where id = #{id}
28 </select> 28 </select>
29 29
30 - <select id="selectHistoryWorkById" parameterType="String" resultType="java.util.Map">  
31 - select start_time as startTime,end_time as endTime, reason,type from workflow_hi where id = #{id} 30 + <select id="selectHistoryWorkByPId" parameterType="String" resultType="java.util.Map">
  31 + select start_time as startTime,end_time as endTime, reason,type from workflow_hi where instance_id = #{id}
32 </select> 32 </select>
33 33
34 34
trash-admin/src/main/resources/application-dev.yml
  View file @6d2ba61
@@ -10,12 +10,15 @@ trash: @@ -10,12 +10,15 @@ trash:
10 demoEnabled: true 10 demoEnabled: true
11 # 文件路径 示例（ Windows配置D:/trash/uploadPath，Linux配置 /home/trash/uploadPath，存储桶 trash/uploadPath,nginx配置 /trash/upload） 11 # 文件路径 示例（ Windows配置D:/trash/uploadPath，Linux配置 /home/trash/uploadPath，存储桶 trash/uploadPath,nginx配置 /trash/upload）
12 #profile: /home/thrid-system/upload 12 #profile: /home/thrid-system/upload
13 - profile: D:/work/project/Documents/uploadPath/trash 13 + profile: D:/work/uploadPath/trash
14 # 获取ip地址开关 14 # 获取ip地址开关
15 addressEnabled: false 15 addressEnabled: false
16 # 验证码类型 math 数组计算 char 字符验证 16 # 验证码类型 math 数组计算 char 字符验证
17 captchaType: math 17 captchaType: math
18 - remote: abc 18 + # 远程服务器地址
  19 + remotePath: http://183.66.242.6:6001
  20 +
  21 +
19 # 数据源配置 22 # 数据源配置
20 spring: 23 spring:
21 datasource: 24 datasource:
trash-admin/src/main/resources/application.yml
  View file @6d2ba61
@@ -39,7 +39,7 @@ token: @@ -39,7 +39,7 @@ token:
39 # 令牌密钥 39 # 令牌密钥
40 secret: abcdefghijklmnopqrstuvwxyz 40 secret: abcdefghijklmnopqrstuvwxyz
41 # 令牌有效期（默认30分钟） 41 # 令牌有效期（默认30分钟）
42 - expireTime: 30 42 + expireTime: 120
43 43
44 # MyBatis配置 44 # MyBatis配置
45 mybatis: 45 mybatis:
trash-common/src/main/java/com/trash/common/config/trashConfig.java
  View file @6d2ba61
@@ -26,6 +26,8 @@ public class trashConfig @@ -26,6 +26,8 @@ public class trashConfig
26 26
27 /** 上传路径 */ 27 /** 上传路径 */
28 private static String profile; 28 private static String profile;
  29 +
  30 + private String remotePath;
29 31
30 /** 获取地址开关 */ 32 /** 获取地址开关 */
31 private static boolean addressEnabled; 33 private static boolean addressEnabled;
@@ -90,7 +92,17 @@ public class trashConfig @@ -90,7 +92,17 @@ public class trashConfig
90 trashConfig.addressEnabled = addressEnabled; 92 trashConfig.addressEnabled = addressEnabled;
91 } 93 }
92 94
93 - /** 95 +
  96 +
  97 + public String getRemotePath() {
  98 + return remotePath;
  99 + }
  100 +
  101 + public void setRemotePath(String remote) {
  102 + this.remotePath = remote;
  103 + }
  104 +
  105 + /**
94 * 获取头像上传路径 106 * 获取头像上传路径
95 */ 107 */
96 public static String getAvatarPath() 108 public static String getAvatarPath()
trash-common/src/main/java/com/trash/common/utils/RemoteServerUtils.java
  View file @6d2ba61
@@ -4,9 +4,14 @@ import java.util.List; @@ -4,9 +4,14 @@ import java.util.List;
4 import java.util.Map; 4 import java.util.Map;
5 import java.util.concurrent.TimeUnit; 5 import java.util.concurrent.TimeUnit;
6 6
  7 +import org.springframework.beans.factory.annotation.Value;
  8 +import org.springframework.context.annotation.Configuration;
  9 +import org.springframework.context.annotation.PropertySource;
  10 +
7 import com.alibaba.fastjson.JSON; 11 import com.alibaba.fastjson.JSON;
8 import com.alibaba.fastjson.JSONArray; 12 import com.alibaba.fastjson.JSONArray;
9 import com.alibaba.fastjson.JSONObject; 13 import com.alibaba.fastjson.JSONObject;
  14 +import com.trash.common.config.trashConfig;
10 import com.trash.common.utils.SecurityUtils; 15 import com.trash.common.utils.SecurityUtils;
11 16
12 import okhttp3.MediaType; 17 import okhttp3.MediaType;
@@ -16,9 +21,12 @@ import okhttp3.RequestBody; @@ -16,9 +21,12 @@ import okhttp3.RequestBody;
16 21
17 public class RemoteServerUtils { 22 public class RemoteServerUtils {
18 23
19 -// static String remote = "http://183.66.242.6:14601/"; 24 +// public static String remote = "http://183.66.242.6:14601/";
  25 +
  26 +// public static String remote = "http://175.6.47.84:8008/";
20 27
21 - public static String remote = "http://175.6.47.84:8008/"; 28 +
  29 + public static String remote;
22 30
23 public static OkHttpClient okHttpClient; 31 public static OkHttpClient okHttpClient;
24 32
@@ -27,16 +35,28 @@ public class RemoteServerUtils { @@ -27,16 +35,28 @@ public class RemoteServerUtils {
27 public static String UpdateTruckRequestPath = "/api/gpsservice/cs/basevehicle/credit/status"; 35 public static String UpdateTruckRequestPath = "/api/gpsservice/cs/basevehicle/credit/status";
28 36
29 public static String TruckStatusListRequestPath = "/api/gpsservice/cs/basevehicle/statusquery"; 37 public static String TruckStatusListRequestPath = "/api/gpsservice/cs/basevehicle/statusquery";
30 - public static String TruckOnlineRequestPath = "/api/gpsservice/api/gpsservice/cs/basevehice/status/list";  
31 38
  39 + public static String TruckInfo = "/api/gpsservice/cs/basevehicle/";
  40 + public static String EarthSitesInfo = "/api/siteservice/cs/earthsites/";
  41 +
  42 + public static String ConstructionInfo = "/api/siteservice/cs/constructionsites/";
  43 +
  44 + public static String UpdateConstruction= "/api/siteservice/cs/constructionsites/status";
  45 +
32 46
33 public static String CompanyListRequestPath = "/api/gpsservice/cs/companies/ledger/list"; 47 public static String CompanyListRequestPath = "/api/gpsservice/cs/companies/ledger/list";
34 48
35 public static String UpdateCompanyRequestPath = "/api/gpsservice/cs/companies/credit/status"; 49 public static String UpdateCompanyRequestPath = "/api/gpsservice/cs/companies/credit/status";
  50 +
  51 + public static String UpdateEarthSiteRequestPath = "/api/siteservice/cs/earthsites/status";
  52 +
  53 + public static String UpdateConractRequestPath = "/api/siteservice/cs/sitecontract/audit/status";
36 54
37 - public static JSONArray getTruckOnlineList(){ 55 +
  56 +
  57 + public static JSONArray getTruckOnline(Map map){
38 JSONArray turckList=null; 58 JSONArray turckList=null;
39 - Object object = get(TruckOnlineRequestPath,null); 59 + Object object = post(TruckStatusListRequestPath,map);
40 60
41 if(object != null){ 61 if(object != null){
42 JSONObject jsonObject = JSON.parseObject(object.toString()); 62 JSONObject jsonObject = JSON.parseObject(object.toString());
@@ -46,31 +66,74 @@ public class RemoteServerUtils { @@ -46,31 +66,74 @@ public class RemoteServerUtils {
46 return turckList; 66 return turckList;
47 } 67 }
48 68
  69 + public static Object updateConstationCreditAndStatus(List<Map> map){
  70 + JSONArray turckList=null;
  71 + Object object = post(UpdateConstruction,map);
  72 +
  73 + return object;
  74 + }
49 75
  76 + public static Object updateEarthSitesCreditAndStatus(List<Map> map){
  77 + JSONArray turckList=null;
  78 + Object object = post(UpdateEarthSiteRequestPath,map);
  79 +
  80 + return object;
  81 + }
50 82
51 - public static JSONArray getCompanyList(Map params){ 83 + public static Object updateConractStatus(List<Map> map){
52 JSONArray turckList=null; 84 JSONArray turckList=null;
53 - Object object = post(CompanyListRequestPath,params); 85 + Object object = post(UpdateConractRequestPath,map);
  86 +
  87 + return object;
  88 + }
  89 +
  90 +
  91 +
  92 +
  93 + public static JSONObject getEarthSitesInfo(String id) {
  94 + JSONObject json=null;
  95 + Object object = get(EarthSitesInfo + id,null);
54 96
55 if(object != null){ 97 if(object != null){
56 - JSONObject jsonObject = JSON.parseObject(object.toString());  
57 - turckList = jsonObject.getJSONArray("list"); 98 + json = JSON.parseObject(object.toString());
  99 + return json;
  100 + }
  101 +
  102 + return json;
  103 + }
  104 +
  105 +
  106 +
  107 + public static JSONObject getTruckInfo(String id){
  108 + JSONObject turckList=null;
  109 + Object object = get(TruckInfo + id,null);
  110 +
  111 + if(object != null){
  112 + turckList = JSON.parseObject(object.toString());
  113 + return turckList;
58 } 114 }
59 115
60 return turckList; 116 return turckList;
61 } 117 }
62 118
63 - public static Object updateCompanyList(List<Map> updateList) {  
64 - JSONArray turckList=null;  
65 - Object object = post(UpdateCompanyRequestPath,updateList); 119 +
  120 + public static JSONObject getConstructionInfo(String id) {
  121 + JSONObject turckList=null;
  122 + Object object = get(ConstructionInfo + id,null);
66 123
  124 + if(object != null){
  125 + turckList = JSON.parseObject(object.toString());
  126 + return turckList;
  127 + }
  128 +
  129 + return turckList;
67 130
68 - return object;  
69 } 131 }
  132 +
70 133
71 - public static JSONArray getTruckStatusList(Map params){ 134 + public static JSONArray getCompanyList(Map params){
72 JSONArray turckList=null; 135 JSONArray turckList=null;
73 - Object object = post(TruckStatusListRequestPath,params); 136 + Object object = post(CompanyListRequestPath,params);
74 137
75 if(object != null){ 138 if(object != null){
76 JSONObject jsonObject = JSON.parseObject(object.toString()); 139 JSONObject jsonObject = JSON.parseObject(object.toString());
@@ -80,6 +143,15 @@ public class RemoteServerUtils { @@ -80,6 +143,15 @@ public class RemoteServerUtils {
80 return turckList; 143 return turckList;
81 } 144 }
82 145
  146 + public static Object updateCompanyList(List<Map> updateList) {
  147 + JSONArray turckList=null;
  148 + Object object = post(UpdateCompanyRequestPath,updateList);
  149 +
  150 +
  151 + return object;
  152 + }
  153 +
  154 +
83 public static JSONArray getAreas(){ 155 public static JSONArray getAreas(){
84 JSONArray array=null; 156 JSONArray array=null;
85 Object object = get("/api/gpsservice/cs/area",null); 157 Object object = get("/api/gpsservice/cs/area",null);
@@ -125,10 +197,6 @@ public class RemoteServerUtils { @@ -125,10 +197,6 @@ public class RemoteServerUtils {
125 return object; 197 return object;
126 } 198 }
127 199
128 -  
129 -  
130 -  
131 -  
132 public static Object post(String url,Object obj){ 200 public static Object post(String url,Object obj){
133 if(okHttpClient == null){ 201 if(okHttpClient == null){
134 okHttpClient = new OkHttpClient.Builder() 202 okHttpClient = new OkHttpClient.Builder()
@@ -223,4 +291,6 @@ public class RemoteServerUtils { @@ -223,4 +291,6 @@ public class RemoteServerUtils {
223 } 291 }
224 292
225 293
  294 +
  295 +
226 } 296 }
trash-daily/src/main/resources/mapper/report/WorkReportMapper.xml
  View file @6d2ba61
@@ -74,7 +74,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot; @@ -74,7 +74,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
74 <if test="startTime != null">start_time = #{startTime},</if> 74 <if test="startTime != null">start_time = #{startTime},</if>
75 <if test="endTime != null">end_time = #{endTime},</if> 75 <if test="endTime != null">end_time = #{endTime},</if>
76 <if test="reportContent != null and reportContent != ''">report_content = #{reportContent},</if> 76 <if test="reportContent != null and reportContent != ''">report_content = #{reportContent},</if>
77 - <if test="attachmentLink!= null and attachmentLink != ''">attachment_link = #{attachment_link},</if> 77 + <if test="attachmentLink!= null and attachmentLink != ''">attachment_link = #{attachmentLink},</if>
78 </trim> 78 </trim>
79 where id = #{id} 79 where id = #{id}
80 </update> 80 </update>
trash-framework/src/main/java/com/trash/framework/security/filter/JwtAuthenticationTokenFilter.java
  View file @6d2ba61
@@ -14,7 +14,9 @@ import org.springframework.security.web.authentication.WebAuthenticationDetailsS @@ -14,7 +14,9 @@ import org.springframework.security.web.authentication.WebAuthenticationDetailsS
14 import org.springframework.stereotype.Component; 14 import org.springframework.stereotype.Component;
15 import org.springframework.web.filter.OncePerRequestFilter; 15 import org.springframework.web.filter.OncePerRequestFilter;
16 16
  17 +import com.trash.common.config.trashConfig;
17 import com.trash.common.core.domain.model.LoginUser; 18 import com.trash.common.core.domain.model.LoginUser;
  19 +import com.trash.common.utils.RemoteServerUtils;
18 import com.trash.common.utils.SecurityUtils; 20 import com.trash.common.utils.SecurityUtils;
19 import com.trash.common.utils.StringUtils; 21 import com.trash.common.utils.StringUtils;
20 import com.trash.framework.web.service.SysLoginService; 22 import com.trash.framework.web.service.SysLoginService;
@@ -34,11 +36,20 @@ public class JwtAuthenticationTokenFilter extends OncePerRequestFilter @@ -34,11 +36,20 @@ public class JwtAuthenticationTokenFilter extends OncePerRequestFilter
34 @Autowired 36 @Autowired
35 private SysLoginService loginService; 37 private SysLoginService loginService;
36 38
  39 + /** 系统基础配置 */
  40 + @Autowired
  41 + private trashConfig trashConfig;
  42 +
  43 +
37 @Override 44 @Override
38 protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain chain) 45 protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain chain)
39 throws ServletException, IOException 46 throws ServletException, IOException
40 { 47 {
41 48
  49 + if(RemoteServerUtils.remote == null){
  50 + RemoteServerUtils.remote = trashConfig.getRemotePath();
  51 + }
  52 +
42 LoginUser loginUser = tokenService.getLoginUser(request); 53 LoginUser loginUser = tokenService.getLoginUser(request);
43 54
44 if(loginUser == null){ 55 if(loginUser == null){
trash-framework/src/main/java/com/trash/framework/web/service/SysLoginService.java
  View file @6d2ba61
@@ -20,6 +20,7 @@ import org.springframework.stereotype.Component; @@ -20,6 +20,7 @@ import org.springframework.stereotype.Component;
20 20
21 import com.alibaba.fastjson.JSON; 21 import com.alibaba.fastjson.JSON;
22 import com.alibaba.fastjson.JSONObject; 22 import com.alibaba.fastjson.JSONObject;
  23 +import com.trash.common.config.trashConfig;
23 import com.trash.common.constant.Constants; 24 import com.trash.common.constant.Constants;
24 import com.trash.common.core.domain.entity.SysDept; 25 import com.trash.common.core.domain.entity.SysDept;
25 import com.trash.common.core.domain.entity.SysRole; 26 import com.trash.common.core.domain.entity.SysRole;
@@ -109,7 +110,8 @@ public class SysLoginService @@ -109,7 +110,8 @@ public class SysLoginService
109 } 110 }
110 111
111 112
112 - public final String LOGIN_URL = RemoteServerUtils.remote + "api/authservice/cs/thirdpart/user"; //登录地址 待配置 113 +
  114 + public final String LOGIN_URL = "/api/authservice/cs/thirdpart/user"; //登录地址 待配置
113 115
114 public LoginUser loginByRemote(String token) 116 public LoginUser loginByRemote(String token)
115 { 117 {
@@ -125,7 +127,7 @@ public class SysLoginService @@ -125,7 +127,7 @@ public class SysLoginService
125 token = "Bearer "+ token; 127 token = "Bearer "+ token;
126 } 128 }
127 129
128 - Request request = new Request.Builder().url(LOGIN_URL).addHeader("Authorization",token ).get().build(); 130 + Request request = new Request.Builder().url(RemoteServerUtils.remote + LOGIN_URL).addHeader("Authorization",token ).get().build();
129 131
130 try { 132 try {
131 okhttp3.Response response = okHttpClient.newCall(request).execute(); 133 okhttp3.Response response = okHttpClient.newCall(request).execute();
@@ -168,32 +170,48 @@ public class SysLoginService @@ -168,32 +170,48 @@ public class SysLoginService
168 SysDept dept = new SysDept(); 170 SysDept dept = new SysDept();
169 171
170 172
171 - List<String> poStrings = new ArrayList<String>(); 173 + if(userJson.getJSONArray("userIdentityList")!=null){
  174 +
  175 + List<String> poStrings = new ArrayList<String>();
  176 +
  177 + List<String> rolStrings = new ArrayList<String>();
  178 +
  179 + try {
  180 +
  181 + for(Object obj:userJson.getJSONArray("userIdentityList")){
  182 +
  183 + JSONObject uId = (JSONObject)obj;
  184 +
  185 + poStrings.add(uId.getString("postType"));
  186 +
  187 + rolStrings.add(uId.getString("departmentType"));
  188 +
  189 + }
  190 +
  191 + user.setPostIds(poStrings);
  192 +
  193 + user.setRoleIds(rolStrings);
  194 +
  195 +
  196 +
  197 + } catch (Exception e) {
  198 + // TODO: handle exception
  199 + }
  200 +
  201 +
  202 +
  203 + }
172 204
173 - try {  
174 - for(String str :userJson.getString("postType").split(",")){  
175 - poStrings.add(str);  
176 - }  
177 -  
178 - List<String> rolStrings = new ArrayList<String>();  
179 -  
180 - for(String str :userJson.getString("departmentType").split(",")){  
181 - rolStrings.add(str);  
182 - }  
183 -  
184 - user.setPostIds(poStrings);  
185 -  
186 - user.setRoleIds(rolStrings);  
187 -  
188 - } catch (Exception e) {  
189 - // TODO: handle exception  
190 - } 205 +
  206 +
  207 +
  208 +
191 209
192 dept.setDeptName(userJson.getString("orgName")); 210 dept.setDeptName(userJson.getString("orgName"));
193 211
194 user.setDept(dept); 212 user.setDept(dept);
195 213
196 - user.setAvatar(""); 214 + user.setAvatar(RemoteServerUtils.remote + userJson.getString("elecSignaturePath"));
197 215
198 loginUser.setUser(user); 216 loginUser.setUser(user);
199 217
trash-quartz/src/main/java/com/trash/quartz/task/DriverTask.java
  View file @6d2ba61
@@ -13,8 +13,12 @@ import com.alibaba.fastjson.JSONArray; @@ -13,8 +13,12 @@ import com.alibaba.fastjson.JSONArray;
13 import com.alibaba.fastjson.JSONObject; 13 import com.alibaba.fastjson.JSONObject;
14 import com.trash.activiti.service.IActTaskService; 14 import com.trash.activiti.service.IActTaskService;
15 import com.trash.business.domain.CompanyCredit; 15 import com.trash.business.domain.CompanyCredit;
  16 +import com.trash.business.domain.SupervisionThreestep;
16 import com.trash.business.domain.TruckCredit; 17 import com.trash.business.domain.TruckCredit;
  18 +import com.trash.business.mapper.SupervisionThreestepMapper;
17 import com.trash.business.service.ICompanyCreditService; 19 import com.trash.business.service.ICompanyCreditService;
  20 +import com.trash.business.service.ISupervisionThreestepService;
  21 +import com.trash.business.service.ITruckActivateService;
18 import com.trash.business.service.ITruckCreditService; 22 import com.trash.business.service.ITruckCreditService;
19 import com.trash.common.core.domain.model.LoginUser; 23 import com.trash.common.core.domain.model.LoginUser;
20 import com.trash.common.utils.RemoteServerUtils; 24 import com.trash.common.utils.RemoteServerUtils;
@@ -61,12 +65,48 @@ public class DriverTask @@ -61,12 +65,48 @@ public class DriverTask
61 65
62 66
63 private void checkTruckActive() { 67 private void checkTruckActive() {
64 - 68 +
  69 + SupervisionThreestep param =new SupervisionThreestep();
  70 +
  71 + param.setType(0L);
  72 +
  73 + String start, end;
  74 +
  75 + Date date = new Date();
  76 +
  77 + if (new Date().getHours() < 8) {
  78 + end = sdf.format(date);
  79 + date.setDate(date.getDate() - 1);
  80 + start = sdf.format(date);
  81 + } else {
  82 + start = sdf.format(date);
  83 + date.setDate(date.getDate() + 1);
  84 + end = sdf.format(date);
  85 + }
  86 +
  87 + end += " 8:00:00";
  88 + start += " 8:00:00";
  89 +
  90 + try {
  91 + param.setWorkStartTime(sdf.parse(start));
  92 + param.setWorkEndTime(sdf.parse(end));
  93 + } catch (Exception e) {
  94 + // TODO Auto-generated catch block
  95 + e.printStackTrace();
  96 + }
  97 +
  98 + List<SupervisionThreestep> cs = SpringUtils.getBean(SupervisionThreestepMapper.class).selectTodayDataList(param);
  99 +
  100 + for(SupervisionThreestep c:cs){
  101 + SpringUtils.getBean(ISupervisionThreestepService.class).checkDataToActiveTruck(c);
  102 + }
  103 +
65 } 104 }
66 105
67 106
68 private void checkDriverCredit() { 107 private void checkDriverCredit() {
69 108
  109 +
70 } 110 }
71 111
72 112
@@ -166,6 +206,8 @@ public class DriverTask @@ -166,6 +206,8 @@ public class DriverTask
166 206
167 System.out.println("=================== 删除超时报工数据 定时器执行 当前时间: " + simpleDateFormat.format(new Date())); 207 System.out.println("=================== 删除超时报工数据 定时器执行 当前时间: " + simpleDateFormat.format(new Date()));
168 208
  209 + SpringUtils.getBean(ITruckActivateService.class).endAllTruckUnActive();
  210 +
169 SpringUtils.getBean(IActTaskService.class).endAllThreesteptask("workflow_threestep"); 211 SpringUtils.getBean(IActTaskService.class).endAllThreesteptask("workflow_threestep");
170 212
171 SpringUtils.getBean(IWorkflowService.class).deleteWorkflowByName("workflow_threestep"); 213 SpringUtils.getBean(IWorkflowService.class).deleteWorkflowByName("workflow_threestep");
trash-ui/src/api/business/supervisionSpecial.js
  View file @6d2ba61
1 import request from '@/utils/request' 1 import request from '@/utils/request'
2 2
3 -// 查询专项督查列表 3 +// 查询专项督察列表
4 export function listSupervisionSpecial(query) { 4 export function listSupervisionSpecial(query) {
5 return request({ 5 return request({
6 - url: '/business/supervisionSpecial/list', 6 + url: '/SupervisionSpecial/SupervisionSpecial/list',
7 method: 'get', 7 method: 'get',
8 params: query 8 params: query
9 }) 9 })
10 } 10 }
11 11
12 -// 查询专项督查详细 12 +// 查询专项督察详细
13 export function getSupervisionSpecial(id) { 13 export function getSupervisionSpecial(id) {
14 return request({ 14 return request({
15 - url: '/business/supervisionSpecial/' + id, 15 + url: '/SupervisionSpecial/SupervisionSpecial/' + id,
16 method: 'get' 16 method: 'get'
17 }) 17 })
18 } 18 }
19 19
20 -// 新增专项督查 20 +// 新增专项督察
21 export function addSupervisionSpecial(data) { 21 export function addSupervisionSpecial(data) {
22 return request({ 22 return request({
23 - url: '/business/supervisionSpecial', 23 + url: '/SupervisionSpecial/SupervisionSpecial',
24 method: 'post', 24 method: 'post',
25 data: data 25 data: data
26 }) 26 })
27 } 27 }
28 28
29 -// 修改专项督查 29 +// 修改专项督察
30 export function updateSupervisionSpecial(data) { 30 export function updateSupervisionSpecial(data) {
31 return request({ 31 return request({
32 - url: '/business/supervisionSpecial', 32 + url: '/SupervisionSpecial/SupervisionSpecial',
33 method: 'put', 33 method: 'put',
34 data: data 34 data: data
35 }) 35 })
36 } 36 }
37 37
38 -// 删除专项督查 38 +// 删除专项督察
39 export function delSupervisionSpecial(id) { 39 export function delSupervisionSpecial(id) {
40 return request({ 40 return request({
41 - url: '/business/supervisionSpecial/' + id, 41 + url: '/SupervisionSpecial/SupervisionSpecial/' + id,
42 method: 'delete' 42 method: 'delete'
43 }) 43 })
44 } 44 }
45 45
46 -// 导出专项督查 46 +// 导出专项督察
47 export function exportSupervisionSpecial(query) { 47 export function exportSupervisionSpecial(query) {
48 return request({ 48 return request({
49 - url: '/business/supervisionSpecial/export', 49 + url: '/SupervisionSpecial/SupervisionSpecial/export',
50 method: 'get', 50 method: 'get',
51 params: query 51 params: query
52 }) 52 })
trash-ui/src/api/business/threestep.js
  View file @6d2ba61
@@ -35,6 +35,18 @@ export function addThreestep(data) { @@ -35,6 +35,18 @@ export function addThreestep(data) {
35 }) 35 })
36 } 36 }
37 37
  38 +// 新增【请填写功能名称】
  39 +export function todayDataList(data) {
  40 + return request({
  41 + url: '/business/threestep/todayDataList',
  42 + method: 'post',
  43 + data: data
  44 + })
  45 +}
  46 +
  47 +
  48 +
  49 +
38 // 修改【请填写功能名称】 50 // 修改【请填写功能名称】
39 export function updateThreestep(data) { 51 export function updateThreestep(data) {
40 return request({ 52 return request({
trash-ui/src/api/dict.js
  View file @6d2ba61
1 import requestRemote from '@/utils/requestRemote' 1 import requestRemote from '@/utils/requestRemote'
2 2
  3 +export function constructionById(id) {
  4 + return requestRemote({
  5 + url: '/api/siteservice/cs/constructionsites/'+id,
  6 + method: 'get',
  7 + });
  8 +}
  9 +
3 export function constructionsitesList(data) { 10 export function constructionsitesList(data) {
4 return requestRemote({ 11 return requestRemote({
5 url: '/api/siteservice/cs/constructionsites/search', 12 url: '/api/siteservice/cs/constructionsites/search',
trash-ui/src/api/other/projectCheck.js 0 → 100644
  View file @6d2ba61
  1 +import request from '@/utils/request'
  2 +
  3 +// 查询大排查列表
  4 +export function listProjectCheck(query) {
  5 + return request({
  6 + url: '/other/projectCheck/list',
  7 + method: 'get',
  8 + params: query
  9 + })
  10 +}
  11 +
  12 +// 查询大排查详细
  13 +export function getProjectCheck(id) {
  14 + return request({
  15 + url: '/other/projectCheck/' + id,
  16 + method: 'get'
  17 + })
  18 +}
  19 +
  20 +// 新增大排查
  21 +export function addProjectCheck(data) {
  22 + return request({
  23 + url: '/other/projectCheck',
  24 + method: 'post',
  25 + data: data
  26 + })
  27 +}
  28 +
  29 +// 修改大排查
  30 +export function updateProjectCheck(data) {
  31 + return request({
  32 + url: '/other/projectCheck',
  33 + method: 'put',
  34 + data: data
  35 + })
  36 +}
  37 +
  38 +// 删除大排查
  39 +export function delProjectCheck(id) {
  40 + return request({
  41 + url: '/other/projectCheck/' + id,
  42 + method: 'delete'
  43 + })
  44 +}
  45 +
  46 +// 导出大排查
  47 +export function exportProjectCheck(query) {
  48 + return request({
  49 + url: '/other/projectCheck/export',
  50 + method: 'get',
  51 + params: query
  52 + })
  53 +}
0 \ No newline at end of file 54 \ No newline at end of file
trash-ui/src/api/sign/sign.js 0 → 100644
  View file @6d2ba61
  1 +import request from '@/utils/request'
  2 +
  3 +// 查询sign列表
  4 +export function listSign(query) {
  5 + return request({
  6 + url: '/sign/sign/list',
  7 + method: 'get',
  8 + params: query
  9 + })
  10 +}
  11 +
  12 +// 查询sign详细
  13 +export function getSign(id) {
  14 + return request({
  15 + url: '/sign/sign/' + id,
  16 + method: 'get'
  17 + })
  18 +}
  19 +export function getSignByObjId(id) {
  20 + return request({
  21 + url: '/sign/sign/getInfoByObject/' + id,
  22 + method: 'get'
  23 + })
  24 +}
  25 +
  26 +
  27 +// 新增sign
  28 +export function addSign(data) {
  29 + return request({
  30 + url: '/sign/sign',
  31 + method: 'post',
  32 + data: data
  33 + })
  34 +}
  35 +
  36 +// 修改sign
  37 +export function updateSign(data) {
  38 + return request({
  39 + url: '/sign/sign',
  40 + method: 'put',
  41 + data: data
  42 + })
  43 +}
  44 +
  45 +// 删除sign
  46 +export function delSign(id) {
  47 + return request({
  48 + url: '/sign/sign/' + id,
  49 + method: 'delete'
  50 + })
  51 +}
  52 +
  53 +// 导出sign
  54 +export function exportSign(query) {
  55 + return request({
  56 + url: '/sign/sign/export',
  57 + method: 'get',
  58 + params: query
  59 + })
  60 +}
trash-ui/src/layout/index.vue
  View file @6d2ba61
1 <template> 1 <template>
  2 + <div :class="classObj" class="app-wrapper">
  3 + <sidebar class="sidebar-container" />
  4 + <div :class="{hasTagsView:needTagsView}" class="main-container">
  5 + <tags-view v-if="needTagsView" />
2 <app-main /> 6 <app-main />
  7 +
  8 + </div>
  9 + </div>
3 </template> 10 </template>
4 11
5 <script> 12 <script>
trash-ui/src/layout/index3.vue renamed to trash-ui/src/layout/index6vue
  View file @6d2ba61
1 <template> 1 <template>
2 - <div :class="classObj" class="app-wrapper">  
3 - <sidebar class="sidebar-container" />  
4 - <div :class="{hasTagsView:needTagsView}" class="main-container">  
5 - <tags-view v-if="needTagsView" />  
6 <app-main /> 2 <app-main />
7 -  
8 - </div>  
9 - </div>  
10 </template> 3 </template>
11 4
12 <script> 5 <script>
trash-ui/src/permission.js
  View file @6d2ba61
@@ -13,7 +13,7 @@ const whiteList = [&#39;/login&#39;, &#39;/auth-redirect&#39;, &#39;/bind&#39;, &#39;/register&#39;] @@ -13,7 +13,7 @@ const whiteList = [&#39;/login&#39;, &#39;/auth-redirect&#39;, &#39;/bind&#39;, &#39;/register&#39;]
13 13
14 // const whiteList = ['/*'] 14 // const whiteList = ['/*']
15 15
16 -router.beforeEach((to, from, next) => 16 +router.beforeEach((to, from, next) => {
17 NProgress.start() 17 NProgress.start()
18 var token = getToken(); 18 var token = getToken();
19 if(!token){ 19 if(!token){
trash-ui/src/router/index.js
  View file @6d2ba61
@@ -136,6 +136,12 @@ export const constantRoutes = [ @@ -136,6 +136,12 @@ export const constantRoutes = [
136 meta: { title: '三查机制' } 136 meta: { title: '三查机制' }
137 }, 137 },
138 { 138 {
  139 + path: 'supervision/projectCheck',
  140 + component: (resolve) => require(['@/views/other/projectCheck'], resolve),
  141 + name: '大排查',
  142 + meta: { title: '大排查' }
  143 + },
  144 + {
139 path: 'supervision/dayWorkReport', 145 path: 'supervision/dayWorkReport',
140 component: (resolve) => require(['@/views/business/dayWorkReport'], resolve), 146 component: (resolve) => require(['@/views/business/dayWorkReport'], resolve),
141 name: '日开工报表', 147 name: '日开工报表',
@@ -179,12 +185,41 @@ export const constantRoutes = [ @@ -179,12 +185,41 @@ export const constantRoutes = [
179 meta: { title: '违规预警信息' } 185 meta: { title: '违规预警信息' }
180 } 186 }
181 ] 187 ]
182 - }, { 188 + }, {
  189 + path: '/other',
  190 + component: Layout,
  191 + hidden: false,
  192 + children: [
  193 + {
  194 + path: 'otherData',
  195 + component: (resolve) => require(['@/views/otherData/otherData'], resolve),
  196 + name: '其他专项资料',
  197 + meta: { title: '其他专项资料' }
  198 + },
  199 + {
  200 + path: 'TrashData',
  201 + component: (resolve) => require(['@/views/TrashData/TrashData'], resolve),
  202 + name: '资源化利用情况',
  203 + meta: { title: '资源化利用情况' }
  204 + },
  205 +
  206 +
  207 + ],
  208 + },
  209 +
  210 + {
183 path: '/daily', 211 path: '/daily',
184 component: Layout, 212 component: Layout,
185 - hidden: true, 213 + hidden: false,
186 children: [ 214 children: [
187 { 215 {
  216 + path: 'other/otherData',
  217 + component: (resolve) => require(['@/views/otherData/otherData'], resolve),
  218 + name: '日开工报表',
  219 + meta: { title: '日开工报表' }
  220 + },
  221 +
  222 + {
188 path: 'report/index', 223 path: 'report/index',
189 component: (resolve) => require(['@/views/daily/report/index'], resolve), 224 component: (resolve) => require(['@/views/daily/report/index'], resolve),
190 name: '工作报表', 225 name: '工作报表',
trash-ui/src/store/modules/user.js
  View file @6d2ba61
@@ -59,7 +59,7 @@ const user = { @@ -59,7 +59,7 @@ const user = {
59 return new Promise((resolve, reject) => { 59 return new Promise((resolve, reject) => {
60 getInfo(state.token).then(res => { 60 getInfo(state.token).then(res => {
61 const user = res.user 61 const user = res.user
62 - const avatar = require("@/assets/image/profile.jpg"); 62 + const avatar = res.user.avatar;
63 if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组 63 if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组
64 commit('SET_ROLES', res.roles) 64 commit('SET_ROLES', res.roles)
65 commit('SET_PERMISSIONS', res.permissions) 65 commit('SET_PERMISSIONS', res.permissions)
trash-ui/src/views/activiti/task/constructsiteInfo.vue 0 → 100644
  View file @6d2ba61
  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/activiti/task/index.vue
  View file @6d2ba61
@@ -149,6 +149,8 @@ @@ -149,6 +149,8 @@
149 </div> 149 </div>
150 </el-dialog> 150 </el-dialog>
151 151
  152 +
  153 +
152 <el-dialog title="附件" :visible.sync="uploadImageDialog" append-to-body :beforeClose="handleClose"> 154 <el-dialog title="附件" :visible.sync="uploadImageDialog" append-to-body :beforeClose="handleClose">
153 <el-upload multiple :headers="upload.headers" :action="upload.url" :file-list="fileList" 155 <el-upload multiple :headers="upload.headers" :action="upload.url" :file-list="fileList"
154 :on-success="uploadSuccess" :before-upload="beforeUpload"> 156 :on-success="uploadSuccess" :before-upload="beforeUpload">
@@ -163,7 +165,6 @@ @@ -163,7 +165,6 @@
163 <el-dialog title="示意图" :visible.sync="picSample" append-to-body> 165 <el-dialog title="示意图" :visible.sync="picSample" append-to-body>
164 <img src="../../../assets/logo/logo.jpg" width="100%" height="800px" /> 166 <img src="../../../assets/logo/logo.jpg" width="100%" height="800px" />
165 </el-dialog> 167 </el-dialog>
166 -  
167 <!-- 会议管理 --> 168 <!-- 会议管理 -->
168 <el-dialog :title="title" :visible.sync="conferenceOpen" width="850px" append-to-body> 169 <el-dialog :title="title" :visible.sync="conferenceOpen" width="850px" append-to-body>
169 <conferenceInfo :idInfo="idInfo" v-if="conferenceOpen"/> 170 <conferenceInfo :idInfo="idInfo" v-if="conferenceOpen"/>
@@ -185,6 +186,20 @@ @@ -185,6 +186,20 @@
185 </div> 186 </div>
186 </div> 187 </div>
187 </el-dialog> 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 +
188 </div> 203 </div>
189 </template> 204 </template>
190 205
@@ -199,6 +214,10 @@ @@ -199,6 +214,10 @@
199 formDataSave 214 formDataSave
200 } from "@/api/activiti/task"; 215 } from "@/api/activiti/task";
201 216
  217 +
  218 +import { getSignByObjId, addSign, updateSign } from "@/api/sign/sign";
  219 +import constructsiteInfo from "@/views/activiti/task/constructsiteInfo";
  220 +
202 import { 221 import {
203 getArea, 222 getArea,
204 getDict, 223 getDict,
@@ -225,7 +244,8 @@ @@ -225,7 +244,8 @@
225 leaveHistoryForm, 244 leaveHistoryForm,
226 threestepInfo, 245 threestepInfo,
227 conferenceInfo, 246 conferenceInfo,
228 - leaveApplicationInfo 247 + leaveApplicationInfo,
  248 + constructsiteInfo,
229 }, 249 },
230 data() { 250 data() {
231 return { 251 return {
@@ -292,11 +312,14 @@ @@ -292,11 +312,14 @@
292 }, 312 },
293 uploadImageDialog: false, 313 uploadImageDialog: false,
294 conferenceOpen: false, 314 conferenceOpen: false,
  315 + construct:false,
295 idInfo:null, 316 idInfo:null,
296 leaveApplicationOpen:false, 317 leaveApplicationOpen:false,
  318 + signData:null,
297 areas:[], 319 areas:[],
298 roles:[], 320 roles:[],
299 depts:[], 321 depts:[],
  322 + signDataInfo:null,
300 }; 323 };
301 }, 324 },
302 created() { 325 created() {
@@ -366,6 +389,7 @@ @@ -366,6 +389,7 @@
366 this.open2 = false; 389 this.open2 = false;
367 this.leaveApplicationOpen= false; 390 this.leaveApplicationOpen= false;
368 this.conferenceOpen = false; 391 this.conferenceOpen = false;
  392 + this.construct = false;
369 this.reset(); 393 this.reset();
370 }, 394 },
371 // 表单重置 395 // 表单重置
@@ -422,6 +446,18 @@ @@ -422,6 +446,18 @@
422 this.leaveApplicationOpen = true; 446 this.leaveApplicationOpen = true;
423 return; 447 return;
424 } 448 }
  449 +
  450 + if(this.definitionKey == "workflow_constructsite"){
  451 + getSignByObjId(this.businessKey.split(":")[1]).then(res=>{
  452 +
  453 + this.signDataInfo = "经现场查勘及核对资料，现场设施基本达到净车出场标准，建议按程序办理相关手续，妥否，请批示。";
  454 +
  455 + this.signData = res.data;
  456 + this.construct = true;
  457 + });
  458 + return;
  459 + }
  460 +
425 this.open = true; 461 this.open = true;
426 this.title = "审批"; 462 this.title = "审批";
427 }); 463 });
@@ -431,14 +467,15 @@ @@ -431,14 +467,15 @@
431 467
432 this.form.formData[0].controlValue = value; 468 this.form.formData[0].controlValue = value;
433 this.form.formData[0].controlId = formid; 469 this.form.formData[0].controlId = formid;
  470 + this.form.id = this.businessKey.split(":")[1];
  471 + if (this.form.formData[0].controlValue == 0) {
  472 + this.form.status = 1;
  473 + } else {
  474 + this.form.status = 2;
  475 + }
434 476
435 if (this.definitionKey == "workflow_threestep") { 477 if (this.definitionKey == "workflow_threestep") {
436 - this.form.id = this.businessKey.split(":")[1];  
437 - if (this.form.formData[0].controlValue == 0) {  
438 - this.form.status = 1;  
439 - } else {  
440 - this.form.status = 2;  
441 - } 478 +
442 479
443 for (let i = 0; i < 13; i++) { 480 for (let i = 0; i < 13; i++) {
444 if (this.form["sub_img" + i]) { 481 if (this.form["sub_img" + i]) {
@@ -473,13 +510,49 @@ @@ -473,13 +510,49 @@
473 return; 510 return;
474 } 511 }
475 512
  513 + if(this.definitionKey == "workflow_constructsite"){
  514 + if(this.form.status == 1){
  515 + let objId = this.businessKey.split(":")[1];
  516 + let query = {
  517 + objectId : objId,
  518 + };
  519 + if(this.taskName == "勘察科员"){
  520 + query.idx = 0;
  521 + query.sign1Text = this.signDataInfo;
  522 + }else if(this.taskName == "堪察部长"){
  523 + query.idx = 1;
  524 + query.sign2Text = this.signDataInfo;
  525 + }else if(this.taskName == "堪察分管领导"){
  526 + query.idx = 2;
  527 + query.sign3Text = this.signDataInfo;
  528 + }else if(this.taskName == "中心负责人"){
  529 + query.idx = 3;
  530 + query.sign4Text = this.signDataInfo;
  531 + }
  532 +
  533 + addSign(query).then(res=>{
  534 + formDataSave(this.id, this.form.formData).then(response => {
  535 + this.msgSuccess("审批成功");
  536 + this.open = false;
  537 + this.construct = false;
  538 + this.getList();
  539 + });
  540 + })
  541 +
  542 + }else{
  543 +
  544 + formDataSave(this.id, this.form.formData).then(response => {
  545 + this.msgSuccess("审批成功");
  546 + this.construct = false;
  547 + this.getList();
  548 + });
  549 + }
  550 + return;
  551 +
  552 + }
  553 +
476 554
477 555
478 - formDataSave(this.id, this.form.formData).then(response => {  
479 - this.msgSuccess("审批成功");  
480 - this.open = false;  
481 - this.getList();  
482 - });  
483 }, 556 },
484 conferenceSubmitForm(value){ 557 conferenceSubmitForm(value){
485 return; 558 return;
trash-ui/src/views/activiti/task/taskCard.vue
  View file @6d2ba61
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
7 <a @click="sendToParent(task)">详情>></a> 7 <a @click="sendToParent(task)">详情>></a>
8 </div> 8 </div>
9 <el-row class="card_row"> 9 <el-row class="card_row">
10 - <el-col :span="2" class="card_grid"></el-col> 10 + <el-col :span="2" class="card_grid">{{task.name}}</el-col>
11 <div class="card_title">{{task.instanceName}}</div> 11 <div class="card_title">{{task.instanceName}}</div>
12 </el-row> 12 </el-row>
13 13
trash-ui/src/views/activiti/taskhistory/end.vue
  View file @6d2ba61
@@ -9,7 +9,34 @@ @@ -9,7 +9,34 @@
9 <threestepInfo :businessKey="businessKey" v-if="open2"/> 9 <threestepInfo :businessKey="businessKey" v-if="open2"/>
10 10
11 </el-dialog> 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>
12 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>
13 </div> 40 </div>
14 </template> 41 </template>
15 42
@@ -28,12 +55,22 @@ @@ -28,12 +55,22 @@
28 import earthSitesForm from "@/views/workflow/earthSitesForm"; 55 import earthSitesForm from "@/views/workflow/earthSitesForm";
29 import threestepInfo from "@/views/business/threestep/threestepInfo"; 56 import threestepInfo from "@/views/business/threestep/threestepInfo";
30 57
  58 +
  59 +import { getSignByObjId, addSign, updateSign } from "@/api/sign/sign";
  60 +import constructsiteInfo from "@/views/activiti/task/constructsiteInfo";
  61 + import conferenceInfo from "@/views/office/conference/conferenceInfo";
  62 + import leaveApplicationInfo from "@/views/office/leaveApplication/leaveApplicationInfo";
  63 +
  64 +
31 export default { 65 export default {
32 name: "taskHistory", 66 name: "taskHistory",
33 components: { 67 components: {
34 taskCard, 68 taskCard,
35 threestepInfo, 69 threestepInfo,
36 - earthSitesForm 70 + earthSitesForm,
  71 + leaveApplicationInfo,
  72 + conferenceInfo,
  73 + constructsiteInfo
37 }, 74 },
38 data() { 75 data() {
39 return { 76 return {
@@ -71,7 +108,14 @@ @@ -71,7 +108,14 @@
71 }, 108 },
72 needShow:false, 109 needShow:false,
73 // 表单校验 110 // 表单校验
74 - rules: {} 111 + rules: {},
  112 +
  113 + uploadImageDialog: false,
  114 + conferenceOpen: false,
  115 + construct:false,
  116 + idInfo:null,
  117 + leaveApplicationOpen:false,
  118 + signData:null,
75 }; 119 };
76 }, 120 },
77 created() { 121 created() {
@@ -103,6 +147,26 @@ @@ -103,6 +147,26 @@
103 this.resetForm("form"); 147 this.resetForm("form");
104 }, 148 },
105 showTask(row) { 149 showTask(row) {
  150 + if(this.definitionKey == "conference"){
  151 + this.idInfo = row.businessKey.substring(row.businessKey.indexOf(":")+1);
  152 + this.conferenceOpen = true;
  153 + return;
  154 + }
  155 + if(this.definitionKey == "workflow_leave"){
  156 + this.idInfo = row.businessKey.substring(row.businessKey.lastIndexOf(":")+1);
  157 + this.leaveApplicationOpen = true;
  158 + return;
  159 + }
  160 +
  161 + if(this.definitionKey == "workflow_constructsite"){
  162 + getSignByObjId(this.businessKey.split(":")[1]).then(res=>{
  163 + this.signData = res;
  164 + this.construct = true;
  165 + });
  166 + return;
  167 + }
  168 +
  169 +
106 this.needShow = false; 170 this.needShow = false;
107 this.reset(); 171 this.reset();
108 this.definitionKey = row.definitionKey; 172 this.definitionKey = row.definitionKey;
trash-ui/src/views/activiti/taskhistory/index.vue
  View file @6d2ba61
@@ -7,9 +7,20 @@ @@ -7,9 +7,20 @@
7 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 -  
11 </el-dialog> 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>
12 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>
13 </div> 24 </div>
14 </template> 25 </template>
15 26
@@ -23,16 +34,31 @@ @@ -23,16 +34,31 @@
23 formDataShow 34 formDataShow
24 } from "@/api/activiti/taskhistory"; 35 } from "@/api/activiti/taskhistory";
25 36
  37 +
  38 +
  39 +
26 import taskCard from "@/views/activiti/task/taskCard"; 40 import taskCard from "@/views/activiti/task/taskCard";
27 import leaveHistoryForm from "@/views/workflow/leaveHistoryForm"; 41 import leaveHistoryForm from "@/views/workflow/leaveHistoryForm";
28 import threestepInfo from "@/views/business/threestep/threestepInfo"; 42 import threestepInfo from "@/views/business/threestep/threestepInfo";
29 43
  44 +
  45 +import { getSignByObjId, addSign, updateSign } from "@/api/sign/sign";
  46 +import constructsiteInfo from "@/views/activiti/task/constructsiteInfo";
  47 +
  48 + import conferenceInfo from "@/views/office/conference/conferenceInfo";
  49 + import leaveApplicationInfo from "@/views/office/leaveApplication/leaveApplicationInfo";
  50 +
  51 +
  52 +
30 export default { 53 export default {
31 name: "taskHistory", 54 name: "taskHistory",
32 components: { 55 components: {
33 taskCard, 56 taskCard,
34 leaveHistoryForm, 57 leaveHistoryForm,
35 - threestepInfo 58 + threestepInfo,
  59 + leaveApplicationInfo,
  60 + conferenceInfo,
  61 + constructsiteInfo,
36 }, 62 },
37 data() { 63 data() {
38 return { 64 return {
@@ -69,7 +95,14 @@ @@ -69,7 +95,14 @@
69 }, 95 },
70 needShow:false, 96 needShow:false,
71 // 表单校验 97 // 表单校验
72 - rules: {} 98 + rules: {},
  99 +
  100 + uploadImageDialog: false,
  101 + conferenceOpen: false,
  102 + construct:false,
  103 + idInfo:null,
  104 + leaveApplicationOpen:false,
  105 + signData:null,
73 }; 106 };
74 }, 107 },
75 created() { 108 created() {
@@ -101,12 +134,38 @@ @@ -101,12 +134,38 @@
101 this.resetForm("form"); 134 this.resetForm("form");
102 }, 135 },
103 showTask(row,idx) { 136 showTask(row,idx) {
  137 + if(this.definitionKey == "conference"){
  138 + this.idInfo = row.businessKey.substring(row.businessKey.indexOf(":")+1);
  139 + this.conferenceOpen = true;
  140 + return;
  141 + }
  142 + if(this.definitionKey == "workflow_leave"){
  143 + this.idInfo = row.businessKey.substring(row.businessKey.lastIndexOf(":")+1);
  144 + this.leaveApplicationOpen = true;
  145 + return;
  146 + }
  147 +
  148 + if(this.definitionKey == "workflow_constructsite"){
  149 + getSignByObjId(this.businessKey.split(":")[1]).then(res=>{
  150 + this.signData = res;
  151 + this.construct = true;
  152 + });
  153 + return;
  154 + }
  155 +
  156 +
  157 +
104 this.needShow = false; 158 this.needShow = false;
105 this.reset(); 159 this.reset();
106 this.definitionKey = row.definitionKey; 160 this.definitionKey = row.definitionKey;
107 this.businessKey = row.businessKey; 161 this.businessKey = row.businessKey;
108 this.id = row.id; 162 this.id = row.id;
109 this.open2 = true; 163 this.open2 = true;
  164 +
  165 +
  166 +
  167 +
  168 +
110 }, 169 },
111 /** 提交按钮 */ 170 /** 提交按钮 */
112 submitForm() { 171 submitForm() {
trash-ui/src/views/business/supervisionSpecial/index.vue
  View file @6d2ba61
@@ -3,86 +3,18 @@ @@ -3,86 +3,18 @@
3 <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px"> 3 <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
4 <el-form-item label="类型" prop="type"> 4 <el-form-item label="类型" prop="type">
5 <el-select v-model="queryParams.type" placeholder="请选择类型" clearable size="small"> 5 <el-select v-model="queryParams.type" placeholder="请选择类型" clearable size="small">
6 - <el-option label="请选择字典生成" value="" /> 6 + <el-option label="工地" value="0" />
  7 + <el-option label="消纳场" value="1" />
7 </el-select> 8 </el-select>
8 </el-form-item> 9 </el-form-item>
9 - <el-form-item label="督查事项" prop="title">  
10 - <el-input  
11 - v-model="queryParams.title"  
12 - placeholder="请输入督查事项"  
13 - clearable  
14 - size="small"  
15 - @keyup.enter.native="handleQuery"  
16 - /> 10 + <el-form-item label="项目名称" prop="title">
  11 + <el-input v-model="queryParams.title" placeholder="请输入项目名称" clearable size="small"
  12 + @keyup.enter.native="handleQuery" />
17 </el-form-item> 13 </el-form-item>
18 - <el-form-item label="责任部门人签收" prop="signPerson">  
19 - <el-input  
20 - v-model="queryParams.signPerson"  
21 - placeholder="请输入责任部门人签收"  
22 - clearable  
23 - size="small"  
24 - @keyup.enter.native="handleQuery"  
25 - />  
26 - </el-form-item>  
27 - <el-form-item label="签收时间" prop="signTime">  
28 - <el-date-picker clearable size="small" style="width: 200px"  
29 - v-model="queryParams.signTime"  
30 - type="date"  
31 - value-format="yyyy-MM-dd"  
32 - placeholder="选择签收时间">  
33 - </el-date-picker>  
34 - </el-form-item>  
35 - <el-form-item label="回复期限" prop="timeLimit">  
36 - <el-date-picker clearable size="small" style="width: 200px"  
37 - v-model="queryParams.timeLimit"  
38 - type="date"  
39 - value-format="yyyy-MM-dd"  
40 - placeholder="选择回复期限">  
41 - </el-date-picker>  
42 - </el-form-item>  
43 - <el-form-item label="状态" prop="state">  
44 - <el-input  
45 - v-model="queryParams.state"  
46 - placeholder="请输入状态"  
47 - clearable  
48 - size="small"  
49 - @keyup.enter.native="handleQuery"  
50 - />  
51 - </el-form-item>  
52 - <el-form-item label="回复部门" prop="resDepart">  
53 - <el-input  
54 - v-model="queryParams.resDepart"  
55 - placeholder="请输入回复部门"  
56 - clearable  
57 - size="small"  
58 - @keyup.enter.native="handleQuery"  
59 - />  
60 - </el-form-item>  
61 - <el-form-item label="回复时间" prop="resTime">  
62 - <el-date-picker clearable size="small" style="width: 200px"  
63 - v-model="queryParams.resTime"  
64 - type="date"  
65 - value-format="yyyy-MM-dd"  
66 - placeholder="选择回复时间">  
67 - </el-date-picker>  
68 - </el-form-item>  
69 - <el-form-item label="回复部门负责人" prop="resPerson">  
70 - <el-input  
71 - v-model="queryParams.resPerson"  
72 - placeholder="请输入回复部门负责人"  
73 - clearable  
74 - size="small"  
75 - @keyup.enter.native="handleQuery"  
76 - />  
77 - </el-form-item>  
78 - <el-form-item label="批注" prop="annotations">  
79 - <el-input  
80 - v-model="queryParams.annotations"  
81 - placeholder="请输入批注"  
82 - clearable  
83 - size="small"  
84 - @keyup.enter.native="handleQuery"  
85 - /> 14 + <el-form-item label="所属区域" prop="place">
  15 + <el-select v-model="queryParams.place" placeholder="请选择类型" clearable size="small">
  16 + <el-option v-for="item in areas" :label="item.name" :value="item.name" />
  17 + </el-select>
86 </el-form-item> 18 </el-form-item>
87 <el-form-item> 19 <el-form-item>
88 <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> 20 <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -92,156 +24,66 @@ @@ -92,156 +24,66 @@
92 24
93 <el-row :gutter="10" class="mb8"> 25 <el-row :gutter="10" class="mb8">
94 <el-col :span="1.5"> 26 <el-col :span="1.5">
95 - <el-button  
96 - type="primary"  
97 - icon="el-icon-plus"  
98 - size="mini"  
99 - @click="handleAdd"  
100 - v-hasPermi="['business:supervisionSpecial:add']"  
101 - >新增</el-button>  
102 - </el-col>  
103 - <el-col :span="1.5">  
104 - <el-button  
105 - type="success"  
106 - icon="el-icon-edit"  
107 - size="mini"  
108 - :disabled="single"  
109 - @click="handleUpdate"  
110 - v-hasPermi="['business:supervisionSpecial:edit']"  
111 - >修改</el-button> 27 + <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd"
  28 + v-hasPermi="['SupervisionSpecial:SupervisionSpecial:add']">新增</el-button>
112 </el-col> 29 </el-col>
113 <el-col :span="1.5"> 30 <el-col :span="1.5">
114 - <el-button  
115 - type="danger"  
116 - icon="el-icon-delete"  
117 - size="mini"  
118 - :disabled="multiple"  
119 - @click="handleDelete"  
120 - v-hasPermi="['business:supervisionSpecial:remove']"  
121 - >删除</el-button> 31 + <el-button type="warning" icon="el-icon-download" size="mini" @click="handleExport"
  32 + v-hasPermi="['SupervisionSpecial:SupervisionSpecial:export']">导出</el-button>
122 </el-col> 33 </el-col>
123 - <el-col :span="1.5">  
124 - <el-button  
125 - type="warning"  
126 - icon="el-icon-download"  
127 - size="mini"  
128 - @click="handleExport"  
129 - v-hasPermi="['business:supervisionSpecial:export']"  
130 - >导出</el-button>  
131 - </el-col>  
132 - <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> 34 + <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
133 </el-row> 35 </el-row>
134 36
135 - <el-table v-loading="loading" :data="supervisionSpecialList" @selection-change="handleSelectionChange"> 37 + <el-table v-loading="loading" :data="SupervisionSpecialList" @selection-change="handleSelectionChange">
136 <el-table-column type="selection" width="55" align="center" /> 38 <el-table-column type="selection" width="55" align="center" />
137 - <el-table-column label="主键ID" align="center" prop="id" />  
138 - <el-table-column label="类型" align="center" prop="type" />  
139 - <el-table-column label="督查事项" align="center" prop="title" />  
140 - <el-table-column label="督查内容" align="center" prop="content" />  
141 - <el-table-column label="责任部门人签收" align="center" prop="signPerson" />  
142 - <el-table-column label="签收时间" align="center" prop="signTime" width="180">  
143 - <template slot-scope="scope">  
144 - <span>{{ parseTime(scope.row.signTime, '{y}-{m}-{d}') }}</span>  
145 - </template>  
146 - </el-table-column>  
147 - <el-table-column label="回复期限" align="center" prop="timeLimit" width="180"> 39 + <el-table-column label="序号" align="center" prop="id" />
  40 + <el-table-column label="所属区域" align="center" prop="place" />
  41 + <el-table-column label="填报日期" align="center" prop="createTime" width="180">
148 <template slot-scope="scope"> 42 <template slot-scope="scope">
149 - <span>{{ parseTime(scope.row.timeLimit, '{y}-{m}-{d}') }}</span> 43 + <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
150 </template> 44 </template>
151 </el-table-column> 45 </el-table-column>
152 - <el-table-column label="状态" align="center" prop="state" />  
153 - <el-table-column label="回复部门" align="center" prop="resDepart" />  
154 - <el-table-column label="回复时间" align="center" prop="resTime" width="180">  
155 - <template slot-scope="scope">  
156 - <span>{{ parseTime(scope.row.resTime, '{y}-{m}-{d}') }}</span>  
157 - </template>  
158 - </el-table-column>  
159 - <el-table-column label="回复部门负责人" align="center" prop="resPerson" />  
160 - <el-table-column label="回复内容" align="center" prop="resContent" />  
161 - <el-table-column label="批注" align="center" prop="annotations" /> 46 + <el-table-column label="项目名称" align="center" prop="title" />
  47 + <el-table-column label="督查内容" align="center" prop="content" />
  48 + <el-table-column label="督查人" align="center" prop="person" />
  49 +
162 <el-table-column label="操作" align="center" class-name="small-padding fixed-width"> 50 <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
163 <template slot-scope="scope"> 51 <template slot-scope="scope">
164 - <el-button  
165 - size="mini"  
166 - type="text"  
167 - icon="el-icon-edit"  
168 - @click="handleUpdate(scope.row)"  
169 - v-hasPermi="['business:supervisionSpecial:edit']"  
170 - >修改</el-button>  
171 - <el-button  
172 - size="mini"  
173 - type="text"  
174 - icon="el-icon-delete"  
175 - @click="handleDelete(scope.row)"  
176 - v-hasPermi="['business:supervisionSpecial:remove']"  
177 - >删除</el-button> 52 + <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
  53 + v-hasPermi="['SupervisionSpecial:SupervisionSpecial:edit']">查看详情</el-button>
178 </template> 54 </template>
179 </el-table-column> 55 </el-table-column>
180 </el-table> 56 </el-table>
181 -  
182 - <pagination  
183 - v-show="total>0"  
184 - :total="total"  
185 - :page.sync="queryParams.pageNum"  
186 - :limit.sync="queryParams.pageSize"  
187 - @pagination="getList"  
188 - />  
189 57
190 - <!-- 添加或修改专项督查对话框 -->  
191 - <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> 58 + <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
  59 + @pagination="getList" />
  60 +
  61 + <!-- 添加或修改专项督察对话框 -->
  62 + <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
192 <el-form ref="form" :model="form" :rules="rules" label-width="80px"> 63 <el-form ref="form" :model="form" :rules="rules" label-width="80px">
193 <el-form-item label="类型" prop="type"> 64 <el-form-item label="类型" prop="type">
194 - <el-select v-model="form.type" placeholder="请选择类型">  
195 - <el-option label="请选择字典生成" value="" /> 65 + <el-select v-model="form.type" placeholder="请选择类型" @change="form.title=null;">
  66 + <el-option label="工地" value="0" />
  67 + <el-option label="消纳场" value="1" />
196 </el-select> 68 </el-select>
197 </el-form-item> 69 </el-form-item>
198 - <el-form-item label="督查事项" prop="title">  
199 - <el-input v-model="form.title" placeholder="请输入督查事项" />  
200 - </el-form-item> 70 + <el-row>
  71 + <el-col :span="12">
  72 + <el-form-item label="项目名称" prop="title">
  73 + <el-select v-model="form.title" placeholder="项目名称" >
  74 + <el-option v-for="item in data[form.type]" :label="item.name" :value="item.name" @click.native="selectName(item)"/>
  75 + </el-select>
  76 + </el-form-item>
  77 + </el-col>
  78 + <el-col :span="12">
  79 + <el-form-item label="督查人" prop="person">
  80 + <el-input v-model="form.person" placeholder="请输入督查人" />
  81 + </el-form-item>
  82 + </el-col>
  83 +
  84 + </el-row>
201 <el-form-item label="督查内容"> 85 <el-form-item label="督查内容">
202 - <editor v-model="form.content" :min-height="192"/>  
203 - </el-form-item>  
204 - <el-form-item label="责任部门人签收" prop="signPerson">  
205 - <el-input v-model="form.signPerson" placeholder="请输入责任部门人签收" />  
206 - </el-form-item>  
207 - <el-form-item label="签收时间" prop="signTime">  
208 - <el-date-picker clearable size="small" style="width: 200px"  
209 - v-model="form.signTime"  
210 - type="date"  
211 - value-format="yyyy-MM-dd"  
212 - placeholder="选择签收时间">  
213 - </el-date-picker>  
214 - </el-form-item>  
215 - <el-form-item label="回复期限" prop="timeLimit">  
216 - <el-date-picker clearable size="small" style="width: 200px"  
217 - v-model="form.timeLimit"  
218 - type="date"  
219 - value-format="yyyy-MM-dd"  
220 - placeholder="选择回复期限">  
221 - </el-date-picker>  
222 - </el-form-item>  
223 - <el-form-item label="状态" prop="state">  
224 - <el-input v-model="form.state" placeholder="请输入状态" />  
225 - </el-form-item>  
226 - <el-form-item label="回复部门" prop="resDepart">  
227 - <el-input v-model="form.resDepart" placeholder="请输入回复部门" />  
228 - </el-form-item>  
229 - <el-form-item label="回复时间" prop="resTime">  
230 - <el-date-picker clearable size="small" style="width: 200px"  
231 - v-model="form.resTime"  
232 - type="date"  
233 - value-format="yyyy-MM-dd"  
234 - placeholder="选择回复时间">  
235 - </el-date-picker>  
236 - </el-form-item>  
237 - <el-form-item label="回复部门负责人" prop="resPerson">  
238 - <el-input v-model="form.resPerson" placeholder="请输入回复部门负责人" />  
239 - </el-form-item>  
240 - <el-form-item label="回复内容">  
241 - <editor v-model="form.resContent" :min-height="192"/>  
242 - </el-form-item>  
243 - <el-form-item label="批注" prop="annotations">  
244 - <el-input v-model="form.annotations" placeholder="请输入批注" /> 86 + <el-input type="textarea" v-model="form.content" placeholder="督查内容" :rows="8"/>
245 </el-form-item> 87 </el-form-item>
246 </el-form> 88 </el-form>
247 <div slot="footer" class="dialog-footer"> 89 <div slot="footer" class="dialog-footer">
@@ -253,153 +95,187 @@ @@ -253,153 +95,187 @@
253 </template> 95 </template>
254 96
255 <script> 97 <script>
256 -import { listSupervisionSpecial, getSupervisionSpecial, delSupervisionSpecial, addSupervisionSpecial, updateSupervisionSpecial, exportSupervisionSpecial } from "@/api/business/supervisionSpecial";  
257 -import Editor from '@/components/Editor'; 98 + import {
  99 + listSupervisionSpecial,
  100 + getSupervisionSpecial,
  101 + delSupervisionSpecial,
  102 + addSupervisionSpecial,
  103 + updateSupervisionSpecial,
  104 + exportSupervisionSpecial
  105 + }
  106 + from "@/api/business/supervisionSpecial";
258 107
259 -export default {  
260 - name: "SupervisionSpecial",  
261 - components: { Editor },  
262 - data() {  
263 - return {  
264 - // 遮罩层  
265 - loading: true,  
266 - // 选中数组  
267 - ids: [],  
268 - // 非单个禁用  
269 - single: true,  
270 - // 非多个禁用  
271 - multiple: true,  
272 - // 显示搜索条件  
273 - showSearch: true,  
274 - // 总条数  
275 - total: 0,  
276 - // 专项督查表格数据  
277 - supervisionSpecialList: [],  
278 - // 弹出层标题  
279 - title: "",  
280 - // 是否显示弹出层  
281 - open: false,  
282 - // 查询参数  
283 - queryParams: {  
284 - pageNum: 1,  
285 - pageSize: 10,  
286 - type: null,  
287 - title: null,  
288 - content: null,  
289 - signPerson: null,  
290 - signTime: null,  
291 - timeLimit: null,  
292 - state: null,  
293 - resDepart: null,  
294 - resTime: null,  
295 - resPerson: null,  
296 - resContent: null,  
297 - annotations: null  
298 - },  
299 - // 表单参数  
300 - form: {},  
301 - // 表单校验  
302 - rules: {  
303 - }  
304 - };  
305 - },  
306 - created() {  
307 - this.getList();  
308 - },  
309 - methods: {  
310 - /** 查询专项督查列表 */  
311 - getList() {  
312 - this.loading = true;  
313 - listSupervisionSpecial(this.queryParams).then(response => {  
314 - this.supervisionSpecialList = response.rows;  
315 - this.total = response.total;  
316 - this.loading = false;  
317 - });  
318 - },  
319 - // 取消按钮  
320 - cancel() {  
321 - this.open = false;  
322 - this.reset(); 108 + import Editor from '@/components/Editor';
  109 +
  110 + import {
  111 + earthsitesList,
  112 + constructionsitesList,
  113 + getArea,
  114 + } from "@/api/dict";
  115 +
  116 + export default {
  117 + name: "SupervisionSpecial",
  118 + components: {
  119 + Editor
323 }, 120 },
324 - // 表单重置  
325 - reset() {  
326 - this.form = {  
327 - id: null,  
328 - type: null,  
329 - title: null,  
330 - content: null,  
331 - signPerson: null,  
332 - signTime: null,  
333 - timeLimit: null,  
334 - state: null,  
335 - createBy: null,  
336 - createTime: null,  
337 - updateTime: null,  
338 - updateBy: null,  
339 - resDepart: null,  
340 - resTime: null,  
341 - resPerson: null,  
342 - resContent: null,  
343 - annotations: null 121 + data() {
  122 + return {
  123 + // 遮罩层
  124 + loading: true,
  125 + // 选中数组
  126 + ids: [],
  127 + // 非单个禁用
  128 + single: true,
  129 + // 非多个禁用
  130 + multiple: true,
  131 + // 显示搜索条件
  132 + showSearch: true,
  133 + // 总条数
  134 + total: 0,
  135 + // 专项督察表格数据
  136 + SupervisionSpecialList: [],
  137 + // 弹出层标题
  138 + title: "",
  139 + // 是否显示弹出层
  140 + open: false,
  141 + // 查询参数
  142 + queryParams: {
  143 + pageNum: 1,
  144 + pageSize: 10,
  145 + type: null,
  146 + title: null,
  147 + content: null,
  148 + person: null,
  149 + place: null,
  150 + },
  151 + data: {},
  152 + areas: [],
  153 + // 表单参数
  154 + form: {},
  155 + // 表单校验
  156 + rules: {}
344 }; 157 };
345 - this.resetForm("form");  
346 - },  
347 - /** 搜索按钮操作 */  
348 - handleQuery() {  
349 - this.queryParams.pageNum = 1;  
350 - this.getList();  
351 - },  
352 - /** 重置按钮操作 */  
353 - resetQuery() {  
354 - this.resetForm("queryForm");  
355 - this.handleQuery();  
356 - },  
357 - // 多选框选中数据  
358 - handleSelectionChange(selection) {  
359 - this.ids = selection.map(item => item.id)  
360 - this.single = selection.length!==1  
361 - this.multiple = !selection.length  
362 }, 158 },
363 - /** 新增按钮操作 */  
364 - handleAdd() {  
365 - this.reset();  
366 - this.open = true;  
367 - this.title = "添加专项督查";  
368 - },  
369 - /** 修改按钮操作 */  
370 - handleUpdate(row) {  
371 - this.reset();  
372 - const id = row.id || this.ids  
373 - getSupervisionSpecial(id).then(response => {  
374 - this.form = response.data;  
375 - this.open = true;  
376 - this.title = "修改专项督查"; 159 + created() {
  160 + getArea().then(res => {
  161 + this.areas = res.result;
  162 + });
  163 +
  164 + let remoteQueryData = {
  165 + "page": 1,
  166 + "size": 9999
  167 + };
  168 +
  169 + constructionsitesList(remoteQueryData).then(res => {
  170 + this.data[0] = res.result.list;
  171 + });
  172 +
  173 + earthsitesList(remoteQueryData).then(res => {
  174 + this.data[1] = res.result.list;
377 }); 175 });
  176 +
  177 +
  178 + this.getList();
378 }, 179 },
379 - /** 提交按钮 */  
380 - submitForm() {  
381 - this.$refs["form"].validate(valid => {  
382 - if (valid) {  
383 - if (this.form.id != null) {  
384 - updateSupervisionSpecial(this.form).then(response => {  
385 - this.msgSuccess("修改成功");  
386 - this.open = false;  
387 - this.getList();  
388 - });  
389 - } else {  
390 - addSupervisionSpecial(this.form).then(response => {  
391 - this.msgSuccess("新增成功");  
392 - this.open = false;  
393 - this.getList();  
394 - }); 180 + methods: {
  181 + selectName(item){
  182 +
  183 +
  184 + for(var i in this.areas){
  185 + if(this.areas[i].code == item.areaCode){
  186 + this.form.place = this.areas[i].name;
395 } 187 }
396 } 188 }
397 - });  
398 - },  
399 - /** 删除按钮操作 */  
400 - handleDelete(row) {  
401 - const ids = row.id || this.ids;  
402 - this.$confirm('是否确认删除专项督查编号为"' + ids + '"的数据项?', "警告", { 189 +
  190 +
  191 +
  192 + },
  193 + /** 查询专项督察列表 */
  194 + getList() {
  195 + this.loading = true;
  196 + listSupervisionSpecial(this.queryParams).then(response => {
  197 + this.SupervisionSpecialList = response.rows;
  198 + this.total = response.total;
  199 + this.loading = false;
  200 + });
  201 + },
  202 + // 取消按钮
  203 + cancel() {
  204 + this.open = false;
  205 + this.reset();
  206 + },
  207 + // 表单重置
  208 + reset() {
  209 + this.form = {
  210 + id: null,
  211 + type: null,
  212 + title: null,
  213 + content: null,
  214 + person: null,
  215 + place: null,
  216 + createBy: null,
  217 + createTime: null,
  218 + updateTime: null,
  219 + updateBy: null
  220 + };
  221 + this.resetForm("form");
  222 + },
  223 + /** 搜索按钮操作 */
  224 + handleQuery() {
  225 + this.queryParams.pageNum = 1;
  226 + this.getList();
  227 + },
  228 + /** 重置按钮操作 */
  229 + resetQuery() {
  230 + this.resetForm("queryForm");
  231 + this.handleQuery();
  232 + },
  233 + // 多选框选中数据
  234 + handleSelectionChange(selection) {
  235 + this.ids = selection.map(item => item.id)
  236 + this.single = selection.length !== 1
  237 + this.multiple = !selection.length
  238 + },
  239 + /** 新增按钮操作 */
  240 + handleAdd() {
  241 + this.reset();
  242 + this.open = true;
  243 + this.title = "添加专项督察";
  244 + },
  245 + /** 修改按钮操作 */
  246 + handleUpdate(row) {
  247 + this.reset();
  248 + const id = row.id || this.ids
  249 + getSupervisionSpecial(id).then(response => {
  250 + this.form = response.data;
  251 + this.open = true;
  252 + this.title = "修改专项督察";
  253 + });
  254 + },
  255 + /** 提交按钮 */
  256 + submitForm() {
  257 + this.$refs["form"].validate(valid => {
  258 + if (valid) {
  259 + if (this.form.id != null) {
  260 + updateSupervisionSpecial(this.form).then(response => {
  261 + this.msgSuccess("修改成功");
  262 + this.open = false;
  263 + this.getList();
  264 + });
  265 + } else {
  266 + addSupervisionSpecial(this.form).then(response => {
  267 + this.msgSuccess("新增成功");
  268 + this.open = false;
  269 + this.getList();
  270 + });
  271 + }
  272 + }
  273 + });
  274 + },
  275 + /** 删除按钮操作 */
  276 + handleDelete(row) {
  277 + const ids = row.id || this.ids;
  278 + this.$confirm('是否确认删除专项督察编号为"' + ids + '"的数据项?', "警告", {
403 confirmButtonText: "确定", 279 confirmButtonText: "确定",
404 cancelButtonText: "取消", 280 cancelButtonText: "取消",
405 type: "warning" 281 type: "warning"
@@ -409,11 +285,11 @@ export default { @@ -409,11 +285,11 @@ export default {
409 this.getList(); 285 this.getList();
410 this.msgSuccess("删除成功"); 286 this.msgSuccess("删除成功");
411 }) 287 })
412 - },  
413 - /** 导出按钮操作 */  
414 - handleExport() {  
415 - const queryParams = this.queryParams;  
416 - this.$confirm('是否确认导出所有专项督查数据项?', "警告", { 288 + },
  289 + /** 导出按钮操作 */
  290 + handleExport() {
  291 + const queryParams = this.queryParams;
  292 + this.$confirm('是否确认导出所有专项督察数据项?', "警告", {
417 confirmButtonText: "确定", 293 confirmButtonText: "确定",
418 cancelButtonText: "取消", 294 cancelButtonText: "取消",
419 type: "warning" 295 type: "warning"
@@ -422,7 +298,7 @@ export default { @@ -422,7 +298,7 @@ export default {
422 }).then(response => { 298 }).then(response => {
423 this.download(response.message); 299 this.download(response.message);
424 }) 300 })
  301 + }
425 } 302 }
426 - }  
427 -}; 303 + };
428 </script> 304 </script>
trash-ui/src/views/business/truckActivate/index.vue
  View file @6d2ba61
1 <template> 1 <template>
2 <div class="app-container"> 2 <div class="app-container">
  3 + <el-row :gutter="10" class="mb8">
  4 + <el-col :span="1.5">
  5 + <el-button :class="{'el-button':true, 'el-button--primary':this.queryParams.pageStatus==0}" size="mini"
  6 + @click="getList(0);">车辆激活</el-button>
  7 + </el-col>
  8 + <el-col :span="1.5">
  9 + <el-button :class="{'el-button':true,'el-button--primary':this.queryParams.pageStatus==1}" size="mini"
  10 + @click="getList(1);">车辆激活历史</el-button>
  11 + </el-col>
  12 + </el-row>
  13 +
  14 +
3 <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px"> 15 <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
4 <el-form-item label="所属企业" prop="company"> 16 <el-form-item label="所属企业" prop="company">
5 <el-input 17 <el-input
@@ -10,12 +22,10 @@ @@ -10,12 +22,10 @@
10 @keyup.enter.native="handleQuery" 22 @keyup.enter.native="handleQuery"
11 /> 23 />
12 </el-form-item> 24 </el-form-item>
13 - <el-form-item label="车牌号  
14 -" prop="licensePlate"> 25 + <el-form-item label="车牌号" prop="licensePlate">
15 <el-input 26 <el-input
16 v-model="queryParams.licensePlate" 27 v-model="queryParams.licensePlate"
17 - placeholder="请输入车牌号  
18 -" 28 + placeholder="请输入车牌号"
19 clearable 29 clearable
20 size="small" 30 size="small"
21 @keyup.enter.native="handleQuery" 31 @keyup.enter.native="handleQuery"
@@ -38,17 +48,16 @@ @@ -38,17 +48,16 @@
38 <el-row :gutter="10" class="mb8"> 48 <el-row :gutter="10" class="mb8">
39 <el-col :span="1.5"> 49 <el-col :span="1.5">
40 <el-button 50 <el-button
  51 + v-if="this.queryParams.status==0"
41 type="primary" 52 type="primary"
42 - icon="el-icon-plus"  
43 size="mini" 53 size="mini"
44 @click="handleAdd" 54 @click="handleAdd"
45 v-hasPermi="['business:truckActivate:add']" 55 v-hasPermi="['business:truckActivate:add']"
46 - >手动激活</el-button> 56 + >添加车辆并激活</el-button>
47 </el-col> 57 </el-col>
48 <el-col :span="1.5"> 58 <el-col :span="1.5">
49 <el-button 59 <el-button
50 type="warning" 60 type="warning"
51 - icon="el-icon-download"  
52 size="mini" 61 size="mini"
53 @click="handleExport" 62 @click="handleExport"
54 v-hasPermi="['business:truckActivate:export']" 63 v-hasPermi="['business:truckActivate:export']"
@@ -69,28 +78,17 @@ @@ -69,28 +78,17 @@
69 </el-table-column> 78 </el-table-column>
70 <el-table-column label="激活状态" prop="objectId"> 79 <el-table-column label="激活状态" prop="objectId">
71 <template slot-scope="scope"> 80 <template slot-scope="scope">
72 - <span>{{ scope.row.activateTime==null ? "未激活" : "激活" }}</span>  
73 - </template>  
74 - </el-table-column> 81 + <span v-if="scope.row.activateTime!=null">已激活</span>
75 82
76 - <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">  
77 - <template slot-scope="scope">  
78 - <el-button 83 + <el-button v-if="scope.row.activateTime==null"
79 size="mini" 84 size="mini"
80 type="text" 85 type="text"
81 - icon="el-icon-edit"  
82 @click="handleUpdate(scope.row)" 86 @click="handleUpdate(scope.row)"
83 v-hasPermi="['business:truckActivate:edit']" 87 v-hasPermi="['business:truckActivate:edit']"
84 - >修改</el-button>  
85 - <el-button  
86 - size="mini"  
87 - type="text"  
88 - icon="el-icon-delete"  
89 - @click="handleDelete(scope.row)"  
90 - v-hasPermi="['business:truckActivate:remove']"  
91 - >删除</el-button> 88 + >手动激活</el-button>
92 </template> 89 </template>
93 - </el-table-column> --> 90 + </el-table-column>
  91 +
94 </el-table> 92 </el-table>
95 93
96 <pagination 94 <pagination
@@ -104,19 +102,26 @@ @@ -104,19 +102,26 @@
104 <!-- 添加或修改车辆激活对话框 --> 102 <!-- 添加或修改车辆激活对话框 -->
105 <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> 103 <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
106 <el-form ref="form" :model="form" :rules="rules" label-width="80px"> 104 <el-form ref="form" :model="form" :rules="rules" label-width="80px">
  105 + <el-form-item label="所属工地" prop="construction">
  106 + <el-select v-model="form.construction" placeholder="请选择所属工地">
  107 + <el-option v-for="item in constList" @click.native="getCompany(item)" :label="item.name" :value="item.name" :key="item.id"></el-option>
  108 + </el-select>
  109 + </el-form-item>
107 <el-form-item label="所属企业" prop="company"> 110 <el-form-item label="所属企业" prop="company">
108 - <el-select v-model="form.company" filterable multiple clearable reserve-keyword>  
109 - <el-option v-for="item in companyList" :label="item.name" :value="item.name" :key="item.id" /> 111 + <el-select v-model="form.company" filterable reserve-keyword>
  112 + <el-option v-for="item in constCompany" :label="item" :value="item" @click.native="getTruckListByCompanyName(item)"/>
110 </el-select> 113 </el-select>
111 </el-form-item> 114 </el-form-item>
112 <el-form-item label="车牌号" prop="licensePlate"> 115 <el-form-item label="车牌号" prop="licensePlate">
113 - <el-input v-model="form.licensePlate" placeholder="请输入车牌号" />  
114 - </el-form-item>  
115 -  
116 - <el-form-item label="所属工地" prop="construction">  
117 - <el-input v-model="form.construction" placeholder="请输入所属工地" disabled/> 116 + <el-select v-model="form.licensePlate" placeholder="请选择车辆">
  117 + <el-option v-if="construction.companyTrucks.indexOf(item.id) == -1"
  118 + v-for="item in companyTruckList"
  119 + :label="item.licenseplateNo"
  120 + :value="item.licenseplateNo"
  121 + :key="item.id"
  122 + @click.native="getTruck(item)"/>
  123 + </el-select>
118 </el-form-item> 124 </el-form-item>
119 -  
120 </el-form> 125 </el-form>
121 <div slot="footer" class="dialog-footer"> 126 <div slot="footer" class="dialog-footer">
122 <el-button type="primary" @click="submitForm">确 定</el-button> 127 <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -130,9 +135,13 @@ @@ -130,9 +135,13 @@
130 import { listTruckActivate, getTruckActivate, delTruckActivate, addTruckActivate, updateTruckActivate, exportTruckActivate } from "@/api/business/truckActivate"; 135 import { listTruckActivate, getTruckActivate, delTruckActivate, addTruckActivate, updateTruckActivate, exportTruckActivate } from "@/api/business/truckActivate";
131 136
132 import { 137 import {
133 - truckList,  
134 - companyList,  
135 - } from "@/api/dict"; 138 + todayDataList,
  139 + } from "@/api/business/threestep";
  140 +
  141 +import {
  142 + truckList,
  143 + companyList,
  144 +} from "@/api/dict";
136 145
137 export default { 146 export default {
138 name: "TruckActivate", 147 name: "TruckActivate",
@@ -175,15 +184,46 @@ export default { @@ -175,15 +184,46 @@ export default {
175 form: {}, 184 form: {},
176 // 表单校验 185 // 表单校验
177 rules: { 186 rules: {
178 - } 187 + construction: [{
  188 + required: true,
  189 + message: '请填写完整',
  190 + trigger: 'blur'
  191 + }, ],
  192 +
  193 + company: [{
  194 + required: true,
  195 + message: '请填写完整',
  196 + trigger: 'blur'
  197 + }, ],
  198 +
  199 +
  200 + licensePlate: [{
  201 + required: true,
  202 + message: '请填写完整',
  203 + trigger: 'blur'
  204 + }, ],
  205 + },
  206 + constList:[],
  207 + constCompany:[],
  208 + companyTruckList:[],
  209 +
  210 + construction : null,
  211 + truck : null,
  212 + company:null,
179 }; 213 };
180 }, 214 },
181 created() { 215 created() {
182 - this.getList(); 216 + this.getList(0);
183 }, 217 },
184 methods: { 218 methods: {
185 /** 查询车辆激活列表 */ 219 /** 查询车辆激活列表 */
186 - getList() { 220 + getList(index) {
  221 + if(index == 0){
  222 + this.queryParams.status = 0;
  223 + }
  224 + if(index == 1){
  225 + this.queryParams.status = 1;
  226 + }
187 this.loading = true; 227 this.loading = true;
188 listTruckActivate(this.queryParams).then(response => { 228 listTruckActivate(this.queryParams).then(response => {
189 this.truckActivateList = response.rows; 229 this.truckActivateList = response.rows;
@@ -201,6 +241,46 @@ export default { @@ -201,6 +241,46 @@ export default {
201 }); 241 });
202 242
203 243
  244 + let data = {
  245 + type : 0,
  246 + status:1,
  247 + }
  248 +
  249 + todayDataList(data).then(res=>{
  250 + this.constList = res;
  251 + });
  252 +
  253 + },
  254 + getCompany(obj){
  255 + if(obj.companys){
  256 + this.constCompany = obj.companys.split(",");
  257 + }
  258 + this.form.company = null;
  259 + this.construction = obj;
  260 + },
  261 +
  262 + getTruckListByCompanyName(name){
  263 + this.form.licensePlate = null;
  264 + for(let i in this.companyList){
  265 + if(this.companyList[i].name == name){
  266 + this.company = this.companyList[i];
  267 + let remoteQuery = {
  268 + page:1,
  269 + size:9999,
  270 + companyID:this.companyList[i].id,
  271 + valid:0,
  272 + dishonestState:0,
  273 + }
  274 + truckList(remoteQuery).then(res=>{
  275 + this.companyTruckList = res.result.list;
  276 + });
  277 +
  278 + break;
  279 + }
  280 + }
  281 + },
  282 + getTruck(truck){
  283 + this.truck = truck;
204 }, 284 },
205 // 取消按钮 285 // 取消按钮
206 cancel() { 286 cancel() {
@@ -250,30 +330,30 @@ export default { @@ -250,30 +330,30 @@ export default {
250 /** 修改按钮操作 */ 330 /** 修改按钮操作 */
251 handleUpdate(row) { 331 handleUpdate(row) {
252 this.reset(); 332 this.reset();
253 - const id = row.id || this.ids  
254 - getTruckActivate(id).then(response => {  
255 - this.form = response.data;  
256 - this.open = true;  
257 - this.title = "修改车辆激活"; 333 + this.form.id = row.id;
  334 + this.form.activateTime = new Date();
  335 + updateTruckActivate(this.form).then(response => {
  336 + this.msgSuccess("修改成功");
  337 + this.open = false;
  338 + this.getList();
258 }); 339 });
  340 +
259 }, 341 },
260 /** 提交按钮 */ 342 /** 提交按钮 */
261 submitForm() { 343 submitForm() {
262 this.$refs["form"].validate(valid => { 344 this.$refs["form"].validate(valid => {
263 if (valid) { 345 if (valid) {
264 - if (this.form.id != null) {  
265 - updateTruckActivate(this.form).then(response => {  
266 - this.msgSuccess("修改成功");  
267 - this.open = false;  
268 - this.getList();  
269 - });  
270 - } else { 346 + this.form.objectId = this.truck.id;
  347 + this.form.company = this.company.name;
  348 + this.form.earthsite = this.construction.earthsitesName;
  349 + this.form.status = 0;
  350 + this.form.activateTime = new Date();
  351 +
271 addTruckActivate(this.form).then(response => { 352 addTruckActivate(this.form).then(response => {
272 this.msgSuccess("新增成功"); 353 this.msgSuccess("新增成功");
273 this.open = false; 354 this.open = false;
274 this.getList(); 355 this.getList();
275 }); 356 });
276 - }  
277 } 357 }
278 }); 358 });
279 }, 359 },
trash-ui/src/views/other/projectCheck/index.vue 0 → 100644
  View file @6d2ba61
  1 +<template>
  2 + <div class="app-container">
  3 + <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
  4 + <el-form-item label="工程名称" prop="name">
  5 + <el-input
  6 + v-model="queryParams.name"
  7 + placeholder="请输入工程名称"
  8 + clearable
  9 + size="small"
  10 + @keyup.enter.native="handleQuery"
  11 + />
  12 + </el-form-item>
  13 + <el-form-item label="检查时间" prop="checkTime">
  14 + <el-date-picker clearable size="small" style="width: 200px"
  15 + v-model="queryParams.checkTime"
  16 + type="date"
  17 + value-format="yyyy-MM-dd"
  18 + placeholder="选择检查时间">
  19 + </el-date-picker>
  20 + </el-form-item>
  21 + <el-form-item label="所属区域" prop="projectType">
  22 + <el-select disabled v-model="queryParams.place" placeholder="请选择所属区域" clearable size="small">
  23 + <el-option v-for="item in areas" :label="item.name" :value="item.code" :key="item.code" />
  24 + </el-select>
  25 + </el-form-item>
  26 + <el-form-item>
  27 + <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
  28 + <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
  29 + </el-form-item>
  30 + </el-form>
  31 +
  32 + <el-row :gutter="10" class="mb8">
  33 + <el-col :span="1.5">
  34 + <el-button
  35 + type="primary"
  36 + icon="el-icon-plus"
  37 + size="mini"
  38 + @click="handleAdd"
  39 + v-hasPermi="['other:projectCheck:add']"
  40 + >新增</el-button>
  41 + </el-col>
  42 + <el-col :span="1.5">
  43 + <el-button
  44 + type="warning"
  45 + icon="el-icon-download"
  46 + size="mini"
  47 + @click="handleExport"
  48 + v-hasPermi="['other:projectCheck:export']"
  49 + >导出</el-button>
  50 + </el-col>
  51 + <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
  52 + </el-row>
  53 +
  54 + <el-table v-loading="loading" :data="projectCheckList" @selection-change="handleSelectionChange">
  55 + <el-table-column label="序号 " align="center" prop="id" />
  56 + <el-table-column label="所属区域" align="center" prop="place" >
  57 +
  58 + <template slot-scope="scope">
  59 + <span>{{ getPlace(scope.row.place) }}</span>
  60 + </template>
  61 + </el-table-column>
  62 +
  63 + <el-table-column label="检查时间" align="center" prop="checkTime" width="180">
  64 + <template slot-scope="scope">
  65 + <span>{{ parseTime(scope.row.checkTime, '{y}-{m}-{d}') }}</span>
  66 + </template>
  67 + </el-table-column>
  68 + <el-table-column label="工程名称" align="center" prop="name" />
  69 + <el-table-column label="工程地址" align="center" prop="address" />
  70 + <el-table-column label="工程期限" align="center" prop="timeLimit" width="180">
  71 + <template slot-scope="scope">
  72 + <span>{{ parseTime(scope.row.timeLimit, '{y}-{m}-{d}') }}</span>
  73 + </template>
  74 + </el-table-column>
  75 + <el-table-column label="检察人员" align="center" prop="checkPeople" />
  76 + <el-table-column label="是否达标" align="center" prop="p9C3" >
  77 + <template slot-scope="scope">
  78 + <span>{{ scope.row.p9C3 == 1 ? "是" : "否"}}</span>
  79 + </template>
  80 + </el-table-column>
  81 + <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
  82 + <template slot-scope="scope">
  83 + <el-button
  84 + size="mini"
  85 + type="text"
  86 + icon="el-icon-edit"
  87 + @click="handleUpdate(scope.row)"
  88 + v-hasPermi="['other:projectCheck:edit']"
  89 + >查看详情</el-button>
  90 + </template>
  91 + </el-table-column>
  92 + </el-table>
  93 +
  94 + <pagination
  95 + v-show="total>0"
  96 + :total="total"
  97 + :page.sync="queryParams.pageNum"
  98 + :limit.sync="queryParams.pageSize"
  99 + @pagination="getList"
  100 + />
  101 +
  102 + <!-- 添加或修改大排查对话框 -->
  103 + <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
  104 + <el-form ref="form" :model="form" :rules="rules" label-width="160px">
  105 + <el-form-item label="工程类型" prop="type">
  106 + <el-select disabled v-model="form.type" placeholder="请选择工程类型">
  107 + <el-option label="工地" value=0 />
  108 + <el-option label="消纳场" value=1 />
  109 + </el-select>
  110 + </el-form-item>
  111 + <el-row>
  112 + <el-col :span="12">
  113 + <el-form-item label="工程名称" prop="name">
  114 + <el-select disabled v-model="form.name" placeholder="请选择所属区域" filterable clearable reserve-keyword>
  115 + <el-option v-for="item in data[form.type]" :label="item.name" :value="item.name" :key="item.id" @click.native="form.place = item.areaCode;">
  116 + </el-option>
  117 + </el-select>
  118 + </el-form-item>
  119 + </el-col>
  120 + <el-col :span="12">
  121 + <el-form-item label="工程地址" prop="address">
  122 + <el-input v-model="form.address" placeholder="请输入工程标准量" />
  123 + </el-form-item>
  124 + </el-col>
  125 + <el-input v-model="form.place" placeholder="" type="hidden"/>
  126 + </el-row>
  127 + <el-row>
  128 + <el-col :span="12">
  129 + <el-form-item label="工程期限" prop="timeLimit">
  130 + <el-date-picker clearable size="small" style="width: 200px"
  131 + v-model="form.timeLimit"
  132 + type="date"
  133 + value-format="yyyy-MM-dd"
  134 + placeholder="选择工程期限">
  135 + </el-date-picker>
  136 + </el-form-item>
  137 + </el-col>
  138 + <el-col :span="12">
  139 + <el-form-item label="检查时间" prop="checkTime">
  140 + <el-date-picker clearable size="small" style="width: 200px"
  141 + v-model="form.checkTime"
  142 + type="date"
  143 + value-format="yyyy-MM-dd"
  144 + placeholder="选择检查时间">
  145 + </el-date-picker>
  146 + </el-form-item>
  147 + </el-col>
  148 + </el-row>
  149 +
  150 + <el-row>
  151 + <el-col :span="12">
  152 + <el-form-item label="工程类别" prop="projectType">
  153 + <el-select disabled v-model="form.projectType" placeholder="请选择工程类别">
  154 + <el-option label="平场" value="平场" />
  155 + <el-option label="下挖" value="下挖" />
  156 + </el-select>
  157 + </el-form-item>
  158 + </el-col>
  159 + <el-col :span="12">
  160 + <el-form-item label="工程标准量" prop="stock">
  161 + <el-input v-model="form.stock" placeholder="请输入工程标准量" type="number"/>
  162 + </el-form-item>
  163 + </el-col>
  164 + </el-row>
  165 + <el-row>
  166 + <el-col :span="12">
  167 + <el-form-item label="检察人员" prop="checkPeople">
  168 + <el-input v-model="form.checkPeople" placeholder="请输入检察人员" />
  169 + </el-form-item>
  170 + </el-col>
  171 + <el-col :span="12">
  172 + <el-form-item label="工程量存量" prop="margin">
  173 + <el-input v-model="form.margin" placeholder="请输入工程量存量" type="number"/>
  174 + </el-form-item>
  175 + </el-col>
  176 + </el-row>
  177 + <label>渣土扬尘治理执行规范检查</label>
  178 + <el-row>
  179 + <el-col :span="9">
  180 + <el-form-item label="过水塘区 长度" prop="p1">
  181 + <el-input v-model="form.p1" placeholder="米" type="number"/>
  182 + </el-form-item>
  183 + </el-col>
  184 + <el-col :span="5">
  185 + <el-form-item label="集泥沟" prop="p1C1">
  186 + <el-radio-group v-model="form.p1C1">
  187 + <el-radio label="1" style="color:green;">✔</el-radio>
  188 + <el-radio label="0" style="color:red;">X</el-radio>
  189 + </el-radio-group>
  190 + </el-form-item>
  191 + </el-col>
  192 + <el-col :span="5">
  193 + <el-form-item label="进出水源" prop="p1C2">
  194 + <el-radio-group v-model="form.p1C2">
  195 + <el-radio label="1" style="color:green;">✔</el-radio>
  196 + <el-radio label="0" style="color:red;">X</el-radio>
  197 + </el-radio-group>
  198 + </el-form-item>
  199 + </el-col>
  200 + <el-col :span="5">
  201 + <el-form-item label="是否清理" prop="p1C3">
  202 + <el-radio-group v-model="form.p1C3">
  203 + <el-radio label="1" style="color:green;">✔</el-radio>
  204 + <el-radio label="0" style="color:red;">X</el-radio>
  205 + </el-radio-group>
  206 + </el-form-item>
  207 + </el-col>
  208 + </el-row>
  209 + <el-row>
  210 + <el-col :span="9">
  211 + <el-form-item label="自动洗车区 长度" prop="p2">
  212 + <el-input v-model="form.p2" placeholder="米" type="number"/>
  213 + </el-form-item>
  214 + </el-col>
  215 + <el-col :span="5">
  216 + <el-form-item label="感应装置" prop="p2C1">
  217 + <el-radio-group v-model="form.p2C1">
  218 + <el-radio label="1" style="color:green;">✔</el-radio>
  219 + <el-radio label="0" style="color:red;">X</el-radio>
  220 + </el-radio-group>
  221 + </el-form-item>
  222 + </el-col>
  223 + <el-col :span="5">
  224 + <el-form-item label="是否清理" prop="p2C2">
  225 + <el-radio-group v-model="form.p2C2">
  226 + <el-radio label="1" style="color:green;">✔</el-radio>
  227 + <el-radio label="0" style="color:red;">X</el-radio>
  228 + </el-radio-group>
  229 + </el-form-item>
  230 + </el-col>
  231 + <el-col :span="5">
  232 + <el-form-item label="使用达标情况" prop="p2C3">
  233 + <el-radio-group v-model="form.p2C3">
  234 + <el-radio label="1" style="color:green;">✔</el-radio>
  235 + <el-radio label="0" style="color:red;">X</el-radio>
  236 + </el-radio-group>
  237 + </el-form-item>
  238 + </el-col>
  239 + </el-row>
  240 + <el-row>
  241 + <el-col :span="7">
  242 + <el-form-item label="人工冲洗区 长度" prop="p3">
  243 + <el-input v-model="form.p3" placeholder="米" type="number"/>
  244 + </el-form-item>
  245 + </el-col>
  246 + <el-col :span="7">
  247 + <el-form-item label="水枪" prop="p3C1">
  248 + <el-input v-model="form.p3C1" placeholder="把" type="number"/>
  249 + </el-form-item>
  250 + </el-col>
  251 + <el-col :span="5">
  252 + <el-form-item label="是否清理" prop="p3C2">
  253 + <el-radio-group v-model="form.p3C2">
  254 + <el-radio label="1" style="color:green;">✔</el-radio>
  255 + <el-radio label="0" style="color:red;">X</el-radio>
  256 + </el-radio-group>
  257 + </el-form-item>
  258 + </el-col>
  259 + <el-col :span="5">
  260 + <el-form-item label="是否整洁" prop="p3C3">
  261 + <el-radio-group v-model="form.p3C3">
  262 + <el-radio label="1" style="color:green;">✔</el-radio>
  263 + <el-radio label="0" style="color:red;">X</el-radio>
  264 + </el-radio-group>
  265 + </el-form-item>
  266 + </el-col>
  267 + </el-row>
  268 + <el-row>
  269 + <el-col :span="7">
  270 + <el-form-item label="出口 长度" prop="p4">
  271 + <el-input v-model="form.p4" placeholder="米" type="number"/>
  272 + </el-form-item>
  273 + </el-col>
  274 + <el-col :span="5">
  275 + <el-form-item label="是否硬化" prop="p4C1">
  276 + <el-radio-group v-model="form.p4C1">
  277 + <el-radio label="1" style="color:green;">✔</el-radio>
  278 + <el-radio label="0" style="color:red;">X</el-radio>
  279 + </el-radio-group>
  280 + </el-form-item>
  281 + </el-col>
  282 + <el-col :span="5">
  283 + <el-form-item label="是否整洁" prop="p4C2">
  284 + <el-radio-group v-model="form.p4C2">
  285 + <el-radio label="1" style="color:green;">✔</el-radio>
  286 + <el-radio label="0" style="color:red;">X</el-radio>
  287 + </el-radio-group>
  288 + </el-form-item>
  289 + </el-col>
  290 + </el-row>
  291 + <el-row>
  292 + <el-col :span="7">
  293 + <el-form-item label="场内同行道路 硬化" prop="p5">
  294 + <el-radio-group v-model="form.p5">
  295 + <el-radio label="1" style="color:green;">✔</el-radio>
  296 + <el-radio label="0" style="color:red;">X</el-radio>
  297 + </el-radio-group>
  298 + </el-form-item>
  299 + </el-col>
  300 + <el-col :span="7">
  301 + <el-form-item label="未硬化" prop="p5C1">
  302 + <el-radio-group v-model="form.p5C1">
  303 + <el-radio label="1" style="color:green;">✔</el-radio>
  304 + <el-radio label="0" style="color:red;">X</el-radio>
  305 + </el-radio-group>
  306 + </el-form-item>
  307 + </el-col>
  308 + <el-col :span="7">
  309 + <el-form-item label="硬化方式" prop="p5C2">
  310 + <el-input v-model="form.p5C2" placeholder="把" type="number"/>
  311 + </el-form-item>
  312 + </el-col>
  313 + </el-row>
  314 + <el-row>
  315 + <el-col :span="7">
  316 + <el-form-item label="用电照明 通电情况" prop="p6">
  317 + <el-radio-group v-model="form.p6">
  318 + <el-radio label="1" style="color:green;">✔</el-radio>
  319 + <el-radio label="0" style="color:red;">X</el-radio>
  320 + </el-radio-group>
  321 + </el-form-item>
  322 + </el-col>
  323 + <el-col :span="7">
  324 + <el-form-item label="有" prop="p6C1">
  325 + <el-input v-model="form.p6C1" placeholder="盏" type="number"/>
  326 + </el-form-item>
  327 + </el-col>
  328 + <el-col :span="5">
  329 + <el-form-item label="使用达标情况" prop="p6C2">
  330 + <el-radio-group v-model="form.p6C2">
  331 + <el-radio label="1" style="color:green;">✔</el-radio>
  332 + <el-radio label="0" style="color:red;">X</el-radio>
  333 + </el-radio-group>
  334 + </el-form-item>
  335 + </el-col>
  336 + </el-row>
  337 + <el-row>
  338 + <el-col :span="7">
  339 + <el-form-item label="视频监控 球机" prop="p7">
  340 + <el-input v-model="form.p7" placeholder="台" type="number"/>
  341 + </el-form-item>
  342 + </el-col>
  343 + <el-col :span="7">
  344 + <el-form-item label="枪机" prop="p7C1">
  345 + <el-input v-model="form.p7C1" placeholder="台" type="number"/>
  346 + </el-form-item>
  347 + </el-col>
  348 + <el-col :span="5">
  349 + <el-form-item label="是否接入平台" prop="p7C2">
  350 + <el-radio-group v-model="form.p7C2">
  351 + <el-radio label="1" style="color:green;">✔</el-radio>
  352 + <el-radio label="0" style="color:red;">X</el-radio>
  353 + </el-radio-group>
  354 + </el-form-item>
  355 + </el-col>
  356 + </el-row>
  357 + <el-row>
  358 + <el-col :span="7">
  359 + <el-form-item label="其他设施 围挡" prop="p8">
  360 + <el-input v-model="form.p8" placeholder="米" type="number"/>
  361 + </el-form-item>
  362 + </el-col>
  363 + <el-col :span="5">
  364 + <el-form-item label="裸露黄土覆盖" prop="p8C1">
  365 + <el-radio-group v-model="form.p8C1">
  366 + <el-radio label="1" style="color:green;">✔</el-radio>
  367 + <el-radio label="0" style="color:red;">X</el-radio>
  368 + </el-radio-group>
  369 + </el-form-item>
  370 + </el-col>
  371 + <el-col :span="5">
  372 + <el-form-item label="喷淋降尘" prop="p8C2">
  373 + <el-radio-group v-model="form.p8C2">
  374 + <el-radio label="1" style="color:green;">✔</el-radio>
  375 + <el-radio label="0" style="color:red;">X</el-radio>
  376 + </el-radio-group>
  377 + </el-form-item>
  378 + </el-col>
  379 + </el-row>
  380 +
  381 +
  382 + <el-form-item label="周边市容环境" prop="environment">
  383 + <el-input v-model="form.environment" placeholder="请输入周边市容环境" />
  384 + </el-form-item>
  385 + <label>三查工作情况检查</label>
  386 +
  387 + <el-row>
  388 + <el-col :span="24">
  389 + <el-form-item label="责任主体单位或建设运营单位台账登记情况" prop="p9">
  390 + <el-radio-group v-model="form.p9C1">
  391 + <el-radio label="1" style="color:green;">✔</el-radio>
  392 + <el-radio label="0" style="color:red;">X</el-radio>
  393 + </el-radio-group>
  394 + </el-form-item>
  395 + </el-col>
  396 + <el-row>
  397 + </el-row>
  398 + <el-col :span="24">
  399 + <el-form-item label="主签运输公司台账登记情况" prop="p9C2">
  400 + <el-radio-group v-model="form.p9C2">
  401 + <el-radio label="1" style="color:green;">✔</el-radio>
  402 + <el-radio label="0" style="color:red;">X</el-radio>
  403 + </el-radio-group>
  404 + </el-form-item>
  405 + </el-col>
  406 + </el-row>
  407 +
  408 + <el-form-item label="在用消纳场地及对应线路" prop="line">
  409 + <el-input v-model="form.line" placeholder="请输入在用消纳场地及对应线路" />
  410 + </el-form-item>
  411 + <el-form-item label="主要问题以及整改意见" prop="dest">
  412 + <el-input v-model="form.dest" placeholder="请输入主要问题以及整改意见" />
  413 + </el-form-item>
  414 + <el-form-item label="检查人员意见以及签名" prop="checkSign">
  415 + <el-input v-model="form.checkSign" placeholder="请输入检查人员意见以及签名" />
  416 + </el-form-item>
  417 + <el-form-item label="建设单位代表签字" prop="sign">
  418 + <el-input v-model="form.sign" placeholder="请输入建设单位代表签字" />
  419 + </el-form-item>
  420 +
  421 + </el-row>
  422 + <el-col :span="24">
  423 + <el-form-item label="是否达标" prop="p9C3">
  424 + <el-select disabled v-model="form.p9C3">
  425 + <el-option label="是" style="color:green;" value=1 />
  426 + <el-option label="否" style="color:red;" value=0 />
  427 + </el-select>
  428 + </el-form-item>
  429 + </el-col>
  430 + </el-row>
  431 +
  432 + </el-form>
  433 + <div slot="footer" class="dialog-footer">
  434 + <el-button type="primary" @click="submitForm">确 定</el-button>
  435 + <el-button @click="cancel">取 消</el-button>
  436 + </div>
  437 + </el-dialog>
  438 +
  439 + <!-- 添加或修改大排查对话框 -->
  440 + <el-dialog :title="title" :visible.sync="open2" width="1000px" append-to-body>
  441 + <el-form ref="form" :model="form" :rules="rules" label-width="160px">
  442 + <el-form-item label="工程类型" prop="type">
  443 + <el-select disabled v-model="form.type" placeholder="请选择工程类型">
  444 + <el-option label="工地" value=0 />
  445 + <el-option label="消纳场" value=1 />
  446 + </el-select>
  447 + </el-form-item>
  448 + <el-row>
  449 + <el-col :span="12">
  450 + <el-form-item label="工程名称" prop="name">
  451 + <el-select disabled v-model="form.name" placeholder="请选择所属区域" filterable clearable reserve-keyword>
  452 + <el-option v-for="item in data[form.type]" :label="item.name" :value="item.name" :key="item.id" @click.native="form.place = item.areaCode;">
  453 + </el-option>
  454 + </el-select>
  455 + </el-form-item>
  456 + </el-col>
  457 + <el-col :span="12">
  458 + <el-form-item label="工程地址" prop="address">
  459 + <el-input disabled v-model="form.address" placeholder="请输入工程标准量" />
  460 + </el-form-item>
  461 + </el-col>
  462 + <el-input disabled v-model="form.place" placeholder="" type="hidden"/>
  463 + </el-row>
  464 + <el-row>
  465 + <el-col :span="12">
  466 + <el-form-item label="工程期限" prop="timeLimit">
  467 + <el-date-picker clearable size="small" style="width: 200px"
  468 + v-model="form.timeLimit"
  469 + type="date"
  470 + value-format="yyyy-MM-dd"
  471 + placeholder="选择工程期限">
  472 + </el-date-picker>
  473 + </el-form-item>
  474 + </el-col>
  475 + <el-col :span="12">
  476 + <el-form-item label="检查时间" prop="checkTime">
  477 + <el-date-picker clearable size="small" style="width: 200px"
  478 + v-model="form.checkTime"
  479 + type="date"
  480 + value-format="yyyy-MM-dd"
  481 + placeholder="选择检查时间">
  482 + </el-date-picker>
  483 + </el-form-item>
  484 + </el-col>
  485 + </el-row>
  486 +
  487 + <el-row>
  488 + <el-col :span="12">
  489 + <el-form-item label="工程类别" prop="projectType">
  490 + <el-select disabled v-model="form.projectType" placeholder="请选择工程类别">
  491 + <el-option label="平场" value="平场" />
  492 + <el-option label="下挖" value="下挖" />
  493 + </el-select>
  494 + </el-form-item>
  495 + </el-col>
  496 + <el-col :span="12">
  497 + <el-form-item label="工程标准量" prop="stock">
  498 + <el-input disabled v-model="form.stock" placeholder="请输入工程标准量" type="number"/>
  499 + </el-form-item>
  500 + </el-col>
  501 + </el-row>
  502 + <el-row>
  503 + <el-col :span="12">
  504 + <el-form-item label="检察人员" prop="checkPeople">
  505 + <el-input disabled v-model="form.checkPeople" placeholder="请输入检察人员" />
  506 + </el-form-item>
  507 + </el-col>
  508 + <el-col :span="12">
  509 + <el-form-item label="工程量存量" prop="margin">
  510 + <el-input disabled v-model="form.margin" placeholder="请输入工程量存量" type="number"/>
  511 + </el-form-item>
  512 + </el-col>
  513 + </el-row>
  514 + <label>渣土扬尘治理执行规范检查</label>
  515 + <el-row>
  516 + <el-col :span="9">
  517 + <el-form-item label="过水塘区 长度" prop="p1">
  518 + <el-input disabled v-model="form.p1" placeholder="米" type="number"/>
  519 + </el-form-item>
  520 + </el-col>
  521 + <el-col :span="5">
  522 + <el-form-item label="集泥沟" prop="p1C1">
  523 + <el-radio-group disabled v-model="form.p1C1">
  524 + <el-radio label="1" style="color:green;">✔</el-radio>
  525 + <el-radio label="0" style="color:red;">X</el-radio>
  526 + </el-radio-group>
  527 + </el-form-item>
  528 + </el-col>
  529 + <el-col :span="5">
  530 + <el-form-item label="进出水源" prop="p1C2">
  531 + <el-radio-group disabled v-model="form.p1C2">
  532 + <el-radio label="1" style="color:green;">✔</el-radio>
  533 + <el-radio label="0" style="color:red;">X</el-radio>
  534 + </el-radio-group>
  535 + </el-form-item>
  536 + </el-col>
  537 + <el-col :span="5">
  538 + <el-form-item label="是否清理" prop="p1C3">
  539 + <el-radio-group disabled v-model="form.p1C3">
  540 + <el-radio label="1" style="color:green;">✔</el-radio>
  541 + <el-radio label="0" style="color:red;">X</el-radio>
  542 + </el-radio-group>
  543 + </el-form-item>
  544 + </el-col>
  545 + </el-row>
  546 + <el-row>
  547 + <el-col :span="9">
  548 + <el-form-item label="自动洗车区 长度" prop="p2">
  549 + <el-input disabled v-model="form.p2" placeholder="米" type="number"/>
  550 + </el-form-item>
  551 + </el-col>
  552 + <el-col :span="5">
  553 + <el-form-item label="感应装置" prop="p2C1">
  554 + <el-radio-group disabled v-model="form.p2C1">
  555 + <el-radio label="1" style="color:green;">✔</el-radio>
  556 + <el-radio label="0" style="color:red;">X</el-radio>
  557 + </el-radio-group>
  558 + </el-form-item>
  559 + </el-col>
  560 + <el-col :span="5">
  561 + <el-form-item label="是否清理" prop="p2C2">
  562 + <el-radio-group disabled v-model="form.p2C2">
  563 + <el-radio label="1" style="color:green;">✔</el-radio>
  564 + <el-radio label="0" style="color:red;">X</el-radio>
  565 + </el-radio-group>
  566 + </el-form-item>
  567 + </el-col>
  568 + <el-col :span="5">
  569 + <el-form-item label="使用达标情况" prop="p2C3">
  570 + <el-radio-group disabled v-model="form.p2C3">
  571 + <el-radio label="1" style="color:green;">✔</el-radio>
  572 + <el-radio label="0" style="color:red;">X</el-radio>
  573 + </el-radio-group>
  574 + </el-form-item>
  575 + </el-col>
  576 + </el-row>
  577 + <el-row>
  578 + <el-col :span="7">
  579 + <el-form-item label="人工冲洗区 长度" prop="p3">
  580 + <el-input disabled v-model="form.p3" placeholder="米" type="number"/>
  581 + </el-form-item>
  582 + </el-col>
  583 + <el-col :span="7">
  584 + <el-form-item label="水枪" prop="p3C1">
  585 + <el-input disabled v-model="form.p3C1" placeholder="把" type="number"/>
  586 + </el-form-item>
  587 + </el-col>
  588 + <el-col :span="5">
  589 + <el-form-item label="是否清理" prop="p3C2">
  590 + <el-radio-group disabled v-model="form.p3C2">
  591 + <el-radio label="1" style="color:green;">✔</el-radio>
  592 + <el-radio label="0" style="color:red;">X</el-radio>
  593 + </el-radio-group>
  594 + </el-form-item>
  595 + </el-col>
  596 + <el-col :span="5">
  597 + <el-form-item label="是否整洁" prop="p3C3">
  598 + <el-radio-group disabled v-model="form.p3C3">
  599 + <el-radio label="1" style="color:green;">✔</el-radio>
  600 + <el-radio label="0" style="color:red;">X</el-radio>
  601 + </el-radio-group>
  602 + </el-form-item>
  603 + </el-col>
  604 + </el-row>
  605 + <el-row>
  606 + <el-col :span="7">
  607 + <el-form-item label="出口 长度" prop="p4">
  608 + <el-input disabled v-model="form.p4" placeholder="米" type="number"/>
  609 + </el-form-item>
  610 + </el-col>
  611 + <el-col :span="5">
  612 + <el-form-item label="是否硬化" prop="p4C1">
  613 + <el-radio-group disabled v-model="form.p4C1">
  614 + <el-radio label="1" style="color:green;">✔</el-radio>
  615 + <el-radio label="0" style="color:red;">X</el-radio>
  616 + </el-radio-group>
  617 + </el-form-item>
  618 + </el-col>
  619 + <el-col :span="5">
  620 + <el-form-item label="是否整洁" prop="p4C2">
  621 + <el-radio-group disabled v-model="form.p4C2">
  622 + <el-radio label="1" style="color:green;">✔</el-radio>
  623 + <el-radio label="0" style="color:red;">X</el-radio>
  624 + </el-radio-group>
  625 + </el-form-item>
  626 + </el-col>
  627 + </el-row>
  628 + <el-row>
  629 + <el-col :span="7">
  630 + <el-form-item label="场内同行道路 硬化" prop="p5">
  631 + <el-radio-group disabled v-model="form.p5">
  632 + <el-radio label="1" style="color:green;">✔</el-radio>
  633 + <el-radio label="0" style="color:red;">X</el-radio>
  634 + </el-radio-group>
  635 + </el-form-item>
  636 + </el-col>
  637 + <el-col :span="7">
  638 + <el-form-item label="未硬化" prop="p5C1">
  639 + <el-radio-group disabled v-model="form.p5C1">
  640 + <el-radio label="1" style="color:green;">✔</el-radio>
  641 + <el-radio label="0" style="color:red;">X</el-radio>
  642 + </el-radio-group>
  643 + </el-form-item>
  644 + </el-col>
  645 + <el-col :span="7">
  646 + <el-form-item label="硬化方式" prop="p5C2">
  647 + <el-input disabled v-model="form.p5C2" placeholder="把" type="number"/>
  648 + </el-form-item>
  649 + </el-col>
  650 + </el-row>
  651 + <el-row>
  652 + <el-col :span="7">
  653 + <el-form-item label="用电照明 通电情况" prop="p6">
  654 + <el-radio-group disabled v-model="form.p6">
  655 + <el-radio label="1" style="color:green;">✔</el-radio>
  656 + <el-radio label="0" style="color:red;">X</el-radio>
  657 + </el-radio-group>
  658 + </el-form-item>
  659 + </el-col>
  660 + <el-col :span="7">
  661 + <el-form-item label="有" prop="p6C1">
  662 + <el-input disabled v-model="form.p6C1" placeholder="盏" type="number"/>
  663 + </el-form-item>
  664 + </el-col>
  665 + <el-col :span="5">
  666 + <el-form-item label="使用达标情况" prop="p6C2">
  667 + <el-radio-group disabled v-model="form.p6C2">
  668 + <el-radio label="1" style="color:green;">✔</el-radio>
  669 + <el-radio label="0" style="color:red;">X</el-radio>
  670 + </el-radio-group>
  671 + </el-form-item>
  672 + </el-col>
  673 + </el-row>
  674 + <el-row>
  675 + <el-col :span="7">
  676 + <el-form-item label="视频监控 球机" prop="p7">
  677 + <el-input disabled v-model="form.p7" placeholder="台" type="number"/>
  678 + </el-form-item>
  679 + </el-col>
  680 + <el-col :span="7">
  681 + <el-form-item label="枪机" prop="p7C1">
  682 + <el-input disabled v-model="form.p7C1" placeholder="台" type="number"/>
  683 + </el-form-item>
  684 + </el-col>
  685 + <el-col :span="5">
  686 + <el-form-item label="是否接入平台" prop="p7C2">
  687 + <el-radio-group disabled v-model="form.p7C2">
  688 + <el-radio label="1" style="color:green;">✔</el-radio>
  689 + <el-radio label="0" style="color:red;">X</el-radio>
  690 + </el-radio-group>
  691 + </el-form-item>
  692 + </el-col>
  693 + </el-row>
  694 + <el-row>
  695 + <el-col :span="7">
  696 + <el-form-item label="其他设施 围挡" prop="p8">
  697 + <el-input disabled v-model="form.p8" placeholder="米" type="number"/>
  698 + </el-form-item>
  699 + </el-col>
  700 + <el-col :span="5">
  701 + <el-form-item label="裸露黄土覆盖" prop="p8C1">
  702 + <el-radio-group disabled v-model="form.p8C1">
  703 + <el-radio label="1" style="color:green;">✔</el-radio>
  704 + <el-radio label="0" style="color:red;">X</el-radio>
  705 + </el-radio-group>
  706 + </el-form-item>
  707 + </el-col>
  708 + <el-col :span="5">
  709 + <el-form-item label="喷淋降尘" prop="p8C2">
  710 + <el-radio-group disabled v-model="form.p8C2">
  711 + <el-radio label="1" style="color:green;">✔</el-radio>
  712 + <el-radio label="0" style="color:red;">X</el-radio>
  713 + </el-radio-group>
  714 + </el-form-item>
  715 + </el-col>
  716 + </el-row>
  717 +
  718 +
  719 + <el-form-item label="周边市容环境" prop="environment">
  720 + <el-input disabled v-model="form.environment" placeholder="请输入周边市容环境" />
  721 + </el-form-item>
  722 + <label>三查工作情况检查</label>
  723 +
  724 + <el-row>
  725 + <el-col :span="24">
  726 + <el-form-item label="责任主体单位或建设运营单位台账登记情况" prop="p9">
  727 + <el-radio-group disabled v-model="form.p9C1">
  728 + <el-radio label="1" style="color:green;">✔</el-radio>
  729 + <el-radio label="0" style="color:red;">X</el-radio>
  730 + </el-radio-group>
  731 + </el-form-item>
  732 + </el-col>
  733 + <el-row>
  734 + </el-row>
  735 + <el-col :span="24">
  736 + <el-form-item label="主签运输公司台账登记情况" prop="p9C2">
  737 + <el-radio-group disabled v-model="form.p9C2">
  738 + <el-radio label="1" style="color:green;">✔</el-radio>
  739 + <el-radio label="0" style="color:red;">X</el-radio>
  740 + </el-radio-group>
  741 + </el-form-item>
  742 + </el-col>
  743 + </el-row>
  744 +
  745 + <el-form-item label="在用消纳场地及对应线路" prop="line">
  746 + <el-input disabled v-model="form.line" placeholder="请输入在用消纳场地及对应线路" />
  747 + </el-form-item>
  748 + <el-form-item label="主要问题以及整改意见" prop="dest">
  749 + <el-input disabled v-model="form.dest" placeholder="请输入主要问题以及整改意见" />
  750 + </el-form-item>
  751 + <el-form-item label="检查人员意见以及签名" prop="checkSign">
  752 + <el-input disabled v-model="form.checkSign" placeholder="请输入检查人员意见以及签名" />
  753 + </el-form-item>
  754 + <el-form-item label="建设单位代表签字" prop="sign">
  755 + <el-input disabled v-model="form.sign" placeholder="请输入建设单位代表签字" />
  756 + </el-form-item>
  757 +
  758 + </el-row>
  759 + <el-col :span="24">
  760 + <el-form-item label="是否达标" prop="p9C3">
  761 + <el-select disabled v-model="form.p9C3">
  762 + <el-option label="是" style="color:green;" value=1 />
  763 + <el-option label="否" style="color:red;" value=0 />
  764 + </el-select>
  765 + </el-form-item>
  766 + </el-col>
  767 + </el-row>
  768 +
  769 + </el-form>
  770 + <div slot="footer" class="dialog-footer">
  771 + <el-button type="primary" @click="submitForm">确 定</el-button>
  772 + <el-button @click="cancel">取 消</el-button>
  773 + </div>
  774 + </el-dialog>
  775 +
  776 + </div>
  777 +</template>
  778 +
  779 +<script>
  780 +import { listProjectCheck, getProjectCheck, delProjectCheck, addProjectCheck, updateProjectCheck, exportProjectCheck } from "@/api/other/projectCheck";
  781 +
  782 + import {
  783 + earthsitesList,
  784 + constructionsitesList,
  785 + getDict,
  786 + getArea,
  787 + } from "@/api/dict";
  788 +
  789 +export default {
  790 + name: "ProjectCheck",
  791 + data() {
  792 + return {
  793 + // 遮罩层
  794 + loading: true,
  795 + // 选中数组
  796 + ids: [],
  797 + // 非单个禁用
  798 + single: true,
  799 + // 非多个禁用
  800 + multiple: true,
  801 + // 显示搜索条件
  802 + showSearch: true,
  803 + // 总条数
  804 + total: 0,
  805 + // 大排查表格数据
  806 + projectCheckList: [],
  807 + // 弹出层标题
  808 + title: "",
  809 + // 是否显示弹出层
  810 + open: false,
  811 + // 查询参数
  812 + queryParams: {
  813 + pageNum: 1,
  814 + pageSize: 10,
  815 + name: null,
  816 + checkTime: null,
  817 + projectType: null,
  818 + checkPeople: null,
  819 + margin: null,
  820 + },
  821 + data:{
  822 + 0:[],
  823 + 1:[]
  824 + },
  825 + areas:[],
  826 + open2:false,
  827 + // 表单参数
  828 + form: {},
  829 + remoteQueryData: {
  830 + "page": 1,
  831 + "size": 9999
  832 + },
  833 + // 表单校验
  834 + rules: {
  835 + checkTime: [
  836 + { required: true, message: "检查时间不能为空", trigger: "blur" }
  837 + ],
  838 + projectType: [
  839 + { required: true, message: "工程类别不能为空", trigger: "change" }
  840 + ],
  841 + stock: [
  842 + { required: true, message: "工程标准量不能为空", trigger: "blur" }
  843 + ],
  844 +
  845 + address: [
  846 + { required: true, message: "工程类别不能为空", trigger: "change" }
  847 + ],
  848 + checkPeople: [
  849 + { required: true, message: "检察人员不能为空", trigger: "blur" }
  850 + ],
  851 + margin: [
  852 + { required: true, message: "工程量存量不能为空", trigger: "blur" }
  853 + ],
  854 + createTime: [
  855 + { required: true, message: "创建时间不能为空", trigger: "blur" }
  856 + ],
  857 + createBy: [
  858 + { required: true, message: "创建人不能为空", trigger: "blur" }
  859 + ],
  860 + p1: [
  861 + { required: true, message: "过水塘区不能为空", trigger: "change" }
  862 + ],
  863 + p1C1: [
  864 + { required: true, message: "集泥沟不能为空", trigger: "blur" }
  865 + ],
  866 + p1C2: [
  867 + { required: true, message: "进出水源不能为空", trigger: "blur" }
  868 + ],
  869 + p1C3: [
  870 + { required: true, message: "未完整填写", trigger: "blur" }
  871 + ],
  872 + p2: [
  873 + { required: true, message: "未完整填写", trigger: "blur" }
  874 + ],
  875 + p2C1: [
  876 + { required: true, message: "未完整填写", trigger: "blur" }
  877 + ],
  878 + p2C2: [
  879 + { required: true, message: "未完整填写", trigger: "blur" }
  880 + ],
  881 + p2C3: [
  882 + { required: true, message: "未完整填写", trigger: "blur" }
  883 + ],
  884 + p3: [
  885 + { required: true, message: "未完整填写", trigger: "blur" }
  886 + ],
  887 + p3C1: [
  888 + { required: true, message: "未完整填写", trigger: "blur" }
  889 + ],
  890 + p3C2: [
  891 + { required: true, message: "未完整填写", trigger: "blur" }
  892 + ],
  893 + p3C3: [
  894 + { required: true, message: "未完整填写", trigger: "blur" }
  895 + ],
  896 + p4: [
  897 + { required: true, message: "未完整填写", trigger: "blur" }
  898 + ],
  899 + p4C1: [
  900 + { required: true, message: "未完整填写", trigger: "blur" }
  901 + ],
  902 + p4C2: [
  903 + { required: true, message: "未完整填写", trigger: "blur" }
  904 + ],
  905 + p5: [
  906 + { required: true, message: "未完整填写", trigger: "blur" }
  907 + ],
  908 + p5C1: [
  909 + { required: true, message: "未完整填写", trigger: "blur" }
  910 + ],
  911 + p5C2: [
  912 + { required: true, message: "未完整填写", trigger: "blur" }
  913 + ],
  914 + p5C3: [
  915 + { required: true, message: "未完整填写", trigger: "blur" }
  916 + ],
  917 + p6: [
  918 + { required: true, message: "未完整填写", trigger: "blur" }
  919 + ],
  920 + p6C1: [
  921 + { required: true, message: "未完整填写", trigger: "blur" }
  922 + ],
  923 + p6C2: [
  924 + { required: true, message: "未完整填写", trigger: "blur" }
  925 + ],
  926 + p7: [
  927 + { required: true, message: "未完整填写", trigger: "blur" }
  928 + ],
  929 + p7C1: [
  930 + { required: true, message: "未完整填写", trigger: "blur" }
  931 + ],
  932 + p7C2: [
  933 + { required: true, message: "未完整填写", trigger: "blur" }
  934 + ],
  935 + p8: [
  936 + { required: true, message: "未完整填写", trigger: "blur" }
  937 + ],
  938 + p8C1: [
  939 + { required: true, message: "未完整填写", trigger: "blur" }
  940 + ],
  941 + p8C2: [
  942 + { required: true, message: "未完整填写", trigger: "blur" }
  943 + ],
  944 + p9C1: [
  945 + { required: true, message: "未完整填写", trigger: "blur" }
  946 + ],
  947 + p9C2: [
  948 + { required: true, message: "未完整填写", trigger: "blur" }
  949 + ],
  950 + p9C3: [
  951 + { required: true, message: "未完整填写", trigger: "blur" }
  952 + ],
  953 + environment: [
  954 + { required: true, message: "周边市容环境不能为空", trigger: "blur" }
  955 + ],
  956 + line: [
  957 + { required: true, message: "在用消纳场地及对应线路不能为空", trigger: "blur" }
  958 + ],
  959 + dest: [
  960 + { required: true, message: "主要问题以及整改意见不能为空", trigger: "blur" }
  961 + ],
  962 + checkSign: [
  963 + { required: true, message: "检查人员意见以及签名不能为空", trigger: "blur" }
  964 + ],
  965 + sign: [
  966 + { required: true, message: "建设单位代表签字不能为空", trigger: "blur" }
  967 + ]
  968 + }
  969 + };
  970 + },
  971 + created() {
  972 + getArea().then(res => {
  973 + this.areas = res.result;
  974 + });
  975 +
  976 + constructionsitesList(this.remoteQueryData).then(res => {
  977 + this.data[0]= res.result.list;
  978 + });
  979 +
  980 + earthsitesList(this.remoteQueryData).then(res => {
  981 + this.data[1]= res.result.list;
  982 + });
  983 +
  984 + this.getList();
  985 + },
  986 + methods: {
  987 + getPlace(code){
  988 +
  989 + for(let i in this.areas){
  990 + if(this.areas[i].code == code){
  991 +
  992 + return this.areas[i].name;
  993 +
  994 + }
  995 +
  996 + }
  997 +
  998 + },
  999 + /** 查询大排查列表 */
  1000 + getList() {
  1001 + this.loading = true;
  1002 + listProjectCheck(this.queryParams).then(response => {
  1003 + this.projectCheckList = response.rows;
  1004 + this.total = response.total;
  1005 + this.loading = false;
  1006 + });
  1007 + },
  1008 + // 取消按钮
  1009 + cancel() {
  1010 + this.open = false;
  1011 + this.reset();
  1012 + },
  1013 + // 表单重置
  1014 + reset() {
  1015 + this.form = {
  1016 + id: null,
  1017 + type: null,
  1018 + name: null,
  1019 + timeLimit: null,
  1020 + checkTime: null,
  1021 + projectType: null,
  1022 + stock: null,
  1023 + checkPeople: null,
  1024 + margin: null,
  1025 + createTime: null,
  1026 + createBy: null,
  1027 + p1: null,
  1028 + p1C1: null,
  1029 + p1C2: null,
  1030 + p1C3: null,
  1031 + p2: null,
  1032 + p2C1: null,
  1033 + p2C2: null,
  1034 + p2C3: null,
  1035 + p3: null,
  1036 + p3C1: null,
  1037 + p3C2: null,
  1038 + p3C3: null,
  1039 + p4: null,
  1040 + p4C1: null,
  1041 + p4C2: null,
  1042 + p4C3: null,
  1043 + p5: null,
  1044 + p5C1: null,
  1045 + p5C2: null,
  1046 + p5C3: null,
  1047 + p6: null,
  1048 + p6C1: null,
  1049 + p6C2: null,
  1050 + p6C3: null,
  1051 + p7: null,
  1052 + p7C1: null,
  1053 + p7C2: null,
  1054 + p7C3: null,
  1055 + p8: null,
  1056 + p8C1: null,
  1057 + p8C2: null,
  1058 + p8C3: null,
  1059 + p9C1: null,
  1060 + p9C2: null,
  1061 + p9C3: null,
  1062 + environment: null,
  1063 + line: null,
  1064 + dest: null,
  1065 + checkSign: null,
  1066 + sign: null
  1067 + };
  1068 + this.resetForm("form");
  1069 + },
  1070 + /** 搜索按钮操作 */
  1071 + handleQuery() {
  1072 + this.queryParams.pageNum = 1;
  1073 + this.getList();
  1074 + },
  1075 + /** 重置按钮操作 */
  1076 + resetQuery() {
  1077 + this.resetForm("queryForm");
  1078 + this.handleQuery();
  1079 + },
  1080 + // 多选框选中数据
  1081 + handleSelectionChange(selection) {
  1082 + this.ids = selection.map(item => item.id)
  1083 + this.single = selection.length!==1
  1084 + this.multiple = !selection.length
  1085 + },
  1086 + /** 新增按钮操作 */
  1087 + handleAdd() {
  1088 + this.reset();
  1089 + this.open = true;
  1090 + this.title = "添加大排查";
  1091 + },
  1092 + /** 修改按钮操作 */
  1093 + handleUpdate(row) {
  1094 + this.reset();
  1095 + const id = row.id || this.ids
  1096 + getProjectCheck(id).then(response => {
  1097 + this.form = response.data;
  1098 +
  1099 + for(let i in this.form ){
  1100 + if(typeof this.form[i] == "number"){
  1101 + this.form[i] = this.form[i] +"";
  1102 + }
  1103 + }
  1104 +
  1105 + this.open2 = true;
  1106 + this.title = "修改大排查";
  1107 + });
  1108 + },
  1109 + /** 提交按钮 */
  1110 + submitForm() {
  1111 + this.$refs["form"].validate(valid => {
  1112 + if (valid) {
  1113 + if (this.form.id != null) {
  1114 + updateProjectCheck(this.form).then(response => {
  1115 + this.msgSuccess("修改成功");
  1116 + this.open = false;
  1117 + this.getList();
  1118 + });
  1119 + } else {
  1120 + addProjectCheck(this.form).then(response => {
  1121 + this.msgSuccess("新增成功");
  1122 + this.open = false;
  1123 + this.getList();
  1124 + });
  1125 + }
  1126 + }
  1127 + });
  1128 + },
  1129 + /** 删除按钮操作 */
  1130 + handleDelete(row) {
  1131 + const ids = row.id || this.ids;
  1132 + this.$confirm('是否确认删除大排查编号为"' + ids + '"的数据项?', "警告", {
  1133 + confirmButtonText: "确定",
  1134 + cancelButtonText: "取消",
  1135 + type: "warning"
  1136 + }).then(function() {
  1137 + return delProjectCheck(ids);
  1138 + }).then(() => {
  1139 + this.getList();
  1140 + this.msgSuccess("删除成功");
  1141 + })
  1142 + },
  1143 + /** 导出按钮操作 */
  1144 + handleExport() {
  1145 + const queryParams = this.queryParams;
  1146 + this.$confirm('是否确认导出所有大排查数据项?', "警告", {
  1147 + confirmButtonText: "确定",
  1148 + cancelButtonText: "取消",
  1149 + type: "warning"
  1150 + }).then(function() {
  1151 + return exportProjectCheck(queryParams);
  1152 + }).then(response => {
  1153 + this.download(response.msg);
  1154 + })
  1155 + }
  1156 + }
  1157 +};
  1158 +</script>
trash-ui/src/views/sign/sign/index.vue 0 → 100644
  View file @6d2ba61
  1 +<template>
  2 + <div class="app-container">
  3 + <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
  4 + <el-form-item label="基础数据ID" prop="objectId">
  5 + <el-input
  6 + v-model="queryParams.objectId"
  7 + placeholder="请输入基础数据ID"
  8 + clearable
  9 + size="small"
  10 + @keyup.enter.native="handleQuery"
  11 + />
  12 + </el-form-item>
  13 + <el-form-item label="businessKey预留" prop="workflowId">
  14 + <el-input
  15 + v-model="queryParams.workflowId"
  16 + placeholder="请输入businessKey预留"
  17 + clearable
  18 + size="small"
  19 + @keyup.enter.native="handleQuery"
  20 + />
  21 + </el-form-item>
  22 + <el-form-item>
  23 + <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
  24 + <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
  25 + </el-form-item>
  26 + </el-form>
  27 +
  28 + <el-row :gutter="10" class="mb8">
  29 + <el-col :span="1.5">
  30 + <el-button
  31 + type="primary"
  32 + icon="el-icon-plus"
  33 + size="mini"
  34 + @click="handleAdd"
  35 + v-hasPermi="['sign:sign:add']"
  36 + >新增</el-button>
  37 + </el-col>
  38 + <el-col :span="1.5">
  39 + <el-button
  40 + type="success"
  41 + icon="el-icon-edit"
  42 + size="mini"
  43 + :disabled="single"
  44 + @click="handleUpdate"
  45 + v-hasPermi="['sign:sign:edit']"
  46 + >修改</el-button>
  47 + </el-col>
  48 + <el-col :span="1.5">
  49 + <el-button
  50 + type="danger"
  51 + icon="el-icon-delete"
  52 + size="mini"
  53 + :disabled="multiple"
  54 + @click="handleDelete"
  55 + v-hasPermi="['sign:sign:remove']"
  56 + >删除</el-button>
  57 + </el-col>
  58 + <el-col :span="1.5">
  59 + <el-button
  60 + type="warning"
  61 + icon="el-icon-download"
  62 + size="mini"
  63 + @click="handleExport"
  64 + v-hasPermi="['sign:sign:export']"
  65 + >导出</el-button>
  66 + </el-col>
  67 + <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
  68 + </el-row>
  69 +
  70 + <el-table v-loading="loading" :data="signList" @selection-change="handleSelectionChange">
  71 + <el-table-column type="selection" width="55" align="center" />
  72 + <el-table-column label="主键id" align="center" prop="id" />
  73 + <el-table-column label="基础数据ID" align="center" prop="objectId" />
  74 + <el-table-column label="签名1" align="center" prop="sign1" />
  75 + <el-table-column label="签名2" align="center" prop="sign2" />
  76 + <el-table-column label="签名3" align="center" prop="sign3" />
  77 + <el-table-column label="签名4" align="center" prop="sign4" />
  78 + <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
  79 + <template slot-scope="scope">
  80 + <el-button
  81 + size="mini"
  82 + type="text"
  83 + icon="el-icon-edit"
  84 + @click="handleUpdate(scope.row)"
  85 + v-hasPermi="['sign:sign:edit']"
  86 + >修改</el-button>
  87 + <el-button
  88 + size="mini"
  89 + type="text"
  90 + icon="el-icon-delete"
  91 + @click="handleDelete(scope.row)"
  92 + v-hasPermi="['sign:sign:remove']"
  93 + >删除</el-button>
  94 + </template>
  95 + </el-table-column>
  96 + </el-table>
  97 +
  98 + <pagination
  99 + v-show="total>0"
  100 + :total="total"
  101 + :page.sync="queryParams.pageNum"
  102 + :limit.sync="queryParams.pageSize"
  103 + @pagination="getList"
  104 + />
  105 +
  106 + <!-- 添加或修改sign对话框 -->
  107 + <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
  108 + <el-form ref="form" :model="form" :rules="rules" label-width="80px">
  109 + <el-form-item label="基础数据ID" prop="objectId">
  110 + <el-input v-model="form.objectId" placeholder="请输入基础数据ID" />
  111 + </el-form-item>
  112 + <el-form-item label="businessKey预留" prop="workflowId">
  113 + <el-input v-model="form.workflowId" placeholder="请输入businessKey预留" />
  114 + </el-form-item>
  115 + <el-form-item label="签名1" prop="sign1">
  116 + <el-input v-model="form.sign1" placeholder="请输入签名1" />
  117 + </el-form-item>
  118 + <el-form-item label="签名2" prop="sign2">
  119 + <el-input v-model="form.sign2" placeholder="请输入签名2" />
  120 + </el-form-item>
  121 + <el-form-item label="签名3" prop="sign3">
  122 + <el-input v-model="form.sign3" placeholder="请输入签名3" />
  123 + </el-form-item>
  124 + <el-form-item label="签名4" prop="sign4">
  125 + <el-input v-model="form.sign4" placeholder="请输入签名4" />
  126 + </el-form-item>
  127 + </el-form>
  128 + <div slot="footer" class="dialog-footer">
  129 + <el-button type="primary" @click="submitForm">确 定</el-button>
  130 + <el-button @click="cancel">取 消</el-button>
  131 + </div>
  132 + </el-dialog>
  133 + </div>
  134 +</template>
  135 +
  136 +<script>
  137 +import { listSign, getSign, delSign, addSign, updateSign, exportSign } from "@/api/sign/sign";
  138 +
  139 +export default {
  140 + name: "Sign",
  141 + data() {
  142 + return {
  143 + // 遮罩层
  144 + loading: true,
  145 + // 选中数组
  146 + ids: [],
  147 + // 非单个禁用
  148 + single: true,
  149 + // 非多个禁用
  150 + multiple: true,
  151 + // 显示搜索条件
  152 + showSearch: true,
  153 + // 总条数
  154 + total: 0,
  155 + // sign表格数据
  156 + signList: [],
  157 + // 弹出层标题
  158 + title: "",
  159 + // 是否显示弹出层
  160 + open: false,
  161 + // 查询参数
  162 + queryParams: {
  163 + pageNum: 1,
  164 + pageSize: 10,
  165 + objectId: null,
  166 + workflowId: null,
  167 + },
  168 + // 表单参数
  169 + form: {},
  170 + // 表单校验
  171 + rules: {
  172 + }
  173 + };
  174 + },
  175 + created() {
  176 + this.getList();
  177 + },
  178 + methods: {
  179 + /** 查询sign列表 */
  180 + getList() {
  181 + this.loading = true;
  182 + listSign(this.queryParams).then(response => {
  183 + this.signList = response.rows;
  184 + this.total = response.total;
  185 + this.loading = false;
  186 + });
  187 + },
  188 + // 取消按钮
  189 + cancel() {
  190 + this.open = false;
  191 + this.reset();
  192 + },
  193 + // 表单重置
  194 + reset() {
  195 + this.form = {
  196 + id: null,
  197 + objectId: null,
  198 + workflowId: null,
  199 + createTime: null,
  200 + sign1: null,
  201 + sign2: null,
  202 + sign3: null,
  203 + sign4: null
  204 + };
  205 + this.resetForm("form");
  206 + },
  207 + /** 搜索按钮操作 */
  208 + handleQuery() {
  209 + this.queryParams.pageNum = 1;
  210 + this.getList();
  211 + },
  212 + /** 重置按钮操作 */
  213 + resetQuery() {
  214 + this.resetForm("queryForm");
  215 + this.handleQuery();
  216 + },
  217 + // 多选框选中数据
  218 + handleSelectionChange(selection) {
  219 + this.ids = selection.map(item => item.id)
  220 + this.single = selection.length!==1
  221 + this.multiple = !selection.length
  222 + },
  223 + /** 新增按钮操作 */
  224 + handleAdd() {
  225 + this.reset();
  226 + this.open = true;
  227 + this.title = "添加sign";
  228 + },
  229 + /** 修改按钮操作 */
  230 + handleUpdate(row) {
  231 + this.reset();
  232 + const id = row.id || this.ids
  233 + getSign(id).then(response => {
  234 + this.form = response.data;
  235 + this.open = true;
  236 + this.title = "修改sign";
  237 + });
  238 + },
  239 + /** 提交按钮 */
  240 + submitForm() {
  241 + this.$refs["form"].validate(valid => {
  242 + if (valid) {
  243 + if (this.form.id != null) {
  244 + updateSign(this.form).then(response => {
  245 + this.msgSuccess("修改成功");
  246 + this.open = false;
  247 + this.getList();
  248 + });
  249 + } else {
  250 + addSign(this.form).then(response => {
  251 + this.msgSuccess("新增成功");
  252 + this.open = false;
  253 + this.getList();
  254 + });
  255 + }
  256 + }
  257 + });
  258 + },
  259 + /** 删除按钮操作 */
  260 + handleDelete(row) {
  261 + const ids = row.id || this.ids;
  262 + this.$confirm('是否确认删除sign编号为"' + ids + '"的数据项?', "警告", {
  263 + confirmButtonText: "确定",
  264 + cancelButtonText: "取消",
  265 + type: "warning"
  266 + }).then(function() {
  267 + return delSign(ids);
  268 + }).then(() => {
  269 + this.getList();
  270 + this.msgSuccess("删除成功");
  271 + })
  272 + },
  273 + /** 导出按钮操作 */
  274 + handleExport() {
  275 + const queryParams = this.queryParams;
  276 + this.$confirm('是否确认导出所有sign数据项?', "警告", {
  277 + confirmButtonText: "确定",
  278 + cancelButtonText: "取消",
  279 + type: "warning"
  280 + }).then(function() {
  281 + return exportSign(queryParams);
  282 + }).then(response => {
  283 + this.download(response.msg);
  284 + })
  285 + }
  286 + }
  287 +};
  288 +</script>
trash-workFlow/src/main/java/com/trash/business/controller/CompanyCreditController.java
  View file @6d2ba61
@@ -38,7 +38,6 @@ public class CompanyCreditController extends BaseController @@ -38,7 +38,6 @@ public class CompanyCreditController extends BaseController
38 /** 38 /**
39 * 查询企业失信列表 39 * 查询企业失信列表
40 */ 40 */
41 - @PreAuthorize("@ss.hasPermi('Company:credit:list')")  
42 @GetMapping("/list") 41 @GetMapping("/list")
43 public TableDataInfo list(CompanyCredit companyCredit) 42 public TableDataInfo list(CompanyCredit companyCredit)
44 { 43 {
trash-workFlow/src/main/java/com/trash/business/controller/ConstructionCreditController.java
  View file @6d2ba61
@@ -38,7 +38,6 @@ public class ConstructionCreditController extends BaseController @@ -38,7 +38,6 @@ public class ConstructionCreditController extends BaseController
38 /** 38 /**
39 * 查询工地失信列表 39 * 查询工地失信列表
40 */ 40 */
41 - @PreAuthorize("@ss.hasPermi('business:ConstructionCredit:list')")  
42 @GetMapping("/list") 41 @GetMapping("/list")
43 public TableDataInfo list(ConstructionCredit constructionCredit) 42 public TableDataInfo list(ConstructionCredit constructionCredit)
44 { 43 {
trash-workFlow/src/main/java/com/trash/business/controller/ConstructionSignController.java 0 → 100644
  View file @6d2ba61
  1 +package com.trash.business.controller;
  2 +
  3 +import java.util.List;
  4 +import org.springframework.security.access.prepost.PreAuthorize;
  5 +import org.springframework.beans.factory.annotation.Autowired;
  6 +import org.springframework.web.bind.annotation.GetMapping;
  7 +import org.springframework.web.bind.annotation.PostMapping;
  8 +import org.springframework.web.bind.annotation.PutMapping;
  9 +import org.springframework.web.bind.annotation.DeleteMapping;
  10 +import org.springframework.web.bind.annotation.PathVariable;
  11 +import org.springframework.web.bind.annotation.RequestBody;
  12 +import org.springframework.web.bind.annotation.RequestMapping;
  13 +import org.springframework.web.bind.annotation.RestController;
  14 +import com.trash.common.annotation.Log;
  15 +import com.trash.common.core.controller.BaseController;
  16 +import com.trash.common.core.domain.AjaxResult;
  17 +import com.trash.common.enums.BusinessType;
  18 +import com.trash.business.domain.ConstructionSign;
  19 +import com.trash.business.service.IConstructionSignService;
  20 +import com.trash.common.utils.poi.ExcelUtil;
  21 +import com.trash.common.core.page.TableDataInfo;
  22 +
  23 +/**
  24 + * signController
  25 + *
  26 + * @author trash
  27 + * @date 2023-05-14
  28 + */
  29 +@RestController
  30 +@RequestMapping("/sign/sign")
  31 +public class ConstructionSignController extends BaseController
  32 +{
  33 + @Autowired
  34 + private IConstructionSignService constructionSignService;
  35 +
  36 + /**
  37 + * 查询sign列表
  38 + */
  39 + @PreAuthorize("@ss.hasPermi('sign:sign:list')")
  40 + @GetMapping("/list")
  41 + public TableDataInfo list(ConstructionSign constructionSign)
  42 + {
  43 + startPage();
  44 + List<ConstructionSign> list = constructionSignService.selectConstructionSignList(constructionSign);
  45 + return getDataTable(list);
  46 + }
  47 +
  48 + /**
  49 + * 导出sign列表
  50 + */
  51 + @PreAuthorize("@ss.hasPermi('sign:sign:export')")
  52 + @Log(title = "sign", businessType = BusinessType.EXPORT)
  53 + @GetMapping("/export")
  54 + public AjaxResult export(ConstructionSign constructionSign)
  55 + {
  56 + List<ConstructionSign> list = constructionSignService.selectConstructionSignList(constructionSign);
  57 + ExcelUtil<ConstructionSign> util = new ExcelUtil<ConstructionSign>(ConstructionSign.class);
  58 + return util.exportExcel(list, "sign");
  59 + }
  60 +
  61 + /**
  62 + * 获取sign详细信息
  63 + */
  64 + @PreAuthorize("@ss.hasPermi('sign:sign:query')")
  65 + @GetMapping(value = "/{id}")
  66 + public AjaxResult getInfo(@PathVariable("id") Long id)
  67 + {
  68 + return AjaxResult.success(constructionSignService.selectConstructionSignById(id));
  69 + }
  70 +
  71 +
  72 + /**
  73 + * 获取sign详细信息
  74 + */
  75 + @GetMapping(value = "getInfoByObject/{objectId}")
  76 + public AjaxResult getInfo(@PathVariable("objectId") String objectId)
  77 + {
  78 + return AjaxResult.success(constructionSignService.selectConstructionSignByObjId(objectId));
  79 + }
  80 +
  81 +
  82 + /**
  83 + * 新增sign
  84 + */
  85 + @PreAuthorize("@ss.hasPermi('sign:sign:add')")
  86 + @Log(title = "sign", businessType = BusinessType.INSERT)
  87 + @PostMapping
  88 + public AjaxResult add(@RequestBody ConstructionSign constructionSign)
  89 + {
  90 + return toAjax(constructionSignService.insertConstructionSign(constructionSign));
  91 + }
  92 +
  93 + /**
  94 + * 修改sign
  95 + */
  96 + @PreAuthorize("@ss.hasPermi('sign:sign:edit')")
  97 + @Log(title = "sign", businessType = BusinessType.UPDATE)
  98 + @PutMapping
  99 + public AjaxResult edit(@RequestBody ConstructionSign constructionSign)
  100 + {
  101 + return toAjax(constructionSignService.updateConstructionSign(constructionSign));
  102 + }
  103 +
  104 + /**
  105 + * 删除sign
  106 + */
  107 + @PreAuthorize("@ss.hasPermi('sign:sign:remove')")
  108 + @Log(title = "sign", businessType = BusinessType.DELETE)
  109 + @DeleteMapping("/{ids}")
  110 + public AjaxResult remove(@PathVariable Long[] ids)
  111 + {
  112 + return toAjax(constructionSignService.deleteConstructionSignByIds(ids));
  113 + }
  114 +}
trash-workFlow/src/main/java/com/trash/business/controller/DriverCreditController.java
  View file @6d2ba61
@@ -38,7 +38,6 @@ public class DriverCreditController extends BaseController @@ -38,7 +38,6 @@ public class DriverCreditController extends BaseController
38 /** 38 /**
39 * 查询驾驶员失信列表 39 * 查询驾驶员失信列表
40 */ 40 */
41 - @PreAuthorize("@ss.hasPermi('driver:credit:list')")  
42 @GetMapping("/list") 41 @GetMapping("/list")
43 public TableDataInfo list(DriverCredit driverCredit) 42 public TableDataInfo list(DriverCredit driverCredit)
44 { 43 {
trash-workFlow/src/main/java/com/trash/business/controller/EarthsitesCreditController.java
  View file @6d2ba61
@@ -38,7 +38,6 @@ public class EarthsitesCreditController extends BaseController @@ -38,7 +38,6 @@ public class EarthsitesCreditController extends BaseController
38 /** 38 /**
39 * 查询消纳场失信列表 39 * 查询消纳场失信列表
40 */ 40 */
41 - @PreAuthorize("@ss.hasPermi('EarthSites:credit:list')")  
42 @GetMapping("/list") 41 @GetMapping("/list")
43 public TableDataInfo list(EarthsitesCredit earthsitesCredit) 42 public TableDataInfo list(EarthsitesCredit earthsitesCredit)
44 { 43 {
trash-workFlow/src/main/java/com/trash/business/controller/SupervisionSpecialController.java
  View file @6d2ba61
@@ -21,22 +21,22 @@ import com.trash.common.utils.poi.ExcelUtil; @@ -21,22 +21,22 @@ import com.trash.common.utils.poi.ExcelUtil;
21 import com.trash.common.core.page.TableDataInfo; 21 import com.trash.common.core.page.TableDataInfo;
22 22
23 /** 23 /**
24 - * 专项督查Controller 24 + * 专项督察Controller
25 * 25 *
26 * @author trash 26 * @author trash
27 - * @date 2023-05-03 27 + * @date 2023-05-14
28 */ 28 */
29 @RestController 29 @RestController
30 -@RequestMapping("/business/supervisionSpecial") 30 +@RequestMapping("/SupervisionSpecial/SupervisionSpecial")
31 public class SupervisionSpecialController extends BaseController 31 public class SupervisionSpecialController extends BaseController
32 { 32 {
33 @Autowired 33 @Autowired
34 private ISupervisionSpecialService supervisionSpecialService; 34 private ISupervisionSpecialService supervisionSpecialService;
35 35
36 /** 36 /**
37 - * 查询专项督查列表 37 + * 查询专项督察列表
38 */ 38 */
39 - @PreAuthorize("@ss.hasPermi('business:supervisionSpecial:list')") 39 + @PreAuthorize("@ss.hasPermi('SupervisionSpecial:SupervisionSpecial:list')")
40 @GetMapping("/list") 40 @GetMapping("/list")
41 public TableDataInfo list(SupervisionSpecial supervisionSpecial) 41 public TableDataInfo list(SupervisionSpecial supervisionSpecial)
42 { 42 {
@@ -46,22 +46,22 @@ public class SupervisionSpecialController extends BaseController @@ -46,22 +46,22 @@ public class SupervisionSpecialController extends BaseController
46 } 46 }
47 47
48 /** 48 /**
49 - * 导出专项督查列表 49 + * 导出专项督察列表
50 */ 50 */
51 - @PreAuthorize("@ss.hasPermi('business:supervisionSpecial:export')")  
52 - @Log(title = "专项督查", businessType = BusinessType.EXPORT) 51 + @PreAuthorize("@ss.hasPermi('SupervisionSpecial:SupervisionSpecial:export')")
  52 + @Log(title = "专项督察", businessType = BusinessType.EXPORT)
53 @GetMapping("/export") 53 @GetMapping("/export")
54 public AjaxResult export(SupervisionSpecial supervisionSpecial) 54 public AjaxResult export(SupervisionSpecial supervisionSpecial)
55 { 55 {
56 List<SupervisionSpecial> list = supervisionSpecialService.selectSupervisionSpecialList(supervisionSpecial); 56 List<SupervisionSpecial> list = supervisionSpecialService.selectSupervisionSpecialList(supervisionSpecial);
57 ExcelUtil<SupervisionSpecial> util = new ExcelUtil<SupervisionSpecial>(SupervisionSpecial.class); 57 ExcelUtil<SupervisionSpecial> util = new ExcelUtil<SupervisionSpecial>(SupervisionSpecial.class);
58 - return util.exportExcel(list, "supervisionSpecial"); 58 + return util.exportExcel(list, "SupervisionSpecial");
59 } 59 }
60 60
61 /** 61 /**
62 - * 获取专项督查详细信息 62 + * 获取专项督察详细信息
63 */ 63 */
64 - @PreAuthorize("@ss.hasPermi('business:supervisionSpecial:query')") 64 + @PreAuthorize("@ss.hasPermi('SupervisionSpecial:SupervisionSpecial:query')")
65 @GetMapping(value = "/{id}") 65 @GetMapping(value = "/{id}")
66 public AjaxResult getInfo(@PathVariable("id") String id) 66 public AjaxResult getInfo(@PathVariable("id") String id)
67 { 67 {
@@ -69,10 +69,10 @@ public class SupervisionSpecialController extends BaseController @@ -69,10 +69,10 @@ public class SupervisionSpecialController extends BaseController
69 } 69 }
70 70
71 /** 71 /**
72 - * 新增专项督查 72 + * 新增专项督察
73 */ 73 */
74 - @PreAuthorize("@ss.hasPermi('business:supervisionSpecial:add')")  
75 - @Log(title = "专项督查", businessType = BusinessType.INSERT) 74 + @PreAuthorize("@ss.hasPermi('SupervisionSpecial:SupervisionSpecial:add')")
  75 + @Log(title = "专项督察", businessType = BusinessType.INSERT)
76 @PostMapping 76 @PostMapping
77 public AjaxResult add(@RequestBody SupervisionSpecial supervisionSpecial) 77 public AjaxResult add(@RequestBody SupervisionSpecial supervisionSpecial)
78 { 78 {
@@ -80,10 +80,10 @@ public class SupervisionSpecialController extends BaseController @@ -80,10 +80,10 @@ public class SupervisionSpecialController extends BaseController
80 } 80 }
81 81
82 /** 82 /**
83 - * 修改专项督查 83 + * 修改专项督察
84 */ 84 */
85 - @PreAuthorize("@ss.hasPermi('business:supervisionSpecial:edit')")  
86 - @Log(title = "专项督查", businessType = BusinessType.UPDATE) 85 + @PreAuthorize("@ss.hasPermi('SupervisionSpecial:SupervisionSpecial:edit')")
  86 + @Log(title = "专项督察", businessType = BusinessType.UPDATE)
87 @PutMapping 87 @PutMapping
88 public AjaxResult edit(@RequestBody SupervisionSpecial supervisionSpecial) 88 public AjaxResult edit(@RequestBody SupervisionSpecial supervisionSpecial)
89 { 89 {
@@ -91,10 +91,10 @@ public class SupervisionSpecialController extends BaseController @@ -91,10 +91,10 @@ public class SupervisionSpecialController extends BaseController
91 } 91 }
92 92
93 /** 93 /**
94 - * 删除专项督查 94 + * 删除专项督察
95 */ 95 */
96 - @PreAuthorize("@ss.hasPermi('business:supervisionSpecial:remove')")  
97 - @Log(title = "专项督查", businessType = BusinessType.DELETE) 96 + @PreAuthorize("@ss.hasPermi('SupervisionSpecial:SupervisionSpecial:remove')")
  97 + @Log(title = "专项督察", businessType = BusinessType.DELETE)
98 @DeleteMapping("/{ids}") 98 @DeleteMapping("/{ids}")
99 public AjaxResult remove(@PathVariable String[] ids) 99 public AjaxResult remove(@PathVariable String[] ids)
100 { 100 {
trash-workFlow/src/main/java/com/trash/business/controller/SupervisionThreestepController.java
  View file @6d2ba61
@@ -69,15 +69,26 @@ public class SupervisionThreestepController extends BaseController @@ -69,15 +69,26 @@ public class SupervisionThreestepController extends BaseController
69 return getDataTable(list); 69 return getDataTable(list);
70 } 70 }
71 71
  72 + @PostMapping("/todayDataList")
  73 + public List<SupervisionThreestep> todayDataList(@RequestBody SupervisionThreestep supervisionThreestep)
  74 + {
  75 + return supervisionThreestepService.selectTodayDataList(supervisionThreestep);
  76 + }
  77 +
  78 +
72 79
73 /** 80 /**
74 * 查询三查机制列表 81 * 查询三查机制列表
75 */ 82 */
76 - @PreAuthorize("@ss.hasPermi('business:threestep:list')")  
77 @PostMapping("/dayWorkList") 83 @PostMapping("/dayWorkList")
78 public AjaxResult days(@RequestBody SupervisionThreestep supervisionThreestep) 84 public AjaxResult days(@RequestBody SupervisionThreestep supervisionThreestep)
79 { 85 {
80 - return AjaxResult.success(supervisionThreestepService.selectDayWorkListByType(supervisionThreestep)); 86 + List<Map> list= supervisionThreestepService.selectDayWorkListByType(supervisionThreestep);
  87 + AjaxResult result = AjaxResult.success(list);
  88 + result.put("result", AjaxResult.success(list).get("data"));
  89 + result.put("data", null);
  90 +
  91 + return result;
81 } 92 }
82 93
83 /** 94 /**
trash-workFlow/src/main/java/com/trash/business/controller/TruckCreditController.java
  View file @6d2ba61
@@ -38,7 +38,6 @@ public class TruckCreditController extends BaseController @@ -38,7 +38,6 @@ public class TruckCreditController extends BaseController
38 /** 38 /**
39 * 查询车辆失信列表 39 * 查询车辆失信列表
40 */ 40 */
41 - @PreAuthorize("@ss.hasPermi('truck:credit:list')")  
42 @GetMapping("/list") 41 @GetMapping("/list")
43 public TableDataInfo list(TruckCredit truckCredit) 42 public TableDataInfo list(TruckCredit truckCredit)
44 { 43 {
trash-workFlow/src/main/java/com/trash/business/domain/CompanyCredit.java
  View file @6d2ba61
@@ -25,7 +25,7 @@ public class CompanyCredit extends BaseEntity @@ -25,7 +25,7 @@ public class CompanyCredit extends BaseEntity
25 private String name; 25 private String name;
26 26
27 /** 失信时间 */ 27 /** 失信时间 */
28 - @JsonFormat(pattern = "yyyy-MM-dd") 28 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:SS")
29 @Excel(name = "失信时间", width = 30, dateFormat = "yyyy-MM-dd") 29 @Excel(name = "失信时间", width = 30, dateFormat = "yyyy-MM-dd")
30 private Date time; 30 private Date time;
31 31
trash-workFlow/src/main/java/com/trash/business/domain/ConstructionCredit.java
  View file @6d2ba61
@@ -25,7 +25,7 @@ public class ConstructionCredit extends BaseEntity @@ -25,7 +25,7 @@ public class ConstructionCredit extends BaseEntity
25 @Excel(name = "工地垃圾类型") 25 @Excel(name = "工地垃圾类型")
26 private String type; 26 private String type;
27 27
28 - @JsonFormat(pattern = "yyyy-MM-dd") 28 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:SS")
29 @Excel(name = "操作日期",dateFormat="yyyy-MM-dd") 29 @Excel(name = "操作日期",dateFormat="yyyy-MM-dd")
30 private Date time; 30 private Date time;
31 31
trash-workFlow/src/main/java/com/trash/business/domain/ConstructionSign.java 0 → 100644
  View file @6d2ba61
  1 +package com.trash.business.domain;
  2 +
  3 +import java.util.Date;
  4 +
  5 +import org.apache.commons.lang3.builder.ToStringBuilder;
  6 +import org.apache.commons.lang3.builder.ToStringStyle;
  7 +
  8 +import com.fasterxml.jackson.annotation.JsonFormat;
  9 +import com.trash.common.annotation.Excel;
  10 +import com.trash.common.core.domain.BaseEntity;
  11 +
  12 +/**
  13 + * sign对象 construction_sign
  14 + *
  15 + * @author trash
  16 + * @date 2023-05-14
  17 + */
  18 +public class ConstructionSign extends BaseEntity
  19 +{
  20 + private static final long serialVersionUID = 1L;
  21 +
  22 + /** 主键id */
  23 + private Long id;
  24 +
  25 + /** 基础数据ID */
  26 + @Excel(name = "基础数据ID")
  27 + private String objectId;
  28 +
  29 + /** businessKey预留 */
  30 + private String workflowId;
  31 +
  32 + /** 签名1 */
  33 + @Excel(name = "签名1")
  34 + private String sign1;
  35 + /** 失信时间 */
  36 + @JsonFormat(pattern = "yyyy-MM-dd")
  37 + @Excel(name = "签名时间", width = 30, dateFormat = "yyyy-MM-dd")
  38 + private Date sign1Time;
  39 +
  40 + /** 失信时间 */
  41 + @JsonFormat(pattern = "yyyy-MM-dd")
  42 + @Excel(name = "签名时间", width = 30, dateFormat = "yyyy-MM-dd")
  43 + private Date sign2Time;
  44 +
  45 + /** 失信时间 */
  46 + @JsonFormat(pattern = "yyyy-MM-dd")
  47 + @Excel(name = "签名时间", width = 30, dateFormat = "yyyy-MM-dd")
  48 + private Date sign3Time;
  49 +
  50 + /** 失信时间 */
  51 + @JsonFormat(pattern = "yyyy-MM-dd")
  52 + @Excel(name = "签名时间", width = 30, dateFormat = "yyyy-MM-dd")
  53 + private Date sign4Time;
  54 +
  55 +
  56 + /** 签名2 */
  57 + @Excel(name = "签名2")
  58 + private String sign2;
  59 +
  60 + /** 签名3 */
  61 + @Excel(name = "签名3")
  62 + private String sign3;
  63 +
  64 + private String sign4;
  65 +
  66 + private String sign1Text;
  67 +
  68 + private String sign2Text;
  69 +
  70 + private String sign3Text;
  71 +
  72 + private String sign4Text;
  73 +
  74 +
  75 +
  76 + public String getSign1Text() {
  77 + return sign1Text;
  78 + }
  79 +
  80 + public void setSign1Text(String sign1Text) {
  81 + this.sign1Text = sign1Text;
  82 + }
  83 +
  84 + public String getSign2Text() {
  85 + return sign2Text;
  86 + }
  87 +
  88 + public void setSign2Text(String sign2Text) {
  89 + this.sign2Text = sign2Text;
  90 + }
  91 +
  92 + public String getSign3Text() {
  93 + return sign3Text;
  94 + }
  95 +
  96 + public void setSign3Text(String sign3Text) {
  97 + this.sign3Text = sign3Text;
  98 + }
  99 +
  100 + public String getSign4Text() {
  101 + return sign4Text;
  102 + }
  103 +
  104 + public void setSign4Text(String sign4Text) {
  105 + this.sign4Text = sign4Text;
  106 + }
  107 +
  108 + public int idx;
  109 +
  110 +
  111 +
  112 + public int getIdx() {
  113 + return idx;
  114 + }
  115 +
  116 + public void setIdx(int idx) {
  117 + this.idx = idx;
  118 + }
  119 +
  120 + public Date getSign1Time() {
  121 + return sign1Time;
  122 + }
  123 +
  124 + public void setSign1Time(Date sign1Time) {
  125 + this.sign1Time = sign1Time;
  126 + }
  127 +
  128 + public Date getSign2Time() {
  129 + return sign2Time;
  130 + }
  131 +
  132 + public void setSign2Time(Date sign2Time) {
  133 + this.sign2Time = sign2Time;
  134 + }
  135 +
  136 + public Date getSign3Time() {
  137 + return sign3Time;
  138 + }
  139 +
  140 + public void setSign3Time(Date sign3Time) {
  141 + this.sign3Time = sign3Time;
  142 + }
  143 +
  144 + public Date getSign4Time() {
  145 + return sign4Time;
  146 + }
  147 +
  148 + public void setSign4Time(Date sign4Time) {
  149 + this.sign4Time = sign4Time;
  150 + }
  151 +
  152 + public void setId(Long id)
  153 + {
  154 + this.id = id;
  155 + }
  156 +
  157 + public Long getId()
  158 + {
  159 + return id;
  160 + }
  161 + public void setObjectId(String objectId)
  162 + {
  163 + this.objectId = objectId;
  164 + }
  165 +
  166 + public String getObjectId()
  167 + {
  168 + return objectId;
  169 + }
  170 + public void setWorkflowId(String workflowId)
  171 + {
  172 + this.workflowId = workflowId;
  173 + }
  174 +
  175 + public String getWorkflowId()
  176 + {
  177 + return workflowId;
  178 + }
  179 + public void setSign1(String sign1)
  180 + {
  181 + this.sign1 = sign1;
  182 + }
  183 +
  184 + public String getSign1()
  185 + {
  186 + return sign1;
  187 + }
  188 + public void setSign2(String sign2)
  189 + {
  190 + this.sign2 = sign2;
  191 + }
  192 +
  193 + public String getSign2()
  194 + {
  195 + return sign2;
  196 + }
  197 + public void setSign3(String sign3)
  198 + {
  199 + this.sign3 = sign3;
  200 + }
  201 +
  202 + public String getSign3()
  203 + {
  204 + return sign3;
  205 + }
  206 + public void setSign4(String sign4)
  207 + {
  208 + this.sign4 = sign4;
  209 + }
  210 +
  211 + public String getSign4()
  212 + {
  213 + return sign4;
  214 + }
  215 +
  216 + @Override
  217 + public String toString() {
  218 + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
  219 + .append("id", getId())
  220 + .append("objectId", getObjectId())
  221 + .append("workflowId", getWorkflowId())
  222 + .append("createTime", getCreateTime())
  223 + .append("sign1", getSign1())
  224 + .append("sign2", getSign2())
  225 + .append("sign3", getSign3())
  226 + .append("sign4", getSign4())
  227 + .toString();
  228 + }
  229 +}
trash-workFlow/src/main/java/com/trash/business/domain/DriverCredit.java
  View file @6d2ba61
@@ -29,7 +29,7 @@ public class DriverCredit extends BaseEntity @@ -29,7 +29,7 @@ public class DriverCredit extends BaseEntity
29 private String idNumber; 29 private String idNumber;
30 30
31 /** 失信时间 */ 31 /** 失信时间 */
32 - @JsonFormat(pattern = "yyyy-MM-dd") 32 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:SS")
33 @Excel(name = "失信时间", width = 30, dateFormat = "yyyy-MM-dd") 33 @Excel(name = "失信时间", width = 30, dateFormat = "yyyy-MM-dd")
34 private Date time; 34 private Date time;
35 35
trash-workFlow/src/main/java/com/trash/business/domain/EarthsitesCredit.java
  View file @6d2ba61
@@ -29,7 +29,7 @@ public class EarthsitesCredit extends BaseEntity @@ -29,7 +29,7 @@ public class EarthsitesCredit extends BaseEntity
29 private String type; 29 private String type;
30 30
31 /** 失信时间 */ 31 /** 失信时间 */
32 - @JsonFormat(pattern = "yyyy-MM-dd") 32 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:SS")
33 @Excel(name = "失信时间", width = 30, dateFormat = "yyyy-MM-dd") 33 @Excel(name = "失信时间", width = 30, dateFormat = "yyyy-MM-dd")
34 private Date time; 34 private Date time;
35 35
trash-workFlow/src/main/java/com/trash/business/domain/SupervisionSpecial.java
  View file @6d2ba61
1 package com.trash.business.domain; 1 package com.trash.business.domain;
2 2
3 -import java.util.Date;  
4 -import com.fasterxml.jackson.annotation.JsonFormat;  
5 import org.apache.commons.lang3.builder.ToStringBuilder; 3 import org.apache.commons.lang3.builder.ToStringBuilder;
6 import org.apache.commons.lang3.builder.ToStringStyle; 4 import org.apache.commons.lang3.builder.ToStringStyle;
7 import com.trash.common.annotation.Excel; 5 import com.trash.common.annotation.Excel;
8 import com.trash.common.core.domain.BaseEntity; 6 import com.trash.common.core.domain.BaseEntity;
9 7
10 /** 8 /**
11 - * 专项督查对象 supervision_special 9 + * 专项督察对象 supervision_special
12 * 10 *
13 * @author trash 11 * @author trash
14 - * @date 2023-05-03 12 + * @date 2023-05-14
15 */ 13 */
16 public class SupervisionSpecial extends BaseEntity 14 public class SupervisionSpecial extends BaseEntity
17 { 15 {
18 private static final long serialVersionUID = 1L; 16 private static final long serialVersionUID = 1L;
19 17
20 - /** 主键ID */ 18 + /** 序号 */
  19 + @Excel(name = "序号")
21 private String id; 20 private String id;
22 21
23 /** 类型 */ 22 /** 类型 */
24 - @Excel(name = "类型") 23 + @Excel(name = "类型", readConverterExp = "0=工地,1=消纳场")
25 private String type; 24 private String type;
26 25
27 /** 督查事项 */ 26 /** 督查事项 */
28 - @Excel(name = "督查事项") 27 + @Excel(name = "项目名称")
29 private String title; 28 private String title;
30 29
31 /** 督查内容 */ 30 /** 督查内容 */
32 @Excel(name = "督查内容") 31 @Excel(name = "督查内容")
33 private String content; 32 private String content;
34 33
35 - /** 责任部门人签收 */  
36 - @Excel(name = "责任部门人签收")  
37 - private String signPerson; 34 + /** 督查人 */
  35 + @Excel(name = "督查人")
  36 + private String person;
38 37
39 - /** 签收时间 */  
40 - @JsonFormat(pattern = "yyyy-MM-dd")  
41 - @Excel(name = "签收时间", width = 30, dateFormat = "yyyy-MM-dd")  
42 - private Date signTime;  
43 -  
44 - /** 回复期限 */  
45 - @JsonFormat(pattern = "yyyy-MM-dd")  
46 - @Excel(name = "回复期限", width = 30, dateFormat = "yyyy-MM-dd")  
47 - private Date timeLimit;  
48 -  
49 - /** 状态 */  
50 - @Excel(name = "状态")  
51 - private String state;  
52 -  
53 - /** 回复部门 */  
54 - @Excel(name = "回复部门")  
55 - private String resDepart;  
56 -  
57 - /** 回复时间 */  
58 - @JsonFormat(pattern = "yyyy-MM-dd")  
59 - @Excel(name = "回复时间", width = 30, dateFormat = "yyyy-MM-dd")  
60 - private Date resTime;  
61 -  
62 - /** 回复部门负责人 */  
63 - @Excel(name = "回复部门负责人")  
64 - private String resPerson;  
65 -  
66 - /** 回复内容 */  
67 - @Excel(name = "回复内容")  
68 - private String resContent;  
69 -  
70 - /** 批注 */  
71 - @Excel(name = "批注")  
72 - private String annotations; 38 + @Excel(name = "所属区域")
  39 + private String place;
73 40
74 public void setId(String id) 41 public void setId(String id)
75 { 42 {
@@ -107,86 +74,23 @@ public class SupervisionSpecial extends BaseEntity @@ -107,86 +74,23 @@ public class SupervisionSpecial extends BaseEntity
107 { 74 {
108 return content; 75 return content;
109 } 76 }
110 - public void setSignPerson(String signPerson)  
111 - {  
112 - this.signPerson = signPerson;  
113 - }  
114 -  
115 - public String getSignPerson()  
116 - {  
117 - return signPerson;  
118 - }  
119 - public void setSignTime(Date signTime)  
120 - {  
121 - this.signTime = signTime;  
122 - }  
123 -  
124 - public Date getSignTime()  
125 - {  
126 - return signTime;  
127 - }  
128 - public void setTimeLimit(Date timeLimit)  
129 - {  
130 - this.timeLimit = timeLimit;  
131 - }  
132 -  
133 - public Date getTimeLimit()  
134 - {  
135 - return timeLimit;  
136 - }  
137 - public void setState(String state)  
138 - {  
139 - this.state = state;  
140 - }  
141 -  
142 - public String getState()  
143 - {  
144 - return state;  
145 - }  
146 - public void setResDepart(String resDepart)  
147 - {  
148 - this.resDepart = resDepart;  
149 - }  
150 -  
151 - public String getResDepart()  
152 - {  
153 - return resDepart;  
154 - }  
155 - public void setResTime(Date resTime)  
156 - {  
157 - this.resTime = resTime;  
158 - }  
159 -  
160 - public Date getResTime()  
161 - {  
162 - return resTime;  
163 - }  
164 - public void setResPerson(String resPerson)  
165 - {  
166 - this.resPerson = resPerson;  
167 - }  
168 -  
169 - public String getResPerson()  
170 - {  
171 - return resPerson;  
172 - }  
173 - public void setResContent(String resContent) 77 + public void setPerson(String person)
174 { 78 {
175 - this.resContent = resContent; 79 + this.person = person;
176 } 80 }
177 81
178 - public String getResContent() 82 + public String getPerson()
179 { 83 {
180 - return resContent; 84 + return person;
181 } 85 }
182 - public void setAnnotations(String annotations) 86 + public void setPlace(String place)
183 { 87 {
184 - this.annotations = annotations; 88 + this.place = place;
185 } 89 }
186 90
187 - public String getAnnotations() 91 + public String getPlace()
188 { 92 {
189 - return annotations; 93 + return place;
190 } 94 }
191 95
192 @Override 96 @Override
@@ -196,19 +100,12 @@ public class SupervisionSpecial extends BaseEntity @@ -196,19 +100,12 @@ public class SupervisionSpecial extends BaseEntity
196 .append("type", getType()) 100 .append("type", getType())
197 .append("title", getTitle()) 101 .append("title", getTitle())
198 .append("content", getContent()) 102 .append("content", getContent())
199 - .append("signPerson", getSignPerson())  
200 - .append("signTime", getSignTime())  
201 - .append("timeLimit", getTimeLimit())  
202 - .append("state", getState()) 103 + .append("person", getPerson())
  104 + .append("state", getPlace())
203 .append("createBy", getCreateBy()) 105 .append("createBy", getCreateBy())
204 .append("createTime", getCreateTime()) 106 .append("createTime", getCreateTime())
205 .append("updateTime", getUpdateTime()) 107 .append("updateTime", getUpdateTime())
206 .append("updateBy", getUpdateBy()) 108 .append("updateBy", getUpdateBy())
207 - .append("resDepart", getResDepart())  
208 - .append("resTime", getResTime())  
209 - .append("resPerson", getResPerson())  
210 - .append("resContent", getResContent())  
211 - .append("annotations", getAnnotations())  
212 .toString(); 109 .toString();
213 } 110 }
214 } 111 }
trash-workFlow/src/main/java/com/trash/business/domain/TruckActivate.java
  View file @6d2ba61
@@ -57,8 +57,30 @@ public class TruckActivate extends BaseEntity @@ -57,8 +57,30 @@ public class TruckActivate extends BaseEntity
57 57
58 @Excel(name = "状态") 58 @Excel(name = "状态")
59 private String isAct; 59 private String isAct;
  60 +
  61 + private String startTime;
  62 + private String endTime;
  63 +
  64 +
  65 +
  66 +
  67 + public String getStartTime() {
  68 + return startTime;
  69 + }
  70 +
  71 + public void setStartTime(String startTime) {
  72 + this.startTime = startTime;
  73 + }
  74 +
  75 + public String getEndTime() {
  76 + return endTime;
  77 + }
  78 +
  79 + public void setEndTime(String endTime) {
  80 + this.endTime = endTime;
  81 + }
60 82
61 - public String getIsAct() { 83 + public String getIsAct() {
62 return activateTime==null?"未激活":"激活"; 84 return activateTime==null?"未激活":"激活";
63 } 85 }
64 86
trash-workFlow/src/main/java/com/trash/business/domain/TruckCredit.java
  View file @6d2ba61
@@ -46,7 +46,7 @@ public class TruckCredit extends BaseEntity @@ -46,7 +46,7 @@ public class TruckCredit extends BaseEntity
46 46
47 private Long createType; 47 private Long createType;
48 48
49 - @JsonFormat(pattern = "yyyy-MM-dd") 49 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:SS")
50 @Excel(name = "${失信时间}", dateFormat = "yyyy-MM-dd") 50 @Excel(name = "${失信时间}", dateFormat = "yyyy-MM-dd")
51 private Date time; 51 private Date time;
52 52
trash-workFlow/src/main/java/com/trash/business/mapper/ConstructionSignMapper.java 0 → 100644
  View file @6d2ba61
  1 +package com.trash.business.mapper;
  2 +
  3 +import java.util.List;
  4 +import com.trash.business.domain.ConstructionSign;
  5 +
  6 +/**
  7 + * signMapper接口
  8 + *
  9 + * @author trash
  10 + * @date 2023-05-14
  11 + */
  12 +public interface ConstructionSignMapper
  13 +{
  14 + /**
  15 + * 查询sign
  16 + *
  17 + * @param id signID
  18 + * @return sign
  19 + */
  20 + ConstructionSign selectConstructionSignById(Long id);
  21 +
  22 + /**
  23 + * 查询sign列表
  24 + *
  25 + * @param constructionSign sign
  26 + * @return sign集合
  27 + */
  28 + List<ConstructionSign> selectConstructionSignList(ConstructionSign constructionSign);
  29 +
  30 + /**
  31 + * 新增sign
  32 + *
  33 + * @param constructionSign sign
  34 + * @return 结果
  35 + */
  36 + int insertConstructionSign(ConstructionSign constructionSign);
  37 +
  38 + /**
  39 + * 修改sign
  40 + *
  41 + * @param constructionSign sign
  42 + * @return 结果
  43 + */
  44 + int updateConstructionSign(ConstructionSign constructionSign);
  45 +
  46 + /**
  47 + * 删除sign
  48 + *
  49 + * @param id signID
  50 + * @return 结果
  51 + */
  52 + int deleteConstructionSignById(Long id);
  53 +
  54 + /**
  55 + * 批量删除sign
  56 + *
  57 + * @param ids 需要删除的数据ID
  58 + * @return 结果
  59 + */
  60 + int deleteConstructionSignByIds(Long[] ids);
  61 +
  62 + ConstructionSign selectConstructionSignByObjId(String objectId);
  63 +}
trash-workFlow/src/main/java/com/trash/business/mapper/SupervisionSpecialMapper.java
  View file @6d2ba61
@@ -4,58 +4,58 @@ import java.util.List; @@ -4,58 +4,58 @@ import java.util.List;
4 import com.trash.business.domain.SupervisionSpecial; 4 import com.trash.business.domain.SupervisionSpecial;
5 5
6 /** 6 /**
7 - * 专项督查Mapper接口 7 + * 专项督察Mapper接口
8 * 8 *
9 * @author trash 9 * @author trash
10 - * @date 2023-05-03 10 + * @date 2023-05-14
11 */ 11 */
12 public interface SupervisionSpecialMapper 12 public interface SupervisionSpecialMapper
13 { 13 {
14 /** 14 /**
15 - * 查询专项督查 15 + * 查询专项督察
16 * 16 *
17 - * @param id 专项督查ID  
18 - * @return 专项督查 17 + * @param id 专项督察ID
  18 + * @return 专项督察
19 */ 19 */
20 - public SupervisionSpecial selectSupervisionSpecialById(String id); 20 + SupervisionSpecial selectSupervisionSpecialById(String id);
21 21
22 /** 22 /**
23 - * 查询专项督查列表 23 + * 查询专项督察列表
24 * 24 *
25 - * @param supervisionSpecial 专项督查  
26 - * @return 专项督查集合 25 + * @param supervisionSpecial 专项督察
  26 + * @return 专项督察集合
27 */ 27 */
28 - public List<SupervisionSpecial> selectSupervisionSpecialList(SupervisionSpecial supervisionSpecial); 28 + List<SupervisionSpecial> selectSupervisionSpecialList(SupervisionSpecial supervisionSpecial);
29 29
30 /** 30 /**
31 - * 新增专项督查 31 + * 新增专项督察
32 * 32 *
33 - * @param supervisionSpecial 专项督查 33 + * @param supervisionSpecial 专项督察
34 * @return 结果 34 * @return 结果
35 */ 35 */
36 - public int insertSupervisionSpecial(SupervisionSpecial supervisionSpecial); 36 + int insertSupervisionSpecial(SupervisionSpecial supervisionSpecial);
37 37
38 /** 38 /**
39 - * 修改专项督查 39 + * 修改专项督察
40 * 40 *
41 - * @param supervisionSpecial 专项督查 41 + * @param supervisionSpecial 专项督察
42 * @return 结果 42 * @return 结果
43 */ 43 */
44 - public int updateSupervisionSpecial(SupervisionSpecial supervisionSpecial); 44 + int updateSupervisionSpecial(SupervisionSpecial supervisionSpecial);
45 45
46 /** 46 /**
47 - * 删除专项督查 47 + * 删除专项督察
48 * 48 *
49 - * @param id 专项督查ID 49 + * @param id 专项督察ID
50 * @return 结果 50 * @return 结果
51 */ 51 */
52 - public int deleteSupervisionSpecialById(String id); 52 + int deleteSupervisionSpecialById(String id);
53 53
54 /** 54 /**
55 - * 批量删除专项督查 55 + * 批量删除专项督察
56 * 56 *
57 * @param ids 需要删除的数据ID 57 * @param ids 需要删除的数据ID
58 * @return 结果 58 * @return 结果
59 */ 59 */
60 - public int deleteSupervisionSpecialByIds(String[] ids); 60 + int deleteSupervisionSpecialByIds(String[] ids);
61 } 61 }
trash-workFlow/src/main/java/com/trash/business/mapper/SupervisionThreestepMapper.java
  View file @6d2ba61
@@ -68,4 +68,6 @@ public interface SupervisionThreestepMapper @@ -68,4 +68,6 @@ public interface SupervisionThreestepMapper
68 public List<String> getNames(SupervisionThreestep supervisionThreestep); 68 public List<String> getNames(SupervisionThreestep supervisionThreestep);
69 69
70 public List<Map> selectDayWorkListByType(SupervisionThreestep supervisionThreestep); 70 public List<Map> selectDayWorkListByType(SupervisionThreestep supervisionThreestep);
  71 +
  72 + List<SupervisionThreestep> selectTodayDataList(SupervisionThreestep param);
71 } 73 }
trash-workFlow/src/main/java/com/trash/business/mapper/TruckActivateMapper.java
  View file @6d2ba61
@@ -58,4 +58,8 @@ public interface TruckActivateMapper @@ -58,4 +58,8 @@ public interface TruckActivateMapper
58 * @return 结果 58 * @return 结果
59 */ 59 */
60 public int deleteTruckActivateByIds(Long[] ids); 60 public int deleteTruckActivateByIds(Long[] ids);
  61 +
  62 + public void endAllTurckUnActive();
  63 +
  64 + public TruckActivate selectTodayTruckActivateByObjId(String objId);
61 } 65 }
trash-workFlow/src/main/java/com/trash/business/service/IConstructionSignService.java 0 → 100644
  View file @6d2ba61
  1 +package com.trash.business.service;
  2 +
  3 +import java.util.List;
  4 +import com.trash.business.domain.ConstructionSign;
  5 +
  6 +/**
  7 + * signService接口
  8 + *
  9 + * @author trash
  10 + * @date 2023-05-14
  11 + */
  12 +public interface IConstructionSignService
  13 +{
  14 + /**
  15 + * 查询sign
  16 + *
  17 + * @param id signID
  18 + * @return sign
  19 + */
  20 + ConstructionSign selectConstructionSignById(Long id);
  21 +
  22 + /**
  23 + * 查询sign列表
  24 + *
  25 + * @param constructionSign sign
  26 + * @return sign集合
  27 + */
  28 + List<ConstructionSign> selectConstructionSignList(ConstructionSign constructionSign);
  29 +
  30 + /**
  31 + * 新增sign
  32 + *
  33 + * @param constructionSign sign
  34 + * @return 结果
  35 + */
  36 + int insertConstructionSign(ConstructionSign constructionSign);
  37 +
  38 + /**
  39 + * 修改sign
  40 + *
  41 + * @param constructionSign sign
  42 + * @return 结果
  43 + */
  44 + int updateConstructionSign(ConstructionSign constructionSign);
  45 +
  46 + /**
  47 + * 批量删除sign
  48 + *
  49 + * @param ids 需要删除的signID
  50 + * @return 结果
  51 + */
  52 + int deleteConstructionSignByIds(Long[] ids);
  53 +
  54 + /**
  55 + * 删除sign信息
  56 + *
  57 + * @param id signID
  58 + * @return 结果
  59 + */
  60 + int deleteConstructionSignById(Long id);
  61 +
  62 + ConstructionSign selectConstructionSignByObjId(String objectId);
  63 +}
trash-workFlow/src/main/java/com/trash/business/service/ISupervisionSpecialService.java
  View file @6d2ba61
@@ -4,58 +4,58 @@ import java.util.List; @@ -4,58 +4,58 @@ import java.util.List;
4 import com.trash.business.domain.SupervisionSpecial; 4 import com.trash.business.domain.SupervisionSpecial;
5 5
6 /** 6 /**
7 - * 专项督查Service接口 7 + * 专项督察Service接口
8 * 8 *
9 * @author trash 9 * @author trash
10 - * @date 2023-05-03 10 + * @date 2023-05-14
11 */ 11 */
12 public interface ISupervisionSpecialService 12 public interface ISupervisionSpecialService
13 { 13 {
14 /** 14 /**
15 - * 查询专项督查 15 + * 查询专项督察
16 * 16 *
17 - * @param id 专项督查ID  
18 - * @return 专项督查 17 + * @param id 专项督察ID
  18 + * @return 专项督察
19 */ 19 */
20 - public SupervisionSpecial selectSupervisionSpecialById(String id); 20 + SupervisionSpecial selectSupervisionSpecialById(String id);
21 21
22 /** 22 /**
23 - * 查询专项督查列表 23 + * 查询专项督察列表
24 * 24 *
25 - * @param supervisionSpecial 专项督查  
26 - * @return 专项督查集合 25 + * @param supervisionSpecial 专项督察
  26 + * @return 专项督察集合
27 */ 27 */
28 - public List<SupervisionSpecial> selectSupervisionSpecialList(SupervisionSpecial supervisionSpecial); 28 + List<SupervisionSpecial> selectSupervisionSpecialList(SupervisionSpecial supervisionSpecial);
29 29
30 /** 30 /**
31 - * 新增专项督查 31 + * 新增专项督察
32 * 32 *
33 - * @param supervisionSpecial 专项督查 33 + * @param supervisionSpecial 专项督察
34 * @return 结果 34 * @return 结果
35 */ 35 */
36 - public int insertSupervisionSpecial(SupervisionSpecial supervisionSpecial); 36 + int insertSupervisionSpecial(SupervisionSpecial supervisionSpecial);
37 37
38 /** 38 /**
39 - * 修改专项督查 39 + * 修改专项督察
40 * 40 *
41 - * @param supervisionSpecial 专项督查 41 + * @param supervisionSpecial 专项督察
42 * @return 结果 42 * @return 结果
43 */ 43 */
44 - public int updateSupervisionSpecial(SupervisionSpecial supervisionSpecial); 44 + int updateSupervisionSpecial(SupervisionSpecial supervisionSpecial);
45 45
46 /** 46 /**
47 - * 批量删除专项督查 47 + * 批量删除专项督察
48 * 48 *
49 - * @param ids 需要删除的专项督查ID 49 + * @param ids 需要删除的专项督察ID
50 * @return 结果 50 * @return 结果
51 */ 51 */
52 - public int deleteSupervisionSpecialByIds(String[] ids); 52 + int deleteSupervisionSpecialByIds(String[] ids);
53 53
54 /** 54 /**
55 - * 删除专项督查信息 55 + * 删除专项督察信息
56 * 56 *
57 - * @param id 专项督查ID 57 + * @param id 专项督察ID
58 * @return 结果 58 * @return 结果
59 */ 59 */
60 - public int deleteSupervisionSpecialById(String id); 60 + int deleteSupervisionSpecialById(String id);
61 } 61 }
trash-workFlow/src/main/java/com/trash/business/service/ISupervisionThreestepService.java
  View file @6d2ba61
@@ -30,6 +30,10 @@ public interface ISupervisionThreestepService @@ -30,6 +30,10 @@ public interface ISupervisionThreestepService
30 * @return 三查机制集合 30 * @return 三查机制集合
31 */ 31 */
32 List<SupervisionThreestep> selectSupervisionThreestepList(SupervisionThreestep supervisionThreestep); 32 List<SupervisionThreestep> selectSupervisionThreestepList(SupervisionThreestep supervisionThreestep);
  33 +
  34 +
  35 + List<SupervisionThreestep> selectTodayDataList(SupervisionThreestep supervisionThreestep);
  36 +
33 37
34 /** 38 /**
35 * 新增三查机制 39 * 新增三查机制
@@ -61,6 +65,9 @@ public interface ISupervisionThreestepService @@ -61,6 +65,9 @@ public interface ISupervisionThreestepService
61 * @param id 三查机制ID 65 * @param id 三查机制ID
62 * @return 结果 66 * @return 结果
63 */ 67 */
  68 +
  69 + public void checkDataToActiveTruck(SupervisionThreestep supervisionThreestep);
  70 +
64 int deleteSupervisionThreestepById(Long id); 71 int deleteSupervisionThreestepById(Long id);
65 72
66 String upload(MultipartFile file); 73 String upload(MultipartFile file);
@@ -72,4 +79,6 @@ public interface ISupervisionThreestepService @@ -72,4 +79,6 @@ public interface ISupervisionThreestepService
72 public List<String> getNames(SupervisionThreestep supervisionThreestep); 79 public List<String> getNames(SupervisionThreestep supervisionThreestep);
73 80
74 public List<Map> selectDayWorkListByType(SupervisionThreestep supervisionThreestep); 81 public List<Map> selectDayWorkListByType(SupervisionThreestep supervisionThreestep);
  82 +
  83 +
75 } 84 }
trash-workFlow/src/main/java/com/trash/business/service/ITruckActivateService.java
  View file @6d2ba61
@@ -58,4 +58,6 @@ public interface ITruckActivateService @@ -58,4 +58,6 @@ public interface ITruckActivateService
58 * @return 结果 58 * @return 结果
59 */ 59 */
60 public int deleteTruckActivateById(Long id); 60 public int deleteTruckActivateById(Long id);
  61 +
  62 + public void endAllTruckUnActive();
61 } 63 }
trash-workFlow/src/main/java/com/trash/business/service/impl/ConstructionSignServiceImpl.java 0 → 100644
  View file @6d2ba61
  1 +package com.trash.business.service.impl;
  2 +
  3 +import java.util.List;
  4 +import com.trash.common.utils.DateUtils;
  5 +import com.trash.common.utils.SecurityUtils;
  6 +
  7 +import org.springframework.beans.factory.annotation.Autowired;
  8 +import org.springframework.stereotype.Service;
  9 +import com.trash.business.mapper.ConstructionSignMapper;
  10 +import com.trash.business.domain.ConstructionSign;
  11 +import com.trash.business.service.IConstructionSignService;
  12 +
  13 +/**
  14 + * signService业务层处理
  15 + *
  16 + * @author trash
  17 + * @date 2023-05-14
  18 + */
  19 +@Service
  20 +public class ConstructionSignServiceImpl implements IConstructionSignService
  21 +{
  22 + @Autowired
  23 + private ConstructionSignMapper constructionSignMapper;
  24 +
  25 + /**
  26 + * 查询sign
  27 + *
  28 + * @param id signID
  29 + * @return sign
  30 + */
  31 + @Override
  32 + public ConstructionSign selectConstructionSignById(Long id)
  33 + {
  34 + return constructionSignMapper.selectConstructionSignById(id);
  35 + }
  36 + @Override
  37 + public ConstructionSign selectConstructionSignByObjId(String id)
  38 + {
  39 + return constructionSignMapper.selectConstructionSignByObjId(id);
  40 + }
  41 +
  42 + /**
  43 + * 查询sign列表
  44 + *
  45 + * @param constructionSign sign
  46 + * @return sign
  47 + */
  48 + @Override
  49 + public List<ConstructionSign> selectConstructionSignList(ConstructionSign constructionSign)
  50 + {
  51 + return constructionSignMapper.selectConstructionSignList(constructionSign);
  52 + }
  53 +
  54 + /**
  55 + * 新增sign
  56 + *
  57 + * @param constructionSign sign
  58 + * @return 结果
  59 + */
  60 + @Override
  61 + public int insertConstructionSign(ConstructionSign constructionSign)
  62 + {
  63 + int i;
  64 + ConstructionSign oldDate = constructionSignMapper.selectConstructionSignByObjId(constructionSign.getObjectId());
  65 +
  66 +
  67 + constructionSign.setCreateTime(DateUtils.getNowDate());
  68 +
  69 + String sign = SecurityUtils.getLoginUser().getUser().getAvatar();
  70 +
  71 + if (constructionSign.getIdx() == 0) {
  72 + constructionSign.setSign1(sign);
  73 + constructionSign.setSign1Time(DateUtils.getNowDate());
  74 + }else if (constructionSign.getIdx() == 1) {
  75 + constructionSign.setSign2(sign);
  76 + constructionSign.setSign2Time(DateUtils.getNowDate());
  77 + }else if (constructionSign.getIdx() == 2) {
  78 + constructionSign.setSign3(sign);
  79 + constructionSign.setSign3Time(DateUtils.getNowDate());
  80 + }else if (constructionSign.getIdx() == 3) {
  81 + constructionSign.setSign4(sign);
  82 + constructionSign.setSign4Time(DateUtils.getNowDate());
  83 + }
  84 +
  85 + if(oldDate != null){
  86 + constructionSign.setId(oldDate.getId());
  87 +
  88 + i = constructionSignMapper.updateConstructionSign(constructionSign);
  89 + }else{
  90 +
  91 + i = constructionSignMapper.insertConstructionSign(constructionSign);
  92 + }
  93 +
  94 +
  95 + return i;
  96 + }
  97 +
  98 + /**
  99 + * 修改sign
  100 + *
  101 + * @param constructionSign sign
  102 + * @return 结果
  103 + */
  104 + @Override
  105 + public int updateConstructionSign(ConstructionSign constructionSign)
  106 + {
  107 + return constructionSignMapper.updateConstructionSign(constructionSign);
  108 + }
  109 +
  110 + /**
  111 + * 批量删除sign
  112 + *
  113 + * @param ids 需要删除的signID
  114 + * @return 结果
  115 + */
  116 + @Override
  117 + public int deleteConstructionSignByIds(Long[] ids)
  118 + {
  119 + return constructionSignMapper.deleteConstructionSignByIds(ids);
  120 + }
  121 +
  122 + /**
  123 + * 删除sign信息
  124 + *
  125 + * @param id signID
  126 + * @return 结果
  127 + */
  128 + @Override
  129 + public int deleteConstructionSignById(Long id)
  130 + {
  131 + return constructionSignMapper.deleteConstructionSignById(id);
  132 + }
  133 +}
trash-workFlow/src/main/java/com/trash/business/service/impl/SupervisionSpecialServiceImpl.java
  View file @6d2ba61
@@ -9,10 +9,10 @@ import com.trash.business.domain.SupervisionSpecial; @@ -9,10 +9,10 @@ import com.trash.business.domain.SupervisionSpecial;
9 import com.trash.business.service.ISupervisionSpecialService; 9 import com.trash.business.service.ISupervisionSpecialService;
10 10
11 /** 11 /**
12 - * 专项督查Service业务层处理 12 + * 专项督察Service业务层处理
13 * 13 *
14 * @author trash 14 * @author trash
15 - * @date 2023-05-03 15 + * @date 2023-05-14
16 */ 16 */
17 @Service 17 @Service
18 public class SupervisionSpecialServiceImpl implements ISupervisionSpecialService 18 public class SupervisionSpecialServiceImpl implements ISupervisionSpecialService
@@ -21,10 +21,10 @@ public class SupervisionSpecialServiceImpl implements ISupervisionSpecialService @@ -21,10 +21,10 @@ public class SupervisionSpecialServiceImpl implements ISupervisionSpecialService
21 private SupervisionSpecialMapper supervisionSpecialMapper; 21 private SupervisionSpecialMapper supervisionSpecialMapper;
22 22
23 /** 23 /**
24 - * 查询专项督查 24 + * 查询专项督察
25 * 25 *
26 - * @param id 专项督查ID  
27 - * @return 专项督查 26 + * @param id 专项督察ID
  27 + * @return 专项督察
28 */ 28 */
29 @Override 29 @Override
30 public SupervisionSpecial selectSupervisionSpecialById(String id) 30 public SupervisionSpecial selectSupervisionSpecialById(String id)
@@ -33,10 +33,10 @@ public class SupervisionSpecialServiceImpl implements ISupervisionSpecialService @@ -33,10 +33,10 @@ public class SupervisionSpecialServiceImpl implements ISupervisionSpecialService
33 } 33 }
34 34
35 /** 35 /**
36 - * 查询专项督查列表 36 + * 查询专项督察列表
37 * 37 *
38 - * @param supervisionSpecial 专项督查  
39 - * @return 专项督查 38 + * @param supervisionSpecial 专项督察
  39 + * @return 专项督察
40 */ 40 */
41 @Override 41 @Override
42 public List<SupervisionSpecial> selectSupervisionSpecialList(SupervisionSpecial supervisionSpecial) 42 public List<SupervisionSpecial> selectSupervisionSpecialList(SupervisionSpecial supervisionSpecial)
@@ -45,9 +45,9 @@ public class SupervisionSpecialServiceImpl implements ISupervisionSpecialService @@ -45,9 +45,9 @@ public class SupervisionSpecialServiceImpl implements ISupervisionSpecialService
45 } 45 }
46 46
47 /** 47 /**
48 - * 新增专项督查 48 + * 新增专项督察
49 * 49 *
50 - * @param supervisionSpecial 专项督查 50 + * @param supervisionSpecial 专项督察
51 * @return 结果 51 * @return 结果
52 */ 52 */
53 @Override 53 @Override
@@ -58,9 +58,9 @@ public class SupervisionSpecialServiceImpl implements ISupervisionSpecialService @@ -58,9 +58,9 @@ public class SupervisionSpecialServiceImpl implements ISupervisionSpecialService
58 } 58 }
59 59
60 /** 60 /**
61 - * 修改专项督查 61 + * 修改专项督察
62 * 62 *
63 - * @param supervisionSpecial 专项督查 63 + * @param supervisionSpecial 专项督察
64 * @return 结果 64 * @return 结果
65 */ 65 */
66 @Override 66 @Override
@@ -71,9 +71,9 @@ public class SupervisionSpecialServiceImpl implements ISupervisionSpecialService @@ -71,9 +71,9 @@ public class SupervisionSpecialServiceImpl implements ISupervisionSpecialService
71 } 71 }
72 72
73 /** 73 /**
74 - * 批量删除专项督查 74 + * 批量删除专项督察
75 * 75 *
76 - * @param ids 需要删除的专项督查ID 76 + * @param ids 需要删除的专项督察ID
77 * @return 结果 77 * @return 结果
78 */ 78 */
79 @Override 79 @Override
@@ -83,9 +83,9 @@ public class SupervisionSpecialServiceImpl implements ISupervisionSpecialService @@ -83,9 +83,9 @@ public class SupervisionSpecialServiceImpl implements ISupervisionSpecialService
83 } 83 }
84 84
85 /** 85 /**
86 - * 删除专项督查信息 86 + * 删除专项督察信息
87 * 87 *
88 - * @param id 专项督查ID 88 + * @param id 专项督察ID
89 * @return 结果 89 * @return 结果
90 */ 90 */
91 @Override 91 @Override
trash-workFlow/src/main/java/com/trash/business/service/impl/SupervisionThreestepServiceImpl.java
  View file @6d2ba61
@@ -3,10 +3,12 @@ package com.trash.business.service.impl; @@ -3,10 +3,12 @@ package com.trash.business.service.impl;
3 import java.io.IOException; 3 import java.io.IOException;
4 import java.text.ParseException; 4 import java.text.ParseException;
5 import java.text.SimpleDateFormat; 5 import java.text.SimpleDateFormat;
  6 +import java.util.ArrayList;
6 import java.util.Date; 7 import java.util.Date;
7 import java.util.List; 8 import java.util.List;
8 import java.util.Map; 9 import java.util.Map;
9 10
  11 +import org.apache.commons.collections4.map.HashedMap;
10 import org.springframework.beans.factory.annotation.Autowired; 12 import org.springframework.beans.factory.annotation.Autowired;
11 import org.springframework.stereotype.Service; 13 import org.springframework.stereotype.Service;
12 import org.springframework.transaction.annotation.Transactional; 14 import org.springframework.transaction.annotation.Transactional;
@@ -14,9 +16,11 @@ import org.springframework.web.multipart.MultipartFile; @@ -14,9 +16,11 @@ import org.springframework.web.multipart.MultipartFile;
14 16
15 import com.alibaba.fastjson.JSONArray; 17 import com.alibaba.fastjson.JSONArray;
16 import com.alibaba.fastjson.JSONObject; 18 import com.alibaba.fastjson.JSONObject;
  19 +import com.sun.jna.platform.unix.solaris.LibKstat.KstatNamed.UNION.STR;
17 import com.trash.business.domain.SupervisionThreestep; 20 import com.trash.business.domain.SupervisionThreestep;
18 import com.trash.business.domain.TruckActivate; 21 import com.trash.business.domain.TruckActivate;
19 import com.trash.business.mapper.SupervisionThreestepMapper; 22 import com.trash.business.mapper.SupervisionThreestepMapper;
  23 +import com.trash.business.mapper.TruckActivateMapper;
20 import com.trash.business.service.ISupervisionThreestepService; 24 import com.trash.business.service.ISupervisionThreestepService;
21 import com.trash.business.service.ITruckActivateService; 25 import com.trash.business.service.ITruckActivateService;
22 import com.trash.common.config.trashConfig; 26 import com.trash.common.config.trashConfig;
@@ -43,6 +47,14 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer @@ -43,6 +47,14 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
43 @Autowired 47 @Autowired
44 ITruckActivateService truckActivateService; 48 ITruckActivateService truckActivateService;
45 49
  50 + @Autowired
  51 + TruckActivateMapper truckActivateMapper;
  52 +
  53 +
  54 +
  55 + SimpleDateFormat yearFomat = new SimpleDateFormat("yyyy-MM-dd");
  56 + SimpleDateFormat timeFomat = new SimpleDateFormat("HH:mm:SS");
  57 +
46 /** 58 /**
47 * 查询三查机制 59 * 查询三查机制
48 * 60 *
@@ -70,21 +82,21 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer @@ -70,21 +82,21 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
70 Date date = new Date(); 82 Date date = new Date();
71 83
72 if (new Date().getHours() < 8) { 84 if (new Date().getHours() < 8) {
73 - end = sdf.format(date); 85 + end = yearFomat.format(date);
74 date.setDate(date.getDate() - 1); 86 date.setDate(date.getDate() - 1);
75 - start = sdf.format(date); 87 + start = yearFomat.format(date);
76 } else { 88 } else {
77 - start = sdf.format(date); 89 + start = yearFomat.format(date);
78 date.setDate(date.getDate() + 1); 90 date.setDate(date.getDate() + 1);
79 - end = sdf.format(date); 91 + end = yearFomat.format(date);
80 } 92 }
81 93
82 end += " 8:00:00"; 94 end += " 8:00:00";
83 start += " 8:00:00"; 95 start += " 8:00:00";
84 96
85 try { 97 try {
86 - supervisionThreestep.setWorkStartTime(sdf.parse(start));  
87 - supervisionThreestep.setWorkEndTime(sdf.parse(end)); 98 + supervisionThreestep.setWorkStartTime(yearFomat.parse(start));
  99 + supervisionThreestep.setWorkEndTime(yearFomat.parse(end));
88 } catch (Exception e) { 100 } catch (Exception e) {
89 // TODO Auto-generated catch block 101 // TODO Auto-generated catch block
90 e.printStackTrace(); 102 e.printStackTrace();
@@ -119,21 +131,21 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer @@ -119,21 +131,21 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
119 Date date = new Date(); 131 Date date = new Date();
120 132
121 if (new Date().getHours() < 8) { 133 if (new Date().getHours() < 8) {
122 - end = sdf.format(date); 134 + end = yearFomat.format(date);
123 date.setDate(date.getDate() - 1); 135 date.setDate(date.getDate() - 1);
124 - start = sdf.format(date); 136 + start = yearFomat.format(date);
125 } else { 137 } else {
126 - start = sdf.format(date); 138 + start = yearFomat.format(date);
127 date.setDate(date.getDate() + 1); 139 date.setDate(date.getDate() + 1);
128 - end = sdf.format(date); 140 + end = yearFomat.format(date);
129 } 141 }
130 142
131 end += " 8:00:00"; 143 end += " 8:00:00";
132 start += " 8:00:00"; 144 start += " 8:00:00";
133 145
134 try { 146 try {
135 - supervisionThreestep.setWorkStartTime(sdf.parse(start));  
136 - supervisionThreestep.setWorkEndTime(sdf.parse(end)); 147 + supervisionThreestep.setWorkStartTime(yearFomat.parse(start));
  148 + supervisionThreestep.setWorkEndTime(yearFomat.parse(end));
137 } catch (Exception e) { 149 } catch (Exception e) {
138 // TODO Auto-generated catch block 150 // TODO Auto-generated catch block
139 e.printStackTrace(); 151 e.printStackTrace();
@@ -160,7 +172,6 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer @@ -160,7 +172,6 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
160 return supervisionThreestepMapper.getNames(supervisionThreestep); 172 return supervisionThreestepMapper.getNames(supervisionThreestep);
161 } 173 }
162 174
163 - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");  
164 175
165 @Override 176 @Override
166 public List<Map> selectDayWorkList(SupervisionThreestep supervisionThreestep) { 177 public List<Map> selectDayWorkList(SupervisionThreestep supervisionThreestep) {
@@ -171,21 +182,21 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer @@ -171,21 +182,21 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
171 Date date = new Date(); 182 Date date = new Date();
172 183
173 if (new Date().getHours() < 8) { 184 if (new Date().getHours() < 8) {
174 - end = sdf.format(date); 185 + end = yearFomat.format(date);
175 date.setDate(date.getDate() - 1); 186 date.setDate(date.getDate() - 1);
176 - start = sdf.format(date); 187 + start = yearFomat.format(date);
177 } else { 188 } else {
178 - start = sdf.format(date); 189 + start = yearFomat.format(date);
179 date.setDate(date.getDate() + 1); 190 date.setDate(date.getDate() + 1);
180 - end = sdf.format(date); 191 + end = yearFomat.format(date);
181 } 192 }
182 193
183 end += " 8:00:00"; 194 end += " 8:00:00";
184 start += " 8:00:00"; 195 start += " 8:00:00";
185 196
186 try { 197 try {
187 - supervisionThreestep.setWorkStartTime(sdf.parse(start));  
188 - supervisionThreestep.setWorkEndTime(sdf.parse(end)); 198 + supervisionThreestep.setWorkStartTime(yearFomat.parse(start));
  199 + supervisionThreestep.setWorkEndTime(yearFomat.parse(end));
189 } catch (Exception e) { 200 } catch (Exception e) {
190 // TODO Auto-generated catch block 201 // TODO Auto-generated catch block
191 e.printStackTrace(); 202 e.printStackTrace();
@@ -210,15 +221,112 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer @@ -210,15 +221,112 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
210 return list; 221 return list;
211 } 222 }
212 223
  224 +
213 225
214 @Override 226 @Override
215 public List<Map> selectDayWorkListByType(SupervisionThreestep supervisionThreestep) { 227 public List<Map> selectDayWorkListByType(SupervisionThreestep supervisionThreestep) {
216 228
217 - return supervisionThreestepMapper.selectDayWorkListByType(supervisionThreestep); 229 + String start, end;
  230 +
  231 + Date date = new Date();
  232 +
  233 + if (new Date().getHours() < 8) {
  234 + end = yearFomat.format(date);
  235 + date.setDate(date.getDate() - 1);
  236 + start = yearFomat.format(date);
  237 + } else {
  238 + start = yearFomat.format(date);
  239 + date.setDate(date.getDate() + 1);
  240 + end = yearFomat.format(date);
  241 + }
  242 +
  243 + end += " 4:00:00";
  244 + start += " 8:00:00";
  245 +
  246 + try {
  247 + supervisionThreestep.setWorkStartTime(yearFomat.parse(start));
  248 + supervisionThreestep.setWorkEndTime(yearFomat.parse(end));
  249 + } catch (Exception e) {
  250 + // TODO Auto-generated catch block
  251 + e.printStackTrace();
  252 + }
  253 +
  254 +
  255 +
  256 + List<Map> map = supervisionThreestepMapper.selectDayWorkListByType(supervisionThreestep);
  257 +
  258 + List<Map> list = new ArrayList<>();
  259 +
  260 + for(Map m : map){
  261 +
  262 +
  263 + if(supervisionThreestep.getType() == 0){
  264 + JSONObject object = RemoteServerUtils.getConstructionInfo(m.get("id").toString());
  265 +
  266 + if(object != null){
  267 + String endTime = object.get("transportEndTime").toString();
  268 +
  269 + if(new Date().getTime() < DateUtils.dateTime("YYYY-MM-DD HH:mm", yearFomat.format(date) + " " + endTime).getTime()){
  270 + continue;
  271 + }
  272 + }
  273 + }
  274 +
  275 + List<String> idStrings = new ArrayList<String>();
  276 + if(m.get("company_trucks") != null){
  277 + for(String objId : m.get("company_trucks").toString().split(",")){
  278 + TruckActivate truck = truckActivateMapper.selectTodayTruckActivateByObjId(objId);
  279 + if(truck != null){
  280 + idStrings.add(objId);
  281 + }
  282 + }
  283 + }
  284 + m.put("vehicleIdList", idStrings);
  285 +
  286 + list.add(m);
  287 + }
  288 +
  289 +
  290 +
  291 + return list;
218 292
219 } 293 }
220 294
221 295
  296 + public List<SupervisionThreestep> selectTodayDataList(SupervisionThreestep supervisionThreestep){
  297 +
  298 +
  299 + if(supervisionThreestep.getWorkStartTime() == null){
  300 + String start, end;
  301 +
  302 + Date date = new Date();
  303 +
  304 + if (new Date().getHours() < 8) {
  305 + end = yearFomat.format(date);
  306 + date.setDate(date.getDate() - 1);
  307 + start = yearFomat.format(date);
  308 + } else {
  309 + start = yearFomat.format(date);
  310 + date.setDate(date.getDate() + 1);
  311 + end = yearFomat.format(date);
  312 + }
  313 +
  314 + end += " 4:00:00";
  315 + start += " 8:00:00";
  316 +
  317 + try {
  318 + supervisionThreestep.setWorkStartTime(yearFomat.parse(start));
  319 + supervisionThreestep.setWorkEndTime(yearFomat.parse(end));
  320 + } catch (Exception e) {
  321 + // TODO Auto-generated catch block
  322 + e.printStackTrace();
  323 + }
  324 + }
  325 +
  326 +
  327 + return supervisionThreestepMapper.selectTodayDataList(supervisionThreestep);
  328 + }
  329 +
222 /** 330 /**
223 * 新增三查机制 331 * 新增三查机制
224 * 332 *
@@ -279,107 +387,90 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer @@ -279,107 +387,90 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
279 387
280 supervisionThreestep = supervisionThreestepMapper.selectSupervisionThreestepById(supervisionThreestep.getId()); 388 supervisionThreestep = supervisionThreestepMapper.selectSupervisionThreestepById(supervisionThreestep.getId());
281 389
282 - boolean isOpen = false;  
283 -  
284 - SupervisionThreestep construct = new SupervisionThreestep();  
285 - SupervisionThreestep earthsite = new SupervisionThreestep();  
286 -  
287 - if(supervisionThreestep.getType() == 0){  
288 - construct = supervisionThreestep;  
289 -  
290 - earthsite.setType(1L);  
291 -  
292 - earthsite.setObjectId(supervisionThreestep.getEarthsitesId());  
293 -  
294 - earthsite = supervisionThreestepMapper.selectTodayData(earthsite);  
295 - }else{  
296 - earthsite = supervisionThreestep; 390 + if(supervisionThreestep.getType() == 0 && supervisionThreestep.getStatus() == 1)
  391 + checkDataToActiveTruck(supervisionThreestep);
297 392
298 - construct.setType(0L);  
299 -  
300 - construct.setObjectId(supervisionThreestep.getEarthsitesId());  
301 -  
302 - construct = supervisionThreestepMapper.selectTodayData(construct);  
303 - }  
304 -  
305 - if(construct == null){  
306 - return i;  
307 - }  
308 -  
309 - for(String p:outSide){  
310 - if(p.equals(construct.getPlace())&&construct.getStatus() == 1){  
311 - isOpen = true;  
312 - }  
313 - }  
314 -  
315 - if(earthsite != null && construct.getStatus() == 1 && earthsite.getStatus() == 1){  
316 - isOpen = true;  
317 - }  
318 -  
319 - if(!isOpen){  
320 - return i;  
321 - } 393 + return i;
  394 + }
  395 +
  396 + @Override
  397 + public void checkDataToActiveTruck(SupervisionThreestep construct){
322 398
323 String trucks = construct.getCompanyTrucks(); 399 String trucks = construct.getCompanyTrucks();
324 400
325 if(trucks != null){ 401 if(trucks != null){
326 402
327 String[] truckArray = trucks.split(","); 403 String[] truckArray = trucks.split(",");
328 -  
329 -// JSONArray array = RemoteServerUtils.getTruckOnlineList();  
330 -// for(Object object :array){  
331 -// JSONObject truckObject = (JSONObject)object; 404 +
  405 + Map<String,Object> params = new HashedMap<>();
  406 +
  407 + params.put("vehicleIds", truckArray);
  408 + params.put("page", 1);
  409 + params.put("size", 9999);
  410 +
  411 + JSONArray array = RemoteServerUtils.getTruckOnline(params);
  412 +
  413 + for(Object object :array){
  414 + JSONObject truckObject = (JSONObject)object;
332 415
333 for(String truck: truckArray){ 416 for(String truck: truckArray){
334 -// if(truckObject.getString("vehicleId").equals(truck)){ 417 +
  418 +
  419 + if(truckObject.getString("vehicleId").equals(truck)){
335 TruckActivate truckActivate = new TruckActivate(); 420 TruckActivate truckActivate = new TruckActivate();
336 - truckActivate.setStatus(0L);  
337 - if(supervisionThreestep.getType() == 0){  
338 - truckActivate.setConstruction(supervisionThreestep.getName());  
339 - truckActivate.setEarthsite(supervisionThreestep.getEarthsitesName());  
340 - }else{  
341 - truckActivate.setConstruction(supervisionThreestep.getEarthsitesName());  
342 - truckActivate.setEarthsite(supervisionThreestep.getName()); 421 +
  422 + truckActivate.setStatus(0L); //当前数据
  423 + truckActivate.setObjectId(truck); //设置ID
  424 +
  425 + truckActivate.setConstruction(construct.getName());
  426 + truckActivate.setEarthsite(construct.getEarthsitesName());
  427 +
  428 + if(truckObject != null)
  429 + truckActivate.setLicensePlate(truckObject.getString("licenseplateNo"));//设置车牌号
  430 +
  431 +
  432 + JSONObject truckInfo = RemoteServerUtils.getTruckInfo(truck);
  433 + if(truckInfo != null)
  434 + truckActivate.setCompany(truckInfo.getString("companyName"));
  435 +
  436 + List<TruckActivate> taList = truckActivateService.selectTruckActivateList(truckActivate);
  437 +
  438 + if(taList.size() == 1){
  439 + if(taList.get(0).getActivateTime() != null){ //已激活
  440 + continue;
  441 + }
343 } 442 }
344 443
345 - truckActivate.setObjectId(truck);  
346 444
347 -// truckActivate.setLicensePlate(truckObject.getString("licenseplateNo"));  
348 -// if(truckObject.getInteger("state") == 1){  
349 -// truckActivate.setActivateTime(new Date());  
350 -// }else{  
351 -// Map map = new HashedMap<>();  
352 -// map.put("licenseplateNo", truck);  
353 -// checkActiveByTime(map,truckActivate);  
354 -// }  
355 445
356 - truckActivate.setLicensePlate(truck); 446 + if(truckObject.getInteger("vehicleStatus") == 1){
  447 + truckActivate.setActivateTime(new Date());
  448 + }else{
  449 + try {
  450 + if(truckObject.getString("onlineTime") != null && yearFomat.parse(yearFomat.format(new Date())).getTime() == yearFomat.parse(truckObject.getString("onlineTime")).getTime()){
  451 + truckActivate.setActivateTime(new Date());
  452 + }
  453 + } catch (ParseException e) {
  454 + // TODO Auto-generated catch block
  455 + e.printStackTrace();
  456 + }
  457 + }
357 458
358 - truckActivateService.insertTruckActivate(truckActivate); 459 + if(taList.size() > 0){
  460 + truckActivateService.updateTruckActivate(truckActivate);
  461 + }else{
  462 + truckActivateService.insertTruckActivate(truckActivate);
  463 + }
359 464
360 break; 465 break;
361 -// }  
362 -// }  
363 - }  
364 -  
365 - }  
366 -  
367 - return i;  
368 - }  
369 -  
370 - private void checkActiveByTime(Map map,TruckActivate truckActivate) {  
371 - JSONArray list = RemoteServerUtils.getTruckStatusList(map);  
372 - if(list != null && list.size() > 0){  
373 - try {  
374 - if(sdf.parse(sdf.format(new Date())).getTime() == sdf.parse(((JSONObject)list.get(0)).getString("onlineTime")).getTime()){  
375 - truckActivate.setActivateTime(new Date()); 466 + }
376 } 467 }
377 - } catch (ParseException e) {  
378 - // TODO Auto-generated catch block  
379 - e.printStackTrace();  
380 } 468 }
  469 +
381 } 470 }
  471 +
382 } 472 }
  473 +
383 474
384 /** 475 /**
385 * 批量删除三查机制 476 * 批量删除三查机制
trash-workFlow/src/main/java/com/trash/business/service/impl/TruckActivateServiceImpl.java
  View file @6d2ba61
@@ -92,4 +92,11 @@ public class TruckActivateServiceImpl implements ITruckActivateService @@ -92,4 +92,11 @@ public class TruckActivateServiceImpl implements ITruckActivateService
92 { 92 {
93 return truckActivateMapper.deleteTruckActivateById(id); 93 return truckActivateMapper.deleteTruckActivateById(id);
94 } 94 }
  95 +
  96 + @Override
  97 + public void endAllTruckUnActive() {
  98 +
  99 + truckActivateMapper.endAllTurckUnActive();
  100 +
  101 + }
95 } 102 }
trash-workFlow/src/main/java/com/trash/other/controller/ProjectCheckController.java 0 → 100644
  View file @6d2ba61
  1 +package com.trash.other.controller;
  2 +
  3 +import java.util.List;
  4 +import org.springframework.security.access.prepost.PreAuthorize;
  5 +import org.springframework.beans.factory.annotation.Autowired;
  6 +import org.springframework.web.bind.annotation.GetMapping;
  7 +import org.springframework.web.bind.annotation.PostMapping;
  8 +import org.springframework.web.bind.annotation.PutMapping;
  9 +import org.springframework.web.bind.annotation.DeleteMapping;
  10 +import org.springframework.web.bind.annotation.PathVariable;
  11 +import org.springframework.web.bind.annotation.RequestBody;
  12 +import org.springframework.web.bind.annotation.RequestMapping;
  13 +import org.springframework.web.bind.annotation.RestController;
  14 +import com.trash.common.annotation.Log;
  15 +import com.trash.common.core.controller.BaseController;
  16 +import com.trash.common.core.domain.AjaxResult;
  17 +import com.trash.common.enums.BusinessType;
  18 +import com.trash.other.domain.ProjectCheck;
  19 +import com.trash.other.service.IProjectCheckService;
  20 +import com.trash.common.utils.poi.ExcelUtil;
  21 +import com.trash.common.core.page.TableDataInfo;
  22 +
  23 +/**
  24 + * 大排查Controller
  25 + *
  26 + * @author trash
  27 + * @date 2023-05-12
  28 + */
  29 +@RestController
  30 +@RequestMapping("/other/projectCheck")
  31 +public class ProjectCheckController extends BaseController
  32 +{
  33 + @Autowired
  34 + private IProjectCheckService projectCheckService;
  35 +
  36 + /**
  37 + * 查询大排查列表
  38 + */
  39 + @PreAuthorize("@ss.hasPermi('other:projectCheck:list')")
  40 + @GetMapping("/list")
  41 + public TableDataInfo list(ProjectCheck projectCheck)
  42 + {
  43 + startPage();
  44 + List<ProjectCheck> list = projectCheckService.selectProjectCheckList(projectCheck);
  45 + return getDataTable(list);
  46 + }
  47 +
  48 + /**
  49 + * 导出大排查列表
  50 + */
  51 + @PreAuthorize("@ss.hasPermi('other:projectCheck:export')")
  52 + @Log(title = "大排查", businessType = BusinessType.EXPORT)
  53 + @GetMapping("/export")
  54 + public AjaxResult export(ProjectCheck projectCheck)
  55 + {
  56 + List<ProjectCheck> list = projectCheckService.selectProjectCheckList(projectCheck);
  57 + ExcelUtil<ProjectCheck> util = new ExcelUtil<ProjectCheck>(ProjectCheck.class);
  58 + return util.exportExcel(list, "projectCheck");
  59 + }
  60 +
  61 + /**
  62 + * 获取大排查详细信息
  63 + */
  64 + @PreAuthorize("@ss.hasPermi('other:projectCheck:query')")
  65 + @GetMapping(value = "/{id}")
  66 + public AjaxResult getInfo(@PathVariable("id") Long id)
  67 + {
  68 + return AjaxResult.success(projectCheckService.selectProjectCheckById(id));
  69 + }
  70 +
  71 + /**
  72 + * 新增大排查
  73 + */
  74 + @PreAuthorize("@ss.hasPermi('other:projectCheck:add')")
  75 + @Log(title = "大排查", businessType = BusinessType.INSERT)
  76 + @PostMapping
  77 + public AjaxResult add(@RequestBody ProjectCheck projectCheck)
  78 + {
  79 + return toAjax(projectCheckService.insertProjectCheck(projectCheck));
  80 + }
  81 +
  82 + /**
  83 + * 修改大排查
  84 + */
  85 + @PreAuthorize("@ss.hasPermi('other:projectCheck:edit')")
  86 + @Log(title = "大排查", businessType = BusinessType.UPDATE)
  87 + @PutMapping
  88 + public AjaxResult edit(@RequestBody ProjectCheck projectCheck)
  89 + {
  90 + return toAjax(projectCheckService.updateProjectCheck(projectCheck));
  91 + }
  92 +
  93 + /**
  94 + * 删除大排查
  95 + */
  96 + @PreAuthorize("@ss.hasPermi('other:projectCheck:remove')")
  97 + @Log(title = "大排查", businessType = BusinessType.DELETE)
  98 + @DeleteMapping("/{ids}")
  99 + public AjaxResult remove(@PathVariable Long[] ids)
  100 + {
  101 + return toAjax(projectCheckService.deleteProjectCheckByIds(ids));
  102 + }
  103 +}
trash-workFlow/src/main/java/com/trash/other/domain/ProjectCheck.java 0 → 100644
  View file @6d2ba61
  1 +package com.trash.other.domain;
  2 +
  3 +import java.util.Date;
  4 +import com.fasterxml.jackson.annotation.JsonFormat;
  5 +import org.apache.commons.lang3.builder.ToStringBuilder;
  6 +import org.apache.commons.lang3.builder.ToStringStyle;
  7 +import com.trash.common.annotation.Excel;
  8 +import com.trash.common.core.domain.BaseEntity;
  9 +
  10 +/**
  11 + * 大排查对象 project_check
  12 + *
  13 + * @author trash
  14 + * @date 2023-05-12
  15 + */
  16 +public class ProjectCheck extends BaseEntity
  17 +{
  18 + private static final long serialVersionUID = 1L;
  19 +
  20 + /** 序号 */
  21 + private Long id;
  22 +
  23 + /** 工程类型 */
  24 + @Excel(name = "工程类型")
  25 + private Integer type;
  26 +
  27 + /** 工程名称 */
  28 + @Excel(name = "工程名称")
  29 + private String name;
  30 + /** 工程名称 */
  31 + @Excel(name = "工程地址")
  32 + private String address;
  33 +
  34 + /** 工程期限 */
  35 + @JsonFormat(pattern = "yyyy-MM-dd")
  36 + @Excel(name = "工程期限", width = 30, dateFormat = "yyyy-MM-dd")
  37 + private Date timeLimit;
  38 +
  39 + /** 检查时间 */
  40 + @JsonFormat(pattern = "yyyy-MM-dd")
  41 + @Excel(name = "检查时间", width = 30, dateFormat = "yyyy-MM-dd")
  42 + private Date checkTime;
  43 +
  44 + /** 工程类别 */
  45 + private String projectType;
  46 +
  47 + /** 工程标准量 */
  48 + private Long stock;
  49 +
  50 + /** 检察人员 */
  51 + @Excel(name = "检察人员")
  52 + private String checkPeople;
  53 +
  54 + @Excel(name = "区属")
  55 + private String place;
  56 +
  57 + /** 工程量存量 */
  58 + private Long margin;
  59 +
  60 + /** 过水塘区 */
  61 + private Integer p1;
  62 +
  63 + /** 集泥沟 */
  64 + private Integer p1C1;
  65 +
  66 + /** 进出水源 */
  67 + private Integer p1C2;
  68 +
  69 + /** 是否清理 */
  70 + private Integer p1C3;
  71 +
  72 + /** $column.columnComment */
  73 + private Integer p2;
  74 +
  75 + /** $column.columnComment */
  76 + private Integer p2C1;
  77 +
  78 + /** $column.columnComment */
  79 + private Integer p2C2;
  80 +
  81 + /** $column.columnComment */
  82 + private Integer p2C3;
  83 +
  84 + /** $column.columnComment */
  85 + private Integer p3;
  86 +
  87 + /** $column.columnComment */
  88 + private Integer p3C1;
  89 +
  90 + /** $column.columnComment */
  91 + private Integer p3C2;
  92 +
  93 + /** $column.columnComment */
  94 + private Integer p3C3;
  95 +
  96 + /** $column.columnComment */
  97 + private Integer p4;
  98 +
  99 + /** $column.columnComment */
  100 + private Integer p4C1;
  101 +
  102 + /** $column.columnComment */
  103 + private Integer p4C2;
  104 +
  105 + /** $column.columnComment */
  106 + private Integer p4C3;
  107 +
  108 + /** $column.columnComment */
  109 + private Integer p5;
  110 +
  111 + /** $column.columnComment */
  112 + private Integer p5C1;
  113 +
  114 + /** $column.columnComment */
  115 + private Integer p5C2;
  116 +
  117 + /** $column.columnComment */
  118 + private Integer p5C3;
  119 +
  120 + /** $column.columnComment */
  121 + private Integer p6;
  122 +
  123 + /** $column.columnComment */
  124 + private Integer p6C1;
  125 +
  126 + /** $column.columnComment */
  127 + private Integer p6C2;
  128 +
  129 + /** $column.columnComment */
  130 + private Integer p6C3;
  131 +
  132 + /** $column.columnComment */
  133 + private Integer p7;
  134 +
  135 + /** $column.columnComment */
  136 + private Integer p7C1;
  137 +
  138 + /** $column.columnComment */
  139 + private Integer p7C2;
  140 +
  141 + /** $column.columnComment */
  142 + private Integer p7C3;
  143 +
  144 + /** $column.columnComment */
  145 + private Integer p8;
  146 +
  147 + /** $column.columnComment */
  148 + private Integer p8C1;
  149 +
  150 + /** $column.columnComment */
  151 + private Integer p8C2;
  152 +
  153 + /** $column.columnComment */
  154 + private Integer p8C3;
  155 +
  156 + /** $column.columnComment */
  157 + private Integer p9C1;
  158 +
  159 + /** $column.columnComment */
  160 + private Integer p9C2;
  161 +
  162 + /** $column.columnComment */
  163 + @Excel(name = "检察人员")
  164 + private Integer p9C3;
  165 +
  166 + /** 周边市容环境 */
  167 + @Excel(name = "周边市容环境")
  168 + private String environment;
  169 +
  170 + /** 在用消纳场地及对应线路 */
  171 + @Excel(name = "在用消纳场地及对应线路")
  172 + private String line;
  173 +
  174 + /** 主要问题以及整改意见 */
  175 + @Excel(name = "主要问题以及整改意见")
  176 + private String dest;
  177 +
  178 + /** 检查人员意见以及签名 */
  179 + @Excel(name = "检查人员意见以及签名")
  180 + private String checkSign;
  181 +
  182 + /** 建设单位代表签字 */
  183 + @Excel(name = "建设单位代表签字")
  184 + private String sign;
  185 +
  186 +
  187 +
  188 + public String getAddress() {
  189 + return address;
  190 + }
  191 +
  192 + public void setAddress(String address) {
  193 + this.address = address;
  194 + }
  195 +
  196 + public void setId(Long id)
  197 + {
  198 + this.id = id;
  199 + }
  200 +
  201 + public Long getId()
  202 + {
  203 + return id;
  204 + }
  205 + public void setType(Integer type)
  206 + {
  207 + this.type = type;
  208 + }
  209 +
  210 + public Integer getType()
  211 + {
  212 + return type;
  213 + }
  214 + public void setName(String name)
  215 + {
  216 + this.name = name;
  217 + }
  218 +
  219 + public String getName()
  220 + {
  221 + return name;
  222 + }
  223 + public void setTimeLimit(Date timeLimit)
  224 + {
  225 + this.timeLimit = timeLimit;
  226 + }
  227 +
  228 + public Date getTimeLimit()
  229 + {
  230 + return timeLimit;
  231 + }
  232 + public void setCheckTime(Date checkTime)
  233 + {
  234 + this.checkTime = checkTime;
  235 + }
  236 +
  237 + public Date getCheckTime()
  238 + {
  239 + return checkTime;
  240 + }
  241 + public void setProjectType(String projectType)
  242 + {
  243 + this.projectType = projectType;
  244 + }
  245 +
  246 + public String getProjectType()
  247 + {
  248 + return projectType;
  249 + }
  250 + public void setStock(Long stock)
  251 + {
  252 + this.stock = stock;
  253 + }
  254 +
  255 + public Long getStock()
  256 + {
  257 + return stock;
  258 + }
  259 + public void setCheckPeople(String checkPeople)
  260 + {
  261 + this.checkPeople = checkPeople;
  262 + }
  263 +
  264 + public String getCheckPeople()
  265 + {
  266 + return checkPeople;
  267 + }
  268 + public void setMargin(Long margin)
  269 + {
  270 + this.margin = margin;
  271 + }
  272 +
  273 + public Long getMargin()
  274 + {
  275 + return margin;
  276 + }
  277 + public void setP1(Integer p1)
  278 + {
  279 + this.p1 = p1;
  280 + }
  281 +
  282 + public Integer getP1()
  283 + {
  284 + return p1;
  285 + }
  286 + public void setP1C1(Integer p1C1)
  287 + {
  288 + this.p1C1 = p1C1;
  289 + }
  290 +
  291 + public Integer getP1C1()
  292 + {
  293 + return p1C1;
  294 + }
  295 + public void setP1C2(Integer p1C2)
  296 + {
  297 + this.p1C2 = p1C2;
  298 + }
  299 +
  300 + public Integer getP1C2()
  301 + {
  302 + return p1C2;
  303 + }
  304 + public void setP1C3(Integer p1C3)
  305 + {
  306 + this.p1C3 = p1C3;
  307 + }
  308 +
  309 + public Integer getP1C3()
  310 + {
  311 + return p1C3;
  312 + }
  313 + public void setP2(Integer p2)
  314 + {
  315 + this.p2 = p2;
  316 + }
  317 +
  318 + public Integer getP2()
  319 + {
  320 + return p2;
  321 + }
  322 + public void setP2C1(Integer p2C1)
  323 + {
  324 + this.p2C1 = p2C1;
  325 + }
  326 +
  327 + public Integer getP2C1()
  328 + {
  329 + return p2C1;
  330 + }
  331 + public void setP2C2(Integer p2C2)
  332 + {
  333 + this.p2C2 = p2C2;
  334 + }
  335 +
  336 + public Integer getP2C2()
  337 + {
  338 + return p2C2;
  339 + }
  340 + public void setP2C3(Integer p2C3)
  341 + {
  342 + this.p2C3 = p2C3;
  343 + }
  344 +
  345 + public Integer getP2C3()
  346 + {
  347 + return p2C3;
  348 + }
  349 + public void setP3(Integer p3)
  350 + {
  351 + this.p3 = p3;
  352 + }
  353 +
  354 + public Integer getP3()
  355 + {
  356 + return p3;
  357 + }
  358 + public void setP3C1(Integer p3C1)
  359 + {
  360 + this.p3C1 = p3C1;
  361 + }
  362 +
  363 + public Integer getP3C1()
  364 + {
  365 + return p3C1;
  366 + }
  367 + public void setP3C2(Integer p3C2)
  368 + {
  369 + this.p3C2 = p3C2;
  370 + }
  371 +
  372 + public Integer getP3C2()
  373 + {
  374 + return p3C2;
  375 + }
  376 + public void setP3C3(Integer p3C3)
  377 + {
  378 + this.p3C3 = p3C3;
  379 + }
  380 +
  381 + public Integer getP3C3()
  382 + {
  383 + return p3C3;
  384 + }
  385 + public void setP4(Integer p4)
  386 + {
  387 + this.p4 = p4;
  388 + }
  389 +
  390 + public Integer getP4()
  391 + {
  392 + return p4;
  393 + }
  394 + public void setP4C1(Integer p4C1)
  395 + {
  396 + this.p4C1 = p4C1;
  397 + }
  398 +
  399 + public Integer getP4C1()
  400 + {
  401 + return p4C1;
  402 + }
  403 + public void setP4C2(Integer p4C2)
  404 + {
  405 + this.p4C2 = p4C2;
  406 + }
  407 +
  408 + public Integer getP4C2()
  409 + {
  410 + return p4C2;
  411 + }
  412 + public void setP4C3(Integer p4C3)
  413 + {
  414 + this.p4C3 = p4C3;
  415 + }
  416 +
  417 + public Integer getP4C3()
  418 + {
  419 + return p4C3;
  420 + }
  421 + public void setP5(Integer p5)
  422 + {
  423 + this.p5 = p5;
  424 + }
  425 +
  426 + public Integer getP5()
  427 + {
  428 + return p5;
  429 + }
  430 + public void setP5C1(Integer p5C1)
  431 + {
  432 + this.p5C1 = p5C1;
  433 + }
  434 +
  435 + public Integer getP5C1()
  436 + {
  437 + return p5C1;
  438 + }
  439 + public void setP5C2(Integer p5C2)
  440 + {
  441 + this.p5C2 = p5C2;
  442 + }
  443 +
  444 + public Integer getP5C2()
  445 + {
  446 + return p5C2;
  447 + }
  448 + public void setP5C3(Integer p5C3)
  449 + {
  450 + this.p5C3 = p5C3;
  451 + }
  452 +
  453 + public Integer getP5C3()
  454 + {
  455 + return p5C3;
  456 + }
  457 + public void setP6(Integer p6)
  458 + {
  459 + this.p6 = p6;
  460 + }
  461 +
  462 + public Integer getP6()
  463 + {
  464 + return p6;
  465 + }
  466 + public void setP6C1(Integer p6C1)
  467 + {
  468 + this.p6C1 = p6C1;
  469 + }
  470 +
  471 + public Integer getP6C1()
  472 + {
  473 + return p6C1;
  474 + }
  475 + public void setP6C2(Integer p6C2)
  476 + {
  477 + this.p6C2 = p6C2;
  478 + }
  479 +
  480 + public Integer getP6C2()
  481 + {
  482 + return p6C2;
  483 + }
  484 + public void setP6C3(Integer p6C3)
  485 + {
  486 + this.p6C3 = p6C3;
  487 + }
  488 +
  489 + public Integer getP6C3()
  490 + {
  491 + return p6C3;
  492 + }
  493 + public void setP7(Integer p7)
  494 + {
  495 + this.p7 = p7;
  496 + }
  497 +
  498 + public Integer getP7()
  499 + {
  500 + return p7;
  501 + }
  502 + public void setP7C1(Integer p7C1)
  503 + {
  504 + this.p7C1 = p7C1;
  505 + }
  506 +
  507 + public Integer getP7C1()
  508 + {
  509 + return p7C1;
  510 + }
  511 + public void setP7C2(Integer p7C2)
  512 + {
  513 + this.p7C2 = p7C2;
  514 + }
  515 +
  516 + public Integer getP7C2()
  517 + {
  518 + return p7C2;
  519 + }
  520 + public void setP7C3(Integer p7C3)
  521 + {
  522 + this.p7C3 = p7C3;
  523 + }
  524 +
  525 + public Integer getP7C3()
  526 + {
  527 + return p7C3;
  528 + }
  529 + public void setP8(Integer p8)
  530 + {
  531 + this.p8 = p8;
  532 + }
  533 +
  534 + public Integer getP8()
  535 + {
  536 + return p8;
  537 + }
  538 + public void setP8C1(Integer p8C1)
  539 + {
  540 + this.p8C1 = p8C1;
  541 + }
  542 +
  543 + public Integer getP8C1()
  544 + {
  545 + return p8C1;
  546 + }
  547 + public void setP8C2(Integer p8C2)
  548 + {
  549 + this.p8C2 = p8C2;
  550 + }
  551 +
  552 + public Integer getP8C2()
  553 + {
  554 + return p8C2;
  555 + }
  556 + public void setP8C3(Integer p8C3)
  557 + {
  558 + this.p8C3 = p8C3;
  559 + }
  560 +
  561 + public Integer getP8C3()
  562 + {
  563 + return p8C3;
  564 + }
  565 + public void setP9C1(Integer p9C1)
  566 + {
  567 + this.p9C1 = p9C1;
  568 + }
  569 +
  570 + public Integer getP9C1()
  571 + {
  572 + return p9C1;
  573 + }
  574 + public void setP9C2(Integer p9C2)
  575 + {
  576 + this.p9C2 = p9C2;
  577 + }
  578 +
  579 + public Integer getP9C2()
  580 + {
  581 + return p9C2;
  582 + }
  583 + public void setP9C3(Integer p9C3)
  584 + {
  585 + this.p9C3 = p9C3;
  586 + }
  587 +
  588 + public Integer getP9C3()
  589 + {
  590 + return p9C3;
  591 + }
  592 + public void setEnvironment(String environment)
  593 + {
  594 + this.environment = environment;
  595 + }
  596 +
  597 + public String getEnvironment()
  598 + {
  599 + return environment;
  600 + }
  601 + public void setLine(String line)
  602 + {
  603 + this.line = line;
  604 + }
  605 +
  606 + public String getLine()
  607 + {
  608 + return line;
  609 + }
  610 + public void setDest(String dest)
  611 + {
  612 + this.dest = dest;
  613 + }
  614 +
  615 + public String getDest()
  616 + {
  617 + return dest;
  618 + }
  619 + public void setCheckSign(String checkSign)
  620 + {
  621 + this.checkSign = checkSign;
  622 + }
  623 +
  624 + public String getCheckSign()
  625 + {
  626 + return checkSign;
  627 + }
  628 + public void setSign(String sign)
  629 + {
  630 + this.sign = sign;
  631 + }
  632 +
  633 + public String getSign()
  634 + {
  635 + return sign;
  636 + }
  637 +
  638 + @Override
  639 + public String toString() {
  640 + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
  641 + .append("id", getId())
  642 + .append("type", getType())
  643 + .append("name", getName())
  644 + .append("timeLimit", getTimeLimit())
  645 + .append("checkTime", getCheckTime())
  646 + .append("projectType", getProjectType())
  647 + .append("stock", getStock())
  648 + .append("checkPeople", getCheckPeople())
  649 + .append("margin", getMargin())
  650 + .append("createTime", getCreateTime())
  651 + .append("createBy", getCreateBy())
  652 + .append("p1", getP1())
  653 + .append("p1C1", getP1C1())
  654 + .append("p1C2", getP1C2())
  655 + .append("p1C3", getP1C3())
  656 + .append("p2", getP2())
  657 + .append("p2C1", getP2C1())
  658 + .append("p2C2", getP2C2())
  659 + .append("p2C3", getP2C3())
  660 + .append("p3", getP3())
  661 + .append("p3C1", getP3C1())
  662 + .append("p3C2", getP3C2())
  663 + .append("p3C3", getP3C3())
  664 + .append("p4", getP4())
  665 + .append("p4C1", getP4C1())
  666 + .append("p4C2", getP4C2())
  667 + .append("p4C3", getP4C3())
  668 + .append("p5", getP5())
  669 + .append("p5C1", getP5C1())
  670 + .append("p5C2", getP5C2())
  671 + .append("p5C3", getP5C3())
  672 + .append("p6", getP6())
  673 + .append("p6C1", getP6C1())
  674 + .append("p6C2", getP6C2())
  675 + .append("p6C3", getP6C3())
  676 + .append("p7", getP7())
  677 + .append("p7C1", getP7C1())
  678 + .append("p7C2", getP7C2())
  679 + .append("p7C3", getP7C3())
  680 + .append("p8", getP8())
  681 + .append("p8C1", getP8C1())
  682 + .append("p8C2", getP8C2())
  683 + .append("p8C3", getP8C3())
  684 + .append("p9C1", getP9C1())
  685 + .append("p9C2", getP9C2())
  686 + .append("p9C3", getP9C3())
  687 + .append("environment", getEnvironment())
  688 + .append("line", getLine())
  689 + .append("dest", getDest())
  690 + .append("checkSign", getCheckSign())
  691 + .append("sign", getSign())
  692 + .toString();
  693 + }
  694 +
  695 + public String getPlace() {
  696 + return place;
  697 + }
  698 +
  699 + public void setPlace(String place) {
  700 + this.place = place;
  701 + }
  702 +
  703 +}
trash-workFlow/src/main/java/com/trash/other/mapper/ProjectCheckMapper.java 0 → 100644
  View file @6d2ba61
  1 +package com.trash.other.mapper;
  2 +
  3 +import java.util.List;
  4 +import com.trash.other.domain.ProjectCheck;
  5 +
  6 +/**
  7 + * 大排查Mapper接口
  8 + *
  9 + * @author trash
  10 + * @date 2023-05-12
  11 + */
  12 +public interface ProjectCheckMapper
  13 +{
  14 + /**
  15 + * 查询大排查
  16 + *
  17 + * @param id 大排查ID
  18 + * @return 大排查
  19 + */
  20 + ProjectCheck selectProjectCheckById(Long id);
  21 +
  22 + /**
  23 + * 查询大排查列表
  24 + *
  25 + * @param projectCheck 大排查
  26 + * @return 大排查集合
  27 + */
  28 + List<ProjectCheck> selectProjectCheckList(ProjectCheck projectCheck);
  29 +
  30 + /**
  31 + * 新增大排查
  32 + *
  33 + * @param projectCheck 大排查
  34 + * @return 结果
  35 + */
  36 + int insertProjectCheck(ProjectCheck projectCheck);
  37 +
  38 + /**
  39 + * 修改大排查
  40 + *
  41 + * @param projectCheck 大排查
  42 + * @return 结果
  43 + */
  44 + int updateProjectCheck(ProjectCheck projectCheck);
  45 +
  46 + /**
  47 + * 删除大排查
  48 + *
  49 + * @param id 大排查ID
  50 + * @return 结果
  51 + */
  52 + int deleteProjectCheckById(Long id);
  53 +
  54 + /**
  55 + * 批量删除大排查
  56 + *
  57 + * @param ids 需要删除的数据ID
  58 + * @return 结果
  59 + */
  60 + int deleteProjectCheckByIds(Long[] ids);
  61 +}
trash-workFlow/src/main/java/com/trash/other/service/IProjectCheckService.java 0 → 100644
  View file @6d2ba61
  1 +package com.trash.other.service;
  2 +
  3 +import java.util.List;
  4 +import com.trash.other.domain.ProjectCheck;
  5 +
  6 +/**
  7 + * 大排查Service接口
  8 + *
  9 + * @author trash
  10 + * @date 2023-05-12
  11 + */
  12 +public interface IProjectCheckService
  13 +{
  14 + /**
  15 + * 查询大排查
  16 + *
  17 + * @param id 大排查ID
  18 + * @return 大排查
  19 + */
  20 + ProjectCheck selectProjectCheckById(Long id);
  21 +
  22 + /**
  23 + * 查询大排查列表
  24 + *
  25 + * @param projectCheck 大排查
  26 + * @return 大排查集合
  27 + */
  28 + List<ProjectCheck> selectProjectCheckList(ProjectCheck projectCheck);
  29 +
  30 + /**
  31 + * 新增大排查
  32 + *
  33 + * @param projectCheck 大排查
  34 + * @return 结果
  35 + */
  36 + int insertProjectCheck(ProjectCheck projectCheck);
  37 +
  38 + /**
  39 + * 修改大排查
  40 + *
  41 + * @param projectCheck 大排查
  42 + * @return 结果
  43 + */
  44 + int updateProjectCheck(ProjectCheck projectCheck);
  45 +
  46 + /**
  47 + * 批量删除大排查
  48 + *
  49 + * @param ids 需要删除的大排查ID
  50 + * @return 结果
  51 + */
  52 + int deleteProjectCheckByIds(Long[] ids);
  53 +
  54 + /**
  55 + * 删除大排查信息
  56 + *
  57 + * @param id 大排查ID
  58 + * @return 结果
  59 + */
  60 + int deleteProjectCheckById(Long id);
  61 +}
trash-workFlow/src/main/java/com/trash/other/service/impl/ProjectCheckServiceImpl.java 0 → 100644
  View file @6d2ba61
  1 +package com.trash.other.service.impl;
  2 +
  3 +import java.util.List;
  4 +import com.trash.common.utils.DateUtils;
  5 +import com.trash.common.utils.SecurityUtils;
  6 +
  7 +import org.springframework.beans.factory.annotation.Autowired;
  8 +import org.springframework.stereotype.Service;
  9 +import com.trash.other.mapper.ProjectCheckMapper;
  10 +import com.trash.other.domain.ProjectCheck;
  11 +import com.trash.other.service.IProjectCheckService;
  12 +
  13 +/**
  14 + * 大排查Service业务层处理
  15 + *
  16 + * @author trash
  17 + * @date 2023-05-12
  18 + */
  19 +@Service
  20 +public class ProjectCheckServiceImpl implements IProjectCheckService
  21 +{
  22 + @Autowired
  23 + private ProjectCheckMapper projectCheckMapper;
  24 +
  25 + /**
  26 + * 查询大排查
  27 + *
  28 + * @param id 大排查ID
  29 + * @return 大排查
  30 + */
  31 + @Override
  32 + public ProjectCheck selectProjectCheckById(Long id)
  33 + {
  34 + return projectCheckMapper.selectProjectCheckById(id);
  35 + }
  36 +
  37 + /**
  38 + * 查询大排查列表
  39 + *
  40 + * @param projectCheck 大排查
  41 + * @return 大排查
  42 + */
  43 + @Override
  44 + public List<ProjectCheck> selectProjectCheckList(ProjectCheck projectCheck)
  45 + {
  46 + return projectCheckMapper.selectProjectCheckList(projectCheck);
  47 + }
  48 +
  49 + /**
  50 + * 新增大排查
  51 + *
  52 + * @param projectCheck 大排查
  53 + * @return 结果
  54 + */
  55 + @Override
  56 + public int insertProjectCheck(ProjectCheck projectCheck)
  57 + {
  58 + projectCheck.setCreateTime(DateUtils.getNowDate());
  59 + projectCheck.setCreateBy(SecurityUtils.getUsername());
  60 + return projectCheckMapper.insertProjectCheck(projectCheck);
  61 + }
  62 +
  63 + /**
  64 + * 修改大排查
  65 + *
  66 + * @param projectCheck 大排查
  67 + * @return 结果
  68 + */
  69 + @Override
  70 + public int updateProjectCheck(ProjectCheck projectCheck)
  71 + {
  72 + return projectCheckMapper.updateProjectCheck(projectCheck);
  73 + }
  74 +
  75 + /**
  76 + * 批量删除大排查
  77 + *
  78 + * @param ids 需要删除的大排查ID
  79 + * @return 结果
  80 + */
  81 + @Override
  82 + public int deleteProjectCheckByIds(Long[] ids)
  83 + {
  84 + return projectCheckMapper.deleteProjectCheckByIds(ids);
  85 + }
  86 +
  87 + /**
  88 + * 删除大排查信息
  89 + *
  90 + * @param id 大排查ID
  91 + * @return 结果
  92 + */
  93 + @Override
  94 + public int deleteProjectCheckById(Long id)
  95 + {
  96 + return projectCheckMapper.deleteProjectCheckById(id);
  97 + }
  98 +}
trash-workFlow/src/main/java/com/trash/workflow/listener/ConractListener.java 0 → 100644
  View file @6d2ba61
  1 +package com.trash.workflow.listener;
  2 +
  3 +import java.util.ArrayList;
  4 +import java.util.HashMap;
  5 +import java.util.List;
  6 +import java.util.Map;
  7 +
  8 +import org.activiti.engine.delegate.DelegateExecution;
  9 +import org.activiti.engine.delegate.ExecutionListener;
  10 +import org.activiti.engine.delegate.Expression;
  11 +import org.springframework.beans.factory.annotation.Autowired;
  12 +
  13 +import com.trash.common.utils.RemoteServerUtils;
  14 +import com.trash.common.utils.spring.SpringUtils;
  15 +import com.trash.workflow.domain.Workflow;
  16 +import com.trash.workflow.mapper.WorkflowMapper;
  17 +import com.trash.workflow.service.IWorkflowService;
  18 +
  19 +import okhttp3.MediaType;
  20 +import okhttp3.RequestBody;
  21 +
  22 +public class ConractListener implements ExecutionListener {
  23 +
  24 + private Expression state;
  25 +
  26 + @Autowired
  27 + IWorkflowService workflowService;
  28 +
  29 +
  30 + @Override
  31 + public void notify(DelegateExecution delegateExecution) {
  32 +
  33 + List<Map> maps = new ArrayList<Map>();
  34 +
  35 + Map map = new HashMap();
  36 +
  37 + map.put("objectId", delegateExecution.getProcessInstanceBusinessKey().split(":")[1]);
  38 + map.put("auditStatus", state.getValue(delegateExecution).toString());
  39 + maps.add(map);
  40 +
  41 + RemoteServerUtils.updateConractStatus(maps);
  42 +
  43 + workflowUtils.sendDataToHisTory(delegateExecution, state);
  44 +
  45 +
  46 + System.out.println("流程状态更新 更新ID:" + delegateExecution.getProcessInstanceBusinessKey() + "状态:" + state.getValue(delegateExecution).toString());
  47 + }
  48 +
  49 +
  50 +
  51 +}
trash-workFlow/src/main/java/com/trash/workflow/listener/ConstructionEndListener.java 0 → 100644
  View file @6d2ba61
  1 +package com.trash.workflow.listener;
  2 +
  3 +import java.util.ArrayList;
  4 +import java.util.HashMap;
  5 +import java.util.List;
  6 +import java.util.Map;
  7 +
  8 +import org.activiti.engine.delegate.DelegateExecution;
  9 +import org.activiti.engine.delegate.ExecutionListener;
  10 +import org.activiti.engine.delegate.Expression;
  11 +import org.springframework.beans.factory.annotation.Autowired;
  12 +
  13 +import com.trash.common.utils.RemoteServerUtils;
  14 +import com.trash.common.utils.spring.SpringUtils;
  15 +import com.trash.workflow.domain.Workflow;
  16 +import com.trash.workflow.mapper.WorkflowMapper;
  17 +import com.trash.workflow.service.IWorkflowService;
  18 +
  19 +import okhttp3.MediaType;
  20 +import okhttp3.RequestBody;
  21 +
  22 +
  23 +
  24 +public class ConstructionEndListener implements ExecutionListener {
  25 +
  26 + private Expression state;
  27 +
  28 + @Autowired
  29 + IWorkflowService workflowService;
  30 +
  31 +
  32 + @Override
  33 + public void notify(DelegateExecution delegateExecution) {
  34 +
  35 + List<Map> maps = new ArrayList<Map>();
  36 +
  37 + Map map = new HashMap();
  38 +
  39 + map.put("objectId", delegateExecution.getProcessInstanceBusinessKey().split(":")[1]);
  40 + map.put("auditStatus", state.getValue(delegateExecution).toString());
  41 + maps.add(map);
  42 +
  43 + RemoteServerUtils.updateConstationCreditAndStatus(maps);
  44 +
  45 + workflowUtils.sendDataToHisTory(delegateExecution, state);
  46 +
  47 +
  48 + System.out.println("流程状态更新 更新ID:" + delegateExecution.getProcessInstanceBusinessKey() + "状态:" + state.getValue(delegateExecution).toString());
  49 + }
  50 +
  51 +
  52 +
  53 +}
trash-workFlow/src/main/java/com/trash/workflow/listener/EarthSitesEndStateListener.java
  View file @6d2ba61
1 package com.trash.workflow.listener; 1 package com.trash.workflow.listener;
2 2
  3 +import java.util.ArrayList;
  4 +import java.util.HashMap;
  5 +import java.util.List;
  6 +import java.util.Map;
3 import java.util.concurrent.TimeUnit; 7 import java.util.concurrent.TimeUnit;
4 8
5 import org.activiti.engine.delegate.DelegateExecution; 9 import org.activiti.engine.delegate.DelegateExecution;
@@ -25,51 +29,21 @@ public class EarthSitesEndStateListener implements ExecutionListener { @@ -25,51 +29,21 @@ public class EarthSitesEndStateListener implements ExecutionListener {
25 29
26 private Expression state; 30 private Expression state;
27 31
28 - @Autowired  
29 - TokenService tokenService;  
30 -  
31 - public final String LOGIN_URL = RemoteServerUtils.remote + "api/siteservice/cs/earthsites/status";  
32 -  
33 - @Autowired  
34 - IWorkflowService workflowService;  
35 -  
36 32
37 @Override 33 @Override
38 public void notify(DelegateExecution delegateExecution) { 34 public void notify(DelegateExecution delegateExecution) {
39 35
40 - LoginUser loginUser = SecurityUtils.getLoginUser();  
41 -  
42 - OkHttpClient okHttpClient = new OkHttpClient.Builder()  
43 - .connectTimeout(20, TimeUnit.SECONDS)  
44 - .writeTimeout(20, TimeUnit.SECONDS)  
45 - .readTimeout(30, TimeUnit.SECONDS)  
46 - .build(); 36 + List<Map> maps = new ArrayList<Map>();
47 37
48 - JSONObject userJson = null; 38 + Map map = new HashMap();
49 39
50 - String token = "Bears auth:token:" + loginUser.getToken(); 40 + map.put("objectId", delegateExecution.getProcessInstanceBusinessKey().split(":")[1]);
  41 + map.put("auditStatus", state.getValue(delegateExecution).toString());
  42 + maps.add(map);
51 43
52 - String param = "[{'objectId':"+ delegateExecution.getProcessInstanceBusinessKey().split(":")[0] +",'auditStatus':"+ state.getValue(delegateExecution).toString() +"}]";  
53 -  
54 - RequestBody body = RequestBody.create(MediaType.parse("application/json"),param);  
55 -  
56 - Request request = new Request.Builder().url(LOGIN_URL).addHeader("header", token).post(body).build(); 44 + RemoteServerUtils.updateEarthSitesCreditAndStatus(maps);
57 45
58 - try {  
59 - okhttp3.Response response = okHttpClient.newCall(request).execute();  
60 - String result = response.body().string();  
61 -  
62 - if(result != null){  
63 - JSONObject json = JSON.parseObject(result);  
64 - if("success".equals(json.getString("message"))){  
65 - userJson = json.getJSONObject("result");  
66 - }  
67 - }  
68 -  
69 - }catch (Exception e) {  
70 - e.printStackTrace();  
71 - }  
72 - 46 + workflowUtils.sendDataToHisTory(delegateExecution, state);
73 47
74 System.out.println("流程状态更新 更新ID:" + delegateExecution.getProcessInstanceBusinessKey() + "状态:" + state.getValue(delegateExecution).toString()); 48 System.out.println("流程状态更新 更新ID:" + delegateExecution.getProcessInstanceBusinessKey() + "状态:" + state.getValue(delegateExecution).toString());
75 } 49 }
trash-workFlow/src/main/java/com/trash/workflow/listener/SupervisionStateListener.java
  View file @6d2ba61
@@ -27,21 +27,7 @@ public class SupervisionStateListener implements ExecutionListener { @@ -27,21 +27,7 @@ public class SupervisionStateListener implements ExecutionListener {
27 27
28 SpringUtils.getBean(SupervisionThreestepMapper.class).updateSupervisionThreestep(supervisionThreestep); 28 SpringUtils.getBean(SupervisionThreestepMapper.class).updateSupervisionThreestep(supervisionThreestep);
29 29
30 - WorkflowMapper workflowMapper = SpringUtils.getBean(WorkflowMapper.class);  
31 -  
32 - Workflow workflow = new Workflow();  
33 -  
34 - workflow.setId(delegateExecution.getProcessInstanceBusinessKey());  
35 -  
36 - workflow.setState(state.getValue(delegateExecution).toString());  
37 -  
38 - workflowMapper.updateWorkflow(workflow);  
39 -  
40 - workflow = workflowMapper.selectWorkflowById(workflow.getId());  
41 -  
42 - workflowMapper.insertWorkflowHistory(workflow);  
43 -  
44 - workflowMapper.deleteWorkflowById(delegateExecution.getProcessInstanceBusinessKey()); 30 + workflowUtils.sendDataToHisTory(delegateExecution, state);
45 31
46 if("2".equals(state.getValue(delegateExecution))){ 32 if("2".equals(state.getValue(delegateExecution))){
47 SpringUtils.getBean(IActTaskService.class).deleteProcessById(delegateExecution.getProcessInstanceId()); 33 SpringUtils.getBean(IActTaskService.class).deleteProcessById(delegateExecution.getProcessInstanceId());
trash-workFlow/src/main/java/com/trash/workflow/listener/workflowUtils.java 0 → 100644
  View file @6d2ba61
  1 +package com.trash.workflow.listener;
  2 +
  3 +import org.activiti.engine.delegate.DelegateExecution;
  4 +import org.activiti.engine.delegate.Expression;
  5 +
  6 +import com.trash.common.utils.spring.SpringUtils;
  7 +import com.trash.workflow.domain.Workflow;
  8 +import com.trash.workflow.mapper.WorkflowMapper;
  9 +
  10 +public class workflowUtils {
  11 +
  12 + public static void sendDataToHisTory(DelegateExecution delegateExecution,Expression state) {
  13 + WorkflowMapper workflowMapper = SpringUtils.getBean(WorkflowMapper.class);
  14 +
  15 + Workflow workflow = new Workflow();
  16 +
  17 + workflow.setId(delegateExecution.getProcessInstanceBusinessKey());
  18 +
  19 + workflow.setState(state.getValue(delegateExecution).toString());
  20 +
  21 + workflowMapper.updateWorkflow(workflow);
  22 +
  23 + workflow = workflowMapper.selectWorkflowById(workflow.getId());
  24 +
  25 + workflowMapper.insertWorkflowHistory(workflow);
  26 +
  27 + workflowMapper.deleteWorkflowById(delegateExecution.getProcessInstanceBusinessKey());
  28 + }
  29 +
  30 +}
trash-workFlow/src/main/java/com/trash/workflow/service/impl/WorkflowServiceImpl.java
  View file @6d2ba61
@@ -86,7 +86,15 @@ public class WorkflowServiceImpl implements IWorkflowService { @@ -86,7 +86,15 @@ public class WorkflowServiceImpl implements IWorkflowService {
86 processInstance = processRuntime.start(ProcessPayloadBuilder.start().withProcessDefinitionKey(flowType) 86 processInstance = processRuntime.start(ProcessPayloadBuilder.start().withProcessDefinitionKey(flowType)
87 .withName(title).withBusinessKey(businessKey).build()); 87 .withName(title).withBusinessKey(businessKey).build());
88 88
89 - 89 +
  90 + if(flowType.equals("workflow_earthsites")){
  91 + JSONObject earthsites = RemoteServerUtils.getEarthSitesInfo(map.get("id").toString());
  92 +
  93 + if(earthsites != null){
  94 + updateProcess(processInstance,earthsites.getString("areaName"));
  95 + }
  96 + }
  97 +
90 Workflow workflow = new Workflow(); 98 Workflow workflow = new Workflow();
91 workflow.setId(businessKey); 99 workflow.setId(businessKey);
92 workflow.setTitle(title); 100 workflow.setTitle(title);
@@ -96,6 +104,8 @@ public class WorkflowServiceImpl implements IWorkflowService { @@ -96,6 +104,8 @@ public class WorkflowServiceImpl implements IWorkflowService {
96 workflow.setType(map.get("type").toString()); 104 workflow.setType(map.get("type").toString());
97 workflow.setInstanceId(processInstance.getId()); 105 workflow.setInstanceId(processInstance.getId());
98 workflow.setState("0"); 106 workflow.setState("0");
  107 +
  108 +
99 109
100 return workflowMapper.insertWorkflow(workflow); 110 return workflowMapper.insertWorkflow(workflow);
101 } catch (Exception e) { 111 } catch (Exception e) {
@@ -194,11 +204,6 @@ public class WorkflowServiceImpl implements IWorkflowService { @@ -194,11 +204,6 @@ public class WorkflowServiceImpl implements IWorkflowService {
194 204
195 JSONArray array = RemoteServerUtils.getAreas(); 205 JSONArray array = RemoteServerUtils.getAreas();
196 206
197 - Map map = new HashedMap<>();  
198 -  
199 - map.put("type", "CSUserDepartmentType");  
200 -  
201 - JSONArray array2 = RemoteServerUtils.getDict(map);  
202 207
203 String placeName = null; 208 String placeName = null;
204 209
@@ -214,46 +219,56 @@ public class WorkflowServiceImpl implements IWorkflowService { @@ -214,46 +219,56 @@ public class WorkflowServiceImpl implements IWorkflowService {
214 219
215 if(placeName != null){ 220 if(placeName != null){
216 221
217 - String placeCode = null;  
218 - String code = null; 222 + updateProcess(processInstance,placeName);
  223 + }
  224 +
  225 + }
  226 +
  227 + void updateProcess(ProcessInstance processInstance,String placeName){
  228 + Map map = new HashedMap<>();
  229 +
  230 + map.put("type", "CSUserDepartmentType");
219 231
220 - for(Object obj:array2){  
221 - if(((JSONObject)obj).getString("name").equals("渣土办")){  
222 - code = ((JSONObject)(obj)).getString("code");  
223 - }  
224 - if(((JSONObject)obj).getString("name").replace("渣土办", "").equals(placeName)){  
225 - placeCode = ((JSONObject)(obj)).getString("code"); 232 + JSONArray array2 = RemoteServerUtils.getDict(map);
  233 +
  234 +
  235 + String placeCode = null;
  236 + String code = null;
226 237
227 - if(code != null){  
228 - break;  
229 - }  
230 - } 238 + for(Object obj:array2){
  239 + if(((JSONObject)obj).getString("name").equals("渣土办")){
  240 + code = ((JSONObject)(obj)).getString("code");
  241 + }
  242 + if(((JSONObject)obj).getString("name").replace("渣土办", "").equals(placeName)){
  243 + placeCode = ((JSONObject)(obj)).getString("code");
231 244
232 - } 245 + if(code != null){
  246 + break;
  247 + }
  248 + }
233 249
234 - if(placeCode != null){  
235 - Task task = taskService.createTaskQuery().processInstanceId(processInstance.getId()).singleResult(); 250 + }
236 251
  252 + if(placeCode != null){
  253 + Task task = taskService.createTaskQuery().processInstanceId(processInstance.getId()).singleResult();
237 254
238 - List<IdentityLink> list = taskService.getIdentityLinksForTask(task.getId());  
239 255
240 - for(IdentityLink identityLink:list){  
241 -// if(identityLink.getGroupId() != null)  
242 -// taskService.deleteGroupIdentityLink(task.getId(), identityLink.getGroupId(), identityLink.getType());  
243 - if(identityLink.getUserId() != null)  
244 - taskService.deleteUserIdentityLink(task.getId(), identityLink.getUserId(), identityLink.getType());  
245 - } 256 + List<IdentityLink> list = taskService.getIdentityLinksForTask(task.getId());
246 257
247 - taskService.addCandidateUser(task.getId(), placeCode);  
248 -  
249 - task.setDescription(placeCode);  
250 -  
251 - taskService.saveTask(task);  
252 - }  
253 - }  
254 -  
255 - } 258 + for(IdentityLink identityLink:list){
  259 +// if(identityLink.getGroupId() != null)
  260 +// taskService.deleteGroupIdentityLink(task.getId(), identityLink.getGroupId(), identityLink.getType());
  261 + if(identityLink.getUserId() != null)
  262 + taskService.deleteUserIdentityLink(task.getId(), identityLink.getUserId(), identityLink.getType());
  263 + }
256 264
  265 + taskService.addCandidateUser(task.getId(), placeCode);
  266 +
  267 + task.setDescription(placeCode);
  268 +
  269 + taskService.saveTask(task);
  270 + }
  271 + }
257 272
258 /** 273 /**
259 * 查询请假 274 * 查询请假
trash-workFlow/src/main/resources/mapper/SupervisionSpecialMapper.xml
  View file @6d2ba61
@@ -9,40 +9,26 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot; @@ -9,40 +9,26 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
9 <result property="type" column="type" /> 9 <result property="type" column="type" />
10 <result property="title" column="title" /> 10 <result property="title" column="title" />
11 <result property="content" column="content" /> 11 <result property="content" column="content" />
12 - <result property="signPerson" column="sign_person" />  
13 - <result property="signTime" column="sign_time" />  
14 - <result property="timeLimit" column="time_limit" />  
15 - <result property="state" column="state" /> 12 + <result property="person" column="person" />
  13 + <result property="place" column="place" />
16 <result property="createBy" column="create_by" /> 14 <result property="createBy" column="create_by" />
17 <result property="createTime" column="create_time" /> 15 <result property="createTime" column="create_time" />
18 <result property="updateTime" column="update_time" /> 16 <result property="updateTime" column="update_time" />
19 <result property="updateBy" column="update_by" /> 17 <result property="updateBy" column="update_by" />
20 - <result property="resDepart" column="res_depart" />  
21 - <result property="resTime" column="res_time" />  
22 - <result property="resPerson" column="res_person" />  
23 - <result property="resContent" column="res_content" />  
24 - <result property="annotations" column="annotations" />  
25 </resultMap> 18 </resultMap>
26 19
27 <sql id="selectSupervisionSpecialVo"> 20 <sql id="selectSupervisionSpecialVo">
28 - select id, type, title, content, sign_person, sign_time, time_limit, state, create_by, create_time, update_time, update_by, res_depart, res_time, res_person, res_content, annotations from supervision_special 21 + select id, type, title, content, person, place, create_by, create_time, update_time, update_by from supervision_special
29 </sql> 22 </sql>
30 23
31 <select id="selectSupervisionSpecialList" parameterType="SupervisionSpecial" resultMap="SupervisionSpecialResult"> 24 <select id="selectSupervisionSpecialList" parameterType="SupervisionSpecial" resultMap="SupervisionSpecialResult">
32 <include refid="selectSupervisionSpecialVo"/> 25 <include refid="selectSupervisionSpecialVo"/>
33 <where> 26 <where>
34 <if test="type != null and type != ''"> and type = #{type}</if> 27 <if test="type != null and type != ''"> and type = #{type}</if>
35 - <if test="title != null and title != ''"> and title = #{title}</if> 28 + <if test="title != null and title != ''"> and title like concat('%', #{title}, '%')</if>
36 <if test="content != null and content != ''"> and content = #{content}</if> 29 <if test="content != null and content != ''"> and content = #{content}</if>
37 - <if test="signPerson != null and signPerson != ''"> and sign_person = #{signPerson}</if>  
38 - <if test="signTime != null "> and sign_time = #{signTime}</if>  
39 - <if test="timeLimit != null "> and time_limit = #{timeLimit}</if>  
40 - <if test="state != null and state != ''"> and state = #{state}</if>  
41 - <if test="resDepart != null and resDepart != ''"> and res_depart = #{resDepart}</if>  
42 - <if test="resTime != null "> and res_time = #{resTime}</if>  
43 - <if test="resPerson != null and resPerson != ''"> and res_person = #{resPerson}</if>  
44 - <if test="resContent != null and resContent != ''"> and res_content = #{resContent}</if>  
45 - <if test="annotations != null and annotations != ''"> and annotations = #{annotations}</if> 30 + <if test="person != null and person != ''"> and person = #{person}</if>
  31 + <if test="place != null and place != ''"> and place = #{place}</if>
46 </where> 32 </where>
47 </select> 33 </select>
48 34
@@ -58,38 +44,24 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot; @@ -58,38 +44,24 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
58 <if test="type != null">type,</if> 44 <if test="type != null">type,</if>
59 <if test="title != null">title,</if> 45 <if test="title != null">title,</if>
60 <if test="content != null">content,</if> 46 <if test="content != null">content,</if>
61 - <if test="signPerson != null">sign_person,</if>  
62 - <if test="signTime != null">sign_time,</if>  
63 - <if test="timeLimit != null">time_limit,</if>  
64 - <if test="state != null">state,</if> 47 + <if test="person != null">person,</if>
  48 + <if test="place != null">place,</if>
65 <if test="createBy != null">create_by,</if> 49 <if test="createBy != null">create_by,</if>
66 <if test="createTime != null">create_time,</if> 50 <if test="createTime != null">create_time,</if>
67 <if test="updateTime != null">update_time,</if> 51 <if test="updateTime != null">update_time,</if>
68 <if test="updateBy != null">update_by,</if> 52 <if test="updateBy != null">update_by,</if>
69 - <if test="resDepart != null">res_depart,</if>  
70 - <if test="resTime != null">res_time,</if>  
71 - <if test="resPerson != null">res_person,</if>  
72 - <if test="resContent != null">res_content,</if>  
73 - <if test="annotations != null">annotations,</if>  
74 </trim> 53 </trim>
75 <trim prefix="values (" suffix=")" suffixOverrides=","> 54 <trim prefix="values (" suffix=")" suffixOverrides=",">
76 <if test="id != null">#{id},</if> 55 <if test="id != null">#{id},</if>
77 <if test="type != null">#{type},</if> 56 <if test="type != null">#{type},</if>
78 <if test="title != null">#{title},</if> 57 <if test="title != null">#{title},</if>
79 <if test="content != null">#{content},</if> 58 <if test="content != null">#{content},</if>
80 - <if test="signPerson != null">#{signPerson},</if>  
81 - <if test="signTime != null">#{signTime},</if>  
82 - <if test="timeLimit != null">#{timeLimit},</if>  
83 - <if test="state != null">#{state},</if> 59 + <if test="person != null">#{person},</if>
  60 + <if test="place != null">#{place},</if>
84 <if test="createBy != null">#{createBy},</if> 61 <if test="createBy != null">#{createBy},</if>
85 <if test="createTime != null">#{createTime},</if> 62 <if test="createTime != null">#{createTime},</if>
86 <if test="updateTime != null">#{updateTime},</if> 63 <if test="updateTime != null">#{updateTime},</if>
87 <if test="updateBy != null">#{updateBy},</if> 64 <if test="updateBy != null">#{updateBy},</if>
88 - <if test="resDepart != null">#{resDepart},</if>  
89 - <if test="resTime != null">#{resTime},</if>  
90 - <if test="resPerson != null">#{resPerson},</if>  
91 - <if test="resContent != null">#{resContent},</if>  
92 - <if test="annotations != null">#{annotations},</if>  
93 </trim> 65 </trim>
94 </insert> 66 </insert>
95 67
@@ -99,19 +71,12 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot; @@ -99,19 +71,12 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
99 <if test="type != null">type = #{type},</if> 71 <if test="type != null">type = #{type},</if>
100 <if test="title != null">title = #{title},</if> 72 <if test="title != null">title = #{title},</if>
101 <if test="content != null">content = #{content},</if> 73 <if test="content != null">content = #{content},</if>
102 - <if test="signPerson != null">sign_person = #{signPerson},</if>  
103 - <if test="signTime != null">sign_time = #{signTime},</if>  
104 - <if test="timeLimit != null">time_limit = #{timeLimit},</if>  
105 - <if test="state != null">state = #{state},</if> 74 + <if test="person != null">person = #{person},</if>
  75 + <if test="place != null">place = #{place},</if>
106 <if test="createBy != null">create_by = #{createBy},</if> 76 <if test="createBy != null">create_by = #{createBy},</if>
107 <if test="createTime != null">create_time = #{createTime},</if> 77 <if test="createTime != null">create_time = #{createTime},</if>
108 <if test="updateTime != null">update_time = #{updateTime},</if> 78 <if test="updateTime != null">update_time = #{updateTime},</if>
109 <if test="updateBy != null">update_by = #{updateBy},</if> 79 <if test="updateBy != null">update_by = #{updateBy},</if>
110 - <if test="resDepart != null">res_depart = #{resDepart},</if>  
111 - <if test="resTime != null">res_time = #{resTime},</if>  
112 - <if test="resPerson != null">res_person = #{resPerson},</if>  
113 - <if test="resContent != null">res_content = #{resContent},</if>  
114 - <if test="annotations != null">annotations = #{annotations},</if>  
115 </trim> 80 </trim>
116 where id = #{id} 81 where id = #{id}
117 </update> 82 </update>
trash-workFlow/src/main/resources/mapper/SupervisionThreestepMapper.xml
  View file @6d2ba61
@@ -153,11 +153,14 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot; @@ -153,11 +153,14 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
153 153
154 154
155 <select id="selectDayWorkListByType" parameterType="SupervisionThreestep" resultType="java.util.HashMap"> 155 <select id="selectDayWorkListByType" parameterType="SupervisionThreestep" resultType="java.util.HashMap">
156 - select object_id id,name,earthsites_id relationSiteId from supervision_threestep  
157 - where type = #{type}  
158 - and DATE_FORMAT(self_check_time,("%y%m%d")) = DATE_FORMAT(NOW(),("%y%m%d"))  
159 - and status = 1  
160 - ORDER BY self_check_time DESC 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
161 </select> 164 </select>
162 165
163 166
@@ -170,10 +173,21 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot; @@ -170,10 +173,21 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
170 173
171 <select id="selectTodayData" parameterType="SupervisionThreestep" resultMap="SupervisionThreestepResult"> 174 <select id="selectTodayData" parameterType="SupervisionThreestep" resultMap="SupervisionThreestepResult">
172 <include refid="selectSupervisionThreestepVo"/> 175 <include refid="selectSupervisionThreestepVo"/>
173 - where object_id = #{objectId} and type = ${type} and DATE_FORMAT(self_check_time,("%y%m%d")) = DATE_FORMAT(NOW(),("%y%m%d")) 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>
174 </select> 190 </select>
175 -  
176 -  
177 191
178 <insert id="insertSupervisionThreestep" parameterType="SupervisionThreestep" useGeneratedKeys="true" keyProperty="id"> 192 <insert id="insertSupervisionThreestep" parameterType="SupervisionThreestep" useGeneratedKeys="true" keyProperty="id">
179 insert into supervision_threestep 193 insert into supervision_threestep
trash-workFlow/src/main/resources/mapper/TruckActivateMapper.xml
  View file @6d2ba61
@@ -35,6 +35,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot; @@ -35,6 +35,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
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> 36 <if test="createType != null "> and create_type = #{createType}</if>
37 <if test="activateTime != null "> and activate_time = #{activateTime}</if> 37 <if test="activateTime != null "> and activate_time = #{activateTime}</if>
  38 + <if test="startTime != null "> and activate_time BETWEEN #{startTime} and ${endTime}</if>
38 </where> 39 </where>
39 </select> 40 </select>
40 41
@@ -43,6 +44,12 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot; @@ -43,6 +44,12 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
43 where id = #{id} 44 where id = #{id}
44 </select> 45 </select>
45 46
  47 + <select id="selectTodayTruckActivateByObjId" parameterType="String" resultMap="TruckActivateResult">
  48 + <include refid="selectTruckActivateVo"/>
  49 + where object_id = #{objId} and activate_time is not null and status = 0
  50 + </select>
  51 +
  52 +
46 <insert id="insertTruckActivate" parameterType="TruckActivate" useGeneratedKeys="true" keyProperty="id"> 53 <insert id="insertTruckActivate" parameterType="TruckActivate" useGeneratedKeys="true" keyProperty="id">
47 insert into truck_activate 54 insert into truck_activate
48 <trim prefix="(" suffix=")" suffixOverrides=","> 55 <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -90,6 +97,11 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot; @@ -90,6 +97,11 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
90 </trim> 97 </trim>
91 where id = #{id} 98 where id = #{id}
92 </update> 99 </update>
  100 +
  101 + <update id="endAllTurckUnActive" parameterType="TruckActivate">
  102 + update truck_activate set status = 1;
  103 + </update>
  104 +
93 105
94 <delete id="deleteTruckActivateById" parameterType="Long"> 106 <delete id="deleteTruckActivateById" parameterType="Long">
95 delete from truck_activate where id = #{id} 107 delete from truck_activate where id = #{id}
trash-workFlow/src/main/resources/mapper/other/ProjectCheckMapper.xml 0 → 100644
  View file @6d2ba61
  1 +<?xml version="1.0" encoding="UTF-8" ?>
  2 +<!DOCTYPE mapper
  3 +PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  4 +"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
  5 +<mapper namespace="com.trash.other.mapper.ProjectCheckMapper">
  6 +
  7 + <resultMap type="ProjectCheck" id="ProjectCheckResult">
  8 + <result property="id" column="id" />
  9 + <result property="type" column="type" />
  10 + <result property="name" column="name" />
  11 + <result property="timeLimit" column="time_limit" />
  12 + <result property="checkTime" column="check_time" />
  13 + <result property="projectType" column="project_type" />
  14 + <result property="place" column="place" />
  15 + <result property="address" column="address" />
  16 + <result property="stock" column="stock" />
  17 + <result property="checkPeople" column="check_people" />
  18 + <result property="margin" column="margin" />
  19 + <result property="createTime" column="create_time" />
  20 + <result property="createBy" column="create_by" />
  21 + <result property="p1" column="p1" />
  22 + <result property="p1C1" column="p1_c1" />
  23 + <result property="p1C2" column="p1_c2" />
  24 + <result property="p1C3" column="p1_c3" />
  25 + <result property="p2" column="p2" />
  26 + <result property="p2C1" column="p2_c1" />
  27 + <result property="p2C2" column="p2_c2" />
  28 + <result property="p2C3" column="p2_c3" />
  29 + <result property="p3" column="p3" />
  30 + <result property="p3C1" column="p3_c1" />
  31 + <result property="p3C2" column="p3_c2" />
  32 + <result property="p3C3" column="p3_c3" />
  33 + <result property="p4" column="p4" />
  34 + <result property="p4C1" column="p4_c1" />
  35 + <result property="p4C2" column="p4_c2" />
  36 + <result property="p5" column="p5" />
  37 + <result property="p5C1" column="p5_c1" />
  38 + <result property="p5C2" column="p5_c2" />
  39 + <result property="p6" column="p6" />
  40 + <result property="p6C1" column="p6_c1" />
  41 + <result property="p6C2" column="p6_c2" />
  42 + <result property="p7" column="p7" />
  43 + <result property="p7C1" column="p7_c1" />
  44 + <result property="p7C2" column="p7_c2" />
  45 + <result property="p8" column="p8" />
  46 + <result property="p8C1" column="p8_c1" />
  47 + <result property="p8C2" column="p8_c2" />
  48 + <result property="p9C1" column="p9_c1" />
  49 + <result property="p9C2" column="p9_c2" />
  50 + <result property="p9C3" column="p9_c3" />
  51 + <result property="environment" column="environment" />
  52 + <result property="line" column="line" />
  53 + <result property="dest" column="dest" />
  54 + <result property="checkSign" column="check_sign" />
  55 + <result property="sign" column="sign" />
  56 + </resultMap>
  57 +
  58 + <sql id="selectProjectCheckVo">
  59 + select id, type, name, time_limit, check_time, project_type, stock,place,address, check_people, margin, create_time, create_by, p1, p1_c1, p1_c2, p1_c3, p2, p2_c1, p2_c2, p2_c3, p3, p3_c1, p3_c2, p3_c3, p4, p4_c1, p4_c2, p5, p5_c1, p5_c2, p6, p6_c1, p6_c2, p7, p7_c1, p7_c2, p8, p8_c1, p8_c2, p9_c1, p9_c2, p9_c3, environment, line, dest, check_sign, sign from project_check
  60 + </sql>
  61 +
  62 + <select id="selectProjectCheckList" parameterType="ProjectCheck" resultMap="ProjectCheckResult">
  63 + <include refid="selectProjectCheckVo"/>
  64 + <where>
  65 + <if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if>
  66 + <if test="place != null and place != ''"> and place = #{place} </if>
  67 + <if test="checkTime != null "> and check_time = #{checkTime}</if>
  68 + <if test="projectType != null "> and project_type = #{projectType}</if>
  69 + <if test="checkPeople != null and checkPeople != ''"> and check_people = #{checkPeople}</if>
  70 + <if test="margin != null "> and margin = #{margin}</if>
  71 + </where>
  72 + </select>
  73 +
  74 + <select id="selectProjectCheckById" parameterType="Long" resultMap="ProjectCheckResult">
  75 + <include refid="selectProjectCheckVo"/>
  76 + where id = #{id}
  77 + </select>
  78 +
  79 + <insert id="insertProjectCheck" parameterType="ProjectCheck" useGeneratedKeys="true" keyProperty="id">
  80 + insert into project_check
  81 + <trim prefix="(" suffix=")" suffixOverrides=",">
  82 + <if test="type != null">type,</if>
  83 + <if test="name != null">name,</if>
  84 + <if test="timeLimit != null">time_limit,</if>
  85 + <if test="checkTime != null">check_time,</if>
  86 + <if test="projectType != null">project_type,</if>
  87 + <if test="stock != null">stock,</if>
  88 + <if test="place != null">place, </if>
  89 + <if test="address != null">address, </if>
  90 + <if test="checkPeople != null and checkPeople != ''">check_people,</if>
  91 + <if test="margin != null">margin,</if>
  92 + <if test="createTime != null">create_time,</if>
  93 + <if test="createBy != null and createBy != ''">create_by,</if>
  94 + <if test="p1 != null">p1,</if>
  95 + <if test="p1C1 != null">p1_c1,</if>
  96 + <if test="p1C2 != null">p1_c2,</if>
  97 + <if test="p1C3 != null">p1_c3,</if>
  98 + <if test="p2 != null">p2,</if>
  99 + <if test="p2C1 != null">p2_c1,</if>
  100 + <if test="p2C2 != null">p2_c2,</if>
  101 + <if test="p2C3 != null">p2_c3,</if>
  102 + <if test="p3 != null">p3,</if>
  103 + <if test="p3C1 != null">p3_c1,</if>
  104 + <if test="p3C2 != null">p3_c2,</if>
  105 + <if test="p3C3 != null">p3_c3,</if>
  106 + <if test="p4 != null">p4,</if>
  107 + <if test="p4C1 != null">p4_c1,</if>
  108 + <if test="p4C2 != null">p4_c2,</if>
  109 + <if test="p5 != null">p5,</if>
  110 + <if test="p5C1 != null">p5_c1,</if>
  111 + <if test="p5C2 != null">p5_c2,</if>
  112 + <if test="p6 != null">p6,</if>
  113 + <if test="p6C1 != null">p6_c1,</if>
  114 + <if test="p6C2 != null">p6_c2,</if>
  115 + <if test="p7 != null">p7,</if>
  116 + <if test="p7C1 != null">p7_c1,</if>
  117 + <if test="p7C2 != null">p7_c2,</if>
  118 + <if test="p8 != null">p8,</if>
  119 + <if test="p8C1 != null">p8_c1,</if>
  120 + <if test="p8C2 != null">p8_c2,</if>
  121 + <if test="p9C1 != null">p9_c1,</if>
  122 + <if test="p9C2 != null">p9_c2,</if>
  123 + <if test="p9C3 != null">p9_c3,</if>
  124 + <if test="environment != null and environment != ''">environment,</if>
  125 + <if test="line != null and line != ''">line,</if>
  126 + <if test="dest != null and dest != ''">dest,</if>
  127 + <if test="checkSign != null and checkSign != ''">check_sign,</if>
  128 + <if test="sign != null and sign != ''">sign,</if>
  129 + </trim>
  130 + <trim prefix="values (" suffix=")" suffixOverrides=",">
  131 + <if test="type != null">#{type},</if>
  132 + <if test="name != null">#{name},</if>
  133 + <if test="timeLimit != null">#{timeLimit},</if>
  134 + <if test="checkTime != null">#{checkTime},</if>
  135 + <if test="projectType != null">#{projectType},</if>
  136 + <if test="stock != null">#{stock},</if>
  137 + <if test="place != null">#{place}, </if>
  138 + <if test="address != null">#{address}, </if>
  139 + <if test="checkPeople != null and checkPeople != ''">#{checkPeople},</if>
  140 + <if test="margin != null">#{margin},</if>
  141 + <if test="createTime != null">#{createTime},</if>
  142 + <if test="createBy != null and createBy != ''">#{createBy},</if>
  143 + <if test="p1 != null">#{p1},</if>
  144 + <if test="p1C1 != null">#{p1C1},</if>
  145 + <if test="p1C2 != null">#{p1C2},</if>
  146 + <if test="p1C3 != null">#{p1C3},</if>
  147 + <if test="p2 != null">#{p2},</if>
  148 + <if test="p2C1 != null">#{p2C1},</if>
  149 + <if test="p2C2 != null">#{p2C2},</if>
  150 + <if test="p2C3 != null">#{p2C3},</if>
  151 + <if test="p3 != null">#{p3},</if>
  152 + <if test="p3C1 != null">#{p3C1},</if>
  153 + <if test="p3C2 != null">#{p3C2},</if>
  154 + <if test="p3C3 != null">#{p3C3},</if>
  155 + <if test="p4 != null">#{p4},</if>
  156 + <if test="p4C1 != null">#{p4C1},</if>
  157 + <if test="p4C2 != null">#{p4C2},</if>
  158 + <if test="p5 != null">#{p5},</if>
  159 + <if test="p5C1 != null">#{p5C1},</if>
  160 + <if test="p5C2 != null">#{p5C2},</if>
  161 + <if test="p6 != null">#{p6},</if>
  162 + <if test="p6C1 != null">#{p6C1},</if>
  163 + <if test="p6C2 != null">#{p6C2},</if>
  164 + <if test="p7 != null">#{p7},</if>
  165 + <if test="p7C1 != null">#{p7C1},</if>
  166 + <if test="p7C2 != null">#{p7C2},</if>
  167 + <if test="p8 != null">#{p8},</if>
  168 + <if test="p8C1 != null">#{p8C1},</if>
  169 + <if test="p8C2 != null">#{p8C2},</if>
  170 + <if test="p9C1 != null">#{p9C1},</if>
  171 + <if test="p9C2 != null">#{p9C2},</if>
  172 + <if test="p9C3 != null">#{p9C3},</if>
  173 + <if test="environment != null and environment != ''">#{environment},</if>
  174 + <if test="line != null and line != ''">#{line},</if>
  175 + <if test="dest != null and dest != ''">#{dest},</if>
  176 + <if test="checkSign != null and checkSign != ''">#{checkSign},</if>
  177 + <if test="sign != null and sign != ''">#{sign},</if>
  178 + </trim>
  179 + </insert>
  180 +
  181 + <update id="updateProjectCheck" parameterType="ProjectCheck">
  182 + update project_check
  183 + <trim prefix="SET" suffixOverrides=",">
  184 + <if test="type != null">type = #{type},</if>
  185 + <if test="name != null">name = #{name},</if>
  186 + <if test="timeLimit != null">time_limit = #{timeLimit},</if>
  187 + <if test="checkTime != null">check_time = #{checkTime},</if>
  188 + <if test="projectType != null">project_type = #{projectType},</if>
  189 + <if test="place != null">#{place}, </if>
  190 + <if test="address != null">#{address}, </if>
  191 + <if test="stock != null">stock = #{stock},</if>
  192 + <if test="checkPeople != null and checkPeople != ''">check_people = #{checkPeople},</if>
  193 + <if test="margin != null">margin = #{margin},</if>
  194 + <if test="createTime != null">create_time = #{createTime},</if>
  195 + <if test="createBy != null and createBy != ''">create_by = #{createBy},</if>
  196 + <if test="p1 != null">p1 = #{p1},</if>
  197 + <if test="p1C1 != null">p1_c1 = #{p1C1},</if>
  198 + <if test="p1C2 != null">p1_c2 = #{p1C2},</if>
  199 + <if test="p1C3 != null">p1_c3 = #{p1C3},</if>
  200 + <if test="p2 != null">p2 = #{p2},</if>
  201 + <if test="p2C1 != null">p2_c1 = #{p2C1},</if>
  202 + <if test="p2C2 != null">p2_c2 = #{p2C2},</if>
  203 + <if test="p2C3 != null">p2_c3 = #{p2C3},</if>
  204 + <if test="p3 != null">p3 = #{p3},</if>
  205 + <if test="p3C1 != null">p3_c1 = #{p3C1},</if>
  206 + <if test="p3C2 != null">p3_c2 = #{p3C2},</if>
  207 + <if test="p3C3 != null">p3_c3 = #{p3C3},</if>
  208 + <if test="p4 != null">p4 = #{p4},</if>
  209 + <if test="p4C1 != null">p4_c1 = #{p4C1},</if>
  210 + <if test="p4C2 != null">p4_c2 = #{p4C2},</if>
  211 + <if test="p5 != null">p5 = #{p5},</if>
  212 + <if test="p5C1 != null">p5_c1 = #{p5C1},</if>
  213 + <if test="p5C2 != null">p5_c2 = #{p5C2},</if>
  214 + <if test="p6 != null">p6 = #{p6},</if>
  215 + <if test="p6C1 != null">p6_c1 = #{p6C1},</if>
  216 + <if test="p6C2 != null">p6_c2 = #{p6C2},</if>
  217 + <if test="p7 != null">p7 = #{p7},</if>
  218 + <if test="p7C1 != null">p7_c1 = #{p7C1},</if>
  219 + <if test="p7C2 != null">p7_c2 = #{p7C2},</if>
  220 + <if test="p8 != null">p8 = #{p8},</if>
  221 + <if test="p8C1 != null">p8_c1 = #{p8C1},</if>
  222 + <if test="p8C2 != null">p8_c2 = #{p8C2},</if>
  223 + <if test="p9C1 != null">p9_c1 = #{p9C1},</if>
  224 + <if test="p9C2 != null">p9_c2 = #{p9C2},</if>
  225 + <if test="p9C3 != null">p9_c3 = #{p9C3},</if>
  226 + <if test="environment != null and environment != ''">environment = #{environment},</if>
  227 + <if test="line != null and line != ''">line = #{line},</if>
  228 + <if test="dest != null and dest != ''">dest = #{dest},</if>
  229 + <if test="checkSign != null and checkSign != ''">check_sign = #{checkSign},</if>
  230 + <if test="sign != null and sign != ''">sign = #{sign},</if>
  231 + </trim>
  232 + where id = #{id}
  233 + </update>
  234 +
  235 + <delete id="deleteProjectCheckById" parameterType="Long">
  236 + delete from project_check where id = #{id}
  237 + </delete>
  238 +
  239 + <delete id="deleteProjectCheckByIds" parameterType="String">
  240 + delete from project_check where id in
  241 + <foreach item="id" collection="array" open="(" separator="," close=")">
  242 + #{id}
  243 + </foreach>
  244 + </delete>
  245 +
  246 +</mapper>
0 \ No newline at end of file 247 \ No newline at end of file
trash-workFlow/src/main/resources/mapper/sign/ConstructionSignMapper.xml 0 → 100644
  View file @6d2ba61
  1 +<?xml version="1.0" encoding="UTF-8" ?>
  2 +<!DOCTYPE mapper
  3 +PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  4 +"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
  5 +<mapper namespace="com.trash.business.mapper.ConstructionSignMapper">
  6 +
  7 + <resultMap type="ConstructionSign" id="ConstructionSignResult">
  8 + <result property="id" column="id" />
  9 + <result property="objectId" column="object_id" />
  10 + <result property="workflowId" column="workflow_id" />
  11 + <result property="createTime" column="create_time" />
  12 + <result property="sign1" column="sign1" />
  13 + <result property="sign2" column="sign2" />
  14 + <result property="sign3" column="sign3" />
  15 + <result property="sign4" column="sign4" />
  16 + <result property="sign1Time" column="sign1_time" />
  17 + <result property="sign2Time" column="sign2_time" />
  18 + <result property="sign3Time" column="sign3_time" />
  19 + <result property="sign4Time" column="sign4_time" />
  20 + <result property="sign1Text" column="sign1_text" />
  21 + <result property="sign2Text" column="sign2_text" />
  22 + <result property="sign3Text" column="sign3_text" />
  23 + <result property="sign4Text" column="sign4_text" />
  24 + </resultMap>
  25 +
  26 + <sql id="selectConstructionSignVo">
  27 + select id, object_id, workflow_id, create_time, sign1, sign2, sign3, sign4,sign1_time,sign2_time,sign3_time,sign4_time,sign1_text,sign2_text,sign3_text,sign4_text from construction_sign
  28 + </sql>
  29 +
  30 + <select id="selectConstructionSignList" parameterType="ConstructionSign" resultMap="ConstructionSignResult">
  31 + <include refid="selectConstructionSignVo"/>
  32 + <where>
  33 + <if test="objectId != null and objectId != ''"> and object_id = #{objectId}</if>
  34 + <if test="workflowId != null and workflowId != ''"> and workflow_id = #{workflowId}</if>
  35 + </where>
  36 + </select>
  37 +
  38 + <select id="selectConstructionSignById" parameterType="Long" resultMap="ConstructionSignResult">
  39 + <include refid="selectConstructionSignVo"/>
  40 + where id = #{id}
  41 + </select>
  42 +
  43 + <select id="selectConstructionSignByObjId" parameterType="String" resultMap="ConstructionSignResult">
  44 + <include refid="selectConstructionSignVo"/>
  45 + where object_id = #{objectId}
  46 + </select>
  47 +
  48 +
  49 + <insert id="insertConstructionSign" parameterType="ConstructionSign" useGeneratedKeys="true" keyProperty="id">
  50 + insert into construction_sign
  51 + <trim prefix="(" suffix=")" suffixOverrides=",">
  52 + <if test="objectId != null">object_id,</if>
  53 + <if test="workflowId != null">workflow_id,</if>
  54 + <if test="createTime != null">create_time,</if>
  55 + <if test="sign1 != null">sign1,</if>
  56 + <if test="sign2 != null">sign2,</if>
  57 + <if test="sign3 != null">sign3,</if>
  58 + <if test="sign4 != null">sign4,</if>
  59 + <if test="sign1Time != null">sign1_time,</if>
  60 + <if test="sign2Time != null">sign2_time,</if>
  61 + <if test="sign3Time != null">sign3_time,</if>
  62 + <if test="sign4Time != null">sign4_time,</if>
  63 + <if test="sign1Text != null">sign1_text,</if>
  64 + <if test="sign2Text != null">sign2_text,</if>
  65 + <if test="sign3Text != null">sign3_text,</if>
  66 + <if test="sign4Text != null">sign4_text,</if>
  67 +
  68 + </trim>
  69 + <trim prefix="values (" suffix=")" suffixOverrides=",">
  70 + <if test="objectId != null">#{objectId},</if>
  71 + <if test="workflowId != null">#{workflowId},</if>
  72 + <if test="createTime != null">#{createTime},</if>
  73 + <if test="sign1 != null">#{sign1},</if>
  74 + <if test="sign2 != null">#{sign2},</if>
  75 + <if test="sign3 != null">#{sign3},</if>
  76 + <if test="sign4 != null">#{sign4},</if>
  77 + <if test="sign1Time != null">#{sign1Time},</if>
  78 + <if test="sign2Time != null">#{sign2Time},</if>
  79 + <if test="sign3Time != null">#{sign3Time},</if>
  80 + <if test="sign4Time != null">#{sign4Time},</if>
  81 + <if test="sign1Text != null">#{sign1Text},</if>
  82 + <if test="sign2Text != null">#{sign2Text},</if>
  83 + <if test="sign3Text != null">#{sign3Text},</if>
  84 + <if test="sign4Text != null">#{sign4Text},</if>
  85 + </trim>
  86 + </insert>
  87 +
  88 + <update id="updateConstructionSign" parameterType="ConstructionSign">
  89 + update construction_sign
  90 + <trim prefix="SET" suffixOverrides=",">
  91 + <if test="objectId != null">object_id = #{objectId},</if>
  92 + <if test="workflowId != null">workflow_id = #{workflowId},</if>
  93 + <if test="createTime != null">create_time = #{createTime},</if>
  94 + <if test="sign1 != null">sign1 = #{sign1},</if>
  95 + <if test="sign2 != null">sign2 = #{sign2},</if>
  96 + <if test="sign3 != null">sign3 = #{sign3},</if>
  97 + <if test="sign4 != null">sign4 = #{sign4},</if>
  98 + <if test="sign1Time != null">sign1_time = #{sign1Time},</if>
  99 + <if test="sign2Time != null">sign2_time =#{sign2Time},</if>
  100 + <if test="sign3Time != null">sign3_time =#{sign3Time},</if>
  101 + <if test="sign4Time != null">sign4_time =#{sign4Time},</if>
  102 + <if test="sign1Text != null">sign1_text = #{sign1Text},</if>
  103 + <if test="sign2Text != null">sign2_text =#{sign2Text},</if>
  104 + <if test="sign3Text != null">sign3_text =#{sign3Text},</if>
  105 + <if test="sign4Text != null">sign4_text =#{sign4Text},</if>
  106 + </trim>
  107 + where id = #{id}
  108 + </update>
  109 +
  110 + <delete id="deleteConstructionSignById" parameterType="Long">
  111 + delete from construction_sign where id = #{id}
  112 + </delete>
  113 +
  114 + <delete id="deleteConstructionSignByIds" parameterType="String">
  115 + delete from construction_sign where id in
  116 + <foreach item="id" collection="array" open="(" separator="," close=")">
  117 + #{id}
  118 + </foreach>
  119 + </delete>
  120 +
  121 +</mapper>
0 \ No newline at end of file 122 \ No newline at end of file