添加应用白名单接口

common-lib/src/main/java/com/mortals/xhx/common/pdu/site/SiteMatterPdu.java

+package com.mortals.xhx.common.pdu.site;
+import java.util.Date;
+import java.util.List;
+import com.mortals.framework.model.BaseEntityLong;
+
+/**
+* 站点事项Pdu对象
+*
+* @author zxfei
+* @date 2023-02-17
+*/
+
+public class SiteMatterPdu extends BaseEntityLong {
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 站点ID
+    */
+    private Long siteId;
+    /**
+    * 站点名称
+    */
+    private String siteName;
+    /**
+    * 事项ID
+    */
+    private Long matterId;
+    /**
+    * 事项名称
+    */
+    private String matterName;
+    /**
+    * 事项编码
+    */
+    private String matterCode;
+    /**
+    * 部门ID
+    */
+    private Long deptId;
+    /**
+    * 部门名称
+    */
+    private String deptName;
+    /**
+    * 事项类型
+    */
+    private String eventTypeShow;
+    /**
+    * 事项来源
+    */
+    private Integer source;
+    /**
+    * 部门编号
+    */
+    private String deptCode;
+
+    /** 开始 序号，主键，自增长 */
+    private Long idStart;
+
+    /** 结束 序号，主键，自增长 */
+    private Long idEnd;
+
+    /** 增加 序号，主键，自增长 */
+    private Long idIncrement;
+
+    /** 序号，主键，自增长列表 */
+    private List <Long> idList;
+
+    /** 开始 站点ID */
+    private Long siteIdStart;
+
+    /** 结束 站点ID */
+    private Long siteIdEnd;
+
+    /** 增加 站点ID */
+    private Long siteIdIncrement;
+
+    /** 站点ID列表 */
+    private List <Long> siteIdList;
+
+    /** 站点名称 */
+    private List<String> siteNameList;
+
+    /** 开始 事项ID */
+    private Long matterIdStart;
+
+    /** 结束 事项ID */
+    private Long matterIdEnd;
+
+    /** 增加 事项ID */
+    private Long matterIdIncrement;
+
+    /** 事项ID列表 */
+    private List <Long> matterIdList;
+
+    /** 事项名称 */
+    private List<String> matterNameList;
+
+    /** 事项编码 */
+    private List<String> matterCodeList;
+
+    /** 开始 部门ID */
+    private Long deptIdStart;
+
+    /** 结束 部门ID */
+    private Long deptIdEnd;
+
+    /** 增加 部门ID */
+    private Long deptIdIncrement;
+
+    /** 部门ID列表 */
+    private List <Long> deptIdList;
+
+    /** 部门名称 */
+    private List<String> deptNameList;
+
+    /** 事项类型 */
+    private List<String> eventTypeShowList;
+
+    /** 开始 事项来源 */
+    private Integer sourceStart;
+
+    /** 结束 事项来源 */
+    private Integer sourceEnd;
+
+    /** 增加 事项来源 */
+    private Integer sourceIncrement;
+
+    /** 事项来源列表 */
+    private List <Integer> sourceList;
+
+    /** 部门编号 */
+    private List<String> deptCodeList;
+
+    /** 开始 创建时间 */
+    private String createTimeStart;
+
+    /** 结束 创建时间 */
+    private String createTimeEnd;
+
+    /** 开始 创建用户 */
+    private Long createUserIdStart;
+
+    /** 结束 创建用户 */
+    private Long createUserIdEnd;
+
+    /** 增加 创建用户 */
+    private Long createUserIdIncrement;
+
+    /** 创建用户列表 */
+    private List <Long> createUserIdList;
+
+    /** 开始 修改时间 */
+    private String updateTimeStart;
+
+    /** 结束 修改时间 */
+    private String updateTimeEnd;
+
+
+    /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
+    private List<SiteMatterPdu> orConditionList;
+
+    /** AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
+    private List<SiteMatterPdu> andConditionList;
+
+    public SiteMatterPdu(){}
+    /**
+    * 获取 站点ID
+    * @return Long
+    */
+    public Long getSiteId(){
+        return siteId;
+    }
+    /**
+    * 设置 站点ID
+    * @param siteId
+    */
+    public void setSiteId(Long siteId){
+        this.siteId = siteId;
+    }
+    /**
+    * 获取 站点名称
+    * @return String
+    */
+    public String getSiteName(){
+        return siteName;
+    }
+    /**
+    * 设置 站点名称
+    * @param siteName
+    */
+    public void setSiteName(String siteName){
+        this.siteName = siteName;
+    }
+    /**
+    * 获取 事项ID
+    * @return Long
+    */
+    public Long getMatterId(){
+        return matterId;
+    }
+    /**
+    * 设置 事项ID
+    * @param matterId
+    */
+    public void setMatterId(Long matterId){
+        this.matterId = matterId;
+    }
+    /**
+    * 获取 事项名称
+    * @return String
+    */
+    public String getMatterName(){
+        return matterName;
+    }
+    /**
+    * 设置 事项名称
+    * @param matterName
+    */
+    public void setMatterName(String matterName){
+        this.matterName = matterName;
+    }
+    /**
+    * 获取 事项编码
+    * @return String
+    */
+    public String getMatterCode(){
+        return matterCode;
+    }
+    /**
+    * 设置 事项编码
+    * @param matterCode
+    */
+    public void setMatterCode(String matterCode){
+        this.matterCode = matterCode;
+    }
+    /**
+    * 获取 部门ID
+    * @return Long
+    */
+    public Long getDeptId(){
+        return deptId;
+    }
+    /**
+    * 设置 部门ID
+    * @param deptId
+    */
+    public void setDeptId(Long deptId){
+        this.deptId = deptId;
+    }
+    /**
+    * 获取 部门名称
+    * @return String
+    */
+    public String getDeptName(){
+        return deptName;
+    }
+    /**
+    * 设置 部门名称
+    * @param deptName
+    */
+    public void setDeptName(String deptName){
+        this.deptName = deptName;
+    }
+    /**
+    * 获取 事项类型
+    * @return String
+    */
+    public String getEventTypeShow(){
+        return eventTypeShow;
+    }
+    /**
+    * 设置 事项类型
+    * @param eventTypeShow
+    */
+    public void setEventTypeShow(String eventTypeShow){
+        this.eventTypeShow = eventTypeShow;
+    }
+    /**
+    * 获取 事项来源
+    * @return Integer
+    */
+    public Integer getSource(){
+        return source;
+    }
+    /**
+    * 设置 事项来源
+    * @param source
+    */
+    public void setSource(Integer source){
+        this.source = source;
+    }
+    /**
+    * 获取 部门编号
+    * @return String
+    */
+    public String getDeptCode(){
+        return deptCode;
+    }
+    /**
+    * 设置 部门编号
+    * @param deptCode
+    */
+    public void setDeptCode(String deptCode){
+        this.deptCode = deptCode;
+    }
+
+    /**
+    * 获取 开始 序号，主键，自增长
+    * @return idStart
+    */
+    public Long getIdStart(){
+        return this.idStart;
+    }
+
+    /**
+    * 设置 开始 序号，主键，自增长
+    * @param idStart
+    */
+    public void setIdStart(Long idStart){
+        this.idStart = idStart;
+    }
+
+    /**
+    * 获取 结束 序号，主键，自增长
+    * @return $idEnd
+    */
+    public Long getIdEnd(){
+        return this.idEnd;
+    }
+
+    /**
+    * 设置 结束 序号，主键，自增长
+    * @param idEnd
+    */
+    public void setIdEnd(Long idEnd){
+        this.idEnd = idEnd;
+    }
+
+    /**
+    * 获取 增加 序号，主键，自增长
+    * @return idIncrement
+    */
+    public Long getIdIncrement(){
+        return this.idIncrement;
+    }
+
+    /**
+    * 设置 增加 序号，主键，自增长
+    * @param idIncrement
+    */
+    public void setIdIncrement(Long idIncrement){
+        this.idIncrement = idIncrement;
+    }
+
+    /**
+    * 获取 序号，主键，自增长
+    * @return idList
+    */
+    public List<Long> getIdList(){
+        return this.idList;
+    }
+
+    /**
+    * 设置 序号，主键，自增长
+    * @param idList
+    */
+    public void setIdList(List<Long> idList){
+        this.idList = idList;
+    }
+
+    /**
+    * 获取 开始 站点ID
+    * @return siteIdStart
+    */
+    public Long getSiteIdStart(){
+        return this.siteIdStart;
+    }
+
+    /**
+    * 设置 开始 站点ID
+    * @param siteIdStart
+    */
+    public void setSiteIdStart(Long siteIdStart){
+        this.siteIdStart = siteIdStart;
+    }
+
+    /**
+    * 获取 结束 站点ID
+    * @return $siteIdEnd
+    */
+    public Long getSiteIdEnd(){
+        return this.siteIdEnd;
+    }
+
+    /**
+    * 设置 结束 站点ID
+    * @param siteIdEnd
+    */
+    public void setSiteIdEnd(Long siteIdEnd){
+        this.siteIdEnd = siteIdEnd;
+    }
+
+    /**
+    * 获取 增加 站点ID
+    * @return siteIdIncrement
+    */
+    public Long getSiteIdIncrement(){
+        return this.siteIdIncrement;
+    }
+
+    /**
+    * 设置 增加 站点ID
+    * @param siteIdIncrement
+    */
+    public void setSiteIdIncrement(Long siteIdIncrement){
+        this.siteIdIncrement = siteIdIncrement;
+    }
+
+    /**
+    * 获取 站点ID
+    * @return siteIdList
+    */
+    public List<Long> getSiteIdList(){
+        return this.siteIdList;
+    }
+
+    /**
+    * 设置 站点ID
+    * @param siteIdList
+    */
+    public void setSiteIdList(List<Long> siteIdList){
+        this.siteIdList = siteIdList;
+    }
+
+    /**
+    * 获取 站点名称
+    * @return siteNameList
+    */
+    public List<String> getSiteNameList(){
+        return this.siteNameList;
+    }
+
+    /**
+    * 设置 站点名称
+    * @param siteNameList
+    */
+    public void setSiteNameList(List<String> siteNameList){
+        this.siteNameList = siteNameList;
+    }
+    /**
+    * 获取 开始 事项ID
+    * @return matterIdStart
+    */
+    public Long getMatterIdStart(){
+        return this.matterIdStart;
+    }
+
+    /**
+    * 设置 开始 事项ID
+    * @param matterIdStart
+    */
+    public void setMatterIdStart(Long matterIdStart){
+        this.matterIdStart = matterIdStart;
+    }
+
+    /**
+    * 获取 结束 事项ID
+    * @return $matterIdEnd
+    */
+    public Long getMatterIdEnd(){
+        return this.matterIdEnd;
+    }
+
+    /**
+    * 设置 结束 事项ID
+    * @param matterIdEnd
+    */
+    public void setMatterIdEnd(Long matterIdEnd){
+        this.matterIdEnd = matterIdEnd;
+    }
+
+    /**
+    * 获取 增加 事项ID
+    * @return matterIdIncrement
+    */
+    public Long getMatterIdIncrement(){
+        return this.matterIdIncrement;
+    }
+
+    /**
+    * 设置 增加 事项ID
+    * @param matterIdIncrement
+    */
+    public void setMatterIdIncrement(Long matterIdIncrement){
+        this.matterIdIncrement = matterIdIncrement;
+    }
+
+    /**
+    * 获取 事项ID
+    * @return matterIdList
+    */
+    public List<Long> getMatterIdList(){
+        return this.matterIdList;
+    }
+
+    /**
+    * 设置 事项ID
+    * @param matterIdList
+    */
+    public void setMatterIdList(List<Long> matterIdList){
+        this.matterIdList = matterIdList;
+    }
+
+    /**
+    * 获取 事项名称
+    * @return matterNameList
+    */
+    public List<String> getMatterNameList(){
+        return this.matterNameList;
+    }
+
+    /**
+    * 设置 事项名称
+    * @param matterNameList
+    */
+    public void setMatterNameList(List<String> matterNameList){
+        this.matterNameList = matterNameList;
+    }
+    /**
+    * 获取 事项编码
+    * @return matterCodeList
+    */
+    public List<String> getMatterCodeList(){
+        return this.matterCodeList;
+    }
+
+    /**
+    * 设置 事项编码
+    * @param matterCodeList
+    */
+    public void setMatterCodeList(List<String> matterCodeList){
+        this.matterCodeList = matterCodeList;
+    }
+    /**
+    * 获取 开始 部门ID
+    * @return deptIdStart
+    */
+    public Long getDeptIdStart(){
+        return this.deptIdStart;
+    }
+
+    /**
+    * 设置 开始 部门ID
+    * @param deptIdStart
+    */
+    public void setDeptIdStart(Long deptIdStart){
+        this.deptIdStart = deptIdStart;
+    }
+
+    /**
+    * 获取 结束 部门ID
+    * @return $deptIdEnd
+    */
+    public Long getDeptIdEnd(){
+        return this.deptIdEnd;
+    }
+
+    /**
+    * 设置 结束 部门ID
+    * @param deptIdEnd
+    */
+    public void setDeptIdEnd(Long deptIdEnd){
+        this.deptIdEnd = deptIdEnd;
+    }
+
+    /**
+    * 获取 增加 部门ID
+    * @return deptIdIncrement
+    */
+    public Long getDeptIdIncrement(){
+        return this.deptIdIncrement;
+    }
+
+    /**
+    * 设置 增加 部门ID
+    * @param deptIdIncrement
+    */
+    public void setDeptIdIncrement(Long deptIdIncrement){
+        this.deptIdIncrement = deptIdIncrement;
+    }
+
+    /**
+    * 获取 部门ID
+    * @return deptIdList
+    */
+    public List<Long> getDeptIdList(){
+        return this.deptIdList;
+    }
+
+    /**
+    * 设置 部门ID
+    * @param deptIdList
+    */
+    public void setDeptIdList(List<Long> deptIdList){
+        this.deptIdList = deptIdList;
+    }
+
+    /**
+    * 获取 部门名称
+    * @return deptNameList
+    */
+    public List<String> getDeptNameList(){
+        return this.deptNameList;
+    }
+
+    /**
+    * 设置 部门名称
+    * @param deptNameList
+    */
+    public void setDeptNameList(List<String> deptNameList){
+        this.deptNameList = deptNameList;
+    }
+    /**
+    * 获取 事项类型
+    * @return eventTypeShowList
+    */
+    public List<String> getEventTypeShowList(){
+        return this.eventTypeShowList;
+    }
+
+    /**
+    * 设置 事项类型
+    * @param eventTypeShowList
+    */
+    public void setEventTypeShowList(List<String> eventTypeShowList){
+        this.eventTypeShowList = eventTypeShowList;
+    }
+    /**
+    * 获取 开始 事项来源
+    * @return sourceStart
+    */
+    public Integer getSourceStart(){
+        return this.sourceStart;
+    }
+
+    /**
+    * 设置 开始 事项来源
+    * @param sourceStart
+    */
+    public void setSourceStart(Integer sourceStart){
+        this.sourceStart = sourceStart;
+    }
+
+    /**
+    * 获取 结束 事项来源
+    * @return $sourceEnd
+    */
+    public Integer getSourceEnd(){
+        return this.sourceEnd;
+    }
+
+    /**
+    * 设置 结束 事项来源
+    * @param sourceEnd
+    */
+    public void setSourceEnd(Integer sourceEnd){
+        this.sourceEnd = sourceEnd;
+    }
+
+    /**
+    * 获取 增加 事项来源
+    * @return sourceIncrement
+    */
+    public Integer getSourceIncrement(){
+        return this.sourceIncrement;
+    }
+
+    /**
+    * 设置 增加 事项来源
+    * @param sourceIncrement
+    */
+    public void setSourceIncrement(Integer sourceIncrement){
+        this.sourceIncrement = sourceIncrement;
+    }
+
+    /**
+    * 获取 事项来源
+    * @return sourceList
+    */
+    public List<Integer> getSourceList(){
+        return this.sourceList;
+    }
+
+    /**
+    * 设置 事项来源
+    * @param sourceList
+    */
+    public void setSourceList(List<Integer> sourceList){
+        this.sourceList = sourceList;
+    }
+
+    /**
+    * 获取 部门编号
+    * @return deptCodeList
+    */
+    public List<String> getDeptCodeList(){
+        return this.deptCodeList;
+    }
+
+    /**
+    * 设置 部门编号
+    * @param deptCodeList
+    */
+    public void setDeptCodeList(List<String> deptCodeList){
+        this.deptCodeList = deptCodeList;
+    }
+    /**
+    * 获取 开始 创建时间
+    * @return createTimeStart
+    */
+    public String getCreateTimeStart(){
+        return this.createTimeStart;
+    }
+
+    /**
+    * 设置 开始 创建时间
+    * @param createTimeStart
+    */
+    public void setCreateTimeStart(String createTimeStart){
+        this.createTimeStart = createTimeStart;
+    }
+
+    /**
+    * 获取 结束 创建时间
+    * @return createTimeEnd
+    */
+    public String getCreateTimeEnd(){
+        return this.createTimeEnd;
+    }
+
+    /**
+    * 设置 结束 创建时间
+    * @param createTimeEnd
+    */
+    public void setCreateTimeEnd(String createTimeEnd){
+        this.createTimeEnd = createTimeEnd;
+    }
+
+    /**
+    * 获取 开始 创建用户
+    * @return createUserIdStart
+    */
+    public Long getCreateUserIdStart(){
+        return this.createUserIdStart;
+    }
+
+    /**
+    * 设置 开始 创建用户
+    * @param createUserIdStart
+    */
+    public void setCreateUserIdStart(Long createUserIdStart){
+        this.createUserIdStart = createUserIdStart;
+    }
+
+    /**
+    * 获取 结束 创建用户
+    * @return $createUserIdEnd
+    */
+    public Long getCreateUserIdEnd(){
+        return this.createUserIdEnd;
+    }
+
+    /**
+    * 设置 结束 创建用户
+    * @param createUserIdEnd
+    */
+    public void setCreateUserIdEnd(Long createUserIdEnd){
+        this.createUserIdEnd = createUserIdEnd;
+    }
+
+    /**
+    * 获取 增加 创建用户
+    * @return createUserIdIncrement
+    */
+    public Long getCreateUserIdIncrement(){
+        return this.createUserIdIncrement;
+    }
+
+    /**
+    * 设置 增加 创建用户
+    * @param createUserIdIncrement
+    */
+    public void setCreateUserIdIncrement(Long createUserIdIncrement){
+        this.createUserIdIncrement = createUserIdIncrement;
+    }
+
+    /**
+    * 获取 创建用户
+    * @return createUserIdList
+    */
+    public List<Long> getCreateUserIdList(){
+        return this.createUserIdList;
+    }
+
+    /**
+    * 设置 创建用户
+    * @param createUserIdList
+    */
+    public void setCreateUserIdList(List<Long> createUserIdList){
+        this.createUserIdList = createUserIdList;
+    }
+
+    /**
+    * 获取 开始 修改时间
+    * @return updateTimeStart
+    */
+    public String getUpdateTimeStart(){
+        return this.updateTimeStart;
+    }
+
+    /**
+    * 设置 开始 修改时间
+    * @param updateTimeStart
+    */
+    public void setUpdateTimeStart(String updateTimeStart){
+        this.updateTimeStart = updateTimeStart;
+    }
+
+    /**
+    * 获取 结束 修改时间
+    * @return updateTimeEnd
+    */
+    public String getUpdateTimeEnd(){
+        return this.updateTimeEnd;
+    }
+
+    /**
+    * 设置 结束 修改时间
+    * @param updateTimeEnd
+    */
+    public void setUpdateTimeEnd(String updateTimeEnd){
+        this.updateTimeEnd = updateTimeEnd;
+    }
+
+    /**
+    * 设置  序号，主键，自增长
+    * @param id
+    */
+    public SiteMatterPdu id(Long id){
+	    setId(id);
+		return this;
+    }
+
+	 /**
+    * 设置 开始 序号，主键，自增长
+    * @param idStart
+    */
+    public SiteMatterPdu idStart(Long idStart){
+		this.idStart = idStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 序号，主键，自增长
+    * @param idEnd
+    */
+    public SiteMatterPdu idEnd(Long idEnd){
+		this.idEnd = idEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 序号，主键，自增长
+    * @param idIncrement
+    */
+    public SiteMatterPdu idIncrement(Long idIncrement){
+		this.idIncrement = idIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 序号，主键，自增长
+    * @param idList
+    */
+    public SiteMatterPdu idList(List<Long> idList){
+        this.idList = idList;
+		return this;
+        }
+
+    /**
+    * 设置  站点ID
+    * @param siteId
+    */
+    public SiteMatterPdu siteId(Long siteId){
+	    setSiteId(siteId);
+		return this;
+    }
+
+	 /**
+    * 设置 开始 站点ID
+    * @param siteIdStart
+    */
+    public SiteMatterPdu siteIdStart(Long siteIdStart){
+		this.siteIdStart = siteIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 站点ID
+    * @param siteIdEnd
+    */
+    public SiteMatterPdu siteIdEnd(Long siteIdEnd){
+		this.siteIdEnd = siteIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 站点ID
+    * @param siteIdIncrement
+    */
+    public SiteMatterPdu siteIdIncrement(Long siteIdIncrement){
+		this.siteIdIncrement = siteIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 站点ID
+    * @param siteIdList
+    */
+    public SiteMatterPdu siteIdList(List<Long> siteIdList){
+        this.siteIdList = siteIdList;
+		return this;
+        }
+
+
+	/**
+    * 设置 站点名称
+    * @param siteName
+    */
+    public SiteMatterPdu siteName(String siteName){
+        setSiteName(siteName);
+		return this;
+    }
+
+    /**
+    * 设置 站点名称
+    * @param siteNameList
+    */
+    public SiteMatterPdu siteNameList(List<String> siteNameList){
+        this.siteNameList = siteNameList;
+		return this;
+    }
+
+    /**
+    * 设置  事项ID
+    * @param matterId
+    */
+    public SiteMatterPdu matterId(Long matterId){
+	    setMatterId(matterId);
+		return this;
+    }
+
+	 /**
+    * 设置 开始 事项ID
+    * @param matterIdStart
+    */
+    public SiteMatterPdu matterIdStart(Long matterIdStart){
+		this.matterIdStart = matterIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 事项ID
+    * @param matterIdEnd
+    */
+    public SiteMatterPdu matterIdEnd(Long matterIdEnd){
+		this.matterIdEnd = matterIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 事项ID
+    * @param matterIdIncrement
+    */
+    public SiteMatterPdu matterIdIncrement(Long matterIdIncrement){
+		this.matterIdIncrement = matterIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 事项ID
+    * @param matterIdList
+    */
+    public SiteMatterPdu matterIdList(List<Long> matterIdList){
+        this.matterIdList = matterIdList;
+		return this;
+        }
+
+
+	/**
+    * 设置 事项名称
+    * @param matterName
+    */
+    public SiteMatterPdu matterName(String matterName){
+        setMatterName(matterName);
+		return this;
+    }
+
+    /**
+    * 设置 事项名称
+    * @param matterNameList
+    */
+    public SiteMatterPdu matterNameList(List<String> matterNameList){
+        this.matterNameList = matterNameList;
+		return this;
+    }
+
+
+	/**
+    * 设置 事项编码
+    * @param matterCode
+    */
+    public SiteMatterPdu matterCode(String matterCode){
+        setMatterCode(matterCode);
+		return this;
+    }
+
+    /**
+    * 设置 事项编码
+    * @param matterCodeList
+    */
+    public SiteMatterPdu matterCodeList(List<String> matterCodeList){
+        this.matterCodeList = matterCodeList;
+		return this;
+    }
+
+    /**
+    * 设置  部门ID
+    * @param deptId
+    */
+    public SiteMatterPdu deptId(Long deptId){
+	    setDeptId(deptId);
+		return this;
+    }
+
+	 /**
+    * 设置 开始 部门ID
+    * @param deptIdStart
+    */
+    public SiteMatterPdu deptIdStart(Long deptIdStart){
+		this.deptIdStart = deptIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 部门ID
+    * @param deptIdEnd
+    */
+    public SiteMatterPdu deptIdEnd(Long deptIdEnd){
+		this.deptIdEnd = deptIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 部门ID
+    * @param deptIdIncrement
+    */
+    public SiteMatterPdu deptIdIncrement(Long deptIdIncrement){
+		this.deptIdIncrement = deptIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 部门ID
+    * @param deptIdList
+    */
+    public SiteMatterPdu deptIdList(List<Long> deptIdList){
+        this.deptIdList = deptIdList;
+		return this;
+        }
+
+
+	/**
+    * 设置 部门名称
+    * @param deptName
+    */
+    public SiteMatterPdu deptName(String deptName){
+        setDeptName(deptName);
+		return this;
+    }
+
+    /**
+    * 设置 部门名称
+    * @param deptNameList
+    */
+    public SiteMatterPdu deptNameList(List<String> deptNameList){
+        this.deptNameList = deptNameList;
+		return this;
+    }
+
+
+	/**
+    * 设置 事项类型
+    * @param eventTypeShow
+    */
+    public SiteMatterPdu eventTypeShow(String eventTypeShow){
+        setEventTypeShow(eventTypeShow);
+		return this;
+    }
+
+    /**
+    * 设置 事项类型
+    * @param eventTypeShowList
+    */
+    public SiteMatterPdu eventTypeShowList(List<String> eventTypeShowList){
+        this.eventTypeShowList = eventTypeShowList;
+		return this;
+    }
+
+    /**
+    * 设置  事项来源
+    * @param source
+    */
+    public SiteMatterPdu source(Integer source){
+	    setSource(source);
+		return this;
+    }
+
+	 /**
+    * 设置 开始 事项来源
+    * @param sourceStart
+    */
+    public SiteMatterPdu sourceStart(Integer sourceStart){
+		this.sourceStart = sourceStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 事项来源
+    * @param sourceEnd
+    */
+    public SiteMatterPdu sourceEnd(Integer sourceEnd){
+		this.sourceEnd = sourceEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 事项来源
+    * @param sourceIncrement
+    */
+    public SiteMatterPdu sourceIncrement(Integer sourceIncrement){
+		this.sourceIncrement = sourceIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 事项来源
+    * @param sourceList
+    */
+    public SiteMatterPdu sourceList(List<Integer> sourceList){
+        this.sourceList = sourceList;
+		return this;
+        }
+
+
+	/**
+    * 设置 部门编号
+    * @param deptCode
+    */
+    public SiteMatterPdu deptCode(String deptCode){
+        setDeptCode(deptCode);
+		return this;
+    }
+
+    /**
+    * 设置 部门编号
+    * @param deptCodeList
+    */
+    public SiteMatterPdu deptCodeList(List<String> deptCodeList){
+        this.deptCodeList = deptCodeList;
+		return this;
+    }
+
+
+    /**
+    * 设置  创建用户
+    * @param createUserId
+    */
+    public SiteMatterPdu createUserId(Long createUserId){
+	    setCreateUserId(createUserId);
+		return this;
+    }
+
+	 /**
+    * 设置 开始 创建用户
+    * @param createUserIdStart
+    */
+    public SiteMatterPdu createUserIdStart(Long createUserIdStart){
+		this.createUserIdStart = createUserIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 创建用户
+    * @param createUserIdEnd
+    */
+    public SiteMatterPdu createUserIdEnd(Long createUserIdEnd){
+		this.createUserIdEnd = createUserIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 创建用户
+    * @param createUserIdIncrement
+    */
+    public SiteMatterPdu createUserIdIncrement(Long createUserIdIncrement){
+		this.createUserIdIncrement = createUserIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 创建用户
+    * @param createUserIdList
+    */
+    public SiteMatterPdu createUserIdList(List<Long> createUserIdList){
+        this.createUserIdList = createUserIdList;
+		return this;
+        }
+
+
+
+/**
+    * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+    * @return orConditionList
+    */
+    public List<SiteMatterPdu> getOrConditionList(){
+    return this.orConditionList;
+    }
+
+    /**
+    * 设置 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+    * @param orConditionList
+    */
+    public void setOrConditionList(List<SiteMatterPdu> orConditionList){
+        this.orConditionList = orConditionList;
+    }
+
+    /**
+    * 获取 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
+    * @return andConditionList
+    */
+    public List<SiteMatterPdu> getAndConditionList(){
+        return this.andConditionList;
+    }
+
+    /**
+    * 设置 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
+    * @param andConditionList
+    */
+    public void setAndConditionList(List<SiteMatterPdu> andConditionList){
+        this.andConditionList = andConditionList;
+    }
+
+    @Override
+    public int hashCode() {
+         return this.getId().hashCode();
+    }
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) return false;
+        if (obj instanceof SiteMatterPdu) {
+            SiteMatterPdu tmp = (SiteMatterPdu) obj;
+            if (this.getId() == tmp.getId()) {
+                 return true;
+            }
+        }
+        return false;
+    }
+
+    public void initAttrValue(){
+
+            this.siteId = null;
+
+            this.siteName = null;
+
+            this.matterId = null;
+
+            this.matterName = null;
+
+            this.matterCode = null;
+
+            this.deptId = null;
+
+            this.deptName = null;
+
+            this.eventTypeShow = null;
+
+            this.source = null;
+
+            this.deptCode = null;
+    }
+}
\ No newline at end of file

common-lib/src/main/java/com/mortals/xhx/feign/site/ISiteMatterFeign.java

+package com.mortals.xhx.feign.site;
+import com.mortals.xhx.common.pdu.RespData;
+import com.mortals.xhx.common.pdu.site.SiteMatterPdu;
+import com.alibaba.fastjson.JSON;
+import com.mortals.framework.common.Rest;
+import com.mortals.xhx.feign.IFeign;
+import feign.hystrix.FallbackFactory;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.*;
+import java.util.List;
+/**
+ * 站点事项 Feign接口
+ * @author zxfei
+ * @date 2023-02-17
+ */
+@FeignClient(name = "", path = "", fallbackFactory = SiteMatterFeignFallbackFactory.class)
+public interface ISiteMatterFeign extends IFeign {
+
+
+    /**
+     * 查看站点事项列表
+     *
+     * @param siteMatterPdu
+     * @return
+     */
+    @PostMapping(value = "/site/matter/list")
+    Rest<RespData<List<SiteMatterPdu>>> list(@RequestBody SiteMatterPdu siteMatterPdu);
+
+
+    /**
+     * 查看站点事项
+     *
+     * @param id
+     * @return
+     */
+    @GetMapping(value = "/site/matter/info")
+    Rest<SiteMatterPdu> info(@RequestParam(value = "id") Long id);
+
+    /**
+     * 删除站点事项
+     *
+     * @param ids
+     * @return
+     */
+    @GetMapping(value = "/site/matter/delete")
+    Rest<Void> delete(Long[] ids,@RequestHeader("Authorization") String authorization);
+
+
+    /**
+     * 站点事项保存更新
+     *
+     * @param siteMatterPdu
+     * @return
+     */
+    @PostMapping(value = "/site/matter/save")
+    Rest<RespData<SiteMatterPdu>> save(@RequestBody SiteMatterPdu siteMatterPdu,@RequestHeader("Authorization") String authorization);
+
+
+}
+
+
+@Slf4j
+@Component
+class SiteMatterFeignFallbackFactory implements FallbackFactory<ISiteMatterFeign> {
+    @Override
+    public ISiteMatterFeign create(Throwable t) {
+        return new ISiteMatterFeign() {
+            @Override
+            public Rest<RespData<List<SiteMatterPdu>>> list(SiteMatterPdu siteMatterPdu) {
+               return Rest.fail("暂时无法获取站点事项列表，请稍后再试!");
+            }
+
+            @Override
+            public Rest<SiteMatterPdu> info(Long id) {
+               return Rest.fail("暂时无法获取站点事项详细，请稍后再试!");
+            }
+
+            @Override
+            public Rest<Void> delete(Long[] ids, String authorization) {
+                return Rest.fail("暂时无法删除站点事项，请稍后再试!");
+            }
+
+            @Override
+            public Rest<RespData<SiteMatterPdu>> save(SiteMatterPdu siteMatterPdu, String authorization) {
+                return Rest.fail("暂时无法保存站点事项，请稍后再试!");
+            }
+        };
+    }
+}
+
+
+
+
+
+
+
+

fill-manager/src/main/java/com/mortals/xhx/daemon/task/SyncSiteMatterTaskImpl.java

+package com.mortals.xhx.daemon.task;
+
+import com.mortals.framework.common.Rest;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.service.ITask;
+import com.mortals.framework.service.ITaskExcuteService;
+import com.mortals.xhx.common.code.YesNoEnum;
+import com.mortals.xhx.common.pdu.RespData;
+import com.mortals.xhx.common.pdu.site.SiteMatterPdu;
+import com.mortals.xhx.common.pdu.site.SitePdu;
+import com.mortals.xhx.feign.site.ISiteFeign;
+import com.mortals.xhx.feign.site.ISiteMatterFeign;
+import com.mortals.xhx.module.sheet.model.SheetMatterEntity;
+import com.mortals.xhx.module.sheet.service.SheetMatterService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 同步事项列表
+ */
+@Slf4j
+@Service("SyncSiteMatterTask")
+public class SyncSiteMatterTaskImpl implements ITaskExcuteService {
+
+    @Autowired
+    private ISiteFeign siteFeign;
+    @Autowired
+    private ISiteMatterFeign siteMatterFeign;
+    @Autowired
+    private SheetMatterService sheetMatterService;
+
+    @Override
+    public void excuteTask(ITask task) throws AppException {
+
+        SitePdu sitePdu = new SitePdu();
+        sitePdu.setId(1L);
+        Rest<List<SitePdu>> siteRest = siteFeign.getFlatSitesBySiteId(sitePdu);
+        if (siteRest.getCode() == YesNoEnum.YES.getValue()) {
+            siteRest.getData().forEach(site -> {
+                SiteMatterPdu siteMatterPdu = new SiteMatterPdu();
+                siteMatterPdu.setPage(1);
+                siteMatterPdu.setSize(-1);
+                Rest<RespData<List<SiteMatterPdu>>> siteMatterRest = siteMatterFeign.list(siteMatterPdu);
+                if (siteMatterRest.getCode() == YesNoEnum.YES.getValue()) {
+                    //删除后新增
+                    List<SheetMatterEntity> sheetMatterEntities = siteMatterRest.getData().getData().stream().map(siteMatter -> {
+                        SheetMatterEntity sheetMatterEntity = new SheetMatterEntity();
+                        sheetMatterEntity.initAttrValue();
+                        sheetMatterEntity.setSiteId(siteMatter.getSiteId());
+                        sheetMatterEntity.setMatterName(siteMatter.getMatterName());
+                        sheetMatterEntity.setMatterNo(siteMatter.getMatterCode());
+                        sheetMatterEntity.setDeptCode(siteMatter.getDeptCode());
+                        sheetMatterEntity.setDeptName(siteMatter.getDeptCode());
+                        return sheetMatterEntity;
+                    }).collect(Collectors.toList());
+
+                    if (!ObjectUtils.isEmpty(sheetMatterEntities)) {
+                        sheetMatterService.save(sheetMatterEntities);
+                    }
+                }
+            });
+        }
+    }
+    @Override
+    public void stopTask(ITask task) throws AppException {
+
+    }
+}

fill-manager/src/main/java/com/mortals/xhx/module/home/web/HomeController.java

@@ -319,9 +319,10 @@ public class HomeController extends BaseJsonBodyController {
             model.put("dayThrift", todaySum);      //今日节约
             long sum = matterDatumPrintOnlineEntities.stream().collect(Collectors.summarizingInt(x -> x.getPage())).getSum();
 
-            model.put("totalThrift", sum*2);    //累计节约
+            model.put("totalThrift", sum * 2);    //累计节约
             Rest<com.mortals.xhx.common.pdu.site.SitePdu> info = siteFeign.info(homeQueryPdu.getSiteId());
-            model.put("title", info == null ? "" : info.getData().getSiteName()); //标题
+
+            model.put("title", info.getData() == null ? "" : info.getData().getSiteName()); //标题
 
             BasesetEntity basesetEntity = basesetService.selectOne(new BasesetQuery().siteId(homeQueryPdu.getSiteId()));
 
@@ -344,6 +345,7 @@ public class HomeController extends BaseJsonBodyController {
 
     /**
      * 自助服务应用
+     *
      * @return
      */
     @GetMapping({"app/list"})
@@ -352,13 +354,13 @@ public class HomeController extends BaseJsonBodyController {
         String appWhiteStr = GlobalSysInfo.getParamValue(Constant.PARAMS_WHITE_APP_LIST, "中心简介,办事指南,意见建议,中心简介");
         Set<String> appWhiteSet = StrUtil.split(appWhiteStr, ",").stream().collect(Collectors.toSet());
         Rest<List<AppPdu>> ret = new Rest();
-        List<AppPdu> collect =new ArrayList<>();
+        List<AppPdu> collect = new ArrayList<>();
         int code = VALUE_RESULT_SUCCESS;
         try {
             AppPdu appPdu = new AppPdu();
             appPdu.setSiteId(siteId);
             Rest<RespData<List<AppPdu>>> appRest = appFeign.list(appPdu);
-            if(appRest.getCode()==YesNoEnum.YES.getValue()){
+            if (appRest.getCode() == YesNoEnum.YES.getValue()) {
                 collect = appRest.getData().getData().stream().filter(f -> appWhiteSet.contains(f.getAppName())).collect(Collectors.toList());
             }
         } catch (Exception e) {

fill-manager/src/main/resources/sqlmap/module/sheet/SheetMatterMapper.xml

@@ -323,20 +323,20 @@
         </trim>
     </sql>
     <!-- 新增 区分主键自增加还是业务插入 -->
-    <insert id="insert" parameterType="SheetMatterEntity"  useGeneratedKeys="true" keyProperty="id">
+    <insert id="insert" parameterType="SheetMatterEntity" >
         insert into mortals_xhx_sheet_matter
-        (siteId,tid,tcode,tname,matterName,englishName,matterNo,areaCode,deptCode,deptName,powerCode,themeCode,usertypeCode,groupName,url,haveGetMatterInfo,belongDept,appoveObjectShow,operatScopeShow,appoveTimeLimitShow,handleType,legalTimeLimitShow,legalEndExplain,promiseTimeLimitShow,promiseEndExplain,isChargesShow,certificationLevelsShow,planTakeTime,promiseTakeTime,specialProcedure,windowToTheSceneNum,isOnlineSubscribeShow,isExpressTakeShow,isProvinceAcquisitionShow,isApplyProvinceShow,mustSceneExplain,onlineType,onlineToTheSceneNum,onlineOperatDeep,isExpressTakeOnlineShow,isDoorTakeShow,onlineMustSceneExplain,performDeptType,matterEdition,eventTypeShow,performHierarchyShow,powerSourceShow,performDeptTypeShow,goveServiceCenterShow,isConvenientCenterShow,terminalHandle,isOnline,isOnlinePayShow,entrustmentDepartmen,jointInfoShow,matterStatus,numberLimit,type,baseCode,implementCode,implementBodyCode,operateItemCode,townshipName,townshipCode,villageName,villageCode,operateTime,operateSite,cousultingShow,cousultingTelephoneShow,superviseShow,sort,source,createTime,createUserId,updateTime)
+        (id,siteId,tid,tcode,tname,matterName,englishName,matterNo,areaCode,deptCode,deptName,powerCode,themeCode,usertypeCode,groupName,url,haveGetMatterInfo,belongDept,appoveObjectShow,operatScopeShow,appoveTimeLimitShow,handleType,legalTimeLimitShow,legalEndExplain,promiseTimeLimitShow,promiseEndExplain,isChargesShow,certificationLevelsShow,planTakeTime,promiseTakeTime,specialProcedure,windowToTheSceneNum,isOnlineSubscribeShow,isExpressTakeShow,isProvinceAcquisitionShow,isApplyProvinceShow,mustSceneExplain,onlineType,onlineToTheSceneNum,onlineOperatDeep,isExpressTakeOnlineShow,isDoorTakeShow,onlineMustSceneExplain,performDeptType,matterEdition,eventTypeShow,performHierarchyShow,powerSourceShow,performDeptTypeShow,goveServiceCenterShow,isConvenientCenterShow,terminalHandle,isOnline,isOnlinePayShow,entrustmentDepartmen,jointInfoShow,matterStatus,numberLimit,type,baseCode,implementCode,implementBodyCode,operateItemCode,townshipName,townshipCode,villageName,villageCode,operateTime,operateSite,cousultingShow,cousultingTelephoneShow,superviseShow,sort,source,createTime,createUserId,updateTime)
         VALUES
-        (#{siteId},#{tid},#{tcode},#{tname},#{matterName},#{englishName},#{matterNo},#{areaCode},#{deptCode},#{deptName},#{powerCode},#{themeCode},#{usertypeCode},#{groupName},#{url},#{haveGetMatterInfo},#{belongDept},#{appoveObjectShow},#{operatScopeShow},#{appoveTimeLimitShow},#{handleType},#{legalTimeLimitShow},#{legalEndExplain},#{promiseTimeLimitShow},#{promiseEndExplain},#{isChargesShow},#{certificationLevelsShow},#{planTakeTime},#{promiseTakeTime},#{specialProcedure},#{windowToTheSceneNum},#{isOnlineSubscribeShow},#{isExpressTakeShow},#{isProvinceAcquisitionShow},#{isApplyProvinceShow},#{mustSceneExplain},#{onlineType},#{onlineToTheSceneNum},#{onlineOperatDeep},#{isExpressTakeOnlineShow},#{isDoorTakeShow},#{onlineMustSceneExplain},#{performDeptType},#{matterEdition},#{eventTypeShow},#{performHierarchyShow},#{powerSourceShow},#{performDeptTypeShow},#{goveServiceCenterShow},#{isConvenientCenterShow},#{terminalHandle},#{isOnline},#{isOnlinePayShow},#{entrustmentDepartmen},#{jointInfoShow},#{matterStatus},#{numberLimit},#{type},#{baseCode},#{implementCode},#{implementBodyCode},#{operateItemCode},#{townshipName},#{townshipCode},#{villageName},#{villageCode},#{operateTime},#{operateSite},#{cousultingShow},#{cousultingTelephoneShow},#{superviseShow},#{sort},#{source},#{createTime},#{createUserId},#{updateTime})
+        (#{id},#{siteId},#{tid},#{tcode},#{tname},#{matterName},#{englishName},#{matterNo},#{areaCode},#{deptCode},#{deptName},#{powerCode},#{themeCode},#{usertypeCode},#{groupName},#{url},#{haveGetMatterInfo},#{belongDept},#{appoveObjectShow},#{operatScopeShow},#{appoveTimeLimitShow},#{handleType},#{legalTimeLimitShow},#{legalEndExplain},#{promiseTimeLimitShow},#{promiseEndExplain},#{isChargesShow},#{certificationLevelsShow},#{planTakeTime},#{promiseTakeTime},#{specialProcedure},#{windowToTheSceneNum},#{isOnlineSubscribeShow},#{isExpressTakeShow},#{isProvinceAcquisitionShow},#{isApplyProvinceShow},#{mustSceneExplain},#{onlineType},#{onlineToTheSceneNum},#{onlineOperatDeep},#{isExpressTakeOnlineShow},#{isDoorTakeShow},#{onlineMustSceneExplain},#{performDeptType},#{matterEdition},#{eventTypeShow},#{performHierarchyShow},#{powerSourceShow},#{performDeptTypeShow},#{goveServiceCenterShow},#{isConvenientCenterShow},#{terminalHandle},#{isOnline},#{isOnlinePayShow},#{entrustmentDepartmen},#{jointInfoShow},#{matterStatus},#{numberLimit},#{type},#{baseCode},#{implementCode},#{implementBodyCode},#{operateItemCode},#{townshipName},#{townshipCode},#{villageName},#{villageCode},#{operateTime},#{operateSite},#{cousultingShow},#{cousultingTelephoneShow},#{superviseShow},#{sort},#{source},#{createTime},#{createUserId},#{updateTime})
     </insert>
 
     <!-- 批量新增 -->
     <insert id="insertBatch" parameterType="paramDto">
         insert into mortals_xhx_sheet_matter
-        (siteId,tid,tcode,tname,matterName,englishName,matterNo,areaCode,deptCode,deptName,powerCode,themeCode,usertypeCode,groupName,url,haveGetMatterInfo,belongDept,appoveObjectShow,operatScopeShow,appoveTimeLimitShow,handleType,legalTimeLimitShow,legalEndExplain,promiseTimeLimitShow,promiseEndExplain,isChargesShow,certificationLevelsShow,planTakeTime,promiseTakeTime,specialProcedure,windowToTheSceneNum,isOnlineSubscribeShow,isExpressTakeShow,isProvinceAcquisitionShow,isApplyProvinceShow,mustSceneExplain,onlineType,onlineToTheSceneNum,onlineOperatDeep,isExpressTakeOnlineShow,isDoorTakeShow,onlineMustSceneExplain,performDeptType,matterEdition,eventTypeShow,performHierarchyShow,powerSourceShow,performDeptTypeShow,goveServiceCenterShow,isConvenientCenterShow,terminalHandle,isOnline,isOnlinePayShow,entrustmentDepartmen,jointInfoShow,matterStatus,numberLimit,type,baseCode,implementCode,implementBodyCode,operateItemCode,townshipName,townshipCode,villageName,villageCode,operateTime,operateSite,cousultingShow,cousultingTelephoneShow,superviseShow,sort,source,createTime,createUserId,updateTime)
+        (id,siteId,tid,tcode,tname,matterName,englishName,matterNo,areaCode,deptCode,deptName,powerCode,themeCode,usertypeCode,groupName,url,haveGetMatterInfo,belongDept,appoveObjectShow,operatScopeShow,appoveTimeLimitShow,handleType,legalTimeLimitShow,legalEndExplain,promiseTimeLimitShow,promiseEndExplain,isChargesShow,certificationLevelsShow,planTakeTime,promiseTakeTime,specialProcedure,windowToTheSceneNum,isOnlineSubscribeShow,isExpressTakeShow,isProvinceAcquisitionShow,isApplyProvinceShow,mustSceneExplain,onlineType,onlineToTheSceneNum,onlineOperatDeep,isExpressTakeOnlineShow,isDoorTakeShow,onlineMustSceneExplain,performDeptType,matterEdition,eventTypeShow,performHierarchyShow,powerSourceShow,performDeptTypeShow,goveServiceCenterShow,isConvenientCenterShow,terminalHandle,isOnline,isOnlinePayShow,entrustmentDepartmen,jointInfoShow,matterStatus,numberLimit,type,baseCode,implementCode,implementBodyCode,operateItemCode,townshipName,townshipCode,villageName,villageCode,operateTime,operateSite,cousultingShow,cousultingTelephoneShow,superviseShow,sort,source,createTime,createUserId,updateTime)
         VALUES
         <foreach collection="data.dataList" item="item" index="index" separator="," >
-            (#{item.siteId},#{item.tid},#{item.tcode},#{item.tname},#{item.matterName},#{item.englishName},#{item.matterNo},#{item.areaCode},#{item.deptCode},#{item.deptName},#{item.powerCode},#{item.themeCode},#{item.usertypeCode},#{item.groupName},#{item.url},#{item.haveGetMatterInfo},#{item.belongDept},#{item.appoveObjectShow},#{item.operatScopeShow},#{item.appoveTimeLimitShow},#{item.handleType},#{item.legalTimeLimitShow},#{item.legalEndExplain},#{item.promiseTimeLimitShow},#{item.promiseEndExplain},#{item.isChargesShow},#{item.certificationLevelsShow},#{item.planTakeTime},#{item.promiseTakeTime},#{item.specialProcedure},#{item.windowToTheSceneNum},#{item.isOnlineSubscribeShow},#{item.isExpressTakeShow},#{item.isProvinceAcquisitionShow},#{item.isApplyProvinceShow},#{item.mustSceneExplain},#{item.onlineType},#{item.onlineToTheSceneNum},#{item.onlineOperatDeep},#{item.isExpressTakeOnlineShow},#{item.isDoorTakeShow},#{item.onlineMustSceneExplain},#{item.performDeptType},#{item.matterEdition},#{item.eventTypeShow},#{item.performHierarchyShow},#{item.powerSourceShow},#{item.performDeptTypeShow},#{item.goveServiceCenterShow},#{item.isConvenientCenterShow},#{item.terminalHandle},#{item.isOnline},#{item.isOnlinePayShow},#{item.entrustmentDepartmen},#{item.jointInfoShow},#{item.matterStatus},#{item.numberLimit},#{item.type},#{item.baseCode},#{item.implementCode},#{item.implementBodyCode},#{item.operateItemCode},#{item.townshipName},#{item.townshipCode},#{item.villageName},#{item.villageCode},#{item.operateTime},#{item.operateSite},#{item.cousultingShow},#{item.cousultingTelephoneShow},#{item.superviseShow},#{item.sort},#{item.source},#{item.createTime},#{item.createUserId},#{item.updateTime})
+            (#{item.id},#{item.siteId},#{item.tid},#{item.tcode},#{item.tname},#{item.matterName},#{item.englishName},#{item.matterNo},#{item.areaCode},#{item.deptCode},#{item.deptName},#{item.powerCode},#{item.themeCode},#{item.usertypeCode},#{item.groupName},#{item.url},#{item.haveGetMatterInfo},#{item.belongDept},#{item.appoveObjectShow},#{item.operatScopeShow},#{item.appoveTimeLimitShow},#{item.handleType},#{item.legalTimeLimitShow},#{item.legalEndExplain},#{item.promiseTimeLimitShow},#{item.promiseEndExplain},#{item.isChargesShow},#{item.certificationLevelsShow},#{item.planTakeTime},#{item.promiseTakeTime},#{item.specialProcedure},#{item.windowToTheSceneNum},#{item.isOnlineSubscribeShow},#{item.isExpressTakeShow},#{item.isProvinceAcquisitionShow},#{item.isApplyProvinceShow},#{item.mustSceneExplain},#{item.onlineType},#{item.onlineToTheSceneNum},#{item.onlineOperatDeep},#{item.isExpressTakeOnlineShow},#{item.isDoorTakeShow},#{item.onlineMustSceneExplain},#{item.performDeptType},#{item.matterEdition},#{item.eventTypeShow},#{item.performHierarchyShow},#{item.powerSourceShow},#{item.performDeptTypeShow},#{item.goveServiceCenterShow},#{item.isConvenientCenterShow},#{item.terminalHandle},#{item.isOnline},#{item.isOnlinePayShow},#{item.entrustmentDepartmen},#{item.jointInfoShow},#{item.matterStatus},#{item.numberLimit},#{item.type},#{item.baseCode},#{item.implementCode},#{item.implementBodyCode},#{item.operateItemCode},#{item.townshipName},#{item.townshipCode},#{item.villageName},#{item.villageCode},#{item.operateTime},#{item.operateSite},#{item.cousultingShow},#{item.cousultingTelephoneShow},#{item.superviseShow},#{item.sort},#{item.source},#{item.createTime},#{item.createUserId},#{item.updateTime})
         </foreach>
     </insert>
 

fill-manager/src/main/resources/sqlmap/module/sheet/SheetMatterMapperExt.xml

@@ -21,7 +21,7 @@
                     and a.matterName like #{condition.matterName}
                 </if>
                 <if test="condition.matterFullName != null and condition.matterFullName != ''">
-                    and a.matterFullName like #{condition.matterFullName}
+                    and a.matterName like #{condition.matterName}
                 </if>
             </trim>
         </trim>
@@ -47,7 +47,7 @@
                      and a.matterName like #{condition.matterName}
                 </if>
                 <if test="condition.matterFullName != null and condition.matterFullName != ''">
-                    and a.matterFullName like #{condition.matterFullName}
+                    and a.matterName like #{condition.matterName}
                 </if>
             </trim>
         </trim>