添加事项备注字段

base-manager/db/add.sql

@@ -348,6 +348,11 @@ CREATE TABLE `mortals_sys_social_security_set`  (
     `az400` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '机具编码',
     `sm4key` varchar(2048) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '私钥',
     `serviceCode` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '政务排号认证',
+    `bus_code` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '政务业务认证码',
+    `orgName` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '机构名称',
+    `address` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '机具使用地址',
+    `regionCode` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '区域码',
+    `orgCode` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '统一社会信用代码',
     `enabled` tinyint(1) NULL DEFAULT 1 COMMENT '启用开关',
     `remark` varchar(512) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '短信签名',
     `createTime` datetime(0) NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '创建时间',

base-manager/src/main/java/com/mortals/xhx/module/social/model/SocialSecuritySetEntity.java

@@ -10,11 +10,11 @@ import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.social.model.vo.SocialSecuritySetVo;
 import lombok.Data;
 /**
-* 社保配置实体对象
-*
-* @author zxfei
-* @date 2025-03-21
-*/
+ * 社保配置实体对象
+ *
+ * @author zxfei
+ * @date 2025-03-21
+ */
 @Data
 public class SocialSecuritySetEntity extends SocialSecuritySetVo {
     private static final long serialVersionUID = 1L;
@@ -63,6 +63,26 @@ public class SocialSecuritySetEntity extends SocialSecuritySetVo {
      * 短信签名
      */
     private String remark;
+    /**
+     * 政务业务认证码
+     */
+    private String busCode;
+    /**
+     * 机构名称
+     */
+    private String orgName;
+    /**
+     * 机具使用地址
+     */
+    private String address;
+    /**
+     * 区域码
+     */
+    private String regionCode;
+    /**
+     * 统一社会信用代码
+     */
+    private String orgCode;
     @Override
     public int hashCode() {
         return this.getId().hashCode();
@@ -91,5 +111,10 @@ public class SocialSecuritySetEntity extends SocialSecuritySetVo {
         this.serviceCode = "";
         this.enabled = 1;
         this.remark = "";
+        this.busCode = "";
+        this.orgName = "";
+        this.address = "";
+        this.regionCode = "";
+        this.orgCode = "";
     }
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/social/model/SocialSecuritySetQuery.java

@@ -3,11 +3,11 @@ package com.mortals.xhx.module.social.model;
 import java.util.List;
 import com.mortals.xhx.module.social.model.SocialSecuritySetEntity;
 /**
-* 社保配置查询对象
-*
-* @author zxfei
-* @date 2025-03-21
-*/
+ * 社保配置查询对象
+ *
+ * @author zxfei
+ * @date 2025-03-21
+ */
 public class SocialSecuritySetQuery extends SocialSecuritySetEntity {
     /** 开始 序号，主键，自增长 */
     private Long idStart;
@@ -126,6 +126,31 @@ public class SocialSecuritySetQuery extends SocialSecuritySetEntity {
     /** 结束 修改时间 */
     private String updateTimeEnd;
 
+    /** 政务业务认证码 */
+    private List<String> busCodeList;
+
+    /** 政务业务认证码排除列表 */
+    private List <String> busCodeNotList;
+    /** 机构名称 */
+    private List<String> orgNameList;
+
+    /** 机构名称排除列表 */
+    private List <String> orgNameNotList;
+    /** 机具使用地址 */
+    private List<String> addressList;
+
+    /** 机具使用地址排除列表 */
+    private List <String> addressNotList;
+    /** 区域码 */
+    private List<String> regionCodeList;
+
+    /** 区域码排除列表 */
+    private List <String> regionCodeNotList;
+    /** 统一社会信用代码 */
+    private List<String> orgCodeList;
+
+    /** 统一社会信用代码排除列表 */
+    private List <String> orgCodeNotList;
     /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<SocialSecuritySetQuery> orConditionList;
 
@@ -810,6 +835,166 @@ public class SocialSecuritySetQuery extends SocialSecuritySetEntity {
         this.updateTimeEnd = updateTimeEnd;
     }
 
+    /**
+     * 获取 政务业务认证码
+     * @return busCodeList
+     */
+    public List<String> getBusCodeList(){
+        return this.busCodeList;
+    }
+
+    /**
+     * 设置 政务业务认证码
+     * @param busCodeList
+     */
+    public void setBusCodeList(List<String> busCodeList){
+        this.busCodeList = busCodeList;
+    }
+
+    /**
+     * 获取 政务业务认证码
+     * @return busCodeNotList
+     */
+    public List<String> getBusCodeNotList(){
+        return this.busCodeNotList;
+    }
+
+    /**
+     * 设置 政务业务认证码
+     * @param busCodeNotList
+     */
+    public void setBusCodeNotList(List<String> busCodeNotList){
+        this.busCodeNotList = busCodeNotList;
+    }
+
+    /**
+     * 获取 机构名称
+     * @return orgNameList
+     */
+    public List<String> getOrgNameList(){
+        return this.orgNameList;
+    }
+
+    /**
+     * 设置 机构名称
+     * @param orgNameList
+     */
+    public void setOrgNameList(List<String> orgNameList){
+        this.orgNameList = orgNameList;
+    }
+
+    /**
+     * 获取 机构名称
+     * @return orgNameNotList
+     */
+    public List<String> getOrgNameNotList(){
+        return this.orgNameNotList;
+    }
+
+    /**
+     * 设置 机构名称
+     * @param orgNameNotList
+     */
+    public void setOrgNameNotList(List<String> orgNameNotList){
+        this.orgNameNotList = orgNameNotList;
+    }
+
+    /**
+     * 获取 机具使用地址
+     * @return addressList
+     */
+    public List<String> getAddressList(){
+        return this.addressList;
+    }
+
+    /**
+     * 设置 机具使用地址
+     * @param addressList
+     */
+    public void setAddressList(List<String> addressList){
+        this.addressList = addressList;
+    }
+
+    /**
+     * 获取 机具使用地址
+     * @return addressNotList
+     */
+    public List<String> getAddressNotList(){
+        return this.addressNotList;
+    }
+
+    /**
+     * 设置 机具使用地址
+     * @param addressNotList
+     */
+    public void setAddressNotList(List<String> addressNotList){
+        this.addressNotList = addressNotList;
+    }
+
+    /**
+     * 获取 区域码
+     * @return regionCodeList
+     */
+    public List<String> getRegionCodeList(){
+        return this.regionCodeList;
+    }
+
+    /**
+     * 设置 区域码
+     * @param regionCodeList
+     */
+    public void setRegionCodeList(List<String> regionCodeList){
+        this.regionCodeList = regionCodeList;
+    }
+
+    /**
+     * 获取 区域码
+     * @return regionCodeNotList
+     */
+    public List<String> getRegionCodeNotList(){
+        return this.regionCodeNotList;
+    }
+
+    /**
+     * 设置 区域码
+     * @param regionCodeNotList
+     */
+    public void setRegionCodeNotList(List<String> regionCodeNotList){
+        this.regionCodeNotList = regionCodeNotList;
+    }
+
+    /**
+     * 获取 统一社会信用代码
+     * @return orgCodeList
+     */
+    public List<String> getOrgCodeList(){
+        return this.orgCodeList;
+    }
+
+    /**
+     * 设置 统一社会信用代码
+     * @param orgCodeList
+     */
+    public void setOrgCodeList(List<String> orgCodeList){
+        this.orgCodeList = orgCodeList;
+    }
+
+    /**
+     * 获取 统一社会信用代码
+     * @return orgCodeNotList
+     */
+    public List<String> getOrgCodeNotList(){
+        return this.orgCodeNotList;
+    }
+
+    /**
+     * 设置 统一社会信用代码
+     * @param orgCodeNotList
+     */
+    public void setOrgCodeNotList(List<String> orgCodeNotList){
+        this.orgCodeNotList = orgCodeNotList;
+    }
+
     /**
      * 设置  序号，主键，自增长
      * @param id
@@ -1199,6 +1384,101 @@ public class SocialSecuritySetQuery extends SocialSecuritySetEntity {
     }
 
 
+
+    /**
+     * 设置 政务业务认证码
+     * @param busCode
+     */
+    public SocialSecuritySetQuery busCode(String busCode){
+        setBusCode(busCode);
+        return this;
+    }
+
+    /**
+     * 设置 政务业务认证码
+     * @param busCodeList
+     */
+    public SocialSecuritySetQuery busCodeList(List<String> busCodeList){
+        this.busCodeList = busCodeList;
+        return this;
+    }
+
+
+    /**
+     * 设置 机构名称
+     * @param orgName
+     */
+    public SocialSecuritySetQuery orgName(String orgName){
+        setOrgName(orgName);
+        return this;
+    }
+
+    /**
+     * 设置 机构名称
+     * @param orgNameList
+     */
+    public SocialSecuritySetQuery orgNameList(List<String> orgNameList){
+        this.orgNameList = orgNameList;
+        return this;
+    }
+
+
+    /**
+     * 设置 机具使用地址
+     * @param address
+     */
+    public SocialSecuritySetQuery address(String address){
+        setAddress(address);
+        return this;
+    }
+
+    /**
+     * 设置 机具使用地址
+     * @param addressList
+     */
+    public SocialSecuritySetQuery addressList(List<String> addressList){
+        this.addressList = addressList;
+        return this;
+    }
+
+
+    /**
+     * 设置 区域码
+     * @param regionCode
+     */
+    public SocialSecuritySetQuery regionCode(String regionCode){
+        setRegionCode(regionCode);
+        return this;
+    }
+
+    /**
+     * 设置 区域码
+     * @param regionCodeList
+     */
+    public SocialSecuritySetQuery regionCodeList(List<String> regionCodeList){
+        this.regionCodeList = regionCodeList;
+        return this;
+    }
+
+
+    /**
+     * 设置 统一社会信用代码
+     * @param orgCode
+     */
+    public SocialSecuritySetQuery orgCode(String orgCode){
+        setOrgCode(orgCode);
+        return this;
+    }
+
+    /**
+     * 设置 统一社会信用代码
+     * @param orgCodeList
+     */
+    public SocialSecuritySetQuery orgCodeList(List<String> orgCodeList){
+        this.orgCodeList = orgCodeList;
+        return this;
+    }
+
     /**
      * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
      * @return orConditionList