diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/DeclaredProjectManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/DeclaredProjectManage.java index 1290082..26d1019 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/DeclaredProjectManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/DeclaredProjectManage.java @@ -204,6 +204,7 @@ public class DeclaredProjectManage { //项目名称去重 if(StringUtils.isNotBlank(projectDto.getProjectName()) && !projectDto.getProjectName().equals(projectInfo.getProjectName())){ + projectDto.setProjectCode(projectInfo.getProjectCode()); defaultDeclaredProjectManage.checkDuplication(projectDto); } //判断申报金额 是否等于总的 判断年度支付金额 是否等于总金额 diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/DefaultDeclaredProjectManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/DefaultDeclaredProjectManage.java index 87eba24..34bfe72 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/DefaultDeclaredProjectManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/DefaultDeclaredProjectManage.java @@ -91,7 +91,7 @@ public class DefaultDeclaredProjectManage { public void checkDuplication(ProjectDTO project){ VUtils.isTrue(projectService.count(Wrappers.lambdaQuery(Project.class) .eq(Project::getProjectName,project.getProjectName()) - .ne(Objects.nonNull(project.getId()),Project::getId,project.getId())) > 0) + .ne(Objects.nonNull(project.getProjectCode()),Project::getProjectCode,project.getProjectCode())) > 0) .throwMessage(String.format("修改失败 此项目名 【%s】 已存在!",project.getProjectName())); } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/ProjectAdjustmentManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/ProjectAdjustmentManage.java index 83e4034..032bcc3 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/ProjectAdjustmentManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/ProjectAdjustmentManage.java @@ -89,6 +89,7 @@ public class ProjectAdjustmentManage { //项目名称去重 if(StringUtils.isNotBlank(projectDto.getProjectName()) && !projectDto.getProjectName().equals(projectInfo.getProjectName())){ + projectDto.setProjectCode(projectInfo.getProjectCode()); defaultDeclaredProjectManage.checkDuplication(projectDto); } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/dto/ProjectDTO.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/dto/ProjectDTO.java index e5c1ff2..1943728 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/dto/ProjectDTO.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/dto/ProjectDTO.java @@ -34,6 +34,9 @@ public class ProjectDTO implements Serializable { @ApiModelProperty("所属地区编号") private String areaCode; + @ApiModelProperty("项目编号") + private String projectCode; + @ApiModelProperty("所属地区名称") private String area; diff --git a/pmapi/src/main/resources/application-prod.yml b/pmapi/src/main/resources/application-prod.yml index 7b70a65..919a6d8 100644 --- a/pmapi/src/main/resources/application-prod.yml +++ b/pmapi/src/main/resources/application-prod.yml @@ -183,7 +183,8 @@ organization: yxt: #wsdl-url: http://115.239.137.23:9501/ws/v1?wsdl - wsdl-url: file:///data/nd-project-management/wsdl.xml + #wsdl-url: file:///data/nd-project-management/wsdl.xml + wsdl-url: classpath:wsdl-prod.xml # #账号 # user-code: hzndkj # #密码 diff --git a/pmapi/src/main/resources/wsdl-prod.xml b/pmapi/src/main/resources/wsdl-prod.xml new file mode 100644 index 0000000..0302851 --- /dev/null +++ b/pmapi/src/main/resources/wsdl-prod.xml @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file