diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiCustomEnterpriseController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiCustomEnterpriseController.java index a371b2f7e..7bc678420 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiCustomEnterpriseController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiCustomEnterpriseController.java @@ -8,7 +8,6 @@ import com.elink.esua.epdc.dto.enterprise.form.EnterpriseInfoFormDTO; import com.elink.esua.epdc.dto.enterprise.result.EnterpriseInfoResultDTO; import com.elink.esua.epdc.dto.form.CompleteRequisiteInfoDTO; import com.elink.esua.epdc.service.CustomEnterpriseService; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -34,15 +33,14 @@ public class ApiCustomEnterpriseController { **/ @PostMapping("completeSelectiveInfo") public Result completeEnterpriseInfo(@RequestBody EnterpriseInfoFormDTO enterpriseInfoFormDTO) { + /** + * 代码说明: + * 除id外,不对EnterpriseInfoFormDTO的其他字段加限制。 + * 因为前端表单中所有字段都是可选的。 + * 用户提交任何信息都如实写入数据库。 + * 无论空字符串还是空数值(会被转化为0) + */ ValidatorUtils.validateEntity(enterpriseInfoFormDTO); - if(StringUtils.isBlank(enterpriseInfoFormDTO.getBusinessScope()) && - StringUtils.isBlank(enterpriseInfoFormDTO.getIndustry()) && - StringUtils.isBlank(enterpriseInfoFormDTO.getLegalPerson()) && - enterpriseInfoFormDTO.getEmployedPopulation()==null && - enterpriseInfoFormDTO.getRegisteredCapital()==null - ){ - return new Result(); - } return customEnterpriseService.completeEnterpriseInfo(enterpriseInfoFormDTO); } diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/enterprise/form/EnterpriseInfoFormDTO.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/enterprise/form/EnterpriseInfoFormDTO.java index c2e5f226a..e2770fb3c 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/enterprise/form/EnterpriseInfoFormDTO.java +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/enterprise/form/EnterpriseInfoFormDTO.java @@ -39,34 +39,32 @@ public class EnterpriseInfoFormDTO implements Serializable { /** * 主键 */ - @NotBlank(message = "ID不能为空") + @NotBlank(message = "无法匹配企业信息") private String id; /** * 法定代表人 */ - private String legalPerson; + private String legalPerson; /** * 注册资金(万元) */ - @Range(min = 1,message = "注册资金必须大于0") - private Integer registeredCapital; + private Integer registeredCapital; /** * 从业人数 */ - @Range(min = 1,message = "从业人数必须大于0") - private Integer employedPopulation; + private Integer employedPopulation; /** * 所属行业 */ - private String industry; + private String industry; /** * 经营范围 */ - private String businessScope; + private String businessScope; } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/enterprise/EnterpriseInfoDao.xml b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/enterprise/EnterpriseInfoDao.xml index cde42a93b..40a77ce8f 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/enterprise/EnterpriseInfoDao.xml +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/enterprise/EnterpriseInfoDao.xml @@ -25,11 +25,8 @@ UPDATE epdc_enterprise_info LEGAL_PERSON=#{legalPerson}, - REGISTERED_CAPITAL=#{registeredCapital}, - - - EMPLOYED_POPULATION=#{employedPopulation}, - + REGISTERED_CAPITAL = #{registeredCapital}, + EMPLOYED_POPULATION = #{employedPopulation}, INDUSTRY=#{industry}, BUSINESS_SCOPE=#{businessScope}, UPDATED_TIME = now()