From 75bd0eb8bb1650d63fcd46f89ceb22138ce66cf0 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 9 May 2022 08:51:30 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/model/ImportBuildingInfoListener.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java index 3b13b608a8..df4d9d3243 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java @@ -227,13 +227,14 @@ public class ImportBuildingInfoListener extends AnalysisEventListener Date: Mon, 9 May 2022 09:27:40 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E5=B0=8F=E5=8C=BA=E5=AF=BC=E5=85=A5bug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dao/IcNeighborHoodDao.java | 2 ++ .../com/epmet/model/ImportNeighborHoodInfoListener.java | 2 +- .../com/epmet/service/impl/IcNeighborHoodServiceImpl.java | 1 + .../src/main/resources/mapper/IcNeighborHoodDao.xml | 7 +++++++ 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java index 6238d0f303..8d1a4865de 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java @@ -87,4 +87,6 @@ public interface IcNeighborHoodDao extends BaseDao { * @date 2022/4/28 09:10 */ void delProperty(@Param("neighborHoodIds")List neighborHoodIds); + + void updateOneNeighborHood(ImportGeneralDTO info); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportNeighborHoodInfoListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportNeighborHoodInfoListener.java index a2581e8c48..0f351c6b4d 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportNeighborHoodInfoListener.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportNeighborHoodInfoListener.java @@ -109,7 +109,7 @@ public class ImportNeighborHoodInfoListener extends AnalysisEventListener ) + + update ic_neighbor_hood + set ADDRESS = #{address}, + REMARK = #{remark}, + UPDATED_TIME = NOW() + where id = #{neighborHoodId} + From 601c85057c84972907ee1dd4b56554cb9fcb3ec1 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 9 May 2022 10:55:22 +0800 Subject: [PATCH 3/7] sort default 0 --- .../gov-org-server/src/main/resources/mapper/IcBuildingDao.xml | 2 +- .../gov-org-server/src/main/resources/mapper/IcHouseDao.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml index 7387a73354..de7cbe99f1 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml @@ -91,7 +91,7 @@ c.ORGANIZATION_NAME as agencyName, d.ID as gridId, d.GRID_NAME as gridName, - a.SORT as sort, + IFNULL(a.SORT,0) as sort, a.LONGITUDE as longitude, a.LATITUDE as latitude, a.TYPE as buildingTypeKey, diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml index 49472d0dc7..14ad186898 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml @@ -112,7 +112,7 @@ ag.ORGANIZATION_NAME agencyName, c.GRID_ID as gridId, gr.GRID_NAME, - a.sort + IFNULL(a.sort,0) as sort from ic_house a LEFT JOIN ic_building b on a.BUILDING_ID = b.ID and b.DEL_FLAG = '0' LEFT JOIN ic_neighbor_hood c on a.NEIGHBOR_HOOD_ID = c.ID and c.DEL_FLAG = '0' From f49151d47633f3865cbd34dabbcbb45095ebc57e Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 9 May 2022 13:35:40 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E5=A4=9A=E4=BD=99?= =?UTF-8?q?=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/model/ImportNeighborHoodInfoListener.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportNeighborHoodInfoListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportNeighborHoodInfoListener.java index 0f351c6b4d..5bacafb1fe 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportNeighborHoodInfoListener.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportNeighborHoodInfoListener.java @@ -88,12 +88,6 @@ public class ImportNeighborHoodInfoListener extends AnalysisEventListener Date: Mon, 9 May 2022 13:55:41 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E6=A5=BC=E6=A0=8B=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BF=AE=E6=94=B9=E6=A5=BC=E6=A0=8B=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-org-server/src/main/resources/mapper/IcBuildingDao.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml index de7cbe99f1..4976a20114 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml @@ -51,6 +51,7 @@ BUILDING_LEADER_NAME = #{buildingLeaderName}, BUILDING_LEADER_MOBILE = #{buildingLeaderMobile}, SORT = #{sort}, + TYPE = #{type}, UPDATED_TIME = NOW() WHERE ID = #{buildingId} From db5dc52c255d8ffb8b131812b7bdfff395463d52 Mon Sep 17 00:00:00 2001 From: YUJT Date: Mon, 9 May 2022 14:35:07 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B1=85=E6=B0=91?= =?UTF-8?q?=E7=AB=AF=E5=85=9A=E5=91=98=E9=A3=8E=E9=87=87=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/StyleShowListResiFormDTO.java | 22 +++++++++++ .../IcPartymemberStyleController.java | 39 ++++++++++++++----- .../service/IcPartymemberStyleService.java | 14 +++++++ .../impl/IcPartymemberStyleServiceImpl.java | 35 ++++++++++------- 4 files changed, 88 insertions(+), 22 deletions(-) create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/StyleShowListResiFormDTO.java diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/StyleShowListResiFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/StyleShowListResiFormDTO.java new file mode 100644 index 0000000000..102a99b3e7 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/StyleShowListResiFormDTO.java @@ -0,0 +1,22 @@ +package com.epmet.resi.partymember.dto.partymember.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * 党员风采列表接口参数 + * + * @author work@yujt.net.cn + * @date 2022/5/9/0009 14:22 + */ +@Data +public class StyleShowListResiFormDTO extends StyleShowListFormDTO implements Serializable { + + private static final long serialVersionUID = -7548077165302515633L; + + @NotBlank(message = "所属组织不能为空") + private String agencyId; + +} diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartymemberStyleController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartymemberStyleController.java index b22de7b1f6..f73a8bd961 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartymemberStyleController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartymemberStyleController.java @@ -40,6 +40,7 @@ import com.epmet.modules.partymember.service.IcPartymemberStyleService; import com.epmet.resi.partymember.dto.partymember.IcPartymemberStyleDTO; import com.epmet.resi.partymember.dto.partymember.form.PartyMemberStyleFormDTO; import com.epmet.resi.partymember.dto.partymember.form.StyleShowListFormDTO; +import com.epmet.resi.partymember.dto.partymember.form.StyleShowListResiFormDTO; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.io.FilenameUtils; @@ -75,27 +76,27 @@ import java.util.stream.Collectors; @RestController @RequestMapping("icpartymemberstyle") public class IcPartymemberStyleController { - + @Autowired private IcPartymemberStyleService icPartymemberStyleService; @Autowired private EpmetCommonServiceOpenFeignClient commonServiceOpenFeignClient; @GetMapping("page") - public Result> page(@RequestParam Map params){ + public Result> page(@RequestParam Map params) { PageData page = icPartymemberStyleService.page(params); return new Result>().ok(page); } @PostMapping("detail") - public Result get(@RequestBody IcPartymemberStyleDTO dto){ + public Result get(@RequestBody IcPartymemberStyleDTO dto) { IcPartymemberStyleDTO data = icPartymemberStyleService.get(dto.getId()); return new Result().ok(data); } @PostMapping("save") @NoRepeatSubmit - public Result save(@LoginUser TokenDto tokenDto, @RequestBody IcPartymemberStyleDTO dto){ + public Result save(@LoginUser TokenDto tokenDto, @RequestBody IcPartymemberStyleDTO dto) { //效验数据 ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); icPartymemberStyleService.save(tokenDto, dto); @@ -103,7 +104,7 @@ public class IcPartymemberStyleController { } @PostMapping("delete") - public Result delete(@RequestBody IcPartymemberStyleDTO dto){ + public Result delete(@RequestBody IcPartymemberStyleDTO dto) { //效验数据 icPartymemberStyleService.delete(dto.getId()); return new Result(); @@ -156,7 +157,7 @@ public class IcPartymemberStyleController { InputStream inputStream = null; try { inputStream = file.getInputStream(); - }catch (Exception e){ + } catch (Exception e) { ImportTaskCommonFormDTO input = new ImportTaskCommonFormDTO(); input.setOperatorId(tokenDto.getUserId()); input.setTaskId(result.getData().getTaskId()); @@ -172,23 +173,43 @@ public class IcPartymemberStyleController { /** * 数据分析-党员风采列表查询 + * * @param tokenDto * @return */ @PostMapping("showlist") - public Result> showList(@LoginUser TokenDto tokenDto, @RequestBody StyleShowListFormDTO formDTO){ + public Result> showList(@LoginUser TokenDto tokenDto, @RequestBody StyleShowListFormDTO formDTO) { formDTO.setCustomerId(tokenDto.getCustomerId()); formDTO.setUserId(tokenDto.getUserId()); - ValidatorUtils.validateEntity(formDTO,StyleShowListFormDTO.AddUserInternalGroup.class); + ValidatorUtils.validateEntity(formDTO, StyleShowListFormDTO.AddUserInternalGroup.class); return new Result>().ok(icPartymemberStyleService.showList(formDTO)); } + /** + * 党员风采列表 + * + * @param tokenDto 登录用户 + * @param formDto 查询条件 + * @return com.epmet.commons.tools.utils.Result> + * @author work@yujt.net.cn + * @date 2022/5/9/0009 14:23 + */ + @PostMapping("showlistbyagency") + public Result> showListByAgency(@LoginUser TokenDto tokenDto, @RequestBody StyleShowListResiFormDTO formDto) { + formDto.setCustomerId(tokenDto.getCustomerId()); + // 此接口不包含userId相关业务处理 + formDto.setUserId(tokenDto.getUserId()); + ValidatorUtils.validateEntity(formDto, StyleShowListFormDTO.AddUserInternalGroup.class); + return new Result().ok(icPartymemberStyleService.showListByAgency(formDto)); + } + /** * 下载党员风采导入模板 + * * @param response * @throws IOException */ - @RequestMapping(value = "import/template-download" ,method = {RequestMethod.GET, RequestMethod.POST}) + @RequestMapping(value = "import/template-download", method = {RequestMethod.GET, RequestMethod.POST}) public void downloadTemplate(HttpServletResponse response) throws IOException { response.setCharacterEncoding("UTF-8"); response.addHeader(HttpHeaders.ACCESS_CONTROL_EXPOSE_HEADERS, "Content-Disposition"); diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartymemberStyleService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartymemberStyleService.java index 4a9ec6ba5c..9e004e03c5 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartymemberStyleService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartymemberStyleService.java @@ -25,6 +25,7 @@ import com.epmet.modules.partymember.entity.IcPartymemberStyleEntity; import com.epmet.resi.partymember.dto.partymember.IcPartymemberStyleDTO; import com.epmet.resi.partymember.dto.partymember.form.PartyMemberStyleFormDTO; import com.epmet.resi.partymember.dto.partymember.form.StyleShowListFormDTO; +import com.epmet.resi.partymember.dto.partymember.form.StyleShowListResiFormDTO; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; @@ -93,6 +94,7 @@ public interface IcPartymemberStyleService extends BaseService} * @Author zhaoqifeng @@ -102,6 +104,7 @@ public interface IcPartymemberStyleService extends BaseService showList(StyleShowListFormDTO formDTO); + + /** + * 党员风采列表查询 + * + * @param formDto + * @return com.epmet.commons.tools.page.PageData + * @author work@yujt.net.cn + * @date 2022/5/9/0009 14:22 + */ + PageData showListByAgency(StyleShowListResiFormDTO formDto); } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartymemberStyleServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartymemberStyleServiceImpl.java index 3c5871637c..b488b7e15f 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartymemberStyleServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartymemberStyleServiceImpl.java @@ -60,6 +60,7 @@ import com.epmet.modules.partymember.service.IcPartymemberStyleService; import com.epmet.resi.partymember.dto.partymember.IcPartymemberStyleDTO; import com.epmet.resi.partymember.dto.partymember.form.PartyMemberStyleFormDTO; import com.epmet.resi.partymember.dto.partymember.form.StyleShowListFormDTO; +import com.epmet.resi.partymember.dto.partymember.form.StyleShowListResiFormDTO; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; @@ -72,10 +73,8 @@ import org.apache.http.entity.ContentType; import org.apache.poi.ss.usermodel.Workbook; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; -import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.commons.CommonsMultipartFile; import javax.annotation.Resource; @@ -131,7 +130,7 @@ public class IcPartymemberStyleServiceImpl extends BaseServiceImpl { if (StringUtils.isNotBlank(item.getGridId())) { GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(item.getGridId()); - if(gridInfo == null) { + if (gridInfo == null) { log.warn("未找到网格信息:{}", item.getGridId()); return; } @@ -145,8 +144,8 @@ public class IcPartymemberStyleServiceImpl extends BaseServiceImpl getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); + 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); @@ -168,7 +167,7 @@ public class IcPartymemberStyleServiceImpl extends BaseServiceImpl list = baseDao.selectList(wrapper); PageInfo pageInfo = new PageInfo<>(list); @@ -289,13 +288,13 @@ public class IcPartymemberStyleServiceImpl extends BaseServiceImpl> gridOptionResult = govOrgOpenFeignClient.getGridIListByAgency(staffInfoCache.getAgencyId()); + Result> gridOptionResult = govOrgOpenFeignClient.getGridIListByAgency(staffInfoCache.getAgencyId()); if (!gridOptionResult.success()) { throw new EpmetException(gridOptionResult.getCode(), gridOptionResult.getMsg()); } Map gridMap = gridOptionResult.getData().stream().collect(Collectors.toMap(CustomerGridDTO::getGridName, CustomerGridDTO::getId)); //获取党员风采所有分类:key:分类名称； - Map categoryDictMap=icPartymemberStyleCategoryDictService.getCategoryDictMap(tokenDto.getCustomerId()); + Map categoryDictMap = icPartymemberStyleCategoryDictService.getCategoryDictMap(tokenDto.getCustomerId()); //1.数据校验 只允许导入当前组织下的网格的数据 //网格名称不一样的数据舍弃或者分类名称不存在也舍弃 Iterator iterator = result.iterator(); @@ -346,7 +345,7 @@ public class IcPartymemberStyleServiceImpl extends BaseServiceImpl showList(StyleShowListFormDTO formDTO) { - CustomerStaffInfoCacheResult staff = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getUserId()); + String customerId = formDTO.getCustomerId(); + CustomerStaffInfoCacheResult staff = CustomerStaffRedis.getStaffInfo(customerId, formDTO.getUserId()); if (null == staff || StringUtils.isBlank(staff.getAgencyId())) { throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "查询当前工作人员缓存信息失败", "查询用户信息异常"); } - PageInfo pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.selectShowList(staff.getAgencyId(), formDTO.getCustomerId())); + return showListByAgency(formDTO.getPageNo(), formDTO.getPageSize(), staff.getAgencyId(), customerId); + } + + @Override + public PageData showListByAgency(StyleShowListResiFormDTO formDto) { + return showListByAgency(formDto.getPageNo(), formDto.getPageSize(), formDto.getAgencyId(), formDto.getCustomerId()); + } + + private PageData showListByAgency(int pageNo, int pageSize, String agencyId, String customerId) { + PageInfo pageInfo = PageHelper.startPage(pageNo, pageSize).doSelectPageInfo(() -> baseDao.selectShowList(agencyId, customerId)); if (CollectionUtils.isNotEmpty(pageInfo.getList())) { //赋值网格名称 for (IcPartymemberStyleDTO dto : pageInfo.getList()) { @@ -468,5 +478,4 @@ public class IcPartymemberStyleServiceImpl extends BaseServiceImpl(pageInfo.getList(), pageInfo.getTotal()); } - } From 216fb26c863ee64955c7489698f8a2f750d3b78c Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Mon, 9 May 2022 16:15:54 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E5=8F=98=E6=9B=B4=E3=80=82"=E5=B1=85?= =?UTF-8?q?=E6=B0=91=E5=9F=BA=E6=9C=AC=E4=BF=A1=E6=81=AF=E5=BD=95=E5=85=A5?= =?UTF-8?q?=E8=A1=A8"sheet=E4=B8=AD=E7=9A=84=E5=A4=87=E6=B3=A8=EF=BC=8C?= =?UTF-8?q?=E6=8C=AA=E5=8A=A8=E5=88=B0=E4=BA=86"=E5=9F=BA=E7=A1=80?= =?UTF-8?q?=E4=BF=A1=E6=81=AF"=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/ic_resi_import_template.xls | Bin 73728 -> 73728 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template.xls b/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template.xls index 99f2034351177d40c553dab992e44674f7f7da71..0cd7fc22f13ba97f87c79ce9f6b8e4d39f1299e2 100644 GIT binary patch delta 6479 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