Browse Source

Merge remote-tracking branch 'origin/feature/item_appeal' into feature/item_appeal

feature/dangjian
wanggongfeng 3 years ago
parent
commit
4680dc1987
  1. 162
      esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemEnterpriseDTO.java
  2. 15
      esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/SubmitItemFormDTO.java
  3. 94
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemEnterpriseController.java
  4. 33
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemEnterpriseDao.java
  5. 133
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemEnterpriseEntity.java
  6. 110
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/excel/ItemEnterpriseExcel.java
  7. 47
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/redis/ItemEnterpriseRedis.java
  8. 107
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemEnterpriseService.java
  9. 127
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemEnterpriseServiceImpl.java
  10. 5
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
  11. 35
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemEnterpriseDao.xml

162
esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemEnterpriseDTO.java

@ -0,0 +1,162 @@
/**
* 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.item;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* 企业信息表
*
* @author elink elink@elink-cn.com
* @since v1.0.0 2022-09-09
*/
@Data
public class ItemEnterpriseDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键
*/
private String id;
/**
* 用户id
*/
private String userId;
/**
* 项目ID
*/
private String itemId;
/**
* 用户姓名
*/
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 parentDeptIds;
/**
* 父所有部门
*/
private String parentDeptNames;
/**
* 所有部门ID
*/
private String allDeptIds;
/**
* 所有部门名称
*/
private String allDeptNames;
/**
* 乐观锁
*/
private Integer revision;
/**
* 删除标识 01
*/
private String delFlag;
/**
* 创建人
*/
private String createdBy;
/**
* 创建时间
*/
private Date createdTime;
/**
* 更新人
*/
private String updatedBy;
/**
* 更新时间
*/
private Date updatedTime;
}

15
esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/SubmitItemFormDTO.java

@ -123,4 +123,19 @@ public class SubmitItemFormDTO implements Serializable {
* 图片
*/
private List<String> images;
/**
* 企业名称
*/
private String enterpriseName;
/**
* 统一社会信用代码
*/
private String uniformSocialCreditCode;
/**
* 企业地址
*/
private String enterpriseAddress;
}

94
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemEnterpriseController.java

@ -0,0 +1,94 @@
/**
* 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.modules.item.controller;
import com.elink.esua.epdc.commons.tools.page.PageData;
import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
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.DefaultGroup;
import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
import com.elink.esua.epdc.dto.item.ItemEnterpriseDTO;
import com.elink.esua.epdc.modules.item.excel.ItemEnterpriseExcel;
import com.elink.esua.epdc.modules.item.service.ItemEnterpriseService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
import java.util.Map;
/**
* 企业信息表
*
* @author elink elink@elink-cn.com
* @since v1.0.0 2022-09-09
*/
@RestController
@RequestMapping("itementerprise")
public class ItemEnterpriseController {
@Autowired
private ItemEnterpriseService itemEnterpriseService;
@GetMapping("page")
public Result<PageData<ItemEnterpriseDTO>> page(@RequestParam Map<String, Object> params){
PageData<ItemEnterpriseDTO> page = itemEnterpriseService.page(params);
return new Result<PageData<ItemEnterpriseDTO>>().ok(page);
}
@GetMapping("{id}")
public Result<ItemEnterpriseDTO> get(@PathVariable("id") String id){
ItemEnterpriseDTO data = itemEnterpriseService.get(id);
return new Result<ItemEnterpriseDTO>().ok(data);
}
@PostMapping
public Result save(@RequestBody ItemEnterpriseDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
itemEnterpriseService.save(dto);
return new Result();
}
@PutMapping
public Result update(@RequestBody ItemEnterpriseDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
itemEnterpriseService.update(dto);
return new Result();
}
@DeleteMapping
public Result delete(@RequestBody String[] ids){
//效验数据
AssertUtils.isArrayEmpty(ids, "id");
itemEnterpriseService.delete(ids);
return new Result();
}
@GetMapping("export")
public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
List<ItemEnterpriseDTO> list = itemEnterpriseService.list(params);
ExcelUtils.exportExcelToTarget(response, null, list, ItemEnterpriseExcel.class);
}
}

33
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemEnterpriseDao.java

@ -0,0 +1,33 @@
/**
* 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.modules.item.dao;
import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
import com.elink.esua.epdc.modules.item.entity.ItemEnterpriseEntity;
import org.apache.ibatis.annotations.Mapper;
/**
* 企业信息表
*
* @author elink elink@elink-cn.com
* @since v1.0.0 2022-09-09
*/
@Mapper
public interface ItemEnterpriseDao extends BaseDao<ItemEnterpriseEntity> {
}

133
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemEnterpriseEntity.java

@ -0,0 +1,133 @@
/**
* 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.modules.item.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* 企业信息表
*
* @author elink elink@elink-cn.com
* @since v1.0.0 2022-09-09
*/
@Data
@EqualsAndHashCode(callSuper=false)
@TableName("epdc_item_enterprise")
public class ItemEnterpriseEntity extends BaseEpdcEntity {
private static final long serialVersionUID = 1L;
/**
* 用户id
*/
private String userId;
/**
* 项目ID
*/
private String itemId;
/**
* 用户姓名
*/
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 deptName;
/**
* 父所有部门
*/
private String parentDeptIds;
/**
* 父所有部门
*/
private String parentDeptNames;
/**
* 所有部门ID
*/
private String allDeptIds;
/**
* 所有部门名称
*/
private String allDeptNames;
}

110
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/excel/ItemEnterpriseExcel.java

@ -0,0 +1,110 @@
/**
* 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.modules.item.excel;
import cn.afterturn.easypoi.excel.annotation.Excel;
import lombok.Data;
import java.util.Date;
/**
* 企业信息表
*
* @author elink elink@elink-cn.com
* @since v1.0.0 2022-09-09
*/
@Data
public class ItemEnterpriseExcel {
@Excel(name = "主键")
private String id;
@Excel(name = "用户id")
private String userId;
@Excel(name = "项目ID")
private String itemId;
@Excel(name = "用户姓名")
private String realName;
@Excel(name = "性别 0女 1男")
private String sex;
@Excel(name = "联系电话")
private String mobile;
@Excel(name = "企业名称")
private String enterpriseName;
@Excel(name = "统一社会信用代码")
private String uniformSocialCreditCode;
@Excel(name = "企业地址")
private String enterpriseAddress;
@Excel(name = "法定代表人")
private String legalPerson;
@Excel(name = "注册资金(万元)")
private Integer registeredCapital;
@Excel(name = "从业人数")
private Integer employedPopulation;
@Excel(name = "所属行业")
private String industry;
@Excel(name = "经营范围")
private String businessScope;
@Excel(name = "居住街道id")
private Long deptId;
@Excel(name = "父所有部门")
private String parentDeptIds;
@Excel(name = "父所有部门")
private String parentDeptNames;
@Excel(name = "所有部门ID")
private String allDeptIds;
@Excel(name = "所有部门名称")
private String allDeptNames;
@Excel(name = "乐观锁")
private Integer revision;
@Excel(name = "删除标识 0:否,1:是")
private String delFlag;
@Excel(name = "创建人")
private String createdBy;
@Excel(name = "创建时间")
private Date createdTime;
@Excel(name = "更新人")
private String updatedBy;
@Excel(name = "更新时间")
private Date updatedTime;
}

47
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/redis/ItemEnterpriseRedis.java

@ -0,0 +1,47 @@
/**
* 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.modules.item.redis;
import com.elink.esua.epdc.commons.tools.redis.RedisUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
/**
* 企业信息表
*
* @author elink elink@elink-cn.com
* @since v1.0.0 2022-09-09
*/
@Component
public class ItemEnterpriseRedis {
@Autowired
private RedisUtils redisUtils;
public void delete(Object[] ids) {
}
public void set(){
}
public String get(String id){
return null;
}
}

107
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemEnterpriseService.java

@ -0,0 +1,107 @@
/**
* 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.modules.item.service;
import com.elink.esua.epdc.commons.mybatis.service.BaseService;
import com.elink.esua.epdc.commons.tools.page.PageData;
import com.elink.esua.epdc.dto.item.ItemEnterpriseDTO;
import com.elink.esua.epdc.dto.item.form.SubmitItemFormDTO;
import com.elink.esua.epdc.modules.item.entity.ItemEnterpriseEntity;
import com.elink.esua.epdc.modules.item.entity.ItemEntity;
import java.util.List;
import java.util.Map;
/**
* 企业信息表
*
* @author elink elink@elink-cn.com
* @since v1.0.0 2022-09-09
*/
public interface ItemEnterpriseService extends BaseService<ItemEnterpriseEntity> {
/**
* 默认分页
*
* @param params
* @return PageData<ItemEnterpriseDTO>
* @author generator
* @date 2022-09-09
*/
PageData<ItemEnterpriseDTO> page(Map<String, Object> params);
/**
* 默认查询
*
* @param params
* @return java.util.List<ItemEnterpriseDTO>
* @author generator
* @date 2022-09-09
*/
List<ItemEnterpriseDTO> list(Map<String, Object> params);
/**
* 单条查询
*
* @param id
* @return ItemEnterpriseDTO
* @author generator
* @date 2022-09-09
*/
ItemEnterpriseDTO get(String id);
/**
* 默认保存
*
* @param dto
* @return void
* @author generator
* @date 2022-09-09
*/
void save(ItemEnterpriseDTO dto);
/**
* 默认更新
*
* @param dto
* @return void
* @author generator
* @date 2022-09-09
*/
void update(ItemEnterpriseDTO dto);
/**
* 批量删除
*
* @param ids
* @return void
* @author generator
* @date 2022-09-09
*/
void delete(String[] ids);
/**
* @describe: 保存执法信息至新的企业表
* @author wangtong
* @date 2022/9/9 10:06
* @params [formDto]
* @return void
*/
void savaZfInfo(ItemEntity entity, SubmitItemFormDTO formDto);
}

127
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemEnterpriseServiceImpl.java

@ -0,0 +1,127 @@
/**
* 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.modules.item.service.impl;
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.page.PageData;
import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
import com.elink.esua.epdc.dto.item.ItemEnterpriseDTO;
import com.elink.esua.epdc.dto.item.form.SubmitItemFormDTO;
import com.elink.esua.epdc.modules.item.dao.ItemEnterpriseDao;
import com.elink.esua.epdc.modules.item.entity.ItemEnterpriseEntity;
import com.elink.esua.epdc.modules.item.entity.ItemEntity;
import com.elink.esua.epdc.modules.item.redis.ItemEnterpriseRedis;
import com.elink.esua.epdc.modules.item.service.ItemEnterpriseService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
/**
* 企业信息表
*
* @author elink elink@elink-cn.com
* @since v1.0.0 2022-09-09
*/
@Service
public class ItemEnterpriseServiceImpl extends BaseServiceImpl<ItemEnterpriseDao, ItemEnterpriseEntity> implements ItemEnterpriseService {
@Autowired
private ItemEnterpriseRedis itemEnterpriseRedis;
@Override
public PageData<ItemEnterpriseDTO> page(Map<String, Object> params) {
IPage<ItemEnterpriseEntity> page = baseDao.selectPage(
getPage(params, FieldConstant.CREATED_TIME, false),
getWrapper(params)
);
return getPageData(page, ItemEnterpriseDTO.class);
}
@Override
public List<ItemEnterpriseDTO> list(Map<String, Object> params) {
List<ItemEnterpriseEntity> entityList = baseDao.selectList(getWrapper(params));
return ConvertUtils.sourceToTarget(entityList, ItemEnterpriseDTO.class);
}
private QueryWrapper<ItemEnterpriseEntity> getWrapper(Map<String, Object> params){
String id = (String)params.get(FieldConstant.ID_HUMP);
QueryWrapper<ItemEnterpriseEntity> wrapper = new QueryWrapper<>();
wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
return wrapper;
}
@Override
public ItemEnterpriseDTO get(String id) {
ItemEnterpriseEntity entity = baseDao.selectById(id);
return ConvertUtils.sourceToTarget(entity, ItemEnterpriseDTO.class);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void save(ItemEnterpriseDTO dto) {
ItemEnterpriseEntity entity = ConvertUtils.sourceToTarget(dto, ItemEnterpriseEntity.class);
insert(entity);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void update(ItemEnterpriseDTO dto) {
ItemEnterpriseEntity entity = ConvertUtils.sourceToTarget(dto, ItemEnterpriseEntity.class);
updateById(entity);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void delete(String[] ids) {
// 逻辑删除(@TableLogic 注解)
baseDao.deleteBatchIds(Arrays.asList(ids));
}
@Override
@Transactional(rollbackFor = Exception.class)
public void savaZfInfo(ItemEntity itemEntity, SubmitItemFormDTO formDto) {
ItemEnterpriseEntity entity = new ItemEnterpriseEntity();
entity.setUserId(itemEntity.getUserId());
entity.setItemId(itemEntity.getId());
entity.setRealName(itemEntity.getNickName());
entity.setSex("1");//固定男
entity.setMobile(itemEntity.getMobile());
entity.setEnterpriseName(formDto.getEnterpriseName());
entity.setUniformSocialCreditCode(formDto.getUniformSocialCreditCode());
entity.setEnterpriseAddress(formDto.getEnterpriseAddress());
entity.setDeptId(itemEntity.getGridId());
entity.setDeptName(itemEntity.getGrid());
// entity.setParentDeptIds(infoById.getData().getParentDeptIds());
// entity.setParentDeptNames(infoById.getData().getParentDeptNames());
// entity.setAllDeptIds(infoById.getData().getAllDeptIds());
// entity.setAllDeptNames(infoById.getData().getAllDeptNames());
insert(entity);
}
}

5
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java

@ -192,6 +192,9 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
@Autowired
private CategoryService categoryService;
@Autowired
private ItemEnterpriseService itemEnterpriseService;
@Override
public PageData<ItemDTO> page(Map<String, Object> params) {
IPage<ItemEntity> page = baseDao.selectPage(
@ -2511,6 +2514,8 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
itemHandleProcessService.insert(itemHandleProcessEntity);
//发送事件至区中心
if("1".equals(formDto.getPeopleFlag())){
//保存至企业表
itemEnterpriseService.savaZfInfo(entity,formDto);
ItemHandleSubmitFormDTO dto = new ItemHandleSubmitFormDTO();
dto.setId(entity.getId());
dto.setOutHandleAdvice(itemHandleProcessEntity.getOutHandleAdvice());

35
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemEnterpriseDao.xml

@ -0,0 +1,35 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.elink.esua.epdc.modules.item.dao.ItemEnterpriseDao">
<resultMap type="com.elink.esua.epdc.modules.item.entity.ItemEnterpriseEntity" id="itemEnterpriseMap">
<result property="id" column="ID"/>
<result property="userId" column="USER_ID"/>
<result property="itemId" column="ITEM_ID"/>
<result property="realName" column="REAL_NAME"/>
<result property="sex" column="SEX"/>
<result property="mobile" column="MOBILE"/>
<result property="enterpriseName" column="ENTERPRISE_NAME"/>
<result property="uniformSocialCreditCode" column="UNIFORM_SOCIAL_CREDIT_CODE"/>
<result property="enterpriseAddress" column="ENTERPRISE_ADDRESS"/>
<result property="legalPerson" column="LEGAL_PERSON"/>
<result property="registeredCapital" column="REGISTERED_CAPITAL"/>
<result property="employedPopulation" column="EMPLOYED_POPULATION"/>
<result property="industry" column="INDUSTRY"/>
<result property="businessScope" column="BUSINESS_SCOPE"/>
<result property="deptId" column="DEPT_ID"/>
<result property="parentDeptIds" column="PARENT_DEPT_IDS"/>
<result property="parentDeptNames" column="PARENT_DEPT_NAMES"/>
<result property="allDeptIds" column="ALL_DEPT_IDS"/>
<result property="allDeptNames" column="ALL_DEPT_NAMES"/>
<result property="revision" column="REVISION"/>
<result property="delFlag" column="DEL_FLAG"/>
<result property="createdBy" column="CREATED_BY"/>
<result property="createdTime" column="CREATED_TIME"/>
<result property="updatedBy" column="UPDATED_BY"/>
<result property="updatedTime" column="UPDATED_TIME"/>
</resultMap>
</mapper>
Loading…
Cancel
Save