From 90f96d8c0ee2caeb0fc20ae654fc1f0163e6a467 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Tue, 16 Aug 2022 14:49:17 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E5=B7=A1=E6=9F=A5=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E8=AE=B0=E5=BD=95=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/IcEnterpriseChangeRecordDTO.java | 134 ++++++++++++++++++ .../IcEnterpriseChangeRecordController.java | 82 +++++++++++ .../dao/IcEnterpriseChangeRecordDao.java | 16 +++ .../IcEnterpriseChangeRecordEntity.java | 104 ++++++++++++++ .../excel/IcEnterpriseChangeRecordExcel.java | 89 ++++++++++++ .../redis/IcEnterpriseChangeRecordRedis.java | 30 ++++ .../IcEnterpriseChangeRecordService.java | 78 ++++++++++ .../IcEnterpriseChangeRecordServiceImpl.java | 87 ++++++++++++ .../mapper/IcEnterpriseChangeRecordDao.xml | 32 +++++ 9 files changed, 652 insertions(+) create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcEnterpriseChangeRecordDTO.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEnterpriseChangeRecordController.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEnterpriseChangeRecordDao.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcEnterpriseChangeRecordEntity.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcEnterpriseChangeRecordExcel.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/IcEnterpriseChangeRecordRedis.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcEnterpriseChangeRecordService.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseChangeRecordServiceImpl.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseChangeRecordDao.xml diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcEnterpriseChangeRecordDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcEnterpriseChangeRecordDTO.java new file mode 100644 index 0000000000..3af710f1d0 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcEnterpriseChangeRecordDTO.java @@ -0,0 +1,134 @@ +package com.epmet.dto; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * 企事业单位变更记录表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-08-16 + */ +@Data +public class IcEnterpriseChangeRecordDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 唯一标识 + */ + private String id; + + /** + * 客户Id + */ + private String customerId; + + /** + * 网格Id【场所区域】 + */ + private String gridId; + + /** + * 网格所属的组织Id + */ + private String agencyId; + + /** + * agency_id的所有上级 + */ + private String agencyPids; + + /** + * 场所类型：来源于ic_coverage_category_dict + */ + private String placeType; + + /** + * 场所名称 + */ + private String placeOrgName; + + /** + * 场所地址 + */ + private String address; + + /** + * 经度 + */ + private String longitude; + + /** + * 纬度 + */ + private String latitude; + + /** + * 字典value,场所规模【 +0:10人以下 +1:10-20人 +2:21-40人 +3:41-100人 +4:100人以上】 + */ + private String scale; + + /** + * 场所负责人 + */ + private String personInCharge; + + /** + * 负责人电话 + */ + private String mobile; + + /** + * 来源【新增:add 导入:import 】 + */ + private String sourceType; + + /** + * 最新巡查结果【0:合格 1:不合格】 + */ + private String latestResult; + + /** + * 最新检查时间 + */ + private Date latestPatrolTime; + + /** + * 删除标识：0.未删除 1.已删除 + */ + private Integer delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEnterpriseChangeRecordController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEnterpriseChangeRecordController.java new file mode 100644 index 0000000000..426e21cc97 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEnterpriseChangeRecordController.java @@ -0,0 +1,82 @@ +package com.epmet.controller; + +import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ExcelUtils; +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.AssertUtils; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.commons.tools.validator.group.AddGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.commons.tools.validator.group.DefaultGroup; +import com.epmet.dto.IcEnterpriseChangeRecordDTO; +import com.epmet.excel.IcEnterpriseChangeRecordExcel; +import com.epmet.service.IcEnterpriseChangeRecordService; +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 generator generator@elink-cn.com + * @since v1.0.0 2022-08-16 + */ +@RestController +@RequestMapping("icEnterpriseChangeRecord") +public class IcEnterpriseChangeRecordController { + + @Autowired + private IcEnterpriseChangeRecordService icEnterpriseChangeRecordService; + + @RequestMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = icEnterpriseChangeRecordService.page(params); + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}", method = {RequestMethod.POST, RequestMethod.GET}) + public Result get(@PathVariable("id") String id){ + IcEnterpriseChangeRecordDTO data = icEnterpriseChangeRecordService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("save") + public Result save(@RequestBody IcEnterpriseChangeRecordDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + icEnterpriseChangeRecordService.save(dto); + return new Result(); + } + + @NoRepeatSubmit + @PostMapping("update") + public Result update(@RequestBody IcEnterpriseChangeRecordDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + icEnterpriseChangeRecordService.update(dto); + return new Result(); + } + + @RequestMapping(value = "delete", method = {RequestMethod.POST, RequestMethod.DELETE}) + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + icEnterpriseChangeRecordService.delete(ids); + return new Result(); + } + + @GetMapping("export") + public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { + List list = icEnterpriseChangeRecordService.list(params); + ExcelUtils.exportExcelToTarget(response, null, list, IcEnterpriseChangeRecordExcel.class); + } + + + +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEnterpriseChangeRecordDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEnterpriseChangeRecordDao.java new file mode 100644 index 0000000000..31f0611791 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEnterpriseChangeRecordDao.java @@ -0,0 +1,16 @@ +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.entity.IcEnterpriseChangeRecordEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 企事业单位变更记录表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-08-16 + */ +@Mapper +public interface IcEnterpriseChangeRecordDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcEnterpriseChangeRecordEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcEnterpriseChangeRecordEntity.java new file mode 100644 index 0000000000..e544e0ef56 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcEnterpriseChangeRecordEntity.java @@ -0,0 +1,104 @@ +package com.epmet.entity; + +import com.baomidou.mybatisplus.annotation.TableName; + +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * 企事业单位变更记录表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-08-16 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("ic_enterprise_change_record") +public class IcEnterpriseChangeRecordEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户Id + */ + private String customerId; + + /** + * 网格Id【场所区域】 + */ + private String gridId; + + /** + * 网格所属的组织Id + */ + private String agencyId; + + /** + * agency_id的所有上级 + */ + private String agencyPids; + + /** + * 场所类型：来源于ic_coverage_category_dict + */ + private String placeType; + + /** + * 场所名称 + */ + private String placeOrgName; + + /** + * 场所地址 + */ + private String address; + + /** + * 经度 + */ + private String longitude; + + /** + * 纬度 + */ + private String latitude; + + /** + * 字典value,场所规模【 +0:10人以下 +1:10-20人 +2:21-40人 +3:41-100人 +4:100人以上】 + */ + private String scale; + + /** + * 场所负责人 + */ + private String personInCharge; + + /** + * 负责人电话 + */ + private String mobile; + + /** + * 来源【新增:add 导入:import 】 + */ + private String sourceType; + + /** + * 最新巡查结果【0:合格 1:不合格】 + */ + private String latestResult; + + /** + * 最新检查时间 + */ + private Date latestPatrolTime; + +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcEnterpriseChangeRecordExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcEnterpriseChangeRecordExcel.java new file mode 100644 index 0000000000..2149506355 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcEnterpriseChangeRecordExcel.java @@ -0,0 +1,89 @@ +package com.epmet.excel; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; + +import java.util.Date; + +/** + * 企事业单位变更记录表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-08-16 + */ +@Data +public class IcEnterpriseChangeRecordExcel { + + @Excel(name = "唯一标识") + private String id; + + @Excel(name = "客户Id") + private String customerId; + + @Excel(name = "网格Id【场所区域】") + private String gridId; + + @Excel(name = "网格所属的组织Id") + private String agencyId; + + @Excel(name = "agency_id的所有上级") + private String agencyPids; + + @Excel(name = "场所类型：来源于ic_coverage_category_dict") + private String placeType; + + @Excel(name = "场所名称") + private String placeOrgName; + + @Excel(name = "场所地址") + private String address; + + @Excel(name = "经度") + private String longitude; + + @Excel(name = "纬度") + private String latitude; + + @Excel(name = "字典value,场所规模【 +0:10人以下 +1:10-20人 +2:21-40人 +3:41-100人 +4:100人以上】") + private String scale; + + @Excel(name = "场所负责人") + private String personInCharge; + + @Excel(name = "负责人电话") + private String mobile; + + @Excel(name = "来源【新增:add 导入:import 】") + private String sourceType; + + @Excel(name = "最新巡查结果【0:合格 1:不合格】") + private String latestResult; + + @Excel(name = "最新检查时间") + private Date latestPatrolTime; + + @Excel(name = "删除标识：0.未删除 1.已删除") + private Integer delFlag; + + @Excel(name = "乐观锁") + private Integer revision; + + @Excel(name = "创建人") + private String createdBy; + + @Excel(name = "创建时间") + private Date createdTime; + + @Excel(name = "更新人") + private String updatedBy; + + @Excel(name = "更新时间") + private Date updatedTime; + + +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/IcEnterpriseChangeRecordRedis.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/IcEnterpriseChangeRecordRedis.java new file mode 100644 index 0000000000..4a03f6057c --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/IcEnterpriseChangeRecordRedis.java @@ -0,0 +1,30 @@ +package com.epmet.redis; + +import com.epmet.commons.tools.redis.RedisUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * 企事业单位变更记录表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-08-16 + */ +@Component +public class IcEnterpriseChangeRecordRedis { + @Autowired + private RedisUtils redisUtils; + + public void delete(Object[] ids) { + + } + + public void set(){ + + } + + public String get(String id){ + return null; + } + +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcEnterpriseChangeRecordService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcEnterpriseChangeRecordService.java new file mode 100644 index 0000000000..de47def1b9 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcEnterpriseChangeRecordService.java @@ -0,0 +1,78 @@ +package com.epmet.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.IcEnterpriseChangeRecordDTO; +import com.epmet.entity.IcEnterpriseChangeRecordEntity; + +import java.util.List; +import java.util.Map; + +/** + * 企事业单位变更记录表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-08-16 + */ +public interface IcEnterpriseChangeRecordService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2022-08-16 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2022-08-16 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return IcEnterpriseChangeRecordDTO + * @author generator + * @date 2022-08-16 + */ + IcEnterpriseChangeRecordDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-08-16 + */ + void save(IcEnterpriseChangeRecordDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2022-08-16 + */ + void update(IcEnterpriseChangeRecordDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2022-08-16 + */ + void delete(String[] ids); +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseChangeRecordServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseChangeRecordServiceImpl.java new file mode 100644 index 0000000000..dbbc97aa4f --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseChangeRecordServiceImpl.java @@ -0,0 +1,87 @@ +package com.epmet.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.dao.IcEnterpriseChangeRecordDao; +import com.epmet.dto.IcEnterpriseChangeRecordDTO; +import com.epmet.entity.IcEnterpriseChangeRecordEntity; +import com.epmet.redis.IcEnterpriseChangeRecordRedis; +import com.epmet.service.IcEnterpriseChangeRecordService; +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 generator generator@elink-cn.com + * @since v1.0.0 2022-08-16 + */ +@Service +public class IcEnterpriseChangeRecordServiceImpl extends BaseServiceImpl implements IcEnterpriseChangeRecordService { + + @Autowired + private IcEnterpriseChangeRecordRedis icEnterpriseChangeRecordRedis; + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, IcEnterpriseChangeRecordDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, IcEnterpriseChangeRecordDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public IcEnterpriseChangeRecordDTO get(String id) { + IcEnterpriseChangeRecordEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, IcEnterpriseChangeRecordDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(IcEnterpriseChangeRecordDTO dto) { + IcEnterpriseChangeRecordEntity entity = ConvertUtils.sourceToTarget(dto, IcEnterpriseChangeRecordEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(IcEnterpriseChangeRecordDTO dto) { + IcEnterpriseChangeRecordEntity entity = ConvertUtils.sourceToTarget(dto, IcEnterpriseChangeRecordEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseChangeRecordDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseChangeRecordDao.xml new file mode 100644 index 0000000000..2255ae431f --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseChangeRecordDao.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From b70aebc7e64bc33c6b3d37e953fe63302270b05b Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Tue, 16 Aug 2022 15:39:02 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=AE=B0=E5=BD=95=E6=93=8D=E4=BD=9C=E6=97=A5?= =?UTF-8?q?=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/IcEnterpriseChangeRecordDTO.java | 10 +++++ .../IcEnterpriseChangeRecordController.java | 44 ------------------- .../IcEnterpriseChangeRecordEntity.java | 10 +++++ .../service/impl/IcEnterpriseServiceImpl.java | 35 +++++++++++++++ .../mapper/IcEnterpriseChangeRecordDao.xml | 2 + 5 files changed, 57 insertions(+), 44 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcEnterpriseChangeRecordDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcEnterpriseChangeRecordDTO.java index 3af710f1d0..b965382a6f 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcEnterpriseChangeRecordDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcEnterpriseChangeRecordDTO.java @@ -131,4 +131,14 @@ public class IcEnterpriseChangeRecordDTO implements Serializable { */ private Date updatedTime; + /** + * 原始记录id + */ + private String originId; + + /** + * 操作类型,upd,del + */ + private String type; + } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEnterpriseChangeRecordController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEnterpriseChangeRecordController.java index 426e21cc97..e45d9538eb 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEnterpriseChangeRecordController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEnterpriseChangeRecordController.java @@ -1,22 +1,12 @@ package com.epmet.controller; -import com.epmet.commons.tools.aop.NoRepeatSubmit; import com.epmet.commons.tools.page.PageData; -import com.epmet.commons.tools.utils.ExcelUtils; import com.epmet.commons.tools.utils.Result; -import com.epmet.commons.tools.validator.AssertUtils; -import com.epmet.commons.tools.validator.ValidatorUtils; -import com.epmet.commons.tools.validator.group.AddGroup; -import com.epmet.commons.tools.validator.group.UpdateGroup; -import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.dto.IcEnterpriseChangeRecordDTO; -import com.epmet.excel.IcEnterpriseChangeRecordExcel; import com.epmet.service.IcEnterpriseChangeRecordService; 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; @@ -45,38 +35,4 @@ public class IcEnterpriseChangeRecordController { return new Result().ok(data); } - @NoRepeatSubmit - @PostMapping("save") - public Result save(@RequestBody IcEnterpriseChangeRecordDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - icEnterpriseChangeRecordService.save(dto); - return new Result(); - } - - @NoRepeatSubmit - @PostMapping("update") - public Result update(@RequestBody IcEnterpriseChangeRecordDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - icEnterpriseChangeRecordService.update(dto); - return new Result(); - } - - @RequestMapping(value = "delete", method = {RequestMethod.POST, RequestMethod.DELETE}) - public Result delete(@RequestBody String[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - icEnterpriseChangeRecordService.delete(ids); - return new Result(); - } - - @GetMapping("export") - public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { - List list = icEnterpriseChangeRecordService.list(params); - ExcelUtils.exportExcelToTarget(response, null, list, IcEnterpriseChangeRecordExcel.class); - } - - - } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcEnterpriseChangeRecordEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcEnterpriseChangeRecordEntity.java index e544e0ef56..119362360c 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcEnterpriseChangeRecordEntity.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcEnterpriseChangeRecordEntity.java @@ -101,4 +101,14 @@ public class IcEnterpriseChangeRecordEntity extends BaseEpmetEntity { */ private Date latestPatrolTime; + /** + * 原始记录id + */ + private String originId; + + /** + * 操作类型,upd,del + */ + private String type; + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java index a0feee5fba..576726412c 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java @@ -29,6 +29,7 @@ import com.epmet.dto.form.EnterprisePageFormDTO; import com.epmet.dto.form.EnterprisePatrolFormDTO; import com.epmet.dto.form.ImportTaskCommonFormDTO; import com.epmet.dto.result.*; +import com.epmet.entity.IcEnterpriseChangeRecordEntity; import com.epmet.entity.IcEnterpriseEntity; import com.epmet.entity.IcEnterprisePatrolAttachmentEntity; import com.epmet.entity.IcEnterprisePatrolRecordEntity; @@ -38,6 +39,7 @@ import com.epmet.feign.EpmetAdminOpenFeignClient; import com.epmet.feign.EpmetCommonServiceOpenFeignClient; import com.epmet.feign.OssFeignClient; import com.epmet.service.CoverageService; +import com.epmet.service.IcEnterpriseChangeRecordService; import com.epmet.service.IcEnterpriseService; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; @@ -90,6 +92,8 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl queryWrapper = new LambdaQueryWrapper(); @@ -258,12 +266,17 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl selectForUniqueName(String gridId, String placeOrgName, String enterpriseId) { return baseDao.selectForUniqueName(gridId, placeOrgName, enterpriseId); } + + /** + * 记录操作日志 + * + * @param origin + * @param type + * @return void + * @author zhy + * @date 2022/8/16 15:36 + */ + private void log(IcEnterpriseEntity origin, String type){ + // 历史记录 + IcEnterpriseChangeRecordEntity record = ConvertUtils.sourceToTarget(origin, IcEnterpriseChangeRecordEntity.class); + record.setId(null); + record.setCreatedBy(null); + record.setCreatedTime(null); + record.setUpdatedBy(null); + record.setUpdatedTime(null); + record.setOriginId(origin.getId()); + record.setType(type); + icEnterpriseChangeRecordService.insert(record); + } } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseChangeRecordDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseChangeRecordDao.xml index 2255ae431f..eedffe6b44 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseChangeRecordDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseChangeRecordDao.xml @@ -26,6 +26,8 @@ + + From 72898614f4288a425a49c1eb91612ef8315d240a Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Tue, 16 Aug 2022 15:48:01 +0800 Subject: [PATCH 03/11] bug --- .../com/epmet/excel/IcEnterpriseChangeRecordExcel.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcEnterpriseChangeRecordExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcEnterpriseChangeRecordExcel.java index 2149506355..921cb0b549 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcEnterpriseChangeRecordExcel.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcEnterpriseChangeRecordExcel.java @@ -44,12 +44,7 @@ public class IcEnterpriseChangeRecordExcel { @Excel(name = "纬度") private String latitude; - @Excel(name = "字典value,场所规模【 -0:10人以下 -1:10-20人 -2:21-40人 -3:41-100人 -4:100人以上】") + @Excel(name = "字典value,场所规模") private String scale; @Excel(name = "场所负责人") From 9124c19d1894d31408674434955963dbc7a93746 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Tue, 16 Aug 2022 17:06:31 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E5=B7=A1=E6=9F=A5=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/IcEnterpriseController.java | 15 ++++++++ .../epmet/service/IcEnterpriseService.java | 12 +++++++ .../IcEnterpriseChangeRecordServiceImpl.java | 2 ++ .../service/impl/IcEnterpriseServiceImpl.java | 34 +++++++++++++++++++ 4 files changed, 63 insertions(+) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEnterpriseController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEnterpriseController.java index 244711596d..ab2d7cdcb9 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEnterpriseController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEnterpriseController.java @@ -22,6 +22,7 @@ import com.epmet.commons.tools.utils.*; import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.constants.ImportTaskConstants; +import com.epmet.dto.IcEnterpriseChangeRecordDTO; import com.epmet.dto.form.EnterpriseFormDTO; import com.epmet.dto.form.EnterprisePageFormDTO; import com.epmet.dto.form.EnterprisePatrolFormDTO; @@ -100,6 +101,20 @@ public class IcEnterpriseController implements ResultDataResolver { return new Result>().ok(icEnterpriseService.list(formDTO)); } + /** + * 操作日志基础表 + * + * @param params + * @return com.epmet.commons.tools.utils.Result> + * @author zhy + * @date 2022/8/16 16:52 + */ + @RequestMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = icEnterpriseService.page(params); + return new Result>().ok(page); + } + /** * 企事业单位列表导出 * @param tokenDto diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcEnterpriseService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcEnterpriseService.java index 82057fb0cd..40cb66edfb 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcEnterpriseService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcEnterpriseService.java @@ -2,6 +2,7 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.IcEnterpriseChangeRecordDTO; import com.epmet.dto.form.EnterpriseFormDTO; import com.epmet.dto.form.EnterprisePageFormDTO; import com.epmet.dto.form.EnterprisePatrolFormDTO; @@ -10,6 +11,7 @@ import com.epmet.dto.result.EnterprisePatrolResultDTO; import com.epmet.entity.IcEnterpriseEntity; import java.nio.file.Path; +import java.util.Map; /** * 企事业单位表 @@ -68,4 +70,14 @@ public interface IcEnterpriseService extends BaseService { PageData list(EnterprisePageFormDTO formDTO); void execAsyncExcelImport(Path fileSavePath, String taskId, String customerId, String userId); + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2022-08-16 + */ + PageData page(Map params); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseChangeRecordServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseChangeRecordServiceImpl.java index dbbc97aa4f..593306e5d9 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseChangeRecordServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseChangeRecordServiceImpl.java @@ -50,9 +50,11 @@ public class IcEnterpriseChangeRecordServiceImpl extends BaseServiceImpl getWrapper(Map params){ String id = (String)params.get(FieldConstant.ID_HUMP); + String originId = (String)params.get("originId"); QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + wrapper.eq(StringUtils.isNotBlank(originId), "ORIGIN_ID", originId); return wrapper; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java index 576726412c..cb8774154d 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java @@ -2,8 +2,11 @@ package com.epmet.service.impl; import com.alibaba.excel.EasyExcel; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.Constant; +import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; @@ -23,6 +26,7 @@ import com.epmet.commons.tools.utils.FileUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.constants.ImportTaskConstants; import com.epmet.dao.*; +import com.epmet.dto.IcEnterpriseChangeRecordDTO; import com.epmet.dto.SysDictDataDTO; import com.epmet.dto.form.EnterpriseFormDTO; import com.epmet.dto.form.EnterprisePageFormDTO; @@ -413,6 +417,36 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, EnterpriseDetailDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + String placeOrgName = (String)params.get("placeOrgName"); + String mobile = (String)params.get("mobile"); + String gridId = (String)params.get("gridId"); + String placeType = (String)params.get("placeType"); + String scale = (String)params.get("scale"); + String result = (String)params.get("result"); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + wrapper.eq(StringUtils.isNotBlank(placeOrgName), "PLACE_ORG_NAME", placeOrgName); + wrapper.eq(StringUtils.isNotBlank(mobile), "MOBILE", mobile); + wrapper.eq(StringUtils.isNotBlank(gridId), "GRID_ID", gridId); + wrapper.eq(StringUtils.isNotBlank(placeType), "PLACE_TYPE", placeType); + wrapper.eq(StringUtils.isNotBlank(scale), "SCALE", scale); + wrapper.eq(StringUtils.isNotBlank(result), "LATEST_RESULT", result); + + return wrapper; + } + private CustomerStaffInfoCacheResult queryCurrentStaff(String customerId, String userId) { CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(customerId, userId); if (null == staffInfo) { From 554024dbaca1252b502cc73de7480a86a47628f2 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Wed, 17 Aug 2022 10:07:26 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E4=BD=BF=E7=94=A8=E5=8E=9F=E6=9C=AC?= =?UTF-8?q?=E7=9A=84=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/IcEnterpriseController.java | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEnterpriseController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEnterpriseController.java index ab2d7cdcb9..dd72bff61a 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEnterpriseController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEnterpriseController.java @@ -110,8 +110,21 @@ public class IcEnterpriseController implements ResultDataResolver { * @date 2022/8/16 16:52 */ @RequestMapping("page") - public Result> page(@RequestParam Map params){ - PageData page = icEnterpriseService.page(params); + public Result> page(@LoginUser TokenDto tokenDto, @RequestParam Map params){ + EnterprisePageFormDTO formDTO = new EnterprisePageFormDTO(); + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setCurrentStaffId(tokenDto.getUserId()); + formDTO.setPageFlag(true); + formDTO.setPageNo(Integer.parseInt(params.get("page"))); + formDTO.setPageSize(Integer.parseInt(params.get("limit"))); + formDTO.setPlaceOrgName(params.get("placeOrgName")); + formDTO.setMobile(params.get("mobile")); + formDTO.setGridId(params.get("gridId")); + formDTO.setPlaceType(params.get("placeType")); + formDTO.setScale(params.get("scale")); + formDTO.setResult(params.get("result")); + + PageData page = icEnterpriseService.list(formDTO); return new Result>().ok(page); } From 98e50701deb8459d1eded9e0a146e77c6f7fb4c9 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Wed, 17 Aug 2022 13:31:12 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E4=BF=9D=E5=AD=98=E6=97=B6=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=8F=98=E6=9B=B4=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/IcEnterpriseChangeRecordDao.java | 15 +- .../IcEnterpriseChangeRecordServiceImpl.java | 27 ++-- .../service/impl/IcEnterpriseServiceImpl.java | 130 ++++++++++++------ .../mapper/IcEnterpriseChangeRecordDao.xml | 11 ++ 4 files changed, 130 insertions(+), 53 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEnterpriseChangeRecordDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEnterpriseChangeRecordDao.java index 31f0611791..548d9ccb40 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEnterpriseChangeRecordDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEnterpriseChangeRecordDao.java @@ -1,9 +1,13 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.IcEnterpriseChangeRecordDTO; import com.epmet.entity.IcEnterpriseChangeRecordEntity; import org.apache.ibatis.annotations.Mapper; +import java.util.List; +import java.util.Map; + /** * 企事业单位变更记录表 * @@ -12,5 +16,14 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface IcEnterpriseChangeRecordDao extends BaseDao { - + + /** + * 分页列表 + * + * @param params + * @return java.util.List + * @author zhy + * @date 2022/8/9 17:23 + */ + List listPage(Map params); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseChangeRecordServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseChangeRecordServiceImpl.java index 593306e5d9..7b0f3882ef 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseChangeRecordServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseChangeRecordServiceImpl.java @@ -1,14 +1,21 @@ package com.epmet.service.impl; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.enums.DictTypeEnum; +import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.security.user.LoginUserUtil; import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.utils.Result; import com.epmet.dao.IcEnterpriseChangeRecordDao; import com.epmet.dto.IcEnterpriseChangeRecordDTO; +import com.epmet.dto.IcWorkLogDTO; import com.epmet.entity.IcEnterpriseChangeRecordEntity; +import com.epmet.feign.EpmetAdminOpenFeignClient; import com.epmet.redis.IcEnterpriseChangeRecordRedis; import com.epmet.service.IcEnterpriseChangeRecordService; import org.apache.commons.lang3.StringUtils; @@ -31,14 +38,16 @@ public class IcEnterpriseChangeRecordServiceImpl extends BaseServiceImpl page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, IcEnterpriseChangeRecordDTO.class); + params.put("customerId", loginUserUtil.getLoginUserCustomerId()); + IPage page = getPage(params); + List list = baseDao.listPage(params); + return new PageData<>(list, page.getTotal()); } @Override @@ -48,9 +57,9 @@ public class IcEnterpriseChangeRecordServiceImpl extends BaseServiceImpl getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); - String originId = (String)params.get("originId"); + private QueryWrapper getWrapper(Map params) { + String id = (String) params.get(FieldConstant.ID_HUMP); + String originId = (String) params.get("originId"); QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java index cb8774154d..59ec2d331b 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java @@ -1,6 +1,7 @@ package com.epmet.service.impl; import com.alibaba.excel.EasyExcel; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -21,22 +22,19 @@ import com.epmet.commons.tools.redis.common.CustomerOrgRedis; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache; import com.epmet.commons.tools.redis.common.bean.GridInfoCache; +import com.epmet.commons.tools.security.user.LoginUserUtil; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.FileUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.constants.ImportTaskConstants; import com.epmet.dao.*; -import com.epmet.dto.IcEnterpriseChangeRecordDTO; import com.epmet.dto.SysDictDataDTO; import com.epmet.dto.form.EnterpriseFormDTO; import com.epmet.dto.form.EnterprisePageFormDTO; import com.epmet.dto.form.EnterprisePatrolFormDTO; import com.epmet.dto.form.ImportTaskCommonFormDTO; import com.epmet.dto.result.*; -import com.epmet.entity.IcEnterpriseChangeRecordEntity; -import com.epmet.entity.IcEnterpriseEntity; -import com.epmet.entity.IcEnterprisePatrolAttachmentEntity; -import com.epmet.entity.IcEnterprisePatrolRecordEntity; +import com.epmet.entity.*; import com.epmet.excel.EnterpriseImportExcelDTO; import com.epmet.excel.handler.IcEnterpriseExcelImportListener; import com.epmet.feign.EpmetAdminOpenFeignClient; @@ -98,6 +96,10 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl queryWrapper=new LambdaQueryWrapper<>(); - queryWrapper.eq(IcEnterprisePatrolRecordEntity::getEnterpriseId,origin.getEnterpriseId()); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(IcEnterprisePatrolRecordEntity::getEnterpriseId, origin.getEnterpriseId()); if (NumConstant.ZERO == enterprisePatrolRecordDao.selectCount(queryWrapper)) { - baseDao.updateLatestPatrol(origin.getEnterpriseId(),null,StrConstant.EPMETY_STR,currentUserId); + baseDao.updateLatestPatrol(origin.getEnterpriseId(), null, StrConstant.EPMETY_STR, currentUserId); } } /** * 巡查记录列表 * 暂时不分页 + * * @param enterpriseId * @return */ @@ -242,9 +245,9 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl dictList = coverageService.dictMap(customerId, CoveragePlaceTypeEnum.ENTERPRISE_PATROL.getCode()); Map placeTypeMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getLabel, IcCoverageCategoryDictListResultDTO::getValue)); //2、规模名称 Result> dictMapRes = adminOpenFeignClient.dictDataList(DictTypeEnum.SCALE.getCode()); - Map scaleMap = dictMapRes.success() && CollectionUtils.isNotEmpty(dictMapRes.getData()) ? dictMapRes.getData().stream().collect(Collectors.toMap(SysDictDataDTO::getDictLabel,SysDictDataDTO::getDictValue)) : new HashMap<>(); + Map scaleMap = dictMapRes.success() && CollectionUtils.isNotEmpty(dictMapRes.getData()) ? dictMapRes.getData().stream().collect(Collectors.toMap(SysDictDataDTO::getDictLabel, SysDictDataDTO::getDictValue)) : new HashMap<>(); //3、当前工作人员所属组织下的网格列表 List gridList = customerGridDao.selectGridList(staffInfo.getAgencyId()); if (CollectionUtils.isEmpty(gridList)) { throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "当前组织下没有网格", "当前组织下没有直属网格"); } - Map gridMap=gridList.stream().collect(Collectors.toMap(GridListResultDTO::getGridName,GridListResultDTO::getGridId)); + Map gridMap = gridList.stream().collect(Collectors.toMap(GridListResultDTO::getGridName, GridListResultDTO::getGridId)); - IcEnterpriseExcelImportListener listener = new IcEnterpriseExcelImportListener(customerId,staffInfo, this,placeTypeMap,scaleMap,gridMap); + IcEnterpriseExcelImportListener listener = new IcEnterpriseExcelImportListener(customerId, staffInfo, this, placeTypeMap, scaleMap, gridMap); EasyExcel.read(filePath.toFile(), EnterpriseImportExcelDTO.class, listener).headRowNumber(1).sheet(0).doRead(); Path errorDescFile = null; @@ -426,14 +429,14 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); - String placeOrgName = (String)params.get("placeOrgName"); - String mobile = (String)params.get("mobile"); - String gridId = (String)params.get("gridId"); - String placeType = (String)params.get("placeType"); - String scale = (String)params.get("scale"); - String result = (String)params.get("result"); + private QueryWrapper getWrapper(Map params) { + String id = (String) params.get(FieldConstant.ID_HUMP); + String placeOrgName = (String) params.get("placeOrgName"); + String mobile = (String) params.get("mobile"); + String gridId = (String) params.get("gridId"); + String placeType = (String) params.get("placeType"); + String scale = (String) params.get("scale"); + String result = (String) params.get("result"); QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); @@ -456,7 +459,7 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl selectForUniqueName(String gridId, String placeOrgName, String enterpriseId) { - return baseDao.selectForUniqueName(gridId, placeOrgName, enterpriseId); + return baseDao.selectForUniqueName(gridId, placeOrgName, enterpriseId); } /** @@ -468,9 +471,50 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl").concat(formDTO.getPlaceType())); + List categoryList = coverageService.dictMap(loginUserUtil.getLoginUserCustomerId(), "enterprise_patrol"); + Map categoryMap = categoryList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getValue, IcCoverageCategoryDictListResultDTO::getLabel)); + record.setPlaceType(categoryMap.get(record.getPlaceType()).concat("->").concat(categoryMap.get(formDTO.getPlaceType()))); + } + + if (!origin.getGridId().equals(formDTO.getGridId())) { + CustomerGridEntity originGrid = customerGridDao.selectById(record.getGridId()); + CustomerGridEntity thisGrid = customerGridDao.selectById(formDTO.getGridId()); + record.setGridId(record.getGridId().concat("->").concat(thisGrid.getGridName())); + if (originGrid != null && thisGrid != null) { + record.setGridId(originGrid.getGridName().concat("->").concat(formDTO.getGridId())); + } + } + if (!origin.getPlaceOrgName().equals(formDTO.getPlaceOrgName())) { + record.setPlaceOrgName(record.getPlaceOrgName().concat("->").concat(record.getPlaceOrgName())); + } + if (!origin.getScale().equals(formDTO.getScale())) { + record.setScale(record.getScale().concat("->").concat(formDTO.getScale())); + Result> result = epmetAdminOpenFeignClient.dictMap(DictTypeEnum.SCALE.getCode()); + if (!result.success() || null == result.getData()) { + throw new EpmetException("查询字典信息失败" + JSON.toJSONString(result)); + } else { + Map scaleMap = result.getData(); + record.setScale(scaleMap.get(record.getScale()).concat("->").concat(scaleMap.get(formDTO.getScale()))); + } + } + if (!origin.getPersonInCharge().equals(formDTO.getPersonInCharge())) { + record.setPersonInCharge(record.getPersonInCharge().concat("->").concat(formDTO.getPersonInCharge())); + } + if (!origin.getMobile().equals(formDTO.getMobile())) { + record.setMobile(record.getMobile().concat("->").concat(formDTO.getMobile())); + } + if (!origin.getAddress().equals(formDTO.getAddress())) { + record.setAddress(record.getAddress().concat("->").concat(formDTO.getAddress())); + } + } + record.setId(null); record.setCreatedBy(null); record.setCreatedTime(null); diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseChangeRecordDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseChangeRecordDao.xml index eedffe6b44..f69c54e9bd 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseChangeRecordDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseChangeRecordDao.xml @@ -30,5 +30,16 @@ + \ No newline at end of file From 0ecd1ea8d27acbb63baa140dacac0453f0cea8e4 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Wed, 17 Aug 2022 14:22:51 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../V0.0.44__add_enterprise_change_record.sql | 52 +++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.44__add_enterprise_change_record.sql diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.44__add_enterprise_change_record.sql b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.44__add_enterprise_change_record.sql new file mode 100644 index 0000000000..be6f30d58e --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.44__add_enterprise_change_record.sql @@ -0,0 +1,52 @@ +/* + Navicat Premium Data Transfer + + Source Server : epmet_cloud_dev_org + Source Server Type : MySQL + Source Server Version : 50726 + Source Host : 192.168.1.140:3306 + Source Schema : epmet_gov_org + + Target Server Type : MySQL + Target Server Version : 50726 + File Encoding : 65001 + + Date: 17/08/2022 14:20:39 +*/ + +SET NAMES utf8mb4; +SET FOREIGN_KEY_CHECKS = 0; + +-- ---------------------------- +-- Table structure for ic_enterprise_change_record +-- ---------------------------- +DROP TABLE IF EXISTS `ic_enterprise_change_record`; +CREATE TABLE `ic_enterprise_change_record` ( + `ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '唯一标识', + `CUSTOMER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '客户Id', + `GRID_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '网格Id【场所区域】', + `AGENCY_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '网格所属的组织Id', + `AGENCY_PIDS` varchar(256) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'agency_id的所有上级', + `PLACE_TYPE` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '场所类型：来源于ic_coverage_category_dict', + `PLACE_ORG_NAME` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '场所名称', + `ADDRESS` varchar(256) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '场所地址', + `LONGITUDE` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '经度', + `LATITUDE` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '纬度', + `SCALE` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '字典value,场所规模【\r\n0:10人以下\r\n1:10-20人\r\n2:21-40人\r\n3:41-100人\r\n4:100人以上】', + `PERSON_IN_CHARGE` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '场所负责人', + `MOBILE` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '负责人电话', + `SOURCE_TYPE` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '来源【新增:add 导入:import 】', + `LATEST_RESULT` varchar(2) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '最新巡查结果【0:合格 1:不合格】', + `LATEST_PATROL_TIME` datetime NULL DEFAULT NULL COMMENT '最新检查时间', + `DEL_FLAG` int(11) NOT NULL COMMENT '删除标识：0.未删除 1.已删除', + `REVISION` int(11) NOT NULL COMMENT '乐观锁', + `CREATED_BY` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人', + `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '更新人', + `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', + `ORIGIN_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '原始记录ID', + `TYPE` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '操作类型,upd,del', + PRIMARY KEY (`ID`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '企事业单位变更记录表' ROW_FORMAT = COMPACT; + +SET FOREIGN_KEY_CHECKS = 1; From 1d80a52a2d5e8e5325d0898ee43027ee761af9f5 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Wed, 17 Aug 2022 16:43:03 +0800 Subject: [PATCH 08/11] bug --- .../service/impl/IcEnterpriseServiceImpl.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java index 59ec2d331b..265a2018d5 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java @@ -477,41 +477,41 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl").concat(formDTO.getPlaceType())); + record.setPlaceType(origin.getPlaceType().concat("->").concat(formDTO.getPlaceType())); List categoryList = coverageService.dictMap(loginUserUtil.getLoginUserCustomerId(), "enterprise_patrol"); Map categoryMap = categoryList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getValue, IcCoverageCategoryDictListResultDTO::getLabel)); - record.setPlaceType(categoryMap.get(record.getPlaceType()).concat("->").concat(categoryMap.get(formDTO.getPlaceType()))); + record.setPlaceType(categoryMap.get(origin.getPlaceType()).concat("->").concat(categoryMap.get(formDTO.getPlaceType()))); } if (!origin.getGridId().equals(formDTO.getGridId())) { - CustomerGridEntity originGrid = customerGridDao.selectById(record.getGridId()); + CustomerGridEntity originGrid = customerGridDao.selectById(origin.getGridId()); CustomerGridEntity thisGrid = customerGridDao.selectById(formDTO.getGridId()); - record.setGridId(record.getGridId().concat("->").concat(thisGrid.getGridName())); + record.setGridId(origin.getGridId().concat("->").concat(thisGrid.getGridName())); if (originGrid != null && thisGrid != null) { record.setGridId(originGrid.getGridName().concat("->").concat(formDTO.getGridId())); } } if (!origin.getPlaceOrgName().equals(formDTO.getPlaceOrgName())) { - record.setPlaceOrgName(record.getPlaceOrgName().concat("->").concat(record.getPlaceOrgName())); + record.setPlaceOrgName(origin.getPlaceOrgName().concat("->").concat(formDTO.getPlaceOrgName())); } if (!origin.getScale().equals(formDTO.getScale())) { - record.setScale(record.getScale().concat("->").concat(formDTO.getScale())); + record.setScale(origin.getScale().concat("->").concat(formDTO.getScale())); Result> result = epmetAdminOpenFeignClient.dictMap(DictTypeEnum.SCALE.getCode()); if (!result.success() || null == result.getData()) { throw new EpmetException("查询字典信息失败" + JSON.toJSONString(result)); } else { Map scaleMap = result.getData(); - record.setScale(scaleMap.get(record.getScale()).concat("->").concat(scaleMap.get(formDTO.getScale()))); + record.setScale(scaleMap.get(origin.getScale()).concat("->").concat(scaleMap.get(formDTO.getScale()))); } } if (!origin.getPersonInCharge().equals(formDTO.getPersonInCharge())) { - record.setPersonInCharge(record.getPersonInCharge().concat("->").concat(formDTO.getPersonInCharge())); + record.setPersonInCharge(origin.getPersonInCharge().concat("->").concat(formDTO.getPersonInCharge())); } if (!origin.getMobile().equals(formDTO.getMobile())) { - record.setMobile(record.getMobile().concat("->").concat(formDTO.getMobile())); + record.setMobile(origin.getMobile().concat("->").concat(formDTO.getMobile())); } if (!origin.getAddress().equals(formDTO.getAddress())) { - record.setAddress(record.getAddress().concat("->").concat(formDTO.getAddress())); + record.setAddress(origin.getAddress().concat("->").concat(formDTO.getAddress())); } } From 7fdb445cc211f1254c7ad205cbd91cf0b31554ac Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Wed, 17 Aug 2022 17:13:14 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IcEnterpriseChangeRecordController.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEnterpriseChangeRecordController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEnterpriseChangeRecordController.java index e45d9538eb..a3a3be78a1 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEnterpriseChangeRecordController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEnterpriseChangeRecordController.java @@ -7,6 +7,7 @@ import com.epmet.service.IcEnterpriseChangeRecordService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.HashMap; import java.util.Map; @@ -24,15 +25,23 @@ public class IcEnterpriseChangeRecordController { private IcEnterpriseChangeRecordService icEnterpriseChangeRecordService; @RequestMapping("page") - public Result> page(@RequestParam Map params){ + public Result> page(@RequestParam Map params) { PageData page = icEnterpriseChangeRecordService.page(params); return new Result>().ok(page); } @RequestMapping(value = "{id}", method = {RequestMethod.POST, RequestMethod.GET}) - public Result get(@PathVariable("id") String id){ + public Result get(@PathVariable("id") String id) { IcEnterpriseChangeRecordDTO data = icEnterpriseChangeRecordService.get(id); return new Result().ok(data); } + @RequestMapping("history/{originId}") + public Result> page(@PathVariable("originId") String originId) { + Map params = new HashMap<>(); + params.put("originId", originId); + PageData page = icEnterpriseChangeRecordService.page(params); + return new Result>().ok(page); + } + } From 5ffc92eecc80b361840bcacb9b1d46242f907b1a Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Wed, 17 Aug 2022 17:37:12 +0800 Subject: [PATCH 10/11] bug --- .../epmet/controller/IcEnterpriseChangeRecordController.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEnterpriseChangeRecordController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEnterpriseChangeRecordController.java index a3a3be78a1..6865c9dbe3 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEnterpriseChangeRecordController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEnterpriseChangeRecordController.java @@ -37,8 +37,7 @@ public class IcEnterpriseChangeRecordController { } @RequestMapping("history/{originId}") - public Result> page(@PathVariable("originId") String originId) { - Map params = new HashMap<>(); + public Result> page(@PathVariable("originId") String originId, @RequestParam Map params) { params.put("originId", originId); PageData page = icEnterpriseChangeRecordService.page(params); return new Result>().ok(page); From 36b0a7b59f78f73d9eed8b4b6406ddeba0126d75 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Thu, 18 Aug 2022 09:56:53 +0800 Subject: [PATCH 11/11] bug --- .../service/impl/IcEnterpriseServiceImpl.java | 34 ++++++++++++------- 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java index 265a2018d5..56f2ceda49 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java @@ -475,35 +475,45 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl categoryList = coverageService.dictMap(loginUserUtil.getLoginUserCustomerId(), "enterprise_patrol"); + Map categoryMap = categoryList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getValue, IcCoverageCategoryDictListResultDTO::getLabel)); + + CustomerGridEntity originGrid = customerGridDao.selectById(origin.getGridId()); + + Map scaleMap; + Result> result = epmetAdminOpenFeignClient.dictMap(DictTypeEnum.SCALE.getCode()); + if (!result.success() || null == result.getData()) { + throw new EpmetException("查询字典信息失败" + JSON.toJSONString(result)); + } else { + scaleMap = result.getData(); + } + if (formDTO != null) { if (!origin.getPlaceType().equals(formDTO.getPlaceType())) { - record.setPlaceType(origin.getPlaceType().concat("->").concat(formDTO.getPlaceType())); - List categoryList = coverageService.dictMap(loginUserUtil.getLoginUserCustomerId(), "enterprise_patrol"); - Map categoryMap = categoryList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getValue, IcCoverageCategoryDictListResultDTO::getLabel)); record.setPlaceType(categoryMap.get(origin.getPlaceType()).concat("->").concat(categoryMap.get(formDTO.getPlaceType()))); + } else { + record.setPlaceType(categoryMap.get(origin.getPlaceType())); } if (!origin.getGridId().equals(formDTO.getGridId())) { - CustomerGridEntity originGrid = customerGridDao.selectById(origin.getGridId()); CustomerGridEntity thisGrid = customerGridDao.selectById(formDTO.getGridId()); record.setGridId(origin.getGridId().concat("->").concat(thisGrid.getGridName())); if (originGrid != null && thisGrid != null) { record.setGridId(originGrid.getGridName().concat("->").concat(formDTO.getGridId())); } + } else { + record.setGridId(originGrid.getGridName()); } + if (!origin.getPlaceOrgName().equals(formDTO.getPlaceOrgName())) { record.setPlaceOrgName(origin.getPlaceOrgName().concat("->").concat(formDTO.getPlaceOrgName())); } if (!origin.getScale().equals(formDTO.getScale())) { - record.setScale(origin.getScale().concat("->").concat(formDTO.getScale())); - Result> result = epmetAdminOpenFeignClient.dictMap(DictTypeEnum.SCALE.getCode()); - if (!result.success() || null == result.getData()) { - throw new EpmetException("查询字典信息失败" + JSON.toJSONString(result)); - } else { - Map scaleMap = result.getData(); - record.setScale(scaleMap.get(origin.getScale()).concat("->").concat(scaleMap.get(formDTO.getScale()))); - } + record.setScale(scaleMap.get(origin.getScale()).concat("->").concat(scaleMap.get(formDTO.getScale()))); + } else { + record.setScale(scaleMap.get(origin.getScale())); } + if (!origin.getPersonInCharge().equals(formDTO.getPersonInCharge())) { record.setPersonInCharge(origin.getPersonInCharge().concat("->").concat(formDTO.getPersonInCharge())); }