aps-导入调度增加修改人修改时间

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsProcessOperationProcessEquServiceImpl.java

@@ -2661,8 +2661,8 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
         //调用平台接口查询结果
         query.setCurrent(null);
         query.setSize(null);
-        query.setQuerySql(query.getQuerySql().replaceFirst("交期偏差（天）","outdueday"));
-        query.setQuerySql(query.getQuerySql().replaceFirst("是否超交期","isoutdue"));
+        query.setQuerySql(query.getQuerySql().replaceFirst("交期偏差（天）", "outdueday"));
+        query.setQuerySql(query.getQuerySql().replaceFirst("是否超交期", "isoutdue"));
         R listData = cxAdminFeginClient.getListData(query);
         JSONObject jsonObject = JSONObject.parseObject(JSON.toJSONString(listData.getData()));
         JSONArray records = jsonObject.getJSONArray("records");
@@ -2762,6 +2762,7 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
 
     @Override
     public R workShopImport(MultipartFile multipartFile, HttpServletResponse response) throws IOException {
+        SysUserVo currentUser = CXCommonUtils.getCurrentUser();
         WorkShopImportListener listener = new WorkShopImportListener();
         try {
             // 读取数据
@@ -2968,6 +2969,9 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
                 if (equDo.getPlanenddate() != null) {
                     wrapper.set(ApsProcessOperationProcessEquDo::getPlanenddate, equDo.getPlanenddate());
                 }
+                wrapper.set(ApsProcessOperationProcessEquDo::getModifydate, DateUtil.date());
+                wrapper.set(ApsProcessOperationProcessEquDo::getModifyuserid, currentUser.getId());
+                wrapper.set(ApsProcessOperationProcessEquDo::getModifyusername, currentUser.getName());
                 wrapper.eq(ApsProcessOperationProcessEquDo::getId, equDo.getId())
                         .eq(ApsProcessOperationProcessEquDo::getWorkstatus, "待开工");
                 // 开始事务