8.25 已完成信息修改[包括数据库]: 边民,商户,合作社

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

@@ -1,6 +1,7 @@
 package com.pj.api.dto;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
+
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
@@ -10,153 +11,17 @@ import java.util.Date;
  * @Date 2023 08 01 09 59
  **/
 public class PeopleDto {
-
-
-    /**
-     * 姓名
-     */
-    private String name;
-
-    /**
-     * 边民号
-     */
-    private String code;
-
-    /**
-     * 性别(1=男,2=女)
-     */
-    private Integer sex;
-
-    /**
-     * 年龄
-     */
-    private Integer age;
-
-    /**
-     * 身份证
-     */
-    private String idCard;
-
-    /**
-     * 身份证复印件
-     */
-    private String idCardImg;
-
-    /**
-     * 手机号码
-     */
-    private String phone;
-
-    /**
-     * 银行编号
-     */
-    private String bankNo;
-
-    /**
-     * 银行卡号
-     */
-    private String bankCode;
-
-    /**
-     * 银行名称
-     */
-    private String bankName;
-
-    /**
-     * 所属互助组(1=测试组)
-     */
-    private Long groupId;
-
-    /**
-     * 互助组名称
-     */
-    private String groupName;
-
-    /**
-     * 是否可用(0=否,1=是)
-     */
-    private Integer status;
-
-    /**
-     * 角色(1=普通边民,2=兼组长)
-     */
-    private Integer role;
-
-    /**
-     * 经度
-     */
-    private Double lng;
-
-    /**
-     * 纬度
-     */
-    private Double lat;
-
-    /**
-     * 最后一次下单定位
-     */
-    private String lastLocation;
-
-    /**
-     * 联系地址
-     */
-    private String address;
-
-    /**
-     * 地址ID
-     */
-    private String addressIds;
-
-    /**
-     * 详细地址
-     */
-    private String detailAddress;
-
-    /**
-     * 是否锁定
-     */
-    private Integer isLock;
-
-    /**
-     * 当天剩余额度
-     */
-    private Double leftPrice;
-
-    /**
-     *
-     */
-    private Integer judgeStatus;
-
-    /**
-     *
-     */
-    private String judgeContent;
-
-    /**
-     *  注册时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date registerTime;
-
-    /**
-     *
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date judgeTime;
-
-    /**
-     *
-     */
-    private String personId;
-
-    public PeopleDto(String name, String code, Integer sex, Integer age, String idCard, String idCardImg, String phone, String bankNo, String bankCode, String bankName, Long groupId, String groupName, Integer status, Integer role, Double lng, Double lat, String lastLocation, String address, String addressIds, String detailAddress, Integer isLock, Double leftPrice, Integer judgeStatus, String judgeContent, Date registerTime, Date judgeTime, String personId, Long tradeAreaId, String tradeAreaName, Date createTime, String createBy, String createName, Date updateTime, String updateBy, String updateName, Integer deleteStatus) {
-        this.name = name;
+    public PeopleDto(Long id, Long tradeAreaId, String tradeAreaName, String borderName, String code, Integer gencd, Integer age, String idCardNo, String idCardImg, String borderTel, String bankNo, String bankCode, String bankName, Long groupId, String groupName, Integer status, Integer role, Double lng, Double lat, String lastLocation, String address, String addressIds, String detailAddress, Integer isLock, Double leftPrice, Integer judgeStatus, String judgeContent, Date registerTime, Date judgeTime, String personId, Date createTime, String createBy, String createName, Date updateTime, String updateBy, String updateName, Integer deleteStatus, String platSeqNo, Date startDate, Date endDate, String idcdGcertPgoffNm, String birplAddr, String customsCode, Date expiry, String putrecNo, String localGovernmentNo, String filingStatus, String fieldCode) {
+        this.id = id;
+        this.tradeAreaId = tradeAreaId;
+        this.tradeAreaName = tradeAreaName;
+        this.borderName = borderName;
         this.code = code;
-        this.sex = sex;
+        this.gencd = gencd;
         this.age = age;
-        this.idCard = idCard;
+        this.idCardNo = idCardNo;
         this.idCardImg = idCardImg;
-        this.phone = phone;
+        this.borderTel = borderTel;
         this.bankNo = bankNo;
         this.bankCode = bankCode;
         this.bankName = bankName;
@@ -177,8 +42,6 @@ public class PeopleDto {
         this.registerTime = registerTime;
         this.judgeTime = judgeTime;
         this.personId = personId;
-        this.tradeAreaId = tradeAreaId;
-        this.tradeAreaName = tradeAreaName;
         this.createTime = createTime;
         this.createBy = createBy;
         this.createName = createName;
@@ -186,6 +49,28 @@ public class PeopleDto {
         this.updateBy = updateBy;
         this.updateName = updateName;
         this.deleteStatus = deleteStatus;
+        this.platSeqNo = platSeqNo;
+        this.startDate = startDate;
+        this.endDate = endDate;
+        this.idcdGcertPgoffNm = idcdGcertPgoffNm;
+        this.birplAddr = birplAddr;
+        this.customsCode = customsCode;
+        this.expiry = expiry;
+        this.putrecNo = putrecNo;
+        this.localGovernmentNo = localGovernmentNo;
+        this.filingStatus = filingStatus;
+        this.fieldCode = fieldCode;
+    }
+
+    public PeopleDto() {
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
     }
 
     public Long getTradeAreaId() {
@@ -204,60 +89,12 @@ public class PeopleDto {
         this.tradeAreaName = tradeAreaName;
     }
 
-    /**
-     * 互市区域ID
-     */
-    private Long tradeAreaId;
-
-    /**
-     * 互市区名称
-     */
-    private String tradeAreaName;
-
-    /**
-     * 创建时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date createTime;
-
-    /**
-     * 创建人编号
-     */
-    private String createBy;
-
-    /**
-     * 创建人名称
-     */
-    private String createName;
-
-    /**
-     * 更新时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date updateTime;
-
-    /**
-     * 更新人编号
-     */
-    private String updateBy;
-
-    /**
-     * 更新人名称
-     */
-    private String updateName;
-
-    /**
-     * 删除状态(0=禁用,1=启用)
-     */
-    private Integer deleteStatus;
-
-
-    public String getName() {
-        return name;
+    public String getBorderName() {
+        return borderName;
     }
 
-    public void setName(String name) {
-        this.name = name;
+    public void setBorderName(String borderName) {
+        this.borderName = borderName;
     }
 
     public String getCode() {
@@ -268,12 +105,12 @@ public class PeopleDto {
         this.code = code;
     }
 
-    public Integer getSex() {
-        return sex;
+    public Integer getGencd() {
+        return gencd;
     }
 
-    public void setSex(Integer sex) {
-        this.sex = sex;
+    public void setGencd(Integer gencd) {
+        this.gencd = gencd;
     }
 
     public Integer getAge() {
@@ -284,12 +121,12 @@ public class PeopleDto {
         this.age = age;
     }
 
-    public String getIdCard() {
-        return idCard;
+    public String getIdCardNo() {
+        return idCardNo;
     }
 
-    public void setIdCard(String idCard) {
-        this.idCard = idCard;
+    public void setIdCardNo(String idCardNo) {
+        this.idCardNo = idCardNo;
     }
 
     public String getIdCardImg() {
@@ -300,12 +137,12 @@ public class PeopleDto {
         this.idCardImg = idCardImg;
     }
 
-    public String getPhone() {
-        return phone;
+    public String getBorderTel() {
+        return borderTel;
     }
 
-    public void setPhone(String phone) {
-        this.phone = phone;
+    public void setBorderTel(String borderTel) {
+        this.borderTel = borderTel;
     }
 
     public String getBankNo() {
@@ -524,43 +361,340 @@ public class PeopleDto {
         this.deleteStatus = deleteStatus;
     }
 
-    public PeopleDto( String name, String code, Integer sex, Integer age, String idCard, String idCardImg, String phone, String bankNo, String bankCode, String bankName, Long groupId, String groupName, Integer status, Integer role, Double lng, Double lat, String lastLocation, String address, String addressIds, String detailAddress, Integer isLock, Double leftPrice, Integer judgeStatus, String judgeContent, Date registerTime, Date judgeTime, String personId, Date createTime, String createBy, String createName, Date updateTime, String updateBy, String updateName, Integer deleteStatus) {
-        this.name = name;
-        this.code = code;
-        this.sex = sex;
-        this.age = age;
-        this.idCard = idCard;
-        this.idCardImg = idCardImg;
-        this.phone = phone;
-        this.bankNo = bankNo;
-        this.bankCode = bankCode;
-        this.bankName = bankName;
-        this.groupId = groupId;
-        this.groupName = groupName;
-        this.status = status;
-        this.role = role;
-        this.lng = lng;
-        this.lat = lat;
-        this.lastLocation = lastLocation;
-        this.address = address;
-        this.addressIds = addressIds;
-        this.detailAddress = detailAddress;
-        this.isLock = isLock;
-        this.leftPrice = leftPrice;
-        this.judgeStatus = judgeStatus;
-        this.judgeContent = judgeContent;
-        this.registerTime = registerTime;
-        this.judgeTime = judgeTime;
-        this.personId = personId;
-        this.createTime = createTime;
-        this.createBy = createBy;
-        this.createName = createName;
-        this.updateTime = updateTime;
-        this.updateBy = updateBy;
-        this.updateName = updateName;
-        this.deleteStatus = deleteStatus;
+    public String getPlatSeqNo() {
+        return platSeqNo;
     }
 
-    public PeopleDto() {
+    public void setPlatSeqNo(String platSeqNo) {
+        this.platSeqNo = platSeqNo;
     }
+
+    public Date getStartDate() {
+        return startDate;
+    }
+
+    public void setStartDate(Date startDate) {
+        this.startDate = startDate;
+    }
+
+    public Date getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(Date endDate) {
+        this.endDate = endDate;
+    }
+
+    public String getIdcdGcertPgoffNm() {
+        return idcdGcertPgoffNm;
+    }
+
+    public void setIdcdGcertPgoffNm(String idcdGcertPgoffNm) {
+        this.idcdGcertPgoffNm = idcdGcertPgoffNm;
+    }
+
+    public String getBirplAddr() {
+        return birplAddr;
+    }
+
+    public void setBirplAddr(String birplAddr) {
+        this.birplAddr = birplAddr;
+    }
+
+    public String getCustomsCode() {
+        return customsCode;
+    }
+
+    public void setCustomsCode(String customsCode) {
+        this.customsCode = customsCode;
+    }
+
+    public Date getExpiry() {
+        return expiry;
+    }
+
+    public void setExpiry(Date 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;
+    }
+
+    private Long id;
+
+    /**
+     * 互市区id
+     */
+    private Long tradeAreaId;
+
+    /**
+     * 互市区名称
+     */
+    private String tradeAreaName;
+
+    /**
+     * 姓名
+     */
+    private String borderName;
+
+    /**
+     * 边民号
+     */
+    private String code;
+
+    /**
+     * 性别(1=男,2=女)
+     */
+    private Integer gencd;
+
+    /**
+     * 年龄
+     */
+    private Integer age;
+
+    /**
+     * 身份证
+     */
+    private String idCardNo;
+
+    /**
+     * 身份证复印件
+     */
+    private String idCardImg;
+
+    /**
+     * 手机号码
+     */
+    private String borderTel;
+
+    /**
+     * 银行编号
+     */
+    private String bankNo;
+
+    /**
+     * 银行卡号
+     */
+    private String bankCode;
+
+    /**
+     * 银行名称
+     */
+    private String bankName;
+
+    /**
+     * 所属互助组(1=测试组)
+     */
+    private Long groupId;
+
+    /**
+     * 互助组名称
+     */
+    private String groupName;
+
+    /**
+     * 是否可用(0=否,1=是)
+     */
+    private Integer status;
+
+    /**
+     * 角色(1=普通边民,2=兼组长)
+     */
+    private Integer role;
+
+    /**
+     * 经度
+     */
+    private Double lng;
+
+    /**
+     * 纬度
+     */
+    private Double lat;
+
+    /**
+     * 最后一次下单定位
+     */
+    private String lastLocation;
+
+    /**
+     * 联系地址
+     */
+    private String address;
+
+    /**
+     * 地址ID
+     */
+    private String addressIds;
+
+    /**
+     * 详细地址
+     */
+    private String detailAddress;
+
+    /**
+     * 是否锁定
+     */
+    private Integer isLock;
+
+    /**
+     * 当天剩余额度
+     */
+    private Double leftPrice;
+
+    /**
+     * 审核状态
+     */
+    private Integer judgeStatus;
+
+    /**
+     * 审核不通过内容
+     */
+    private String judgeContent;
+
+    /**
+     * 注册时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date registerTime;
+
+    /**
+     * 审核时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date judgeTime;
+
+    /**
+     * 审核人ID
+     */
+    private String personId;
+
+    /**
+     * 创建时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    /**
+     * 创建人编号
+     */
+    private String createBy;
+
+    /**
+     * 创建人名称
+     */
+    private String createName;
+
+    /**
+     * 更新时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    /**
+     * 更新人编号
+     */
+    private String updateBy;
+
+    /**
+     * 更新人名称
+     */
+    private String updateName;
+
+    /**
+     * 删除状态(0=禁用,1=启用)
+     */
+    private Integer deleteStatus;
+
+    /**
+     * 地方平台的内部业务编号，每次申请都是新编号
+     */
+    private String platSeqNo;
+
+    /**
+     * 身份证有效期起，身份证有效期起必须小于身份证有效期止;格式：yyyy-MM-dd
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date startDate;
+
+    /**
+     * 身份证有效期止，身份证有效期止必须大于身份证有效期起;格式：yyyy-MM-dd
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date endDate;
+
+    /**
+     * 身份证发证机关
+     */
+    private String idcdGcertPgoffNm;
+
+    /**
+     * 户籍地址
+     */
+    private String birplAddr;
+
+    /**
+     * 关区代码，参见关区代码表
+     */
+    private String customsCode;
+
+    /**
+     * 有 效 效 截 止 时 间yyyy-MM-dd
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date expiry;
+
+    /**
+     * 备案编号，如果为新增备案，传空值；如果为变更备案，必须传值；
+     */
+    private String putrecNo;
+
+    /**
+     * 地方政府编号
+     */
+    private String localGovernmentNo;
+
+    /**
+     * 备案状态：默认 0=待申报，1=已申报，2=备案通过，3=备案失败
+     */
+    private String filingStatus;
+
+    /**
+     *  场所编码
+     */
+    private String fieldCode;
+
+
+
+
+
 }

sp-service/level-one-server/src/main/java/com/pj/tb_cooperative/TbCooperative.java

@@ -1,17 +1,19 @@
 package com.pj.tb_cooperative;
 
-import java.io.Serializable;
-import java.util.*;
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
-import lombok.EqualsAndHashCode;
-
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+import java.util.Date;
+
 /**
  * Model: tb_cooperative -- 合作社
- * @author lsw
+ * @author yzs 
  */
 @Data
 @Accessors(chain = true)
@@ -21,15 +23,15 @@ public class TbCooperative extends Model<TbCooperative> implements Serializable
 
 	// ---------- 模块常量 ----------
 	/**
-	 * 序列化版本id
+	 * 序列化版本id 
 	 */
-	private static final long serialVersionUID = 1L;
+	private static final long serialVersionUID = 1L;	
 	/**
-	 * 此模块对应的表名
+	 * 此模块对应的表名 
 	 */
-	public static final String TABLE_NAME = "tb_cooperative";
+	public static final String TABLE_NAME = "tb_cooperative";	
 	/**
-	 * 此模块对应的权限码
+	 * 此模块对应的权限码 
 	 */
 	public static final String PERMISSION_CODE = "tb-cooperative";
 	public static final String PERMISSION_CODE_ADD = "tb-cooperative-add";
@@ -41,128 +43,206 @@ public class TbCooperative extends Model<TbCooperative> implements Serializable
 
 	// ---------- 表中字段 ----------
 	/**
-	 * 主键
+	 * 主键 
 	 */
 	@TableId(type = IdType.AUTO)
-	private Long id;
+	private Long id;	
 
 	/**
-	 * 贸易区域id
+	 * 名称 
 	 */
-	private Long tradeAreaId;
+	private String name;	
 
 	/**
-	 * 贸易区域名称
+	 * 法人代表姓名 
 	 */
-	private String tradeAreaName;
+	private String correpName;	
 
 	/**
-	 * 名称
+	 * 身份证号 
 	 */
-	private String name;
+	private String ciphertextIdno;	
 
 	/**
-	 * 法人
+	 * 手机号码 
 	 */
-	private String legalPerson;
+	private String correpTel;	
 
 	/**
-	 * 身份证号
+	 * 营业执照 
 	 */
-	private String idCard;
+	private String businessLicense;	
 
 	/**
-	 * 手机号码
+	 * 银行名称 
 	 */
-	private String contact;
+	private String bankName;	
 
 	/**
-	 * 营业执照
+	 * 银行账号 
 	 */
-	private String businessLicense;
+	private String bankAccount;	
 
 	/**
-	 * 银行名称
+	 * 税号 
 	 */
-	private String bankName;
+	private String dutyParagraph;	
 
 	/**
-	 * 银行账号
+	 * 审核状态(0=未通过,1=已通过,2=审核不通过) 
 	 */
-	private String bankAccount;
+	private String judgeStatus;	
 
 	/**
-	 * 税号
+	 * 审核意见 
 	 */
-	private String dutyParagraph;
+	private String judgeContent;	
 
 	/**
-	 * 地址
+	 * 上次审核时间 
 	 */
-	private String address;
+	private Date judgeTime;	
 
 	/**
-	 * 审核状态(0=未通过,1=已通过,2=审核不通过)
+	 * 注册时间 
 	 */
-	private String judgeStatus;
+	private Date registerTime;	
 
 	/**
-	 * 审核意见
+	 * 创建时间 
 	 */
-	private String judgeContent;
+	private Date createTime;
 
 	/**
-	 * 上次审核时间
+	 * 创建人编号 
 	 */
-	private Date judgeTime;
+	private String createBy;	
 
 	/**
-	 * 注册时间
+	 * 创建人名称 
 	 */
-	private Date registerTime;
+	private String createName;	
 
 	/**
-	 * 创建时间
+	 * 更新时间 
 	 */
-	private Date createTime;
+	private Date updateTime;
 
 	/**
-	 * 创建人编号
+	 * 更新人编号 
 	 */
-	private String createBy;
+	private String updateBy;	
 
 	/**
-	 * 创建人名称
+	 * 更新人名称 
 	 */
-	private String createName;
+	private String updateName;	
 
 	/**
-	 * 更新时间
+	 * 删除状态(0=禁用,1=启用) 
 	 */
-	private Date updateTime;
+	private Integer deleteStatus;	
+
+	/**
+	 * 0=锁住 1=启用 
+	 */
+	private String isLock;	
+
+	/**
+	 * 审核人 
+	 */
+	private String judgeBy;	
+
+	/**
+	 * 贸易区域ID 
+	 */
+	private Long tradeAreaId;	
 
 	/**
-	 * 更新人编号
+	 * 贸易区域名称 
 	 */
-	private String updateBy;
+	private String tradeAreaName;	
 
 	/**
-	 * 更新人名称
+	 * 地方平台的内部业务编号，每次申请都是新编号 
 	 */
-	private String updateName;
+	private String platSeqNo;	
 
 	/**
-	 * 删除状态(0=禁用,1=启用)
+	 * 关区代码 
 	 */
-	private Integer deleteStatus;
+	private String customsCode;	
 
 	/**
-	 * 0=锁住 1=启用
+	 *  合作社名称 
 	 */
-	private String isLock;
+	private String orgName;	
 
 	/**
-	 * 审核人
+	 * 社会统一信用代码 证 （ 业 务 主键，变更时该字段不允许修改） 
 	 */
-	private String judgeBy;
+	private String orgSccd;	
+
+	/**
+	 * 成立日期 
+	 */
+	private String createDate;	
+
+	/**
+	 * 所属边境市（县、区）乡镇村屯名称 
+	 */
+	private String address;	
+
+	/**
+	 * 启停用状态：1- 启用、2-停用、3-注销 
+	 */
+	private String eDStatus;	
+
+	/**
+	 * 有效效截止时间yyyy-MM-dd 
+	 */
+	private String expiry;	
+
+	/**
+	 * 备案编号，如果为新增备案，传空值；如果为变更备案，必须传值； 
+	 */
+	private String putrecNo;	
+
+	/**
+	 * 地方政府编号 
+	 */
+	private String localGovernmentNo;	
+
+	/**
+	 * 监管场所编号 
+	 */
+	private String fieldCode;	
+
+	/**
+	 * 监管场所名称 
+	 */
+	private String fieldName;	
+
+	/**
+	 * 申报状态 D0，暂存，D1 发往海关,D2-发往海关成功， D3-发往海关失败，Y-海关入库成功，N- 海关入库失败，04 退单， 03 通过 
+	 */
+	private String declStatus;	
+
+	/**
+	 * 边民信息集合List<E> borderList 
+	 */
+	private String borderList;	
+
+	/**
+	 * 合作社代表信息 
+	 */
+	private String dclBorderList;	
+
+
+
+
+
+	
+
+
 }

sp-service/level-one-server/src/main/java/com/pj/tb_cooperative/TbCooperativeAppController.java

@@ -1,11 +1,8 @@
 package com.pj.tb_cooperative;
 
-import cn.dev33.satoken.annotation.SaCheckPermission;
-import com.pj.project4sp.SP;
 import com.pj.utils.sg.AjaxJson;
 import com.pj.utils.so.SoMap;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;

sp-service/level-one-server/src/main/java/com/pj/tb_cooperative/TbCooperativeController.java

@@ -21,7 +21,7 @@ public class TbCooperativeController {
 
 	/** 底层 Service 对象 */
 	@Autowired
-	TbCooperativeService tbCooperativeService;
+    TbCooperativeService tbCooperativeService;
 
 	/** 增 */  
 	@RequestMapping("add")

sp-service/level-one-server/src/main/java/com/pj/tb_cooperative/TbCooperativeMapper.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.pj.tb_cooperative.TbCooperativeMapper">
+<mapper namespace="com.pj.tb_cooperative.tb_cooperative.TbCooperativeMapper">
 
 
 	<!-- ================================== 查询相关 ================================== -->
 	<!-- select id, name, legal_person, id_card, contact, business_license, bank_name, bank_account, duty_paragraph, address, judge_status, judge_content, judge_time, register_time, create_time, create_by, create_name, update_time, update_by, update_name, delete_status, is_lock, judge_by from tb_cooperative  -->
 	
 	<!-- 通用映射：自动模式 -->
-	<resultMap id="model" autoMapping="true" type="com.pj.tb_cooperative.TbCooperative"></resultMap>
+	<resultMap id="model" autoMapping="true" type="com.pj.tb_cooperative.tb_cooperative.TbCooperative"></resultMap>
 	
 	<!-- 公共查询sql片段 -->
 	<sql id="select_sql">

sp-service/level-one-server/src/main/java/com/pj/tb_cooperative/TbCooperativeService.java

@@ -2,6 +2,7 @@ package com.pj.tb_cooperative;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.pj.api.dto.CooperativeDto;
 import com.pj.current.satoken.StpUserUtil;
 import com.pj.utils.so.SoMap;
 import org.springframework.beans.BeanUtils;
@@ -18,11 +19,11 @@ import java.util.List;
  */
 @Service
 @Transactional(rollbackFor = Exception.class)
-public class TbCooperativeService extends ServiceImpl<TbCooperativeMapper, TbCooperative> implements IService<TbCooperative>{
+public class TbCooperativeService extends ServiceImpl<TbCooperativeMapper,TbCooperative> implements IService<TbCooperative>{
 
 	/** 底层 Mapper 对象 */
 	@Autowired
-	TbCooperativeMapper tbCooperativeMapper;
+    TbCooperativeMapper tbCooperativeMapper;
 
 	/** 增 */
 	void add(TbCooperative t){
@@ -57,9 +58,9 @@ public class TbCooperativeService extends ServiceImpl<TbCooperativeMapper, TbCoo
 
 	/*------            正常业务👆👆    rpc远程调用👇👇                         -----------*/
 
-	public com.pj.api.dto.CooperativeDto getCooperativeById(Long id) {
+	public CooperativeDto getCooperativeById(Long id) {
 		TbCooperative cooperative = tbCooperativeMapper.selectById(id);
-		com.pj.api.dto.CooperativeDto dto = new com.pj.api.dto.CooperativeDto();
+		com.pj.api.dto.CooperativeDto dto = new CooperativeDto();
 		BeanUtils.copyProperties(cooperative, dto);
 		return dto;
 	}

sp-service/level-one-server/src/main/java/com/pj/tb_cooperative/TbCooperativeUtil.java

@@ -1,5 +1,6 @@
 package com.pj.tb_cooperative;
 
+import com.pj.tb_cooperative.tb_cooperative.TbCooperativeMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -13,7 +14,7 @@ public class TbCooperativeUtil {
 
 	
 	/** 底层 Mapper 对象 */
-	public static TbCooperativeMapper tbCooperativeMapper;
+	public static com.pj.tb_cooperative.tb_cooperative.TbCooperativeMapper tbCooperativeMapper;
 	@Autowired
 	private void setTbCooperativeMapper(TbCooperativeMapper tbCooperativeMapper) {
 		TbCooperativeUtil.tbCooperativeMapper = tbCooperativeMapper;

sp-service/level-one-server/src/main/java/com/pj/tb_goods_cart/MethodGoodsCartService.java

@@ -1,10 +1,8 @@
 package com.pj.tb_goods_cart;
 
-import com.pj.common.core.exception.ServiceException;
 import com.pj.tb_goods_cart.vo.GoodsCartVo;
 import com.pj.tb_goods_transit.TbGoodsTransit;
 import com.pj.tb_goods_transit.TbGoodsTransitMapper;
-import com.pj.tb_shop.TbShop;
 import com.pj.tb_shop.TbShopMapper;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;

sp-service/level-one-server/src/main/java/com/pj/tb_goods_transit/MethodGoodsTransitService.java

@@ -78,7 +78,7 @@ public class MethodGoodsTransitService {
                 enterpriseList.forEach(item -> {
                     // 给边民发送短信,调用短信商接口API
                     try {
-                        smsRetryService.sendSmsMsg(item.getPhone());
+                        smsRetryService.sendSmsMsg(item.getBorderTel());
                     } catch (Exception e) {
                         System.out.println("异常被抓住了!");
                         throw new RuntimeException(e);

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

@@ -122,8 +122,8 @@ public class TbGroupService extends ServiceImpl<TbGroupMapper, TbGroup> implemen
 		}
 		// 设置互助组组长
 		tbGroup.setLeaderId(tbPeople.getId());
-		tbGroup.setLeaderName(tbPeople.getName());
-		tbGroup.setLeaderPhone(tbPeople.getPhone());
+		tbGroup.setLeaderName(tbPeople.getBorderName());
+		tbGroup.setLeaderPhone(tbPeople.getBorderTel());
 		// 写入更新者id
 		tbGroup.setUpdateBy(String.valueOf(loginId));
 		// 更新互助组

sp-service/level-one-server/src/main/java/com/pj/tb_order/TbOrderService.java

@@ -171,7 +171,7 @@ public class TbOrderService extends ServiceImpl<TbOrderMapper, TbOrder> implemen
 			int updated = tbGoodsTransitMapper.updateById(tbGoodsTransit);
 			//给互助组下属所有人发送取消的message
 			PeopleDto peopleDto = levelOneServerInterface.getRpcById(appLoginInfo.getFk());
-			methodOrderService.sendGroupMessage(peopleDto.getGroupId(),peopleDto.getName(),false);
+			methodOrderService.sendGroupMessage(peopleDto.getGroupId(),peopleDto.getBorderName(),false);
 			return updated == 1;
 		}
 		return false;
@@ -330,7 +330,7 @@ public class TbOrderService extends ServiceImpl<TbOrderMapper, TbOrder> implemen
 			peopleConfirmVo.setOrderId(so.getLong("orderId"));
 			peopleConfirmVo.setGroupId(so.getLong("groupId"));
 			peopleConfirmVo.setPeopleId(people.getId());
-			peopleConfirmVo.setPeopleName(people.getName());
+			peopleConfirmVo.setPeopleName(people.getBorderName());
 
 			// 订单确认状态
 			if(peopleIds.contains(people.getId()) || 2 == people.getRole()) {

sp-service/level-one-server/src/main/java/com/pj/tb_people/MethodPeopleService.java

@@ -51,27 +51,27 @@ public class MethodPeopleService {
             TbPeople tbPeople = new TbPeople();
             //解析数据
             if(row.getCell(1) != null)
-                tbPeople.setName(row.getCell(1).getStringCellValue());
+                tbPeople.setBorderName(row.getCell(1).getStringCellValue());
 
             if(row.getCell(2) != null)
                 tbPeople.setCode(row.getCell(2).getStringCellValue());
 
             HSSFCell cell8 = row.getCell(3);
             if (cell8 != null && (cell8.getCellType() == CellType.NUMERIC || cell8.getCellType() == CellType.FORMULA))
-                tbPeople.setSex((int) cell8.getNumericCellValue());
+                tbPeople.setGencd((int) cell8.getNumericCellValue());
 
             HSSFCell cell4 = row.getCell(4);
             if (cell4 != null && (cell4.getCellType() == CellType.NUMERIC || cell4.getCellType() == CellType.FORMULA))
                 tbPeople.setAge((int) cell4.getNumericCellValue());
 
             if(row.getCell(5) != null)
-                tbPeople.setIdCard(row.getCell(3).getStringCellValue());
+                tbPeople.setIdCardNo(row.getCell(3).getStringCellValue());
 
             if(row.getCell(6) != null)
                 tbPeople.setIdCardImg(row.getCell(3).getStringCellValue());
 
             if(row.getCell(7) != null)
-                tbPeople.setPhone(row.getCell(3).getStringCellValue());
+                tbPeople.setBorderTel(row.getCell(3).getStringCellValue());
 
             if(row.getCell(8) != null)
                 tbPeople.setBankNo(row.getCell(3).getStringCellValue());

sp-service/level-one-server/src/main/java/com/pj/tb_people/TbPeople.java

@@ -1,21 +1,20 @@
 package com.pj.tb_people;
 
-import java.io.Serializable;
-import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import lombok.EqualsAndHashCode;
-
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
 
 /**
  * Model: tb_people -- 边民
- * @author qzy 
+ * @author yzs 
  */
 @Data
 @Accessors(chain = true)
@@ -48,21 +47,22 @@ public class TbPeople extends Model<TbPeople> implements Serializable {
 	 * 主键 
 	 */
 	@TableId(type = IdType.AUTO)
-	@JsonSerialize(using = ToStringSerializer.class)
 	private Long id;
 
 	/**
-	 * 互市区id
+	 * 互市区id 
 	 */
-	private Long tradeAreaId;
+	private Long tradeAreaId;	
+
 	/**
-	 * 互市区名称
+	 * 互市区名称 
 	 */
-	private String tradeAreaName;
+	private String tradeAreaName;	
+
 	/**
 	 * 姓名 
 	 */
-	private String name;	
+	private String borderName;	
 
 	/**
 	 * 边民号 
@@ -72,7 +72,7 @@ public class TbPeople extends Model<TbPeople> implements Serializable {
 	/**
 	 * 性别(1=男,2=女) 
 	 */
-	private Integer sex;
+	private Integer gencd;
 
 	/**
 	 * 年龄 
@@ -82,7 +82,7 @@ public class TbPeople extends Model<TbPeople> implements Serializable {
 	/**
 	 * 身份证 
 	 */
-	private String idCard;	
+	private String idCardNo;	
 
 	/**
 	 * 身份证复印件 
@@ -92,7 +92,7 @@ public class TbPeople extends Model<TbPeople> implements Serializable {
 	/**
 	 * 手机号码 
 	 */
-	private String phone;	
+	private String borderTel;	
 
 	/**
 	 * 银行编号 
@@ -127,7 +127,7 @@ public class TbPeople extends Model<TbPeople> implements Serializable {
 	/**
 	 * 角色(1=普通边民,2=兼组长) 
 	 */
-	private Integer role=1;
+	private Integer role;
 
 	/**
 	 * 经度 
@@ -170,36 +170,36 @@ public class TbPeople extends Model<TbPeople> implements Serializable {
 	private Double leftPrice;	
 
 	/**
-	 *  
+	 * 审核状态 
 	 */
 	private Integer judgeStatus;
 
 	/**
-	 *  
+	 * 审核不通过内容 
 	 */
 	private String judgeContent;	
 
 	/**
-	 *  注册时间
+	 * 注册时间 
 	 */
-	@JsonFormat(pattern = "yyyy-MM-dd")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	private Date registerTime;
 
 	/**
-	 *  
+	 * 审核时间 
 	 */
-	@JsonFormat(pattern = "yyyy-MM-dd")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	private Date judgeTime;
 
 	/**
-	 *  
+	 * 审核人ID 
 	 */
 	private String personId;	
 
 	/**
 	 * 创建时间 
 	 */
-	@JsonFormat(pattern = "yyyy-MM-dd")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	private Date createTime;
 
 	/**
@@ -215,7 +215,7 @@ public class TbPeople extends Model<TbPeople> implements Serializable {
 	/**
 	 * 更新时间 
 	 */
-	@JsonFormat(pattern = "yyyy-MM-dd")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	private Date updateTime;
 
 	/**
@@ -231,7 +231,66 @@ public class TbPeople extends Model<TbPeople> implements Serializable {
 	/**
 	 * 删除状态(0=禁用,1=启用) 
 	 */
-	private Integer deleteStatus;
+	private Integer deleteStatus;	
+
+	/**
+	 * 地方平台的内部业务编号，每次申请都是新编号 
+	 */
+	private String platSeqNo;	
+
+	/**
+	 * 身份证有效期起，身份证有效期起必须小于身份证有效期止;格式：yyyy-MM-dd 
+	 */
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	private Date startDate;
+
+	/**
+	 * 身份证有效期止，身份证有效期止必须大于身份证有效期起;格式：yyyy-MM-dd 
+	 */
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	private Date endDate;
+
+	/**
+	 * 身份证发证机关 
+	 */
+	private String idcdGcertPgoffNm;	
+
+	/**
+	 * 户籍地址 
+	 */
+	private String birplAddr;	
+
+	/**
+	 * 关区代码，参见关区代码表 
+	 */
+	private String customsCode;	
+
+	/**
+	 * 有 效 效 截 止 时 间yyyy-MM-dd 
+	 */
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	private Date expiry;
+
+	/**
+	 * 备案编号，如果为新增备案，传空值；如果为变更备案，必须传值； 
+	 */
+	private String putrecNo;	
+
+	/**
+	 * 地方政府编号 
+	 */
+	private String localGovernmentNo;	
+
+	/**
+	 * 备案状态：默认 0=待申报，1=已申报，2=备案通过，3=备案失败 
+	 */
+	private String filingStatus;
+
+	/**
+	 *  场所编码 
+	 */
+	private String fieldCode;	
+
 
 
 

sp-service/level-one-server/src/main/java/com/pj/tb_people/TbPeopleService.java

@@ -292,7 +292,7 @@ public class TbPeopleService extends ServiceImpl<TbPeopleMapper, TbPeople> imple
 		tbOrderPeopleConfirm.setPeopleId(tbPeople.getId());
 		tbOrderPeopleConfirm.setGroupId(tbPeople.getGroupId());
 		tbOrderPeopleConfirm.setOrderId(orderId);
-		tbOrderPeopleConfirm.setPeopleName(tbPeople.getName());
+		tbOrderPeopleConfirm.setPeopleName(tbPeople.getBorderName());
 		tbOrderPeopleConfirm.setCreateTime(new Date());
 		int insert = tbOrderPeopleConfirmMapper.insert(tbOrderPeopleConfirm);
 		//执行查询订单完成情况
@@ -405,7 +405,7 @@ public class TbPeopleService extends ServiceImpl<TbPeopleMapper, TbPeople> imple
 		}
 		filepath = filepath + "\\边民数据表_" + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")) + ".xlsx";
 		//根据需求查询数据
-		List<TbPeople> selectedList = tbPeopleMapper.selectList(new LambdaQueryWrapper<TbPeople>().eq(StringUtils.isNoneBlank(keyword), TbPeople::getName, keyword));
+		List<TbPeople> selectedList = tbPeopleMapper.selectList(new LambdaQueryWrapper<TbPeople>().eq(StringUtils.isNoneBlank(keyword), TbPeople::getBorderName, keyword));
 		if(selectedList.size() == 0)return "没有可导出的数据。";
 		//建立excel对象封装数据
 		HSSFWorkbook workbook = new HSSFWorkbook();
@@ -455,13 +455,13 @@ public class TbPeopleService extends ServiceImpl<TbPeopleMapper, TbPeople> imple
 		for (int i = 0; i < selectedList.size(); i++) {
 			HSSFRow sheetRow = sheet.createRow(sheet.getLastRowNum() + 1);
 			sheetRow.createCell(0).setCellValue(i + 1);
-			sheetRow.createCell(1).setCellValue((selectedList.get(i).getName() + "").equals("null")? "": selectedList.get(i).getName() + "");
+			sheetRow.createCell(1).setCellValue((selectedList.get(i).getBorderName() + "").equals("null")? "": selectedList.get(i).getBorderName() + "");
 			sheetRow.createCell(2).setCellValue((selectedList.get(i).getCode() + "").equals("null")? "": selectedList.get(i).getCode() + "");
-			sheetRow.createCell(3).setCellValue((selectedList.get(i).getSex() + "").equals("null")? "": selectedList.get(i).getSex() + "");
+			sheetRow.createCell(3).setCellValue((selectedList.get(i).getGencd() + "").equals("null")? "": selectedList.get(i).getGencd() + "");
 			sheetRow.createCell(4).setCellValue((selectedList.get(i).getAge() + "").equals("null")? "": selectedList.get(i).getAge() + "");
-			sheetRow.createCell(5).setCellValue((selectedList.get(i).getIdCard() + "").equals("null")? "": selectedList.get(i).getIdCard() + "");
+			sheetRow.createCell(5).setCellValue((selectedList.get(i).getIdCardNo() + "").equals("null")? "": selectedList.get(i).getIdCardNo() + "");
 			sheetRow.createCell(6).setCellValue((selectedList.get(i).getIdCardImg() + "").equals("null")? "": selectedList.get(i).getIdCardImg() + "");
-			sheetRow.createCell(7).setCellValue((selectedList.get(i).getPhone() + "").equals("null")? "": selectedList.get(i).getPhone() + "");
+			sheetRow.createCell(7).setCellValue((selectedList.get(i).getBorderTel() + "").equals("null")? "": selectedList.get(i).getBorderTel() + "");
 			sheetRow.createCell(8).setCellValue((selectedList.get(i).getBankNo() + "" ).equals("null")? "": selectedList.get(i).getBankNo() + "");
 			sheetRow.createCell(9).setCellValue((selectedList.get(i).getBankCode() + "").equals("null")? "": selectedList.get(i).getBankCode() + "");
 			sheetRow.createCell(10).setCellValue((selectedList.get(i).getBankName() + "").equals("null")? "": selectedList.get(i).getBankName() + "");

sp-service/level-one-server/src/main/java/com/pj/tb_shop/MethodShopService.java

@@ -1,6 +1,6 @@
 package com.pj.tb_shop;
 
-import com.pj.tb_goods.TbGoods;
+import com.pj.enummj.DeleteStatus;
 import org.apache.poi.hssf.usermodel.HSSFCell;
 import org.apache.poi.hssf.usermodel.HSSFRow;
 import org.apache.poi.hssf.usermodel.HSSFSheet;
@@ -63,10 +63,10 @@ public class MethodShopService {
                 tbShop.setAddressIds(row.getCell(5).getStringCellValue());
 
             if(row.getCell(6) != null)
-                tbShop.setName(row.getCell(6).getStringCellValue());
+                tbShop.setShopName(row.getCell(6).getStringCellValue());
 
             if(row.getCell(7) != null)
-                tbShop.setNo(row.getCell(7).getStringCellValue());
+                tbShop.setShopNo(row.getCell(7).getStringCellValue());
 
             if(row.getCell(8) != null)
                 tbShop.setArea(row.getCell(8).getStringCellValue());
@@ -105,7 +105,7 @@ public class MethodShopService {
                 tbShop.setUpdateTime(cell3.getDateCellValue());
             }
             //删除状态,默认可用
-            tbShop.setDeleteStatus(1);
+            tbShop.setDeleteStatus(DeleteStatus.DELETE_STATUS_ON.getCode());
 			//添加到集合
 			list.add(tbShop);
 

sp-service/level-one-server/src/main/java/com/pj/tb_shop/TbShop.java

@@ -1,20 +1,19 @@
 package com.pj.tb_shop;
 
-import java.io.Serializable;
-import java.util.*;
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import lombok.EqualsAndHashCode;
-
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+import java.util.Date;
+
 /**
  * Model: tb_shop -- 铺位
- * @author qzy 
+ * @author yzs 
  */
 @Data
 @Accessors(chain = true)
@@ -47,8 +46,7 @@ public class TbShop extends Model<TbShop> implements Serializable {
 	 * 主键 
 	 */
 	@TableId(type = IdType.AUTO)
-	@JsonSerialize(using = ToStringSerializer.class)
-	private Long id;
+	private String id;	
 
 	/**
 	 *  
@@ -56,6 +54,51 @@ public class TbShop extends Model<TbShop> implements Serializable {
 	private Long enterpriseId;	
 
 	/**
+	 * 互市区id 
+	 */
+	private Long tradeAreaId;	
+
+	/**
+	 * 互市区名称 
+	 */
+	private String tradeAreaName;	
+
+	/**
+	 *  
+	 */
+	private String address;	
+
+	/**
+	 *  
+	 */
+	private String addressIds;	
+
+	/**
+	 * 区域(A区=A区,B区=B区,C区=C区) 
+	 */
+	private String area;	
+
+	/**
+	 * 是否可用(0=否,1=是) 
+	 */
+	private Integer status;
+
+	/**
+	 *  
+	 */
+	private String remark;	
+
+	/**
+	 *  
+	 */
+	private String enterpriseName;	
+
+	/**
+	 * 创建时间 
+	 */
+	private Date createTime;	
+
+	/**
 	 * 创建者id 
 	 */
 	private String createBy;	
@@ -66,79 +109,144 @@ public class TbShop extends Model<TbShop> implements Serializable {
 	private String createName;	
 
 	/**
+	 * 更新者id 
+	 */
+	private String updateBy;	
+
+	/**
 	 * 更新者名称 
 	 */
 	private String updateName;	
 
 	/**
-	 * 创建时间 
+	 * 更新时间 
 	 */
-	private Date createTime;
+	private Date updateTime;	
 
 	/**
-	 * 更新者id 
+	 * 删除状态 
 	 */
-	private String updateBy;	
+	private Integer deleteStatus;
 
 	/**
-	 * 更新时间 
+	 * 地方平台的内部业务编号，每次申请都是新编号 
 	 */
-	private Date updateTime;
+	private String platSeqNo;	
 
 	/**
-	 *  
+	 * 商铺名称 
 	 */
-	private Long tradeAreaId;	
+	private String shopName;	
 
 	/**
-	 *  
+	 * 商铺编码 
 	 */
-	private String tradeAreaName;	
+	private String shopNo;	
 
 	/**
-	 *  
+	 * 监管场所编号 
 	 */
-	private String address;	
+	private String fieldCode;	
 
 	/**
-	 *  
+	 * 监管场所名称 
 	 */
-	private String addressIds;	
+	private String fieldName;	
 
 	/**
-	 * 名称 
+	 * 关区代码 
 	 */
-	private String name;	
+	private String customsCode;	
 
 	/**
-	 * 编号 
+	 * 营业执照号或社会信用统一代码 
 	 */
-	private String no;	
+	private String shopSccd;	
 
 	/**
-	 * 区域(A区=A区,B区=B区,C区=C区) 
+	 *  经营范围 
 	 */
-	private String area;	
+	private String bnsScope;	
 
 	/**
-	 * 是否可用(0=否,1=是) 
+	 * 铺主姓名 
 	 */
-	private Integer status;
+	private String ownerName;	
 
 	/**
-	 *  
+	 * 铺主证件类型 01：身份证 02 护照 
 	 */
-	private String remark;	
+	private String ownerIdtype;	
 
 	/**
-	 *  入住商家
+	 * 铺主联系方式 
 	 */
-	private String enterpriseName;	
+	private String ownerTel;	
 
 	/**
-	 * 删除状态 
+	 *  店铺地址 
 	 */
-	private Integer deleteStatus;
+	private String shopAddr;	
+
+	/**
+	 * 商铺类型：1-中方商铺 2-外国商铺 
+	 */
+	private String shopType;	
+
+	/**
+	 * 启停用状态： 1- 启用 2-停用 3-注销 
+	 */
+	private String eDStatus;	
+
+	/**
+	 * 有 效 效 截 止 时 间 
+	 */
+	private String expiry;	
+
+	/**
+	 * 备案编号，如果为新增备案，传空值；如果为变更备案，必须传值； 
+	 */
+	private String putrecNo;	
+
+	/**
+	 * 代理人姓名：商铺类型为外方商铺时必填 
+	 */
+	private String agentName;	
+
+	/**
+	 * 代理人联系方式：商铺类型为外方商铺时必填 
+	 */
+	private String agentTel;	
+
+	/**
+	 * 代理人证件类型：01-身份证，02-护照商铺类型为外方商铺时必填 
+	 */
+	private String agentIdtype;	
+
+	/**
+	 * 代理人身份证：商铺类型为外方商铺时必填 
+	 */
+	private String agentCiphertextIdno;	
+
+	/**
+	 * 地方政府编号 
+	 */
+	private String localGovernmentNo;	
+
+	/**
+	 * 备案状态：默认 0、待申报，1、已申报，2、备案通过，3、备案失败 
+	 */
+	private String filingStatus;	
+
+	/**
+	 * 店铺开户行 
+	 */
+	private String bank;	
+
+	/**
+	 * 店铺开户行账号 
+	 */
+	private String bankAccount;	
 
 
 

sp-service/level-one-server/src/main/java/com/pj/tb_shop/TbShopController.java

@@ -4,13 +4,11 @@ import java.io.IOException;
 import java.util.List;
 import com.pj.utils.so.SoMap;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import com.pj.utils.sg.*;
 import com.pj.project4sp.SP;
 
-import com.pj.current.satoken.StpUserUtil;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import org.springframework.web.multipart.MultipartFile;
 

sp-service/level-one-server/src/main/java/com/pj/tb_shop/TbShopService.java

@@ -104,7 +104,7 @@ public class TbShopService extends ServiceImpl<TbShopMapper, TbShop> implements
 		}
 		filepath = filepath + "\\铺位数据表_" + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")) + ".xlsx";
 		//根据需求查询数据
-		List<TbShop> selectedList = tbShopMapper.selectList(new LambdaQueryWrapper<TbShop>().eq(StringUtils.isNoneBlank(keyword), TbShop::getName, keyword));
+		List<TbShop> selectedList = tbShopMapper.selectList(new LambdaQueryWrapper<TbShop>().eq(StringUtils.isNoneBlank(keyword), TbShop::getShopName, keyword));
 		if(selectedList.size() == 0)return "没有可导出的数据。";
 		//建立excel对象封装数据
 		HSSFWorkbook workbook = new HSSFWorkbook();
@@ -144,8 +144,8 @@ public class TbShopService extends ServiceImpl<TbShopMapper, TbShop> implements
 			sheetRow.createCell(3).setCellValue((selectedList.get(i).getTradeAreaName() + "").equals("null")? "": selectedList.get(i).getTradeAreaName() + "");
 			sheetRow.createCell(4).setCellValue((selectedList.get(i).getAddress() + "").equals("null")? "": selectedList.get(i).getAddress() + "");
 			sheetRow.createCell(5).setCellValue((selectedList.get(i).getAddressIds() + "").equals("null")? "": selectedList.get(i).getAddressIds() + "");
-			sheetRow.createCell(6).setCellValue((selectedList.get(i).getName() + "").equals("null")? "": selectedList.get(i).getName() + "");
-			sheetRow.createCell(7).setCellValue((selectedList.get(i).getNo() + "").equals("null")? "": selectedList.get(i).getNo() + "");
+			sheetRow.createCell(6).setCellValue((selectedList.get(i).getShopName() + "").equals("null")? "": selectedList.get(i).getShopName() + "");
+			sheetRow.createCell(7).setCellValue((selectedList.get(i).getShopNo() + "").equals("null")? "": selectedList.get(i).getShopNo() + "");
 			sheetRow.createCell(8).setCellValue((selectedList.get(i).getArea() + "" ).equals("null")? "": selectedList.get(i).getArea() + "");
 			sheetRow.createCell(9).setCellValue((selectedList.get(i).getStatus() + "").equals("null")? "": selectedList.get(i).getStatus() + "");
 			sheetRow.createCell(10).setCellValue((selectedList.get(i).getRemark() + "").equals("null")? "": selectedList.get(i).getRemark() + "");

sp-service/pom.xml

@@ -28,18 +28,18 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <source>${java.version}</source>
-                    <target>${java.version}</target>
-                    <encoding>${project.build.sourceEncoding}</encoding>
-                    <archive>
-                        <manifest>
-                            <addClasspath>true</addClasspath>
-                            <classpathPrefix>lib/</classpathPrefix>
-                           	<mainClass>${java.run.main.class}</mainClass>
-                        </manifest>
-                    </archive>
-                </configuration>
+<!--                <configuration>-->
+<!--                    <source>${java.version}</source>-->
+<!--                    <target>${java.version}</target>-->
+<!--                    <encoding>${project.build.sourceEncoding}</encoding>-->
+<!--                    <archive>-->
+<!--                        <manifest>-->
+<!--                            <addClasspath>true</addClasspath>-->
+<!--                            <classpathPrefix>lib/</classpathPrefix>-->
+<!--                           	<mainClass>${java.run.main.class}</mainClass>-->
+<!--                        </manifest>-->
+<!--                    </archive>-->
+<!--                </configuration>-->
             </plugin>
             <!-- 拷贝依赖的jar包到lib目录 -->
             <plugin>

sp-service/sp-admin/src/main/java/com/pj/project/app_user/MethodAppUserService.java

@@ -139,7 +139,7 @@ public class MethodAppUserService {
         appUser.setTradeAreaName(peopleDto.getTradeAreaName());
         appUser.setGroupName(peopleDto.getGroupName());
         appUser.setAge(peopleDto.getAge() + "岁");
-        appUser.setGenderName(peopleDto.getSex() == 1? "男" : "女");
+        appUser.setGenderName(peopleDto.getGencd() == 1? "男" : "女");
         appUser.setAddress(peopleDto.getAddress());
         return appUser;
     }