边民组接收相同的组时覆盖旧的组

sp-core/sp-api/src/main/java/com/pj/api/dto/HtGroupDto.java

@@ -1,13 +1,15 @@
 package com.pj.api.dto;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
 
 import java.io.Serializable;
 
-
+@Data
 public class HtGroupDto implements Serializable {
 
-
+    @JsonProperty("opType")
+    private String opType;
     @JsonProperty("platSeqNo")
     private String platSeqNo;
     @JsonProperty("customsCode")
@@ -35,107 +37,5 @@ public class HtGroupDto implements Serializable {
     @JsonProperty("dclBorderList")
     private String dclBorderList;
 
-    public String getPlatSeqNo() {
-        return platSeqNo;
-    }
-
-    public void setPlatSeqNo(String platSeqNo) {
-        this.platSeqNo = platSeqNo;
-    }
-
-    public String getCustomsCode() {
-        return customsCode;
-    }
-
-    public void setCustomsCode(String customsCode) {
-        this.customsCode = customsCode;
-    }
-
-    public String getOrgName() {
-        return orgName;
-    }
-
-    public void setOrgName(String orgName) {
-        this.orgName = orgName;
-    }
-
-    public String getAddress() {
-        return address;
-    }
-
-    public void setAddress(String address) {
-        this.address = address;
-    }
-
-    public String getShopsSccd() {
-        return shopsSccd;
-    }
-
-    public void setShopsSccd(String shopsSccd) {
-        this.shopsSccd = shopsSccd;
-    }
-
-    public String geteDStatus() {
-        return eDStatus;
-    }
-
-    public void seteDStatus(String eDStatus) {
-        this.eDStatus = eDStatus;
-    }
-
-    public String getExpiry() {
-        return expiry;
-    }
-
-    public void setExpiry(String expiry) {
-        this.expiry = expiry;
-    }
-
-    public String getPutrecNo() {
-        return putrecNo;
-    }
-
-    public void setPutrecNo(String putrecNo) {
-        this.putrecNo = putrecNo;
-    }
-
-    public String getLocalGovernmentNo() {
-        return localGovernmentNo;
-    }
-
-    public void setLocalGovernmentNo(String localGovernmentNo) {
-        this.localGovernmentNo = localGovernmentNo;
-    }
-
-    public String getFilingStatus() {
-        return filingStatus;
-    }
-
-    public void setFilingStatus(String filingStatus) {
-        this.filingStatus = filingStatus;
-    }
-
-    public String getFieldCode() {
-        return fieldCode;
-    }
-
-    public void setFieldCode(String fieldCode) {
-        this.fieldCode = fieldCode;
-    }
-
-    public String getBorderList() {
-        return borderList;
-    }
-
-    public void setBorderList(String borderList) {
-        this.borderList = borderList;
-    }
-
-    public String getDclBorderList() {
-        return dclBorderList;
-    }
 
-    public void setDclBorderList(String dclBorderList) {
-        this.dclBorderList = dclBorderList;
-    }
 }

sp-service/level-one-server/src/main/java/com/pj/tb_group/TbGroup.java

@@ -14,7 +14,7 @@ import java.util.Date;
 
 /**
  * Model: tb_group -- 互助组
- * @author yzs 
+ * @author yzs
  */
 @Data
 @Accessors(chain = true)
@@ -24,15 +24,15 @@ public class TbGroup extends Model<TbGroup> implements Serializable {
 
 	// ---------- 模块常量 ----------
 	/**
-	 * 序列化版本id 
+	 * 序列化版本id
 	 */
-	private static final long serialVersionUID = 1L;	
+	private static final long serialVersionUID = 1L;
 	/**
-	 * 此模块对应的表名 
+	 * 此模块对应的表名
 	 */
-	public static final String TABLE_NAME = "tb_group";	
+	public static final String TABLE_NAME = "tb_group";
 	/**
-	 * 此模块对应的权限码 
+	 * 此模块对应的权限码
 	 */
 	public static final String PERMISSION_CODE = "tb-group";
 	public static final String PERMISSION_CODE_ADD = "tb-group-add";
@@ -44,168 +44,171 @@ public class TbGroup extends Model<TbGroup> implements Serializable {
 
 	// ---------- 表中字段 ----------
 	/**
-	 *  
+	 *
 	 */
 	@TableId(type = IdType.AUTO)
 	private Long id;
 
 	/**
-	 *  
+	 *
 	 */
-	private String addressIds;	
+	private String addressIds;
 
 	/**
-	 * 所属边境市（县、区）乡镇村屯 
+	 * 所属边境市（县、区）乡镇村屯
 	 */
-	private String address;	
+	private String address;
 
 	/**
-	 *  
+	 *
 	 */
-	private String detailAddress;	
+	private String detailAddress;
 
 	/**
-	 * 互助组名称 
+	 * 互助组名称
 	 */
-	private String orgName;	
+	private String orgName;
 
 	/**
-	 * 组长ID 
+	 * 组长ID
 	 */
-	private Long leaderId;	
+	private Long leaderId;
 
 	/**
-	 * 组长名 
+	 * 组长名
 	 */
-	private String leaderName;	
+	private String leaderName;
 
 	/**
-	 * 组长电话 
+	 * 组长电话
 	 */
-	private String leaderPhone;	
+	private String leaderPhone;
 
 	/**
-	 *  
+	 *
 	 */
-	private String code;	
+	private String code;
 
 	/**
-	 * 当天该组剩余额度 
+	 * 当天该组剩余额度
 	 */
-	private Double leftPrice;	
+	private Double leftPrice;
 
 	/**
-	 * 创建时间 
+	 * 创建时间
 	 */
 	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	private Date createTime;
 
 	/**
-	 * 创建人编号 
+	 * 创建人编号
 	 */
 	private Long createBy;
 
 	/**
-	 * 创建人名称 
+	 * 创建人名称
 	 */
-	private String createName;	
+	private String createName;
 
 	/**
-	 * 更新时间 
+	 * 更新时间
 	 */
 	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	private Date updateTime;
 
 	/**
-	 * 更新人编号 
+	 * 更新人编号
 	 */
 	private Long updateBy;
 
 	/**
-	 * 更新人名称 
+	 * 更新人名称
 	 */
-	private String updateName;	
+	private String updateName;
 
 	/**
-	 * 删除状态(0=禁用,1=启用) 
+	 * 删除状态(0=禁用,1=启用)
 	 */
-	private Integer deleteStatus;	
+	private Integer deleteStatus;
 
 	/**
-	 * 是否锁住 
+	 * 是否锁住
 	 */
 	private Integer isLock;
 
 	/**
-	 * 互市区id 
+	 * 互市区id
 	 */
-	private Long tradeAreaId;	
+	private Long tradeAreaId;
 
 	/**
-	 * 互市区名称 
+	 * 互市区名称
 	 */
-	private String tradeAreaName;	
+	private String tradeAreaName;
 
 	/**
-	 * 地方平台的内部业务编号，每次申请都是新编号 
+	 * 地方平台的内部业务编号，每次申请都是新编号
 	 */
-	private String platSeqNo;	
+	private String platSeqNo;
 
 	/**
-	 * 关区代码 
+	 * 关区代码
 	 */
-	private String customsCode;	
+	private String customsCode;
 
 	/**
-	 * 登记号 
+	 * 登记号
 	 */
-	private String shopsSccd;	
+	private String shopsSccd;
 
 	/**
-	 * 启停用状态：1-启用、2-停用、3-注销 
+	 * 启停用状态：1-启用、2-停用、3-注销
 	 */
-	private String eDStatus;	
+	private String eDStatus;
 
 	/**
-	 * 有效效截止时间 yyyy-MM-dd 
+	 * 有效效截止时间 yyyy-MM-dd
 	 */
-	private String expiry;	
+	private String expiry;
 
 	/**
-	 * 备案编号，如果为新增备案，传空值；如果为变更备案，必须传值； 
+	 * 备案编号，如果为新增备案，传空值；如果为变更备案，必须传值；
 	 */
-	private String putrecNo;	
+	private String putrecNo;
 
 	/**
-	 *  地方政府编号 
+	 *  地方政府编号
 	 */
-	private String localGovernmentNo;	
+	private String localGovernmentNo;
 
 	/**
-	 * 备案状态：默认 0、待申报，1、已申报，2、备案通过，3、备案失败 
+	 * 备案状态：默认 0、待申报，1、已申报，2、备案通过，3、备案失败
 	 */
-	private String filingStatus;	
+	private String filingStatus;
 
 	/**
-	 * 场站编码 
+	 * 场站编码
 	 */
-	private String fieldCode;	
+	private String fieldCode;
 
 	/**
-	 * 边民信息表体信息，json 数组List, 
+	 * 边民信息表体信息，json 数组List,
 	 */
 	private String borderList;
 
 	/**
-	 * 互助组申报边民代表表体信息，json 数组 List 
+	 * 互助组申报边民代表表体信息，json 数组 List
 	 */
 	private String dclBorderList;
 
+	/**
+	 * 操作类型（01：新增；02：修改；03：删除）
+	 */
+	private String opType;
 
 
 
 
-	
 
 
 }

sp-service/level-one-server/src/main/java/com/pj/tb_group/TbGroupService.java

@@ -379,19 +379,32 @@ public class TbGroupService extends ServiceImpl<TbGroupMapper, TbGroup> implemen
         List<DclBorderList> dclBorderList = JSONUtil.toList(groupDto.getDclBorderList(), DclBorderList.class);
 
         TbTradeArea tbTradeArea = tbTradeAreaService.updateHandler(groupDto.getFieldCode(), "", "");
-        //根据编号进行事务处理
-        TbGroup tbGroup = this.findByAreaCodeAndSeqCode(tbTradeArea.getId(), groupDto.getPlatSeqNo());
-        if (tbGroup == null) {
-            tbGroup = new TbGroup();
-            BeanUtils.copyProperties(groupDto, tbGroup);
-            //新增
-            tbGroup.setDeleteStatus(DeleteStatus.DELETE_STATUS_ON.getCode());
-            tbGroup.setCreateTime(new Date())
-                    .setTradeAreaId(tbTradeArea.getId())
-                    .setTradeAreaName(tbTradeArea.getName());
-            this.save(tbGroup);
+        //根据登记号进行事务处理
+        TbGroup tbGroup = this.findByAreaCodeAndSeqCode(tbTradeArea.getId(), groupDto.getShopsSccd());
+        if(tbGroup != null) {
+            //清空原互助组边民的组信息
+            LambdaQueryWrapper<TbPeople> wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(TbPeople::getGroupId, tbGroup.getId());
+            List<TbPeople> peopleList = tbPeopleMapper.selectList(wrapper);
+
+            for (TbPeople people:peopleList) {
+                people.setGroupName(null).setGroupId(null).setUpdateTime(new Date());
+            }
+            tbPeopleService.updateBatchById(peopleList);
+            //删除原互助组
+            removeById(tbGroup.getId());
         }
 
+        //新增
+        tbGroup = new TbGroup();
+        BeanUtils.copyProperties(groupDto, tbGroup);
+        tbGroup.setDeleteStatus(DeleteStatus.DELETE_STATUS_ON.getCode());
+        tbGroup.setCreateTime(new Date())
+                .setTradeAreaId(tbTradeArea.getId())
+                .setTradeAreaName(tbTradeArea.getName());
+        this.save(tbGroup);
+
+
         for (BorderDTO borderDTO : borderDTOList) {
             TbPeople tbPeople = tbPeopleService.findByIdCarNo(borderDTO.getIdCardNo());
             if (tbPeople == null) {
@@ -404,15 +417,11 @@ public class TbGroupService extends ServiceImpl<TbGroupMapper, TbGroup> implemen
             } else {
                 tbPeople.setRole(1);//普通边民
             }
-
-            tbPeople.setGroupName(tbGroup.getOrgName()).setGroupId(tbGroup.getId()).setTradeAreaId(tbTradeArea.getId())
-                    .setTradeAreaName(tbTradeArea.getName()).setUpdateTime(new Date());
+            tbPeople.setGroupName(tbGroup.getOrgName()).setGroupId(tbGroup.getId())
+                    .setTradeAreaId(tbTradeArea.getId()).setTradeAreaName(tbTradeArea.getName()).setUpdateTime(new Date());
             tbPeopleService.saveOrUpdate(tbPeople);
-            if (dclBorderList1.size() > 0) {
-                tbGroup.setLeaderId(tbPeople.getId())
-                        .setLeaderName(tbPeople.getName())
-                        .setLeaderPhone(tbPeople.getPhone());
 
+            if (dclBorderList1.size() > 0) {
                 AppUserDto appUser = adminInterface.getByFkId(tbPeople.getId());
                 if (appUser != null) {
                     appUser.setUserType(2);
@@ -420,16 +429,22 @@ public class TbGroupService extends ServiceImpl<TbGroupMapper, TbGroup> implemen
                 }
             }
         }
-        //修改
-        BeanUtils.copyProperties(groupDto, tbGroup);
-        tbGroup.setUpdateTime(new Date());
+
+        for (DclBorderList dclBorder : dclBorderList) {
+            TbPeople p = tbPeopleService.findByIdCarNo(dclBorder.getIdCardNo());
+            if(p != null) {
+                tbGroup.setLeaderId(p.getId()).setLeaderName(p.getName()).setLeaderPhone(p.getPhone());
+                break;
+            }
+        }
         super.saveOrUpdate(tbGroup);
+
         return true;
     }
 
-    public TbGroup findByAreaCodeAndSeqCode(Long tradeId, String platSeqNo) {
+    public TbGroup findByAreaCodeAndSeqCode(Long tradeId, String shopsSccd) {
         QueryWrapper<TbGroup> ew = new QueryWrapper<>();
-        ew.lambda().eq(TbGroup::getPlatSeqNo, platSeqNo).eq(TbGroup::getTradeAreaId, tradeId);
+        ew.lambda().eq(TbGroup::getShopsSccd, shopsSccd).eq(TbGroup::getTradeAreaId, tradeId).orderByDesc(TbGroup::getCreateTime);
         List<TbGroup> list = list(ew);
         return list.isEmpty() ? null : list.get(0);
     }