wangpeng
/
integrated_traffic
forked from integrated_whb/integrated_whb
1
0
Fork 0
Code Pull Requests Activity

优化BUG

dev
xiepeng 2024-05-24 16:29:06 +08:00
parent 6eed001b1a
commit f50c2d35df
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/zcloud/controller/operatingvehicles/OperatingVehiclesController.java
View File

@ -11,6 +11,7 @@ import com.zcloud.service.scrapManage.ScrapManageService;
import com.zcloud.service.system.DepartmentService; import com.zcloud.service.system.DepartmentService;
import com.zcloud.service.system.ImgFilesService; import com.zcloud.service.system.ImgFilesService;
import com.zcloud.util.*; import com.zcloud.util.*;
import freemarker.template.utility.StringUtil;
import net.sf.json.JSONArray; import net.sf.json.JSONArray;
import org.apache.commons.io.FileUtils; import org.apache.commons.io.FileUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;

5
src/main/java/com/zcloud/service/system/impl/UserCorpServiceImpl.java
View File

@ -182,11 +182,10 @@ public class UserCorpServiceImpl implements UserCorpService {
userInfo.put("INCUMBENCY", "bd4d802e94354230b1bb19cfabd7f810"); // 在职 userInfo.put("INCUMBENCY", "bd4d802e94354230b1bb19cfabd7f810"); // 在职
userInfoService.setPractitionerReview(userInfo); userInfoService.setPractitionerReview(userInfo);
} else { } else {
//补充人员关联信息（企业、部门、岗位、排班） //补充人员关联信息（企业、岗位、排班）
PageData user = new PageData(); PageData user = new PageData();
Warden.initData(user, "app", pd); Warden.initData(user, "app", pd);
user.put("USER_ID", pd.getString("USER_ID")); user.put("USER_ID", pd.getString("USER_ID"));
user.put("CORPINFO_ID", pd.getString("CORPINFO_ID"));
user.put("DEPARTMENT_ID", pd.getString("DEPARTMENT_ID")); user.put("DEPARTMENT_ID", pd.getString("DEPARTMENT_ID"));
user.put("POST_ID", pd.getString("POST_ID")); user.put("POST_ID", pd.getString("POST_ID"));
user.put("SHIFTDUTYONE", pd.getString("SHIFTDUTYONE")); user.put("SHIFTDUTYONE", pd.getString("SHIFTDUTYONE"));
@ -204,7 +203,7 @@ public class UserCorpServiceImpl implements UserCorpService {
userInfo.put("ENTRY_DATE", pd.getString("ENTRY_DATE")); userInfo.put("ENTRY_DATE", pd.getString("ENTRY_DATE"));
userInfo.put("DUTIES", pd.getString("DUTIES")); userInfo.put("DUTIES", pd.getString("DUTIES"));
userInfo.put("TITLE", pd.getString("TITLE")); userInfo.put("TITLE", pd.getString("TITLE"));
userInfo.put("INCUMBENCY", "bd4d802e94354230b1bb19cfabd7f810"); // 在职 /*userInfo.put("INCUMBENCY", "bd4d802e94354230b1bb19cfabd7f810"); // 在职*/
userInfoService.setPractitionerReview(userInfo); userInfoService.setPractitionerReview(userInfo);
pd.put("ISDELETE", "2"); pd.put("ISDELETE", "2");
} }

2
src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityWaybillRegistrationMapper.xml
View File

@ -266,7 +266,7 @@
bto.PLATE_NUMBER bto.PLATE_NUMBER
from from
<include refid="tableName"></include> f <include refid="tableName"></include> f
left join bus_traffic_operatingvehicle e on f.TRANSPORTVEHICLE = e.PLATE_NUMBER left join bus_traffic_operatingvehicle e on f.TRANSPORTVEHICLE = e.OPERATING_ID
left join sys_user s on s.USER_ID = f.PRACTITIONER left join sys_user s on s.USER_ID = f.PRACTITIONER
left join bus_traffic_driving_sign t on t.WAYBILLREGISTRATION_ID = f.WAYBILLREGISTRATION_ID and t.CHECKTYPE_ID = 'status001' left join bus_traffic_driving_sign t on t.WAYBILLREGISTRATION_ID = f.WAYBILLREGISTRATION_ID and t.CHECKTYPE_ID = 'status001'
left join bus_traffic_driving_sign p on p.WAYBILLREGISTRATION_ID = f.WAYBILLREGISTRATION_ID and p.CHECKTYPE_ID = 'status003' left join bus_traffic_driving_sign p on p.WAYBILLREGISTRATION_ID = f.WAYBILLREGISTRATION_ID and p.CHECKTYPE_ID = 'status003'