From 2700aa44d3ad5959f1f7e88a029ddc4e77f1c225 Mon Sep 17 00:00:00 2001 From: songyunpeng Date: Fri, 28 Feb 2020 17:08:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=BC=81=E4=B8=9A=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=EF=BC=8C=E9=80=89=E5=A1=AB=E8=A1=A8=E5=8D=95=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=20=E5=92=8C=20=E6=9F=A5=E8=AF=A2=E4=BC=81=E4=B8=9A?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ApiCustomEnterpriseController.java | 30 +++++ .../esua/epdc/feign/CustomFeignClient.java | 15 ++- .../fallback/CustomFeignClientFallback.java | 13 ++ .../epdc/service/CustomEnterpriseService.java | 23 ++++ .../impl/CustomEnterpriseServiceImpl.java | 16 +++ .../form/EnterpriseInfoFormDTO.java | 75 ++++++++++++ .../result/EnterpriseInfoResultDTO.java | 112 ++++++++++++++++++ .../controller/EnterpriseInfoController.java | 18 +++ .../enterprise/dao/EnterpriseInfoDao.java | 22 +++- .../service/EnterpriseInfoService.java | 21 ++++ .../impl/EnterpriseInfoServiceImpl.java | 13 ++ .../mapper/enterprise/EnterpriseInfoDao.xml | 38 +++++- 12 files changed, 391 insertions(+), 5 deletions(-) create mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/enterprise/form/EnterpriseInfoFormDTO.java create mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/enterprise/result/EnterpriseInfoResultDTO.java 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 1bd2ddc15..41ef8bf2e 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 @@ -1,5 +1,10 @@ package com.elink.esua.epdc.controller; +import com.elink.esua.epdc.common.token.dto.TokenDto; +import com.elink.esua.epdc.commons.tools.annotation.LoginUser; +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.enterprise.form.EnterpriseInfoFormDTO; +import com.elink.esua.epdc.dto.enterprise.result.EnterpriseInfoResultDTO; import com.elink.esua.epdc.common.token.dto.TokenDto; import com.elink.esua.epdc.commons.tools.annotation.LoginUser; import com.elink.esua.epdc.commons.tools.utils.Result; @@ -21,6 +26,31 @@ public class ApiCustomEnterpriseController { @Autowired private CustomEnterpriseService customEnterpriseService; + /** + * @Description 企业信息完善 + * @Author songyunpeng + * @Date 2020/2/28 + * @Param [enterpriseInfoDTO] + * @return void + **/ + @GetMapping("/completeSelectiveInfo") + public Result completeEnterpriseInfo(EnterpriseInfoFormDTO enterpriseInfoFormDTO) { + return customEnterpriseService.completeEnterpriseInfo(enterpriseInfoFormDTO); + } + /** + * @Description 查询企业信息 + * @Author songyunpeng + * @Date 2020/2/28 + * @Param [userId] + * @return com.elink.esua.epdc.dto.enterprise.result.EnterpriseInfoResultDTO + **/ + + @GetMapping("/getByUserId") + public Result getByUserId(@LoginUser TokenDto tokenDto) { + String userId = tokenDto.getUserId(); + return customEnterpriseService.selectOneEnterpriseInfo(userId); + } + /*** * 完善企业信息，必填表单 diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/CustomFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/CustomFeignClient.java index c06bfc0b4..a65feb0c1 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/CustomFeignClient.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/CustomFeignClient.java @@ -3,22 +3,24 @@ package com.elink.esua.epdc.feign; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.EpidemicSentryPostDTO; +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.dto.form.EpiDemicReportFormDTO; -import com.elink.esua.epdc.dto.result.EpdcSentryPostInfoResultDTO; import com.elink.esua.epdc.feign.fallback.CustomFeignClientFallback; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; /** * @author yzm * @Date: 2020/1/28 13:24 * @Description: 定制化功能模块fegin */ -@FeignClient(name = ServiceConstant.EPDC_CUSTOM_SERVER, fallback = CustomFeignClientFallback.class) +@FeignClient(name = ServiceConstant.EPDC_CUSTOM_SERVER, fallback = CustomFeignClientFallback.class,url = "http://127.0.0.1:9076") public interface CustomFeignClient { /** * @param formDTO @@ -51,7 +53,14 @@ public interface CustomFeignClient { */ @GetMapping(value = "custom/epidemicSentryPost/selectOneByThirdSentryPostid/{thirdSentryPostid}", consumes = MediaType.APPLICATION_JSON_VALUE) Result getEpidemicSentryByThirdSentryPostid(@PathVariable("thirdSentryPostid") String thirdSentryPostid); - + + @GetMapping(value = "custom/enterpriseinfo/completeSelectiveInfo", consumes = MediaType.APPLICATION_JSON_VALUE) + Result completeEnterpriseInfo(EnterpriseInfoFormDTO enterpriseInfoFormDTO); + + + @GetMapping(value = "custom/enterpriseinfo/getByUserId/{userId}", consumes = MediaType.APPLICATION_JSON_VALUE) + Result getEnterpriseInfoByUserId(@PathVariable("userId")String userId); + /*** * 完善企业信息，必填表单 * @param fromDto diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/CustomFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/CustomFeignClientFallback.java index fc957a32d..2cc170f57 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/CustomFeignClientFallback.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/CustomFeignClientFallback.java @@ -4,6 +4,9 @@ import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.EpidemicSentryPostDTO; +import com.elink.esua.epdc.dto.enterprise.EnterpriseInfoDTO; +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.dto.form.EpiDemicReportFormDTO; import com.elink.esua.epdc.feign.CustomFeignClient; @@ -32,6 +35,16 @@ public class CustomFeignClientFallback implements CustomFeignClient { return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "getEpidemicSentryByThirdSentryPostid", thirdSentryPostid); } + @Override + public Result completeEnterpriseInfo(EnterpriseInfoFormDTO enterpriseInfoFormDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "completeEnterpriseInfo", enterpriseInfoFormDTO); + } + + @Override + public Result getEnterpriseInfoByUserId(String userId) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "getEnterpriseInfoByUserId", userId); + } + @Override public Result completeRequisiteInfo(CompleteRequisiteInfoDTO fromDto) { return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "completeRequisiteInfo", fromDto); diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/CustomEnterpriseService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/CustomEnterpriseService.java index 25a851b30..5db5925cf 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/CustomEnterpriseService.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/CustomEnterpriseService.java @@ -1,5 +1,10 @@ package com.elink.esua.epdc.service; +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.enterprise.EnterpriseInfoDTO; +import com.elink.esua.epdc.dto.enterprise.form.EnterpriseInfoFormDTO; +import com.elink.esua.epdc.dto.enterprise.result.EnterpriseInfoResultDTO; + import com.elink.esua.epdc.common.token.dto.TokenDto; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.form.CompleteRequisiteInfoDTO; @@ -12,6 +17,24 @@ import com.elink.esua.epdc.dto.form.CompleteRequisiteInfoDTO; */ public interface CustomEnterpriseService { + /** + * @Description 企业信息完善 + * @Author songyunpeng + * @Date 2020/2/28 + * @Param [enterpriseInfoDTO] + * @return void + **/ + Result completeEnterpriseInfo(EnterpriseInfoFormDTO enterpriseInfoFormDTO); + + /** + * @Description 查询企业信息 + * @Author songyunpeng + * @Date 2020/2/28 + * @Param [userId] + * @return com.elink.esua.epdc.dto.enterprise.result.EnterpriseInfoResultDTO + **/ + Result selectOneEnterpriseInfo(String userId); + /*** * 完善企业信息，必填表单 * @param diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/CustomEnterpriseServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/CustomEnterpriseServiceImpl.java index c37e30449..dd6234b8b 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/CustomEnterpriseServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/CustomEnterpriseServiceImpl.java @@ -1,5 +1,9 @@ package com.elink.esua.epdc.service.impl; +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.enterprise.form.EnterpriseInfoFormDTO; +import com.elink.esua.epdc.dto.enterprise.result.EnterpriseInfoResultDTO; +import com.elink.esua.epdc.feign.CustomFeignClient; import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult; import cn.binarywang.wx.miniapp.bean.WxMaUserInfo; import com.elink.esua.epdc.common.token.dto.TokenDto; @@ -11,6 +15,7 @@ import com.elink.esua.epdc.redis.AppUserRedis; import com.elink.esua.epdc.service.CustomEnterpriseService; import com.elink.esua.epdc.utils.WxMaServiceUtils; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; import me.chanjar.weixin.common.error.WxErrorException; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -35,6 +40,17 @@ public class CustomEnterpriseServiceImpl implements CustomEnterpriseService { @Autowired private WxMaServiceUtils wxMaServiceUtils; + @Override + public Result completeEnterpriseInfo(EnterpriseInfoFormDTO enterpriseInfoDTO) { + return customFeignClient.completeEnterpriseInfo(enterpriseInfoDTO); + } + + @Override + public Result selectOneEnterpriseInfo(String userId) { + return customFeignClient.getEnterpriseInfoByUserId(userId); + } + + @Override public Result completeRequisiteInfo(CompleteRequisiteInfoDTO fromDto, TokenDto tokenDto) { // 验证手机号 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 new file mode 100644 index 000000000..97efd8aaa --- /dev/null +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/enterprise/form/EnterpriseInfoFormDTO.java @@ -0,0 +1,75 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.dto.enterprise.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.Date; + + +/** + * 企业信息完善表单 + * + * @author elink elink@elink-cn.com + * @since v1.0.0 2020-02-28 + */ +@Data +public class EnterpriseInfoFormDTO implements Serializable { + + private static final long serialVersionUID = 6426517740744532420L; + + /** + * 主键 + */ + @NotBlank(message = "ID不能为空") + private String id; + + /** + * 用户id + */ + private String userId; + + /** + * 法定代表人 + */ + private String legalPerson; + + /** + * 注册资金(万元) + */ + private Integer registeredCapital; + + /** + * 从业人数 + */ + private Integer employedPopulation; + + /** + * 所属行业 + */ + private String industry; + + /** + * 经营范围 + */ + private String businessScope; + + +} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/enterprise/result/EnterpriseInfoResultDTO.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/enterprise/result/EnterpriseInfoResultDTO.java new file mode 100644 index 000000000..7cdc325aa --- /dev/null +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/enterprise/result/EnterpriseInfoResultDTO.java @@ -0,0 +1,112 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.dto.enterprise.result; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.Date; + + +/** + * 查询企业信息结果 + * + * @author elink elink@elink-cn.com + * @since v1.0.0 2020-02-28 + */ +@Data +public class EnterpriseInfoResultDTO implements Serializable { + + private static final long serialVersionUID = 6426517740744532420L; + + /** + * 主键 + */ + private String id; + + /** + * 用户id + */ + private String userId; + + /** + * 用户姓名 + */ + private String realName; + + /** + * 性别 0女 1男 + */ + private String sex; + + /** + * 联系电话 + */ + private String mobile; + + /** + * 企业名称 + */ + private String enterpriseName; + + /** + * 统一社会信用代码 + */ + private String uniformSocialCreditCode; + + /** + * 企业地址 + */ + private String enterpriseAddress; + + /** + * 法定代表人 + */ + private String legalPerson; + + /** + * 注册资金(万元) + */ + private Integer registeredCapital; + + /** + * 从业人数 + */ + private Integer employedPopulation; + + /** + * 所属行业 + */ + private String industry; + + /** + * 经营范围 + */ + private String businessScope; + + /** + * 居住网格id + */ + private Long deptId; + /** + * 所有部门名称 + */ + private String allDeptNames; + +} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/enterprise/controller/EnterpriseInfoController.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/enterprise/controller/EnterpriseInfoController.java index 98030c83d..70ef79807 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/enterprise/controller/EnterpriseInfoController.java +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/enterprise/controller/EnterpriseInfoController.java @@ -26,6 +26,8 @@ import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; import com.elink.esua.epdc.dto.enterprise.EnterpriseInfoDTO; +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.modules.enterprise.excel.EnterpriseInfoExcel; import com.elink.esua.epdc.modules.enterprise.service.EnterpriseInfoService; @@ -104,4 +106,20 @@ public class EnterpriseInfoController { public Result completeRequisiteInfo(@RequestBody CompleteRequisiteInfoDTO fromDto) { return enterpriseInfoService.completeRequisiteInfo(fromDto); } + + @GetMapping("completeSelectiveInfo") + public Result completeEnterpriseInfo(@RequestBody EnterpriseInfoFormDTO dto){ + ValidatorUtils.validateEntity(dto); + enterpriseInfoService.completeEnterpriseInfo(dto); + return new Result().ok(true); + } + + @GetMapping("getByUserId/{userId}") + public Result getEnterpriseInfoByUserId(@PathVariable("userId") String userId){ + if(userId==null){ + return new Result().error("用户ID为空"); + } + EnterpriseInfoResultDTO enterpriseInfoDTO = enterpriseInfoService.selectOneEnterpriseInfo(userId); + return new Result().ok(enterpriseInfoDTO); + } } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/enterprise/dao/EnterpriseInfoDao.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/enterprise/dao/EnterpriseInfoDao.java index 7ed20372b..834f19192 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/enterprise/dao/EnterpriseInfoDao.java +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/enterprise/dao/EnterpriseInfoDao.java @@ -18,8 +18,12 @@ package com.elink.esua.epdc.modules.enterprise.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; +import com.elink.esua.epdc.dto.enterprise.EnterpriseInfoDTO; +import com.elink.esua.epdc.dto.enterprise.form.EnterpriseInfoFormDTO; +import com.elink.esua.epdc.dto.enterprise.result.EnterpriseInfoResultDTO; import com.elink.esua.epdc.modules.enterprise.entity.EnterpriseInfoEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; /** * 企业信息表 @@ -29,5 +33,21 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface EnterpriseInfoDao extends BaseDao { - + /** + * @Description 企业信息完善 + * @Author songyunpeng + * @Date 2020/2/28 + * @Param [enterpriseInfoDTO] + * @return void + **/ + void completeEnterpriseInfo(EnterpriseInfoFormDTO formDTO); + + /** + * @Description 查询企业信息 + * @Author songyunpeng + * @Date 2020/2/28 + * @Param [userId] + * @return com.elink.esua.epdc.dto.enterprise.result.EnterpriseInfoResultDTO + **/ + EnterpriseInfoResultDTO selectOneEnterpriseInfo(@Param("userId") String userId); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/enterprise/service/EnterpriseInfoService.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/enterprise/service/EnterpriseInfoService.java index f6600d63c..abfef760e 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/enterprise/service/EnterpriseInfoService.java +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/enterprise/service/EnterpriseInfoService.java @@ -21,8 +21,11 @@ import com.elink.esua.epdc.commons.mybatis.service.BaseService; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.enterprise.EnterpriseInfoDTO; +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.modules.enterprise.entity.EnterpriseInfoEntity; +import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; @@ -95,6 +98,24 @@ public interface EnterpriseInfoService extends BaseService */ void delete(String[] ids); + /** + * @Description 企业信息完善 + * @Author songyunpeng + * @Date 2020/2/28 + * @Param [enterpriseInfoDTO] + * @return void + **/ + void completeEnterpriseInfo(EnterpriseInfoFormDTO enterpriseInfoFormDTO); + + /** + * @Description 查询企业信息 + * @Author songyunpeng + * @Date 2020/2/28 + * @Param [userId] + * @return com.elink.esua.epdc.dto.enterprise.result.EnterpriseInfoResultDTO + **/ + EnterpriseInfoResultDTO selectOneEnterpriseInfo(String userId); + /*** * 完善企业信息，必填表单 diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/enterprise/service/impl/EnterpriseInfoServiceImpl.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/enterprise/service/impl/EnterpriseInfoServiceImpl.java index 92a9871fc..5fb591b34 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/enterprise/service/impl/EnterpriseInfoServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/enterprise/service/impl/EnterpriseInfoServiceImpl.java @@ -28,6 +28,8 @@ import com.elink.esua.epdc.commons.tools.constant.FieldConstant; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.ParentAndAllDeptDTO; import com.elink.esua.epdc.dto.enterprise.EnterpriseInfoDTO; +import com.elink.esua.epdc.dto.enterprise.form.EnterpriseInfoFormDTO; +import com.elink.esua.epdc.dto.enterprise.result.EnterpriseInfoResultDTO; import com.elink.esua.epdc.dto.epdc.form.CompleteRequisiteUserInfoDTO; import com.elink.esua.epdc.dto.form.CompleteRequisiteInfoDTO; import com.elink.esua.epdc.modules.enterprise.dao.EnterpriseInfoDao; @@ -58,6 +60,7 @@ public class EnterpriseInfoServiceImpl extends BaseServiceImpl - + + + + + + + + + + + + + + + + + + + + + UPDATE epdc_enterprise_info + + LEGAL_PERSON=#{legalPerson}, + REGISTERED_CAPITAL=#{registeredCapital}, + EMPLOYED_POPULATION=#{employedPopulation}, + INDUSTRY=#{industry}, + BUSINESS_SCOPE=#{businessScope}, + + WHERE ID=#{id} + + + \ No newline at end of file