Browse Source

【居民端】-【完善企业更多信息注册资金、从业人数数据类型调整】-(王童)-2020/06/02

feature/dangjian
Jackwang 6 years ago
parent
commit
121671ec40
  1. 4
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiCustomEnterpriseController.java
  2. 8
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/CustomFeignClient.java
  3. 6
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/CustomFeignClientFallback.java
  4. 7
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/CustomEnterpriseService.java
  5. 22
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/CustomEnterpriseServiceImpl.java
  6. 111
      esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/enterprise/result/EnterpriseInfoUpdateResultDTO.java
  7. 10
      esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/enterprise/controller/EnterpriseInfoController.java
  8. 4
      esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/enterprise/dao/EnterpriseInfoDao.java
  9. 5
      esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/enterprise/service/EnterpriseInfoService.java
  10. 10
      esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/enterprise/service/impl/EnterpriseInfoServiceImpl.java
  11. 7
      esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/enterprise/EnterpriseInfoDao.xml

4
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiCustomEnterpriseController.java

@ -5,7 +5,7 @@ import com.elink.esua.epdc.commons.tools.annotation.LoginUser;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
import com.elink.esua.epdc.dto.enterprise.form.EnterpriseInfoFormDTO;
import com.elink.esua.epdc.dto.enterprise.result.EnterpriseInfoResultDTO;
import com.elink.esua.epdc.dto.enterprise.result.EnterpriseInfoUpdateResultDTO;
import com.elink.esua.epdc.dto.form.CompleteRequisiteInfoDTO;
import com.elink.esua.epdc.service.CustomEnterpriseService;
import org.springframework.beans.factory.annotation.Autowired;
@ -52,7 +52,7 @@ public class ApiCustomEnterpriseController {
* @Param [userId]
**/
@GetMapping("getByUserId")
public Result<EnterpriseInfoResultDTO> getByUserId(@LoginUser TokenDto tokenDto) {
public Result<EnterpriseInfoUpdateResultDTO> getByUserId(@LoginUser TokenDto tokenDto) {
return customEnterpriseService.selectOneEnterpriseInfo(tokenDto);
}

8
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/CustomFeignClient.java

@ -3,11 +3,11 @@ 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.consult.result.CheckStateResultDTO;
import com.elink.esua.epdc.dto.consult.form.GridOperatorListFormDTO;
import com.elink.esua.epdc.dto.consult.result.CheckStateResultDTO;
import com.elink.esua.epdc.dto.consult.result.GridOperatorListResultDTO;
import com.elink.esua.epdc.dto.enterprise.form.EnterpriseInfoFormDTO;
import com.elink.esua.epdc.dto.enterprise.result.EnterpriseInfoResultDTO;
import com.elink.esua.epdc.dto.enterprise.result.EnterpriseInfoUpdateResultDTO;
import com.elink.esua.epdc.dto.form.CompleteRequisiteInfoDTO;
import com.elink.esua.epdc.dto.form.EpiDemicReportFormDTO;
import com.elink.esua.epdc.feign.fallback.CustomFeignClientFallback;
@ -25,7 +25,7 @@ import java.util.List;
* @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
@ -77,7 +77,7 @@ public interface CustomFeignClient {
* @Param [userId]
**/
@GetMapping(value = "custom/enterpriseinfo/getByUserId/{userId}", consumes = MediaType.APPLICATION_JSON_VALUE)
Result<EnterpriseInfoResultDTO> getEnterpriseInfoByUserId(@PathVariable("userId") String userId);
Result<EnterpriseInfoUpdateResultDTO> getEnterpriseInfoByUserId(@PathVariable("userId") String userId);
/***
* 完善企业信息必填表单

6
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/CustomFeignClientFallback.java

@ -4,11 +4,11 @@ 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.consult.result.CheckStateResultDTO;
import com.elink.esua.epdc.dto.consult.form.GridOperatorListFormDTO;
import com.elink.esua.epdc.dto.consult.result.CheckStateResultDTO;
import com.elink.esua.epdc.dto.consult.result.GridOperatorListResultDTO;
import com.elink.esua.epdc.dto.enterprise.form.EnterpriseInfoFormDTO;
import com.elink.esua.epdc.dto.enterprise.result.EnterpriseInfoResultDTO;
import com.elink.esua.epdc.dto.enterprise.result.EnterpriseInfoUpdateResultDTO;
import com.elink.esua.epdc.dto.form.CompleteRequisiteInfoDTO;
import com.elink.esua.epdc.dto.form.EpiDemicReportFormDTO;
import com.elink.esua.epdc.feign.CustomFeignClient;
@ -45,7 +45,7 @@ public class CustomFeignClientFallback implements CustomFeignClient {
}
@Override
public Result<EnterpriseInfoResultDTO> getEnterpriseInfoByUserId(String userId) {
public Result<EnterpriseInfoUpdateResultDTO> getEnterpriseInfoByUserId(String userId) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "getEnterpriseInfoByUserId", userId);
}

7
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/CustomEnterpriseService.java

@ -1,10 +1,9 @@
package com.elink.esua.epdc.service;
import com.elink.esua.epdc.common.token.dto.TokenDto;
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.dto.enterprise.result.EnterpriseInfoUpdateResultDTO;
import com.elink.esua.epdc.dto.form.CompleteRequisiteInfoDTO;
/**
@ -31,7 +30,7 @@ public interface CustomEnterpriseService {
* @Date 2020/2/28
* @Param [userId]
**/
Result<EnterpriseInfoResultDTO> selectOneEnterpriseInfo(TokenDto tokenDto);
Result<EnterpriseInfoUpdateResultDTO> selectOneEnterpriseInfo(TokenDto tokenDto);
/***
* 完善企业信息必填表单

22
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/CustomEnterpriseServiceImpl.java

@ -1,29 +1,29 @@
package com.elink.esua.epdc.service.impl;
import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
import cn.binarywang.wx.miniapp.util.crypt.WxMaCryptUtils;
import com.alibaba.fastjson.JSONObject;
import com.elink.esua.epdc.common.token.dto.TokenDto;
import com.elink.esua.epdc.commons.tools.constant.NumConstant;
import com.elink.esua.epdc.commons.tools.exception.RenException;
import com.elink.esua.epdc.commons.tools.redis.RedisKeys;
import com.elink.esua.epdc.commons.tools.redis.RedisUtils;
import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
import com.elink.esua.epdc.dto.enterprise.form.EnterpriseInfoFormDTO;
import com.elink.esua.epdc.dto.enterprise.result.EnterpriseInfoResultDTO;
import com.elink.esua.epdc.dto.enterprise.result.EnterpriseInfoUpdateResultDTO;
import com.elink.esua.epdc.dto.form.CompleteRequisiteInfoDTO;
import com.elink.esua.epdc.feign.AdminFeignClient;
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;
import com.elink.esua.epdc.commons.tools.exception.RenException;
import com.elink.esua.epdc.dto.form.CompleteRequisiteInfoDTO;
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;
import org.springframework.stereotype.Service;
/**
@ -57,13 +57,13 @@ public class CustomEnterpriseServiceImpl implements CustomEnterpriseService {
}
@Override
public Result<EnterpriseInfoResultDTO> selectOneEnterpriseInfo(TokenDto tokenDto) {
public Result<EnterpriseInfoUpdateResultDTO> selectOneEnterpriseInfo(TokenDto tokenDto) {
Result<EnterpriseInfoResultDTO> enterpriseResult = customFeignClient.getEnterpriseInfoByUserId(tokenDto.getUserId());
Result<EnterpriseInfoUpdateResultDTO> enterpriseResult = customFeignClient.getEnterpriseInfoByUserId(tokenDto.getUserId());
if (enterpriseResult.success()) {
EnterpriseInfoResultDTO enterpriseInfo = enterpriseResult.getData();
EnterpriseInfoUpdateResultDTO enterpriseInfo = enterpriseResult.getData();
if (null == enterpriseInfo) {
enterpriseInfo = new EnterpriseInfoResultDTO();
enterpriseInfo = new EnterpriseInfoUpdateResultDTO();
enterpriseInfo.setDeptId(tokenDto.getGridId());
//未完善信息获取用户当前所在的网格的后两级机构(社区-网格),返回给前端
Result<ParentAndAllDeptDTO> resultParentAndAllDeptDTO = adminFeignClient.getParentAndAllDept(tokenDto.getGridId());

111
esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/enterprise/result/EnterpriseInfoUpdateResultDTO.java

@ -0,0 +1,111 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* 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.
* <p>
* 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.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.elink.esua.epdc.dto.enterprise.result;
import lombok.Data;
import java.io.Serializable;
/**
* 查询企业信息结果
*
* @author elink elink@elink-cn.com
* @since v1.0.0 2020-02-28
*/
@Data
public class EnterpriseInfoUpdateResultDTO 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 String registeredCapital;
/**
* 从业人数
*/
private String employedPopulation;
/**
* 所属行业
*/
private String industry;
/**
* 经营范围
*/
private String businessScope;
/**
* 居住网格id
*/
private Long deptId;
/**
* 所有部门名称
*/
private String deptName;
}

10
esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/enterprise/controller/EnterpriseInfoController.java

@ -24,11 +24,11 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.commons.tools.validator.AssertUtils;
import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
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.commons.tools.validator.group.UpdateGroup;
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.enterprise.result.EnterpriseInfoUpdateResultDTO;
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;
@ -131,8 +131,8 @@ public class EnterpriseInfoController {
* @Param [userId]
**/
@GetMapping("getByUserId/{userId}")
public Result<EnterpriseInfoResultDTO> getEnterpriseInfoByUserId(@PathVariable("userId") String userId) {
EnterpriseInfoResultDTO enterpriseInfoDTO = enterpriseInfoService.selectOneEnterpriseInfo(userId);
return new Result<EnterpriseInfoResultDTO>().ok(enterpriseInfoDTO);
public Result<EnterpriseInfoUpdateResultDTO> getEnterpriseInfoByUserId(@PathVariable("userId") String userId) {
EnterpriseInfoUpdateResultDTO enterpriseInfoDTO = enterpriseInfoService.selectOneEnterpriseInfo(userId);
return new Result<EnterpriseInfoUpdateResultDTO>().ok(enterpriseInfoDTO);
}
}

4
esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/enterprise/dao/EnterpriseInfoDao.java

@ -20,7 +20,7 @@ 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.dto.enterprise.result.EnterpriseInfoUpdateResultDTO;
import com.elink.esua.epdc.modules.enterprise.entity.EnterpriseInfoEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@ -52,7 +52,7 @@ public interface EnterpriseInfoDao extends BaseDao<EnterpriseInfoEntity> {
* @Date 2020/2/28
* @Param [userId]
**/
EnterpriseInfoResultDTO selectOneEnterpriseInfo(@Param("userId") String userId);
EnterpriseInfoUpdateResultDTO selectOneEnterpriseInfo(@Param("userId") String userId);
/**
* @return java.util.List<com.elink.esua.epdc.dto.enterprise.EnterpriseInfoDTO>

5
esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/enterprise/service/EnterpriseInfoService.java

@ -22,11 +22,10 @@ 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.enterprise.result.EnterpriseInfoUpdateResultDTO;
import com.elink.esua.epdc.dto.form.CompleteRequisiteInfoDTO;
import com.elink.esua.epdc.modules.enterprise.entity.EnterpriseInfoEntity;
import com.elink.esua.epdc.rocketmq.dto.OrganizationModifyDTO;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
@ -115,7 +114,7 @@ public interface EnterpriseInfoService extends BaseService<EnterpriseInfoEntity>
* @Date 2020/2/28
* @Param [userId]
**/
EnterpriseInfoResultDTO selectOneEnterpriseInfo(String userId);
EnterpriseInfoUpdateResultDTO selectOneEnterpriseInfo(String userId);
/***

10
esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/enterprise/service/impl/EnterpriseInfoServiceImpl.java

@ -21,17 +21,16 @@ import cn.hutool.core.util.ArrayUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
import com.elink.esua.epdc.commons.tools.constant.NumConstant;
import com.elink.esua.epdc.commons.tools.exception.RenException;
import com.elink.esua.epdc.commons.tools.page.PageData;
import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.EpidemicDTO;
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.enterprise.result.EnterpriseInfoUpdateResultDTO;
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;
@ -40,7 +39,6 @@ import com.elink.esua.epdc.modules.enterprise.service.EnterpriseInfoService;
import com.elink.esua.epdc.modules.feign.AdminFeignClient;
import com.elink.esua.epdc.modules.feign.UserFeignClient;
import com.elink.esua.epdc.rocketmq.dto.OrganizationModifyDTO;
import io.seata.spring.annotation.GlobalTransactional;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -124,8 +122,8 @@ public class EnterpriseInfoServiceImpl extends BaseServiceImpl<EnterpriseInfoDao
}
@Override
public EnterpriseInfoResultDTO selectOneEnterpriseInfo(String userId) {
EnterpriseInfoResultDTO result = baseDao.selectOneEnterpriseInfo(userId);
public EnterpriseInfoUpdateResultDTO selectOneEnterpriseInfo(String userId) {
EnterpriseInfoUpdateResultDTO result = baseDao.selectOneEnterpriseInfo(userId);
if (null != result) {
String deptName = result.getDeptName();
if (StringUtils.isNotBlank(deptName)) {

7
esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/enterprise/EnterpriseInfoDao.xml

@ -3,7 +3,7 @@
<mapper namespace="com.elink.esua.epdc.modules.enterprise.dao.EnterpriseInfoDao">
<resultMap id="enterpriseInfoMap" type="com.elink.esua.epdc.dto.enterprise.result.EnterpriseInfoResultDTO">
<resultMap id="enterpriseInfoMap" type="com.elink.esua.epdc.dto.enterprise.result.EnterpriseInfoUpdateResultDTO">
<result property="id" column="ID"/>
<result property="userId" column="USER_ID"/>
<result property="realName" column="REAL_NAME"/>
@ -36,7 +36,10 @@
<select id="selectOneEnterpriseInfo" resultMap="enterpriseInfoMap">
select t.ID,t.USER_ID,t.REAL_NAME,t.SEX,t.MOBILE,t.ENTERPRISE_NAME,t.UNIFORM_SOCIAL_CREDIT_CODE,t.ENTERPRISE_ADDRESS,
t.LEGAL_PERSON,t.REGISTERED_CAPITAL,t.EMPLOYED_POPULATION,t.INDUSTRY,t.BUSINESS_SCOPE,t.DEPT_ID,t.ALL_DEPT_NAMES
t.LEGAL_PERSON,
IF(t.REGISTERED_CAPITAL = 0,'',t.REGISTERED_CAPITAL) as REGISTERED_CAPITAL,
IF(t.EMPLOYED_POPULATION = 0,'',t.EMPLOYED_POPULATION) as EMPLOYED_POPULATION,
t.INDUSTRY,t.BUSINESS_SCOPE,t.DEPT_ID,t.ALL_DEPT_NAMES
from epdc_enterprise_info t
where t.USER_ID = #{userId}
</select>

Loading…
Cancel
Save