From 7682f410aed62761fd7331ed472750946f249af7 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 22 Apr 2022 10:30:43 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E4=BA=BA=E6=88=BF=E6=A6=82=E8=A7=88=5F?= =?UTF-8?q?=E6=88=BF=E5=B1=8B=E9=A5=BC=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/result/HouseChartResultDTO.java | 22 ++++++---- .../main/java/com/epmet/dao/IcHouseDao.java | 10 +++-- .../epmet/service/impl/HouseServiceImpl.java | 40 ++++++++++++++++++- .../src/main/resources/mapper/IcHouseDao.xml | 34 ++++++++++++++++ 4 files changed, 94 insertions(+), 12 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseChartResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseChartResultDTO.java index b412f00b07..676fe730f3 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseChartResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseChartResultDTO.java @@ -1,5 +1,7 @@ package com.epmet.dto.result; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; import java.io.Serializable; @@ -21,30 +23,36 @@ public class HouseChartResultDTO implements Serializable { /** * 房屋总数 */ - private Integer houseTotal; + private Integer houseTotal = 0; /** * 房屋自住总数 */ - private Integer zzHouseTotal; + private Integer zzHouseTotal = 0; /** * 房屋自住总数占比（保留两位小数，带百分号的） */ - private String zzHouseRatio; + private String zzHouseRatio = "0%"; /** * 房屋常住总数 */ - private Integer czHouseTotal; + private Integer czHouseTotal = 0; /** * 房屋常住总数占比（保留两位小数，带百分号的） */ - private String czHouseRatio; + private String czHouseRatio = "0%"; /** * 房屋闲置总数 */ - private Integer xzHouseTotal; + private Integer xzHouseTotal = 0; /** * 房屋闲置总数占比（保留两位小数，带百分号的） */ - private String xzHouseRatio; + private String xzHouseRatio = "0%"; + + @JsonIgnore + private Integer num; + //1：出租 0：自住 2：闲置 + @JsonIgnore + private Integer rentFlag; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java index 3b7428dd8b..50ecb715b2 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java @@ -3,10 +3,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.ImportGeneralDTO; import com.epmet.dto.form.IcHouseListFormDTO; -import com.epmet.dto.result.HouseInfoDTO; -import com.epmet.dto.result.HousesNameResultDTO; -import com.epmet.dto.result.IcHouseListResultDTO; -import com.epmet.dto.result.NeighborHoodManageDelResultDTO; +import com.epmet.dto.result.*; import com.epmet.entity.IcHouseEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -83,4 +80,9 @@ public interface IcHouseDao extends BaseDao { */ List getHousesNameByIdCards(@Param("idCards") List idCards); + /** + * @Author sun + * @Description 【人房】房屋总数饼图 + **/ + List houseChart(@Param("orgId") String orgId, @Param("orgType") String orgType); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java index 2d54a6d4c7..6072a5f15c 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java @@ -6,6 +6,7 @@ import com.alibaba.excel.ExcelReader; import com.alibaba.excel.read.metadata.ReadSheet; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; +import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.enums.OrgTypeEnum; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; @@ -13,6 +14,7 @@ import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.feign.ResultDataResolver; import com.epmet.commons.tools.page.PageData; 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.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; @@ -50,8 +52,10 @@ import org.springframework.util.CollectionUtils; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import java.io.InputStream; +import java.text.NumberFormat; import java.util.*; import java.util.concurrent.ExecutorService; +import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; @Slf4j @@ -348,7 +352,41 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { **/ @Override public HouseChartResultDTO houseChart(HouseChartFormDTO formDTO) { - return null; + HouseChartResultDTO resultDTO = new HouseChartResultDTO(); + //计算百分比使用，保留小数点后两位 + NumberFormat numberFormat = NumberFormat.getInstance(); + numberFormat.setMaximumFractionDigits(NumConstant.TWO); + //1.判断入参是否有值，没有值则赋值当前工作人员缓存中所属组织信息 + if (StringUtils.isEmpty(formDTO.getOrgId())) { + //2.获取工作人员缓存信息 + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getUserId()); + if (null == staffInfo) { + throw new EpmetException(String.format("查询工作人员%s缓存信息失败...", formDTO.getUserId())); + } + formDTO.setOrgId(staffInfo.getAgencyId()); + formDTO.setOrgType("agency"); + } + //2.根据入参值查询对应的房屋统计数据 + List list = icHouseDao.houseChart(formDTO.getOrgId(), formDTO.getOrgType()); + //3.汇总数据 + AtomicInteger houseTotal = new AtomicInteger(); + list.forEach(l -> { + houseTotal.addAndGet(l.getNum()); + if (l.getRentFlag() == 0) { + resultDTO.setZzHouseTotal(l.getNum()); + } else if (l.getRentFlag() == 0) { + resultDTO.setCzHouseTotal(l.getNum()); + } else { + resultDTO.setXzHouseTotal(l.getNum()); + } + }); + resultDTO.setHouseTotal(houseTotal.get()); + resultDTO.setZzHouseRatio((resultDTO.getHouseTotal() == 0 || resultDTO.getZzHouseTotal() > resultDTO.getHouseTotal()) ? "0%" : numberFormat.format(((float) resultDTO.getZzHouseTotal() / (float) resultDTO.getHouseTotal()) * 100) + "%"); + resultDTO.setCzHouseRatio((resultDTO.getHouseTotal() == 0 || resultDTO.getCzHouseTotal() > resultDTO.getHouseTotal()) ? "0%" : numberFormat.format(((float) resultDTO.getCzHouseTotal() / (float) resultDTO.getHouseTotal()) * 100) + "%"); + resultDTO.setXzHouseRatio((resultDTO.getHouseTotal() == 0 || resultDTO.getXzHouseTotal() > resultDTO.getHouseTotal()) ? "0%" : numberFormat.format(((float) resultDTO.getXzHouseTotal() / (float) resultDTO.getHouseTotal()) * 100) + "%"); + resultDTO.setOrgId(formDTO.getOrgId()); + resultDTO.setOrgType(formDTO.getOrgType()); + return resultDTO; } /** 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 4712160069..818e89ba99 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 @@ -289,4 +289,38 @@ ) GROUP BY h.OWNER_ID_CARD + + + From 906bb577d6ec0535c637a496edcf6bd1f13fcc7f Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 22 Apr 2022 10:31:59 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E9=80=80=E5=BD=B9=E5=86=9B=E4=BA=BAic=5Fve?= =?UTF-8?q?terans=E8=A1=A8=E6=96=B0=E5=A2=9EIS=5FHANDLE=5FJOB=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E5=8A=9E=E7=90=86=E5=85=AC=E7=9B=8A=E6=80=A7=E5=B2=97?= =?UTF-8?q?=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/IcVeteransDTO.java | 5 +++++ .../src/main/java/com/epmet/entity/IcVeteransEntity.java | 5 +++++ .../src/main/java/com/epmet/excel/IcVeteransExcel.java | 6 ++++++ .../resources/db/migration/V0.0.41__add_is_handle_job.sql | 3 +++ 4 files changed, 19 insertions(+) create mode 100644 epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.41__add_is_handle_job.sql diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVeteransDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVeteransDTO.java index 351b60a933..363dd18934 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVeteransDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVeteransDTO.java @@ -89,6 +89,11 @@ public class IcVeteransDTO implements Serializable { */ private String xjyqk; + /** + * 是否办理公益性岗位,0422新增 + */ + private String isHandleJob; + /** * 删除标识 0.未删除 1.已删除 */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVeteransEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVeteransEntity.java index 076d6f33fe..0aa295885b 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVeteransEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVeteransEntity.java @@ -85,6 +85,11 @@ public class IcVeteransEntity extends BaseEpmetEntity { */ private String xjyqk; + /** + * 是否办理公益性岗位,0422新增 + */ + private String isHandleJob; + /** * 预留字段1 */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVeteransExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVeteransExcel.java index 3109a7fa4d..daa0d616bd 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVeteransExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVeteransExcel.java @@ -64,6 +64,12 @@ public class IcVeteransExcel { @Excel(name = "现就业情况") private String xjyqk; + /** + * 是否办理公益性岗位,0422新增 + */ + @Excel(name = "是否办理公益性岗位") + private String isHandleJob; + @Excel(name = "删除标识 0.未删除 1.已删除") private Integer delFlag; diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.41__add_is_handle_job.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.41__add_is_handle_job.sql new file mode 100644 index 0000000000..b1a71547c7 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.41__add_is_handle_job.sql @@ -0,0 +1,3 @@ +-- 退役军人表增加此列 +ALTER TABLE ic_veterans ADD COLUMN IS_HANDLE_JOB CHAR(1) COMMENT '是否办理公益性岗位,0422新增' AFTER XJYQK; +update ic_veterans set ic_veterans.IS_HANDLE_JOB='0' where ic_veterans.IS_HANDLE_JOB is null or ic_veterans.IS_HANDLE_JOB=''; \ No newline at end of file From 7e01bd6a771ebcb12e8d7635b2680fb1ce25ded5 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Fri, 22 Apr 2022 10:55:54 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E4=BA=BA=E5=91=98=E9=A2=84=E8=AD=A6?= =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcStatsResiWarnDao.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcStatsResiWarnDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcStatsResiWarnDao.xml index 1c1355a8a7..24e607f3c7 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcStatsResiWarnDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcStatsResiWarnDao.xml @@ -162,6 +162,7 @@ from ic_resi_user where DEL_FLAG = '0' and CUSTOMER_ID = #{customerId} + AND `STATUS` = '0' and ${columnName} = '1' From 9573d11b2cd89f900aef97b626836dff764c788f Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 22 Apr 2022 11:10:37 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BA=86=E4=B8=80?= =?UTF-8?q?=E4=BA=9B=E6=9F=A5=E8=AF=A2=E7=BB=84=E4=BB=B6=E3=80=82=E4=BF=AE?= =?UTF-8?q?=E6=94=B9ic=5Fform=5Fitem.search=5Fdisplay=3D'1'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/db/migration/V0.0.22__update_search_col.sql | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.22__update_search_col.sql diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.22__update_search_col.sql b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.22__update_search_col.sql new file mode 100644 index 0000000000..396cf2f803 --- /dev/null +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.22__update_search_col.sql @@ -0,0 +1,8 @@ +update ic_form_item set SEARCH_DISPLAY='1',UPDATED_BY='YZM',UPDATED_TIME=NOW() +WHERE DEL_FLAG='0' +AND SEARCH_DISPLAY='0' +AND LABEL IN( +'文化程度','兴趣特长','残疾类别','残疾等级','所患大病','所患慢性病', +'是否参保','救助金额','人户状况','户籍所在地','居住情况','该居民有无赡养人', +'需求类别','参战时间','是否办理公益性岗位','志愿者类别','特殊人群类别' +); From 7ac39714a03751730c46b09f5c5cbc0b2ac025a2 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 22 Apr 2022 12:11:12 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E5=AF=BC=E5=87=BA=E4=BB=A3=E7=A0=81=20=E6=9A=82?= =?UTF-8?q?=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/IcFormItemGroupDTO.java | 33 +------- .../dto/form/IcFormItemGroupLisFormDTO.java | 84 +++++++++++++++++++ .../controller/IcFormItemGroupController.java | 28 +++---- .../entity/IcExportTemplateConfigEntity.java | 10 +-- .../epmet/service/IcFormItemGroupService.java | 17 +--- .../impl/IcFormItemGroupServiceImpl.java | 34 ++------ 6 files changed, 112 insertions(+), 94 deletions(-) create mode 100644 epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcFormItemGroupLisFormDTO.java diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/IcFormItemGroupDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/IcFormItemGroupDTO.java index 5fe8d5de36..e9d4a34b8c 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/IcFormItemGroupDTO.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/IcFormItemGroupDTO.java @@ -20,7 +20,6 @@ package com.epmet.dto; import lombok.Data; import java.io.Serializable; -import java.util.Date; /** @@ -79,34 +78,4 @@ public class IcFormItemGroupDTO implements Serializable { */ private Boolean display; - /** - * 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/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcFormItemGroupLisFormDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcFormItemGroupLisFormDTO.java new file mode 100644 index 0000000000..49624a71d1 --- /dev/null +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcFormItemGroupLisFormDTO.java @@ -0,0 +1,84 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

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

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

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.dto.form; + +import com.epmet.commons.tools.dto.form.PageFormDTO; +import com.epmet.commons.tools.validator.group.QueryGroup; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + + +/** + * 表单项分组查询条件 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2021-10-26 + */ +@Data +public class IcFormItemGroupLisFormDTO extends PageFormDTO { + + private static final long serialVersionUID = 1L; + + /** + * 分组id + */ + private String id; + + /** + * 客户ID + */ + @NotBlank(message = "客户Id不能为空", groups = QueryGroup.class) + private String customerId; + + /** + * 表单ID + */ + private String formId; + + /** + * 表单编码 + */ + @NotBlank(message = "表单编码不能为空", groups = QueryGroup.class) + private String formCode; + + /** + * 对应的子表名称 + */ + private String tableName; + + /** + * 是否支持添加一行，1支持，默认0不支持 + */ + private Boolean supportAdd; + + /** + * 名称 + */ + private String label; + + /** + * 排序 + */ + private Integer sort; + + /** + * 1展示，0不展示，默认1 + */ + private Boolean display; +} diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcFormItemGroupController.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcFormItemGroupController.java index b4d0079637..94fdaecbd9 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcFormItemGroupController.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcFormItemGroupController.java @@ -17,23 +17,20 @@ package com.epmet.controller; -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.commons.tools.validator.group.QueryGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.dto.IcFormItemGroupDTO; -import com.epmet.excel.IcFormItemGroupExcel; +import com.epmet.dto.form.IcFormItemGroupLisFormDTO; import com.epmet.service.IcFormItemGroupService; 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,14 +42,16 @@ import java.util.Map; @RestController @RequestMapping("icformitemgroup") public class IcFormItemGroupController { - + @Autowired private IcFormItemGroupService icFormItemGroupService; - @GetMapping("page") - public Result> page(@RequestParam Map params){ - PageData page = icFormItemGroupService.page(params); - return new Result>().ok(page); + @PostMapping("list") + public Result> page(@RequestHeader String customerId, @RequestBody IcFormItemGroupLisFormDTO param){ + param.setCustomerId(customerId); + ValidatorUtils.validateEntity(param, QueryGroup.class); + List page = icFormItemGroupService.list(param); + return new Result>().ok(page); } @GetMapping("{id}") @@ -85,10 +84,5 @@ public class IcFormItemGroupController { return new Result(); } - @GetMapping("export") - public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { - List list = icFormItemGroupService.list(params); - ExcelUtils.exportExcelToTarget(response, null, list, IcFormItemGroupExcel.class); - } -} \ No newline at end of file +} diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcExportTemplateConfigEntity.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcExportTemplateConfigEntity.java index d2f4dffe32..338164da26 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcExportTemplateConfigEntity.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcExportTemplateConfigEntity.java @@ -28,6 +28,11 @@ public class IcExportTemplateConfigEntity extends BaseEpmetEntity { */ private String tempId; + /** + * 项标签 + */ + private String label; + /** * 父id */ @@ -43,11 +48,6 @@ public class IcExportTemplateConfigEntity extends BaseEpmetEntity { */ private Integer width; - /** - * 项标签 - */ - private String label; - /** * 排序 */ diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcFormItemGroupService.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcFormItemGroupService.java index 79402d6273..ac28a4e8d2 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcFormItemGroupService.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcFormItemGroupService.java @@ -18,12 +18,11 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; -import com.epmet.commons.tools.page.PageData; import com.epmet.dto.IcFormItemGroupDTO; +import com.epmet.dto.form.IcFormItemGroupLisFormDTO; import com.epmet.entity.IcFormItemGroupEntity; import java.util.List; -import java.util.Map; /** * 表单项分组 @@ -33,16 +32,6 @@ import java.util.Map; */ public interface IcFormItemGroupService extends BaseService { - /** - * 默认分页 - * - * @param params - * @return PageData - * @author generator - * @date 2021-10-26 - */ - PageData page(Map params); - /** * 默认查询 * @@ -51,7 +40,7 @@ public interface IcFormItemGroupService extends BaseService list(Map params); + List list(IcFormItemGroupLisFormDTO params); /** * 单条查询 @@ -92,4 +81,4 @@ public interface IcFormItemGroupService extends BaseService page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, IcFormItemGroupDTO.class); - } - - @Override - public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); + public List list(IcFormItemGroupLisFormDTO params) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(IcFormItemGroupEntity::getCustomerId, params.getCustomerId()) + .orderByAsc(IcFormItemGroupEntity::getSort); + List entityList = baseDao.selectList(wrapper); return ConvertUtils.sourceToTarget(entityList, IcFormItemGroupDTO.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 IcFormItemGroupDTO get(String id) { @@ -97,4 +79,4 @@ public class IcFormItemGroupServiceImpl extends BaseServiceImpl Date: Fri, 22 Apr 2022 13:59:51 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E4=BA=BA=E6=88=BF=E6=A6=82=E8=A7=88=5F?= =?UTF-8?q?=E5=B1=85=E6=B0=91=E9=A5=BC=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcHouseDao.xml | 4 +- .../epmet/dto/result/UserChartResultDTO.java | 7 +++ .../controller/IcResiUserController.java | 8 +--- .../java/com/epmet/dao/IcResiUserDao.java | 2 + .../com/epmet/service/IcResiUserService.java | 2 +- .../service/impl/IcResiUserServiceImpl.java | 43 +++++++++++++++---- .../main/resources/mapper/IcResiUserDao.xml | 23 ++++++++++ 7 files changed, 72 insertions(+), 17 deletions(-) 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 818e89ba99..efdce0c1ad 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 @@ -292,7 +292,8 @@ diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserChartResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserChartResultDTO.java index dd8560b16f..aeda2e9605 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserChartResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserChartResultDTO.java @@ -1,5 +1,6 @@ package com.epmet.dto.result; +import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; import java.io.Serializable; @@ -39,4 +40,10 @@ public class UserChartResultDTO implements Serializable { */ private String ldUserRatio; + @JsonIgnore + private Integer num; + //是否是流动人口【是:1 否:0】 + @JsonIgnore + private String isFloating; + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java index f171340392..3daa255a05 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java @@ -61,7 +61,6 @@ import com.epmet.feign.OssFeignClient; import com.epmet.service.IcResiUserImportService; import com.epmet.service.IcResiUserService; import feign.RequestInterceptor; -import jodd.io.FileUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.io.FileUtils; @@ -71,9 +70,6 @@ import org.apache.commons.lang3.StringUtils; import org.apache.poi.poifs.filesystem.OfficeXmlFileException; import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpHeaders; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -900,10 +896,10 @@ public class IcResiUserController implements ResultDataResolver { **/ @NoRepeatSubmit @PostMapping("userchart") - public Result userChart(@LoginUser TokenDto tokenDto, @RequestBody UserChartFormDTO formDTO) { + public Result userChart(@LoginUser TokenDto tokenDto, @RequestBody UserChartFormDTO formDTO) { formDTO.setCustomerId(tokenDto.getCustomerId()); formDTO.setUserId(tokenDto.getUserId()); - return new Result().ok(icResiUserService.userChart(formDTO)); + return new Result().ok(icResiUserService.userChart(formDTO)); } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java index d3fe22ee44..e5c726447b 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java @@ -288,4 +288,6 @@ public interface IcResiUserDao extends BaseDao { List vaccineList(EpidemicPreventionFormDTO formDTO); IcResiUserEntity selectResiNoDelFlag(@Param("icResiUserId") String icResiUserId); + + List userChart(@Param("orgId") String orgId, @Param("orgType") String orgType); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java index 1e8e704811..7f438c4401 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java @@ -249,5 +249,5 @@ public interface IcResiUserService extends BaseService { * @Author sun * @Description 【人房】居民总数饼图 **/ - HouseChartResultDTO userChart(UserChartFormDTO formDTO); + UserChartResultDTO userChart(UserChartFormDTO formDTO); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java index 51dcd903e9..65b5d29498 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java @@ -67,22 +67,17 @@ import com.google.common.cache.CacheBuilder; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; -import org.apache.http.HttpEntity; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClients; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; -import java.io.IOException; import java.math.BigDecimal; import java.math.RoundingMode; import java.sql.Date; import java.sql.Timestamp; +import java.text.NumberFormat; import java.util.*; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.TimeUnit; @@ -1606,8 +1601,40 @@ public class IcResiUserServiceImpl extends BaseServiceImpl list = baseDao.userChart(formDTO.getOrgId(), formDTO.getOrgType()); + //3.汇总数据 + AtomicInteger userTotal = new AtomicInteger(); + list.forEach(l -> { + userTotal.addAndGet(l.getNum()); + if ("0".equals(l.getIsFloating())) { + resultDTO.setCzUserTotal(l.getNum()); + } else { + resultDTO.setLdUserTotal(l.getNum()); + } + }); + resultDTO.setUserTotal(userTotal.get()); + resultDTO.setCzUserRatio((resultDTO.getUserTotal() == 0 || resultDTO.getCzUserTotal() > resultDTO.getUserTotal()) ? "0%" : numberFormat.format(((float) resultDTO.getCzUserTotal() / (float) resultDTO.getUserTotal()) * 100) + "%"); + resultDTO.setLdUserRatio((resultDTO.getUserTotal() == 0 || resultDTO.getLdUserTotal() > resultDTO.getUserTotal()) ? "0%" : numberFormat.format(((float) resultDTO.getLdUserTotal() / (float) resultDTO.getUserTotal()) * 100) + "%"); + resultDTO.setOrgId(formDTO.getOrgId()); + resultDTO.setOrgType(formDTO.getOrgType()); + + return resultDTO; } } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml index df62d9b6dc..88cf85dc61 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml @@ -820,4 +820,27 @@ + + + From 4cb9f71725d9da00dcbc37fc02be99d698e29a0b Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 22 Apr 2022 14:41:11 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E8=B0=83=E6=95=B4ic=5Fform=5Fitem=5Fgroup.?= =?UTF-8?q?sort?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../migration/V0.0.23__update_group_sort.sql | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.23__update_group_sort.sql diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.23__update_group_sort.sql b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.23__update_group_sort.sql new file mode 100644 index 0000000000..0d6a04eb2d --- /dev/null +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.23__update_group_sort.sql @@ -0,0 +1,18 @@ +update ic_form_item_group set SORT='0' where DEL_FLAG='0' and LABEL='基础信息'; +update ic_form_item_group set SORT='1' where DEL_FLAG='0' and LABEL='教育信息'; +update ic_form_item_group set SORT='2' where DEL_FLAG='0' and LABEL='兴趣爱好'; +update ic_form_item_group set SORT='3' where DEL_FLAG='0' and LABEL='宗教信仰'; +update ic_form_item_group set SORT='4' where DEL_FLAG='0' and LABEL='健康信息'; +update ic_form_item_group set SORT='5' where DEL_FLAG='0' and LABEL='工作信息'; +update ic_form_item_group set SORT='6' where DEL_FLAG='0' and LABEL='经济状况'; +update ic_form_item_group set SORT='7' where DEL_FLAG='0' and LABEL='居住信息'; +update ic_form_item_group set SORT='8' where DEL_FLAG='0' and LABEL='家庭信息'; +update ic_form_item_group set SORT='9' where DEL_FLAG='0' and LABEL='党员信息'; +update ic_form_item_group set SORT='10' where DEL_FLAG='0' and LABEL='保障房信息'; +update ic_form_item_group set SORT='11' where DEL_FLAG='0' and LABEL='失业信息'; +update ic_form_item_group set SORT='12' where DEL_FLAG='0' and LABEL='退役军人信息'; +update ic_form_item_group set SORT='13' where DEL_FLAG='0' and LABEL='志愿者信息'; +update ic_form_item_group set SORT='14' where DEL_FLAG='0' and LABEL='特殊人群信息'; +update ic_form_item_group set SORT='15' where DEL_FLAG='0' and LABEL='统战人员'; +update ic_form_item_group set SORT='16' where DEL_FLAG='0' and LABEL='老年人信息'; +update ic_form_item_group set SORT='17' where DEL_FLAG='0' and LABEL='居民需求信息'; \ No newline at end of file From 5dfe33e9f7d689a43d90620690efad4122d3f735 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 22 Apr 2022 15:23:09 +0800 Subject: [PATCH 8/8] /icform/conditionlist-bygroup --- .../com/epmet/dto/result/ConditionResDTO.java | 23 +++++ .../epmet/controller/IcFormController.java | 13 +++ .../controller/IcFormItemController.java | 10 +++ .../java/com/epmet/dao/IcFormItemDao.java | 9 ++ .../com/epmet/dao/IcFormQueryBuilderDao.java | 8 +- .../entity/IcFormQueryBuilderEntity.java | 15 ++++ .../com/epmet/service/IcFormItemService.java | 8 ++ .../service/impl/IcFormItemServiceImpl.java | 86 ++++++++++++++++++- .../main/resources/mapper/IcFormItemDao.xml | 59 +++++++++++++ .../mapper/IcFormQueryBuilderDao.xml | 21 +++++ 10 files changed, 250 insertions(+), 2 deletions(-) create mode 100644 epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/ConditionResDTO.java diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/ConditionResDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/ConditionResDTO.java new file mode 100644 index 0000000000..db50d133ba --- /dev/null +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/ConditionResDTO.java @@ -0,0 +1,23 @@ +package com.epmet.dto.result; + + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +public class ConditionResDTO implements Serializable { + /** + * 分组ID,'默认，NONE' + */ + private String itemGroupId; + + /** + * 分组名称 + * 基础信息、教育信息.... + */ + private String groupName; + + private List queryItemList; +} diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcFormController.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcFormController.java index b247addf24..ef443587d2 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcFormController.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcFormController.java @@ -102,6 +102,19 @@ public class IcFormController { return new Result>().ok(icFormItemService.queryConditionList(formDto)); } + /** + * 查询条件， 分组显示 + * @param tokenDto + * @param formDto + * @return + */ + @PostMapping("conditionlist-bygroup") + public Result> queryConditionListByGroup(@LoginUser TokenDto tokenDto, @RequestBody CustomerFormQueryDTO formDto){ + formDto.setCustomerId(tokenDto.getCustomerId()); + ValidatorUtils.validateEntity(formDto,CustomerFormQueryDTO.AddUserInternalGroup.class); + return new Result>().ok(icFormItemService.queryConditionListByGroup(formDto)); + } + /** * 居民信息列表_表头 * @param tokenDto diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcFormItemController.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcFormItemController.java index 8eb1a4e549..49c54f3d21 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcFormItemController.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcFormItemController.java @@ -78,4 +78,14 @@ public class IcFormItemController { icFormItemService.editItemType(formDTO); return new Result(); } + + /** + * 初始化默认的查询组件：ic_form_item.SEARCH_DISPLAY='1'的 + * @return + */ + @PostMapping("init-query-builder") + public Result initQueryBuilder(@RequestParam("customerId")String customerId){ + icFormItemService.initQueryBuilder(customerId); + return new Result(); + } } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcFormItemDao.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcFormItemDao.java index d20a49202a..89054811ec 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcFormItemDao.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcFormItemDao.java @@ -37,6 +37,15 @@ public interface IcFormItemDao extends BaseDao { List selectConditionList(@Param("customerId") String customerId, @Param("formCode") String formCode); + List selectConditionListByGroupId(String groupId); + /** + * 查询组件列表 + * @param customerId + * @param formCode + * @return + */ + List selectConditionListGroup(@Param("customerId") String customerId, @Param("formCode") String formCode, @Param("itemIdList") List itemIdList); + List queryTableHeaderList(@Param("customerId") String customerId, @Param("formCode") String formCode); /** diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcFormQueryBuilderDao.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcFormQueryBuilderDao.java index a142d8d637..67a3f319cb 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcFormQueryBuilderDao.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcFormQueryBuilderDao.java @@ -20,6 +20,9 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.entity.IcFormQueryBuilderEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 表单查询项 @@ -29,5 +32,8 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface IcFormQueryBuilderDao extends BaseDao { - + + IcFormQueryBuilderEntity selectDefaultQueryItem(@Param("itemId") String itemId,@Param("itemType") String itemType, @Param("queryType")String queryType); + + List selectItemId(@Param("customerId") String customerId, @Param("formCode") String formCode); } \ No newline at end of file diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcFormQueryBuilderEntity.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcFormQueryBuilderEntity.java index 4713b01dd3..9534fc12d2 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcFormQueryBuilderEntity.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcFormQueryBuilderEntity.java @@ -45,6 +45,11 @@ public class IcFormQueryBuilderEntity extends BaseEpmetEntity { */ private String formItemId; + /** + * 项标签 + */ + private String label; + /** * ic_form.form_code，举例：resi_base_info * @see com.epmet.commons.tools.enums.IcFormCodeEnum @@ -52,11 +57,21 @@ public class IcFormQueryBuilderEntity extends BaseEpmetEntity { */ private String formCode; + /** + * 组件类型 + */ + private String itemType; + /** * 查询类型: equal, like,daterange.... */ private String queryType; + /** + * 值转换类型 + */ + private String funType; + /** * 排序 */ diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcFormItemService.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcFormItemService.java index 0912092f94..3caf6a64c0 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcFormItemService.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcFormItemService.java @@ -43,6 +43,8 @@ public interface IcFormItemService extends BaseService { */ List queryConditionList(CustomerFormQueryDTO formDto); + List queryConditionListByGroup(CustomerFormQueryDTO formDto); + List queryTableHeaderList(CustomerFormQueryDTO formDto); List queryConditions(String customerId,String formCode); @@ -75,4 +77,10 @@ public interface IcFormItemService extends BaseService { * @return */ void editItemType(EditIFormItemFormDTO formDTO); + + /** + * 初始化默认的查询组件：ic_form_item.SEARCH_DISPLAY='1'的 + * @param customerId + */ + void initQueryBuilder(String customerId); } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormItemServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormItemServiceImpl.java index 15f0f70dfb..0fee230ef5 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormItemServiceImpl.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormItemServiceImpl.java @@ -20,14 +20,17 @@ package com.epmet.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; import com.epmet.dao.IcFormItemDao; import com.epmet.dao.IcFormItemOptionsDao; +import com.epmet.dao.IcFormQueryBuilderDao; import com.epmet.dto.form.CustomerFormQueryDTO; import com.epmet.dto.form.EditIFormItemFormDTO; import com.epmet.dto.result.*; import com.epmet.entity.IcFormItemEntity; import com.epmet.entity.IcFormItemOptionsEntity; +import com.epmet.entity.IcFormQueryBuilderEntity; import com.epmet.service.IcFormItemService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -51,7 +54,8 @@ import java.util.stream.Collectors; public class IcFormItemServiceImpl extends BaseServiceImpl implements IcFormItemService { @Autowired private IcFormItemOptionsDao icFormItemOptionsDao; - + @Autowired + private IcFormQueryBuilderDao icFormQueryBuilderDao; /** * 获取居民信息的查询条件，组件列表 * @@ -66,6 +70,16 @@ public class IcFormItemServiceImpl extends BaseServiceImpl queryConditionListByGroup(CustomerFormQueryDTO formDto) { + List itemIdList=icFormQueryBuilderDao.selectItemId(formDto.getCustomerId(),formDto.getFormCode()); + if(CollectionUtils.isEmpty(itemIdList)){ + return new ArrayList<>(); + } + List list=baseDao.selectConditionListGroup(formDto.getCustomerId(),formDto.getFormCode(),itemIdList); + return list; + } + /** * 居民信息列表_表头 * @param formDto @@ -206,6 +220,76 @@ public class IcFormItemServiceImpl extends BaseServiceImpl queryWrapper = new QueryWrapper().lambda() + .eq(StringUtils.isNotBlank(customerId), IcFormItemEntity::getCustomerId, customerId) + .isNotNull(IcFormItemEntity::getColumnName) + .eq(IcFormItemEntity::getSearchDisplay, NumConstant.ONE); + List itemList = baseDao.selectList(queryWrapper); + if (CollectionUtils.isEmpty(itemList)) { + return; + } + for (IcFormItemEntity item : itemList) { + IcFormQueryBuilderEntity builderEntity = new IcFormQueryBuilderEntity(); + builderEntity.setCustomerId(item.getCustomerId()); + builderEntity.setFormItemId(item.getId()); + builderEntity.setLabel(item.getLabel()); + builderEntity.setFormCode(item.getFormCode()); + builderEntity.setItemType(item.getItemType()); + builderEntity.setQueryType(queryType(item.getItemType())); + builderEntity.setFunType(StrConstant.EPMETY_STR); + builderEntity.setSort(item.getSort()); + builderEntity.setCreatedBy("init"); + builderEntity.setUpdatedBy("init"); + //item默认的查询组件已经有了，就不插入了 + IcFormQueryBuilderEntity entity = icFormQueryBuilderDao.selectDefaultQueryItem(item.getId(), item.getItemType(), builderEntity.getQueryType()); + if (null == entity) { + icFormQueryBuilderDao.insert(builderEntity); + } + } + } + + + private String queryType(String itemType) { + String queryType; + switch (itemType) { + case "select": + queryType = "equal"; + break; + case "input": + queryType = "like"; + break; + case "datepicker": + queryType = "daterange"; + break; + case "textarea": + queryType = "like"; + break; + case "radio": + queryType = "equal"; + break; + //多选的，查询时应该是 and (columnname='' or columnname='') + case "checkbox": + queryType = "list_equal"; + break; + case "daterange": + queryType = "daterange"; + break; + case "cascader": + queryType = "equal"; + break; + default: + queryType = "like"; + } + return queryType; + } } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml index 4c3fc899c4..b52940c589 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml @@ -59,6 +59,37 @@ ORDER BY b.SORT asc + @@ -161,4 +192,32 @@ AND a.customer_id = #{customerId} + + + + + + + + diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormQueryBuilderDao.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormQueryBuilderDao.xml index 62281279fa..6ec0f6dae9 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormQueryBuilderDao.xml +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormQueryBuilderDao.xml @@ -18,5 +18,26 @@ + + \ No newline at end of file