Browse Source

Merge remote-tracking branch 'remotes/origin/dev_qr_code' into develop

dev
jianjun 3 years ago
parent
commit
0ad43952f3
  1. 4
      epmet-commons/epmet-commons-tools/pom.xml
  2. 30
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/BarcodeUtils.java
  3. 20
      epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CommunityListResultDTO.java
  4. 22
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java
  5. 10
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java
  6. 25
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/AgencyService.java
  7. 16
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java
  8. 12
      epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
  9. 16
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CollectListFormDTO.java
  10. 9
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiCollectMemFormDTO.java
  11. 48
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListExcelResultDTO.java
  12. 48
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListMemberExcelResultDTO.java
  13. 16
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListResultDTO.java
  14. 40
      epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiCollectController.java
  15. 16
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java
  16. 42
      epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.26__caiji_resi.sql
  17. 9
      epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml

4
epmet-commons/epmet-commons-tools/pom.xml

@ -169,13 +169,13 @@
<dependency>
<groupId>com.google.zxing</groupId>
<artifactId>core</artifactId>
<version>3.3.2</version>
<version>3.4.1</version>
</dependency>
<!-- https://mvnrepository.com/artifact/com.google.zxing/javase -->
<dependency>
<groupId>com.google.zxing</groupId>
<artifactId>javase</artifactId>
<version>3.3.2</version>
<version>3.4.1</version>
</dependency>
</dependencies>

30
epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/BarcodeUtils.java

@ -1,13 +1,5 @@
package com.epmet.commons.tools.utils;
/**
* desc:
*
* @author: LiuJanJun
* @date: 2022/3/18 11:57 上午
* @version: 1.0
*/
import com.google.zxing.BarcodeFormat;
import com.google.zxing.EncodeHintType;
@ -28,7 +20,6 @@ import java.io.IOException;
import java.util.HashMap;
/**
* Author 程鹏
* Date 2021/08/27 16:01
* Description:二维码生成工具类
*/
@ -95,7 +86,7 @@ public class BarcodeUtils {
//x开始的位置:(图片宽度-字体大小*字的个数)/2
int startX = (WIDTH - (FONTSIZE * pressText.length())) / 2;
//y开始的位置:图片高度-(图片高度-图片宽度)/2
int startY = HEIGHT - (HEIGHT - WIDTH) / 2;
int startY = HEIGHT - (HEIGHT - WIDTH) / 2 + FONTSIZE;
int imageW = outImage.getWidth();
int imageH = outImage.getHeight();
@ -169,9 +160,24 @@ public class BarcodeUtils {
} else {
return new String(btf, 0, len - 1, "GBK");
}
}
/*public static void main(String[] args) {
try {
BufferedImage image = BarcodeUtils.drawQRImage("小崽子社区中国国歌过过过过过所多对方水电费是的发生的", "https://epmet-cloud.elinkservice.cn/epmet-oper-gov/#/caiji/b058eb82d65d922fec9dc84f0348fc6a?name=%E5%B0%8F%E5%AF%A8%E5%AD%90%E7%A4%BE%E5%8C%BA&customerId=3fdd0380deff5b30f45376cdf995d1c1&type=community&userId=72d331139a5012b6bba18b40029a2755&123123123111");
//BufferedImage image = BarcodeUtils.drawQRImage("小崽子社区", "erId=72d331139a5012b6bba18b40029a2755&123123123111");
//BufferedImage image2 = BarcodeUtils.getQRCode("小崽子社区", "https://epmet-cloud.elinkservice.cn/epmet-oper-gov/#/caiji/b058eb82d65d922fec9dc84f0348fc6a?name=%E5%B0%8F%E5%AF%A8%E5%AD%90%E7%A4%BE%E5%8C%BA&customerId=3fdd0380deff5b30f45376cdf995d1c1&type=community&userId=72d331139a5012b6bba18b40029a2755&123123123111");
//BufferedImage 转 InputStream
ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
ImageOutputStream imageOutput = ImageIO.createImageOutputStream(byteArrayOutputStream);
ImageIO.write(image, "png", imageOutput);
InputStream inputStream = new ByteArrayInputStream(byteArrayOutputStream.toByteArray());
String s = "/Users/liujianjun/Downloads/t.png";
File file= new File(s);
FileUtils.copyInputStreamToFile(inputStream, file);
} catch (Exception e) {
e.printStackTrace();
}
}*/
}

20
epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CommunityListResultDTO.java

@ -0,0 +1,20 @@
package com.epmet.dto.result;
import lombok.Data;
import java.io.Serializable;
/**
* @Author zxc
* @DateTime 2022/3/21 15:11
* @DESC
*/
@Data
public class CommunityListResultDTO implements Serializable {
private static final long serialVersionUID = 4336149113821131764L;
private String orgId;
private String orgName;
}

22
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java

@ -17,7 +17,6 @@
package com.epmet.controller;
import com.alibaba.fastjson.JSONObject;
import com.epmet.commons.rocketmq.messages.OrgOrStaffMQMsg;
import com.epmet.commons.tools.annotation.LoginUser;
import com.epmet.commons.tools.annotation.RequirePermission;
@ -43,12 +42,7 @@ import com.epmet.send.SendMqMsgUtil;
import com.epmet.service.AgencyService;
import com.epmet.service.CustomerAgencyService;
import com.epmet.service.IcNeighborHoodService;
import com.google.zxing.BarcodeFormat;
import com.google.zxing.EncodeHintType;
import com.google.zxing.MultiFormatWriter;
import com.google.zxing.WriterException;
import com.google.zxing.client.j2se.MatrixToImageWriter;
import com.google.zxing.common.BitMatrix;
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@ -60,8 +54,6 @@ import javax.servlet.http.HttpServletResponse;
import java.awt.image.BufferedImage;
import java.io.*;
import java.net.URLEncoder;
import java.nio.file.FileSystems;
import java.nio.file.Path;
import java.time.LocalDateTime;
import java.time.ZoneOffset;
import java.util.HashMap;
@ -418,7 +410,7 @@ public class AgencyController {
String url = EnvEnum.getCurrentEnv().getUrl().replace("api/", StrConstant.EPMETY_STR)
.concat("epmet-oper-gov/#/caiji/")
.concat(id).concat("?")
.concat("name=").concat(name).concat(StrConstant.AND_MARK)
.concat("name=").concat(URLEncoder.encode(name,StrConstant.UTF_8)).concat(StrConstant.AND_MARK)
.concat("customerId=").concat(tokenDto.getCustomerId()).concat(StrConstant.AND_MARK)
.concat("type=").concat(type).concat(StrConstant.AND_MARK)
.concat("userId=").concat(tokenDto.getUserId())
@ -450,4 +442,14 @@ public class AgencyController {
}
}
/**
* Desc: 查询工作人员所属组织下的所有社区
* @param tokenDto
* @author zxc
* @date 2022/3/21 15:13
*/
@PostMapping("community-list")
public Result<List<CommunityListResultDTO>> getCommunityList(@LoginUser TokenDto tokenDto){
return new Result<List<CommunityListResultDTO>>().ok(agencyService.getCommunityList(tokenDto));
}
}

10
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java

@ -306,5 +306,15 @@ public interface CustomerAgencyDao extends BaseDao<CustomerAgencyEntity> {
OrgMobileResultDTO getAgencyMobile(@Param("gridId") String gridId);
int updateSubAgencyAreaCodeById(@Param("customerId")String customerId, @Param("agencyId")String agencyId, @Param("operateUserId") String operateUserId);
/**
* Desc: 查询组织下的社区
* @param customerId
* @param agencyId
* @author zxc
* @date 2022/3/21 15:23
*/
List<CommunityListResultDTO> getCommunityList(@Param("customerId")String customerId, @Param("agencyId")String agencyId);
}

25
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/AgencyService.java

@ -1,20 +1,3 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.epmet.service;
import com.epmet.commons.tools.security.dto.TokenDto;
@ -156,4 +139,12 @@ public interface AgencyService {
*/
List<SonOrgResultDTO> getSonAgencyId(String orgId,String type);
/**
* Desc: 查询工作人员所属组织下的所有社区
* @param tokenDto
* @author zxc
* @date 2022/3/21 15:13
*/
List<CommunityListResultDTO> getCommunityList(TokenDto tokenDto);
}

16
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java

@ -798,6 +798,22 @@ public class AgencyServiceImpl implements AgencyService {
return new ArrayList<>();
}
/**
* Desc: 查询工作人员所属组织下的所有社区
* @param tokenDto
* @author zxc
* @date 2022/3/21 15:13
*/
@Override
public List<CommunityListResultDTO> getCommunityList(TokenDto tokenDto) {
CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId());
if (null == staffInfo){
throw new EpmetException("未查询到工作人员信息"+staffInfo.getStaffId());
}
String agencyId = staffInfo.getAgencyId();
return customerAgencyDao.getCommunityList(tokenDto.getCustomerId(), agencyId);
}
private CustomerAgencyEntity constructInsertEntity(AddAgencyV2FormDTO formDTO, CustomerAgencyDTO parent) {
CustomerAgencyEntity insertEntity = ConvertUtils.sourceToTarget(formDTO, CustomerAgencyEntity.class);
insertEntity.setOrganizationName(formDTO.getAgencyName());

12
epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml

@ -733,6 +733,18 @@
AND PID = #{orgId}
</select>
<!-- 查询组织下的社区 -->
<select id="getCommunityList" resultType="com.epmet.dto.result.CommunityListResultDTO">
SELECT
ID AS orgId,
ORGANIZATION_NAME AS orgName
FROM customer_agency
WHERE DEL_FLAG = '0'
AND `LEVEL` = 'community'
AND CUSTOMER_ID = #{customerId}
AND CONCAT(PIDS,':',ID) LIKE CONCAT('%',#{agencyId},'%')
</select>
<update id="updateSubAgencyAreaCodeById" parameterType="map">
UPDATE customer_agency
SET AREA_CODE = '',

16
epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CollectListFormDTO.java

@ -1,32 +1,22 @@
package com.epmet.dto.form;
import com.epmet.commons.tools.dto.form.PageFormDTO;
import lombok.Data;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
/**
* @Author zxc
* @DateTime 2022/3/18 19:00
* @DESC
*/
@Data
public class CollectListFormDTO implements Serializable {
public class CollectListFormDTO extends PageFormDTO {
private static final long serialVersionUID = 2106773724057183577L;
public interface CollectListForm{}
@NotNull(message = "pageNo不能为空", groups = CollectListForm.class)
private Integer pageNo;
@NotNull(message = "pageSize不能为空", groups = CollectListForm.class)
private Integer pageSize;
private String orgId;
private String neighborHoodId;
private String buildingId;
private String houseId;
private String address;
/**

9
epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiCollectMemFormDTO.java

@ -4,6 +4,10 @@ import lombok.Data;
import java.io.Serializable;
/**
* 家庭成员信息
* 前端做校验
*/
@Data
public class IcResiCollectMemFormDTO implements Serializable {
/**
@ -13,25 +17,30 @@ public class IcResiCollectMemFormDTO implements Serializable {
/**
* 居住成员1姓名
*/
// @NotBlank(message = "姓名不能为空", groups = {IcResiCollectFormDTO.InternalShowGroup.class, IcResiCollectFormDTO.ExternalShowGroup.class})
private String name;
/**
* 居住成员1身份证号
*/
// @NotBlank(message = "身份证号不能为空", groups = {IcResiCollectFormDTO.InternalShowGroup.class, IcResiCollectFormDTO.ExternalShowGroup.class})
private String idNum;
/**
* 居住成员1手机号
*/
// @NotBlank(message = "手机号不能为空", groups = {IcResiCollectFormDTO.InternalShowGroup.class, IcResiCollectFormDTO.ExternalShowGroup.class})
private String mobile;
/**
* 居住成员1是否参加几轮全员核算检测数字1-10
*/
// @NotBlank(message = "核算检测情况不能为空", groups = {IcResiCollectFormDTO.InternalShowGroup.class, IcResiCollectFormDTO.ExternalShowGroup.class})
private String heSuanCount;
/**
* 居住成员1新冠疫苗接种情况;1:已全程接种2未全程接种0未接种
*/
// @NotNull(message = "疫苗接种情况不能为空", groups = {IcResiCollectFormDTO.InternalShowGroup.class, IcResiCollectFormDTO.ExternalShowGroup.class})
private Integer ymjz;
}

48
epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListExcelResultDTO.java

@ -0,0 +1,48 @@
package com.epmet.dto.result;
import cn.afterturn.easypoi.excel.annotation.Excel;
import cn.afterturn.easypoi.excel.annotation.ExcelCollection;
import lombok.Data;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
/**
* @Author zxc
* @DateTime 2022/3/18 19:00
* @DESC
*/
@Data
public class CollectListExcelResultDTO implements Serializable {
private static final long serialVersionUID = -5659769436514116680L;
/**
* 户主姓名
*/
@Excel(name = "户主姓名",width = 30, needMerge = true)
private String houseHolderName;
/**
* 居住地址
*/
@Excel(name = "居住地址",width = 40, needMerge = true)
private String address;
/**
* 房屋类型1:自有, 0:租住
*/
@Excel(name = "房屋类型",replace = { "自有_1", "租住_2"}, width = 30, needMerge = true)
private String houseType;
/**
* 居住人数
*/
@Excel(name = "居住成员人数",width = 30, needMerge = true)
private Integer totalResi;
@ExcelCollection(name="家庭成员")
private List<CollectListMemberExcelResultDTO> listP = new ArrayList<>();
}

48
epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListMemberExcelResultDTO.java

@ -0,0 +1,48 @@
package com.epmet.dto.result;
import cn.afterturn.easypoi.excel.annotation.Excel;
import lombok.Data;
import java.io.Serializable;
/**
* desc:
*
* @author: LiuJanJun
* @date: 2022/3/21 5:09 下午
* @version: 1.0
*/
@Data
public class CollectListMemberExcelResultDTO implements Serializable {
private static final long serialVersionUID = -4290962585956172531L;
/**
* 成员名字
*/
@Excel(name = "成员姓名", width = 30)
private String memberName;
/**
* 成员身份证
*/
@Excel(name = "成员身份证号", width = 30)
private String memberIdNum;
/**
* 成员电话
*/
@Excel(name = "成员手机号", width = 30)
private String memberMobile;
/**
* 核酸检测次数
*/
@Excel(name = "参加几轮核酸检测", width = 30)
private String heSuanCount = "0";
/**
* 疫苗是否全程接种1全程接种2未全程接种3为接种
*/
@Excel(name = "疫苗接种情况",replace = { "全程接种_1", "未全程接种_2", "未接种_3" }, width = 30)
private String ymjz;
}

16
epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListResultDTO.java

@ -4,7 +4,6 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.Data;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
/**
@ -42,13 +41,6 @@ public class CollectListResultDTO implements Serializable {
private List<CollectListMemberResultDTO> list;
public CollectListResultDTO() {
this.houseHolderName = "";
this.address = "";
this.houseType = "0";
this.totalResi = 0;
this.list = new ArrayList<>();
}
@Data
public static class CollectListMemberResultDTO{
@ -77,12 +69,6 @@ public class CollectListResultDTO implements Serializable {
*/
private Integer ymjz;
public CollectListMemberResultDTO() {
this.memberName = "";
this.memberIdNum = "";
this.memberMobile = "";
this.heSuanCount = "0";
this.ymjz = 0;
}
}
}

40
epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiCollectController.java

@ -2,12 +2,17 @@ package com.epmet.controller;
import com.epmet.commons.tools.annotation.LoginUser;
import com.epmet.commons.tools.aop.NoRepeatSubmit;
import com.epmet.commons.tools.constant.StrConstant;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.utils.ExcelUtils;
import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.ValidatorUtils;
import com.epmet.dto.form.CollectListFormDTO;
import com.epmet.dto.form.IcResiCollectFormDTO;
import com.epmet.dto.result.CollectListExcelResultDTO;
import com.epmet.dto.result.CollectListMemberExcelResultDTO;
import com.epmet.dto.result.CollectListResultDTO;
import com.epmet.service.IcResiCollectService;
import org.springframework.beans.factory.annotation.Autowired;
@ -16,6 +21,8 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.List;
@ -68,4 +75,37 @@ public class IcResiCollectController {
return new Result<PageData<CollectListResultDTO>>().ok(icResiCollectService.getCollectList(formDTO));
}
/**
* Desc: 查询采集居民信息
* @param formDTO
* @param tokenDto
* @author zxc
* @date 2022/3/18 19:23
*/
@PostMapping("export")
public void export(@RequestBody CollectListFormDTO formDTO, @LoginUser TokenDto tokenDto, HttpServletResponse response) throws Exception {
//ValidatorUtils.validateEntity(formDTO,CollectListFormDTO.CollectListForm.class);
//tokenDto.setUserId("73ae6280e46a6653a5605d51d5462725");
//tokenDto.setCustomerId("45687aa479955f9d06204d415238f7cc");
formDTO.setUserId(tokenDto.getUserId());
formDTO.setCustomerId(tokenDto.getCustomerId());
formDTO.setPage(false);
PageData<CollectListResultDTO> collectList = icResiCollectService.getCollectList(formDTO);
List<CollectListExcelResultDTO> list = ConvertUtils.sourceToTarget(collectList.getList(),CollectListExcelResultDTO.class);
collectList.getList().forEach(o->{
List<CollectListMemberExcelResultDTO> children = new ArrayList<>();
o.getList().forEach(item->{
CollectListMemberExcelResultDTO resultDTO = ConvertUtils.sourceToTarget(item, CollectListMemberExcelResultDTO.class);
resultDTO.setYmjz(item.getYmjz() == null? StrConstant.EPMETY_STR:String.valueOf(item.getYmjz()));
children.add(resultDTO);
});
CollectListExcelResultDTO resultDTO = ConvertUtils.sourceToTarget(o, CollectListExcelResultDTO.class);
resultDTO.setListP(children);
list.add(resultDTO);
});
ExcelUtils.exportExcelToTarget(response, null, list, CollectListExcelResultDTO.class);
}
}

16
epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java

@ -86,9 +86,6 @@ public class IcResiCollectServiceImpl extends BaseServiceImpl<IcResiCollectDao,
public PageData<CollectListResultDTO> getCollectList(CollectListFormDTO formDTO) {
PageData<CollectListResultDTO> result = new PageData<>(new ArrayList<>(), 0);
if (StringUtils.isBlank(formDTO.getOrgId()) &&
StringUtils.isBlank(formDTO.getNeighborHoodId()) &&
StringUtils.isBlank(formDTO.getBuildingId()) &&
StringUtils.isBlank(formDTO.getHouseId()) &&
StringUtils.isBlank(formDTO.getAddress()) &&
StringUtils.isBlank(formDTO.getStartDate()) &&
StringUtils.isBlank(formDTO.getEndDate()) ){
@ -98,9 +95,14 @@ public class IcResiCollectServiceImpl extends BaseServiceImpl<IcResiCollectDao,
}
formDTO.setOrgId(staffInfo.getAgencyId());
}
PageInfo<CollectListResultDTO> pageList = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.getCollectList(formDTO));
result.setList(pageList.getList());
result.setTotal(Integer.valueOf(String.valueOf(pageList.getTotal())));
if (formDTO.isPage()){
PageInfo<CollectListResultDTO> pageList = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.getCollectList(formDTO));
result.setList(pageList.getList());
result.setTotal(Integer.parseInt(String.valueOf(pageList.getTotal())));
}else {
List<CollectListResultDTO> collectList = baseDao.getCollectList(formDTO);
result.setList(collectList);
}
return result;
}
@ -135,4 +137,4 @@ public class IcResiCollectServiceImpl extends BaseServiceImpl<IcResiCollectDao,
icResiMemberDao.insert(entity);
}
}
}
}

42
epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.26__caiji_resi.sql

@ -0,0 +1,42 @@
CREATE TABLE `ic_resi_collect` (
`ID` varchar(64) NOT NULL COMMENT '主键',
`CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id customer.id',
`ORIGIN` varchar(32) NOT NULL COMMENT '内部:internal;外部:external。',
`GRID_ID` varchar(64) DEFAULT NULL COMMENT '网格ID',
`AGENCY_ID` varchar(64) DEFAULT NULL COMMENT '组织Id',
`PIDS` varchar(255) DEFAULT NULL COMMENT '组织的pids',
`VILLAGE_ID` varchar(64) DEFAULT NULL COMMENT '所属小区ID;',
`BUILD_ID` varchar(64) DEFAULT NULL COMMENT '所属楼宇Id',
`UNIT_ID` varchar(64) DEFAULT NULL COMMENT '单元id',
`HOME_ID` varchar(64) DEFAULT NULL COMMENT '所属家庭Id',
`ADDRESS` varchar(255) NOT NULL COMMENT '详细地址',
`HOUSE_TYPE` varchar(1) NOT NULL COMMENT '1自由0租住',
`HOUSE_HOLDER_NAME` varchar(32) NOT NULL COMMENT '户主姓名',
`TOTAL_RESI` int(11) NOT NULL COMMENT '居住成员人数',
`DEL_FLAG` int(11) NOT NULL DEFAULT '0' COMMENT '删除标识 0.未删除 1.已删除',
`REVISION` int(11) NOT NULL COMMENT '乐观锁',
`CREATED_BY` varchar(64) NOT NULL COMMENT '创建人',
`CREATED_TIME` datetime NOT NULL COMMENT '创建时间',
`UPDATED_BY` varchar(64) NOT NULL COMMENT '更新人',
`UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
PRIMARY KEY (`ID`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='居民信息采集表';
CREATE TABLE `ic_resi_member` (
`ID` varchar(64) NOT NULL COMMENT '主键',
`CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id customer.id',
`IC_RESI_COLLECT_ID` varchar(64) NOT NULL COMMENT 'ic_resi_colllect.id',
`NAME` varchar(32) NOT NULL COMMENT '居住成员1姓名',
`ID_NUM` varchar(32) NOT NULL COMMENT '居住成员1身份证号',
`MOBILE` varchar(32) NOT NULL COMMENT '居住成员1手机号',
`HE_SUAN_COUNT` varchar(32) NOT NULL COMMENT '居住成员1是否参加几轮全员核算检测,数字1-10',
`YMJZ` int(11) NOT NULL COMMENT '居住成员1新冠疫苗接种情况;1:已全程接种;2:未全程接种;0未接种;',
`DEL_FLAG` int(11) NOT NULL DEFAULT '0' COMMENT '删除标识 0.未删除 1.已删除',
`REVISION` int(11) NOT NULL COMMENT '乐观锁',
`CREATED_BY` varchar(64) NOT NULL COMMENT '创建人',
`CREATED_TIME` datetime NOT NULL COMMENT '创建时间',
`UPDATED_BY` varchar(64) NOT NULL COMMENT '更新人',
`UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
PRIMARY KEY (`ID`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='居民信息成员表';

9
epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml

@ -30,15 +30,6 @@
<if test='orgId != null and orgId != "" '>
AND CONCAT(c.PIDS,':',c.AGENCY_ID) LIKE CONCAT('%',#{orgId},'%')
</if>
<if test='neighborHoodId != null and neighborHoodId != "" '>
AND c.VILLAGE_ID = #{neighborHoodId}
</if>
<if test='buildingId != null and buildingId != "" '>
AND c.BUILD_ID = #{buildingId}
</if>
<if test='houseId != null and houseId != "" '>
AND c.HOME_ID = #{houseId}
</if>
<if test='address != null and address != "" '>
AND c.ADDRESS LIKE CONCAT('%',#{address},'%')
</if>

Loading…
Cancel
Save