From c5e9a5ef92f020859768fef18b46769e0419e5e6 Mon Sep 17 00:00:00 2001 From: PoffyZhang <99775271@qq.com> Date: Wed, 23 Aug 2023 09:40:08 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=8E=A8=E9=80=81=E9=81=82=E6=98=8C?= =?UTF-8?q?=E5=8E=BF=E9=A1=B9=E7=9B=AE=20=E4=BB=A3=E7=A0=81debug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ningdatech/pmapi/ding/controller/DingInfoPullController.java | 2 +- pmapi/src/main/java/com/ningdatech/pmapi/irs/manage/AppIrsManage.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/ding/controller/DingInfoPullController.java b/pmapi/src/main/java/com/ningdatech/pmapi/ding/controller/DingInfoPullController.java index f5d3233..89c9f91 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/ding/controller/DingInfoPullController.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/ding/controller/DingInfoPullController.java @@ -149,7 +149,7 @@ public class DingInfoPullController { projectDto.setProjectCode(row.getCell(0).toString()); projectDto.setProjectName(row.getCell(1).toString()); projectDto.setArea(row.getCell(2).toString()); - projectDto.setAreaCode(row.getCell(3).toString()); + projectDto.setAreaCode("331123000"); String baseProjType = String.valueOf(row.getCell(4)); if(StringUtils.isNotBlank(baseProjType) && baseProjType.contains(".")){ baseProjType = baseProjType.substring(0, diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/irs/manage/AppIrsManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/irs/manage/AppIrsManage.java index 89386af..d73f6de 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/irs/manage/AppIrsManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/irs/manage/AppIrsManage.java @@ -323,13 +323,13 @@ public class AppIrsManage { String baseConstructionType = projectDto.getBaseConstructionType();//"01" String baseProjType = projectDto.getBaseProjType();//"1" String baseProjContacts = projectDto.getContactName();//"毛以林" - String isEffective = "1"; + String isEffective = "02"; // 有效 String baseConsDeprtDing = projectDto.getBuildOrgCode();//"GO_9a7dce7fbaf54787998fa004f1b7c0e1"; String baseProjSetProg = projectDto.getBaseProjSetProg();//"04" String baseProjContactsCall = projectDto.getContactPhone();//"13857049999" String baseProjName = projectDto.getProjectName();//"遂昌县大数据和金融发展中心天工系统" String baseProjConsClass = projectDto.getBaseProjConsClass();//"C" - String areaCode = projectDto.getAreaCode() + "000";//"331123000" + String areaCode = projectDto.getAreaCode();//"331123000" String baseAreaName = projectDto.getArea();//"遂昌县"; String baseManDeprtDing = projectDto.getSuperOrgCode();//"GO_9a7dce7fbaf54787998fa004f1b7c0e1"; String baseProvManDeprtDing = projectDto.getHigherSuperOrgCode();//"GO_6c383c049d95461f9a0df780140ceb32"; From 5384ed07d0b3e982bebaf1427c33c481df719a5f Mon Sep 17 00:00:00 2001 From: PoffyZhang <99775271@qq.com> Date: Wed, 23 Aug 2023 11:14:07 +0800 Subject: [PATCH 2/2] =?UTF-8?q?debug=20=E5=91=98=E5=B7=A5code=20=E5=94=AF?= =?UTF-8?q?=E4=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ningdatech/pmapi/scheduler/task/CommonLogTask.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/scheduler/task/CommonLogTask.java b/pmapi/src/main/java/com/ningdatech/pmapi/scheduler/task/CommonLogTask.java index 49d5e0f..56c1d7b 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/scheduler/task/CommonLogTask.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/scheduler/task/CommonLogTask.java @@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.ningdatech.log.mapper.OptLogMapper; import com.ningdatech.log.model.domain.OptLog; +import com.ningdatech.pmapi.common.constant.BizConst; import com.ningdatech.pmapi.organization.mapper.DingEmployeeInfoMapper; import com.ningdatech.pmapi.organization.model.entity.DingEmployeeInfo; import com.ningdatech.pmapi.scheduler.task.model.CommonLog; @@ -79,7 +80,8 @@ public class CommonLogTask { String employeeCode = userInfo.getEmployeeCode(); if (StringUtils.isNotBlank(employeeCode)){ DingEmployeeInfo dingEmployeeInfo = dingEmployeeInfoMapper.selectOne(new LambdaQueryWrapper() - .eq(DingEmployeeInfo::getEmployeeCode,employeeCode)); + .eq(DingEmployeeInfo::getEmployeeCode,employeeCode) + .last(BizConst.LIMIT_1)); if (dingEmployeeInfo != null){ commonLog.setUserId(String.valueOf(dingEmployeeInfo.getAccountId())); }