Просмотр исходного кода

fix: 工作任务填充驿站人员表ID

zhangying 11 месяцев назад
Родитель
Сommit
afc536f723

+ 14 - 2
src/main/java/com/hz/employmentsite/services/impl/taskAndLog/DoWorkImpl.java

@@ -3,9 +3,12 @@ package com.hz.employmentsite.services.impl.taskAndLog;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.hz.employmentsite.mapper.PcDoworkMapper;
+import com.hz.employmentsite.mapper.PcSiteUserMapper;
 import com.hz.employmentsite.mapper.cquery.DoWorkCQuery;
 import com.hz.employmentsite.model.PcDowork;
 import com.hz.employmentsite.model.PcDoworkExample;
+import com.hz.employmentsite.model.PcSiteUser;
+import com.hz.employmentsite.model.PcSiteUserExample;
 import com.hz.employmentsite.services.service.taskAndLog.DoWorkService;
 import com.hz.employmentsite.util.StringUtils;
 import com.hz.employmentsite.vo.taskAndLog.DoWorkVo;
@@ -29,6 +32,9 @@ public class DoWorkImpl implements DoWorkService {
     @Autowired
     private PcDoworkMapper pcDoworkMapper;
 
+    @Autowired
+    private PcSiteUserMapper pcSiteUserMapper;
+
     @Override
     public PageInfo<DoWorkVo> getList(int pageIndex, int pageSize, List<String> doWorkIDList,
                                       String userName, String workStartDate, String workEndDate,
@@ -57,11 +63,17 @@ public class DoWorkImpl implements DoWorkService {
         DoWorkVo record = get(data.doWorkID);
         PcDowork dbData = record == null ? null : pcDoworkMapper.selectByPrimaryKey(record.doWorkID);
         Boolean isExist = dbData != null;
+
+        // 获取驿站人员表ID
+        PcSiteUserExample siteUserExample = new PcSiteUserExample();
+        PcSiteUserExample.Criteria criteria = siteUserExample.createCriteria();
+        criteria.andUserIDEqualTo(data.userId);
+        PcSiteUser pcSiteUser = pcSiteUserMapper.selectByExample(siteUserExample).stream().findFirst().orElse(new PcSiteUser());
         if (!isExist) {
             //添加
             dbData = new PcDowork();
             dbData.setDoworkID(data.getDoWorkID());
-            dbData.setSiteUserID(data.getSiteUserID());
+            dbData.setSiteUserID(pcSiteUser.getSiteUserID());
             dbData.setDoTypeID(data.getDoTypeID());
             dbData.setWorkContent(data.getWorkContent());
             dbData.setRegionCode(data.getRegionCode());
@@ -74,7 +86,7 @@ public class DoWorkImpl implements DoWorkService {
         } else {
             //修改
             dbData.setDoworkID(data.doWorkID);
-            dbData.setSiteUserID(data.siteUserID);
+            dbData.setSiteUserID(pcSiteUser.getSiteUserID());
             dbData.setDoTypeID(data.doTypeID);
             dbData.setWorkContent(data.workContent);
             dbData.setRegionCode(data.regionCode);