From f50c2d35dfbaed37aeb8d7e98bc101aafa73a948 Mon Sep 17 00:00:00 2001 From: xiepeng Date: Fri, 24 May 2024 16:29:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operatingvehicles/OperatingVehiclesController.java | 1 + .../com/zcloud/service/system/impl/UserCorpServiceImpl.java | 5 ++--- .../TrafficSecurityWaybillRegistrationMapper.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/zcloud/controller/operatingvehicles/OperatingVehiclesController.java b/src/main/java/com/zcloud/controller/operatingvehicles/OperatingVehiclesController.java index 33b488e..b2891a8 100644 --- a/src/main/java/com/zcloud/controller/operatingvehicles/OperatingVehiclesController.java +++ b/src/main/java/com/zcloud/controller/operatingvehicles/OperatingVehiclesController.java @@ -11,6 +11,7 @@ import com.zcloud.service.scrapManage.ScrapManageService; import com.zcloud.service.system.DepartmentService; import com.zcloud.service.system.ImgFilesService; import com.zcloud.util.*; +import freemarker.template.utility.StringUtil; import net.sf.json.JSONArray; import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/com/zcloud/service/system/impl/UserCorpServiceImpl.java b/src/main/java/com/zcloud/service/system/impl/UserCorpServiceImpl.java index 413bf10..4a67c65 100644 --- a/src/main/java/com/zcloud/service/system/impl/UserCorpServiceImpl.java +++ b/src/main/java/com/zcloud/service/system/impl/UserCorpServiceImpl.java @@ -182,11 +182,10 @@ public class UserCorpServiceImpl implements UserCorpService { userInfo.put("INCUMBENCY", "bd4d802e94354230b1bb19cfabd7f810"); // 在职 userInfoService.setPractitionerReview(userInfo); } else { - //补充人员关联信息（企业、部门、岗位、排班） + //补充人员关联信息（企业、岗位、排班） PageData user = new PageData(); Warden.initData(user, "app", pd); 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("POST_ID", pd.getString("POST_ID")); 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("DUTIES", pd.getString("DUTIES")); userInfo.put("TITLE", pd.getString("TITLE")); - userInfo.put("INCUMBENCY", "bd4d802e94354230b1bb19cfabd7f810"); // 在职 + /*userInfo.put("INCUMBENCY", "bd4d802e94354230b1bb19cfabd7f810"); // 在职*/ userInfoService.setPractitionerReview(userInfo); pd.put("ISDELETE", "2"); } diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityWaybillRegistrationMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityWaybillRegistrationMapper.xml index cbeade6..efc5abc 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityWaybillRegistrationMapper.xml +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityWaybillRegistrationMapper.xml @@ -266,7 +266,7 @@ bto.PLATE_NUMBER from 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 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'