Merge remote-tracking branch 'origin/master'

sst-manager/db/add_db.sql

@@ -316,3 +316,20 @@ INSERT INTO `mortals_xhx_param` (`name`, `firstOrganize`, `secondOrganize`, `par
 -- 门户用户同步（2024-01-17）
 -- ----------
 INSERT INTO `mortals_xhx_task` (`name`, `taskKey`, `status`, `excuteService`, `excuteParam`, `excuteHost`, `excuteStrategy`, `excuteDate`, `excuteTime`, `remark`, `lastExcuteHost`, `lastExcuteTime`, `interimExcuteStatus`, `createTime`, `createUserId`, `createUserName`) VALUES ('同步门户用户', 'SyncPortalUserTask', '0', 'SyncPortalUserTask', NULL, NULL, '1', '0', '22:01', NULL, '172.17.0.1', '2024-01-16 22:01:01', '0', '2023-08-24 22:29:18', '1', '系统管理员');
+
+
+-- ----------------------------
+-- 综窗接件信息表 （2024-04-10）
+-- ----------------------------
+DROP TABLE IF EXISTS `mortals_xhx_accept`;
+CREATE TABLE mortals_xhx_accept(
+    `id` bigint(20)   AUTO_INCREMENT   COMMENT '序号，主键，自增长',
+    `applicantId` varchar(128) NOT NULL     COMMENT '接件id',
+    `storageInfo` varchar(128) NOT NULL     COMMENT '存储信息',
+    `createUserId` bigint(20)   COMMENT '创建用户',
+    `createTime` datetime   COMMENT '创建时间',
+    `updateUserId` bigint(20)      COMMENT '更新用户',
+    `updateTime` datetime      COMMENT '更新时间',
+PRIMARY KEY  (`id`)
+,KEY `storageInfo` (`storageInfo`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='综窗接件信息';
\ No newline at end of file

sst-manager/src/main/java/com/mortals/xhx/module/accept/dao/AcceptDao.java

+package com.mortals.xhx.module.accept.dao;
+
+import com.mortals.framework.dao.ICRUDDao;
+import com.mortals.xhx.module.accept.model.AcceptEntity;
+import java.util.List;
+/**
+* 综窗接件信息Dao
+* 综窗接件信息 DAO接口
+*
+* @author zxfei
+* @date 2024-04-10
+*/
+
+public interface  AcceptDao extends ICRUDDao<AcceptEntity,Long>{
+
+
+}

sst-manager/src/main/java/com/mortals/xhx/module/accept/dao/ibatis/AcceptDaoImpl.java

+package com.mortals.xhx.module.accept.dao.ibatis;
+
+
+import org.springframework.stereotype.Repository;
+import com.mortals.xhx.module.accept.dao.AcceptDao;
+import com.mortals.xhx.module.accept.model.AcceptEntity;
+import java.util.Date;
+import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
+import java.util.List;
+/**
+* 综窗接件信息DaoImpl DAO接口
+*
+* @author zxfei
+* @date 2024-04-10
+*/
+@Repository("acceptDao")
+public class AcceptDaoImpl extends BaseCRUDDaoMybatis<AcceptEntity,Long> implements AcceptDao {
+
+
+
+}

sst-manager/src/main/java/com/mortals/xhx/module/accept/model/AcceptEntity.java

+package com.mortals.xhx.module.accept.model;
+import java.util.List;
+import java.util.ArrayList;
+import java.math.BigDecimal;
+import cn.hutool.core.date.DateUtil;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mortals.framework.annotation.Excel;
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.accept.model.vo.AcceptVo;
+import lombok.Data;
+/**
+* 综窗接件信息实体对象
+*
+* @author zxfei
+* @date 2024-04-10
+*/
+@Data
+public class AcceptEntity extends AcceptVo {
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 接件id
+    */
+    private String applicantId;
+    /**
+    * 存储信息
+    */
+    private String storageInfo;
+    @Override
+    public int hashCode() {
+         return this.getId().hashCode();
+    }
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) return false;
+        if (obj instanceof AcceptEntity) {
+            AcceptEntity tmp = (AcceptEntity) obj;
+            if (this.getId() == tmp.getId()) {
+                 return true;
+            }
+        }
+        return false;
+    }
+
+    public void initAttrValue(){
+            this.applicantId = "";
+            this.storageInfo = "";
+    }
+}
\ No newline at end of file

sst-manager/src/main/java/com/mortals/xhx/module/accept/model/AcceptQuery.java

+package com.mortals.xhx.module.accept.model;
+
+import java.util.List;
+import com.mortals.xhx.module.accept.model.AcceptEntity;
+/**
+* 综窗接件信息查询对象
+*
+* @author zxfei
+* @date 2024-04-10
+*/
+public class AcceptQuery extends AcceptEntity {
+    /** 开始 序号，主键，自增长 */
+    private Long idStart;
+
+    /** 结束 序号，主键，自增长 */
+    private Long idEnd;
+
+    /** 增加 序号，主键，自增长 */
+    private Long idIncrement;
+
+    /** 序号，主键，自增长列表 */
+    private List <Long> idList;
+
+    /** 序号，主键，自增长排除列表 */
+    private List <Long> idNotList;
+
+    /** 接件id */
+    private List<String> applicantIdList;
+
+    /** 接件id排除列表 */
+    private List <String> applicantIdNotList;
+    /** 存储信息 */
+    private List<String> storageInfoList;
+
+    /** 存储信息排除列表 */
+    private List <String> storageInfoNotList;
+    /** 开始 创建用户 */
+    private Long createUserIdStart;
+
+    /** 结束 创建用户 */
+    private Long createUserIdEnd;
+
+    /** 增加 创建用户 */
+    private Long createUserIdIncrement;
+
+    /** 创建用户列表 */
+    private List <Long> createUserIdList;
+
+    /** 创建用户排除列表 */
+    private List <Long> createUserIdNotList;
+
+    /** 开始 创建时间 */
+    private String createTimeStart;
+
+    /** 结束 创建时间 */
+    private String createTimeEnd;
+
+    /** 开始 更新用户 */
+    private Long updateUserIdStart;
+
+    /** 结束 更新用户 */
+    private Long updateUserIdEnd;
+
+    /** 增加 更新用户 */
+    private Long updateUserIdIncrement;
+
+    /** 更新用户列表 */
+    private List <Long> updateUserIdList;
+
+    /** 更新用户排除列表 */
+    private List <Long> updateUserIdNotList;
+
+    /** 开始 更新时间 */
+    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<AcceptQuery> orConditionList;
+
+    /** AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
+    private List<AcceptQuery> andConditionList;
+
+    public AcceptQuery(){}
+
+    /**
+    * 获取 开始 序号，主键，自增长
+    * @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;
+    }
+
+    /**
+    * 获取 序号，主键，自增长
+    * @return idNotList
+    */
+    public List<Long> getIdNotList(){
+        return this.idNotList;
+    }
+
+    /**
+    * 设置 序号，主键，自增长
+    * @param idNotList
+    */
+    public void setIdNotList(List<Long> idNotList){
+        this.idNotList = idNotList;
+    }
+
+
+    /**
+    * 获取 接件id
+    * @return applicantIdList
+    */
+    public List<String> getApplicantIdList(){
+        return this.applicantIdList;
+    }
+
+    /**
+    * 设置 接件id
+    * @param applicantIdList
+    */
+    public void setApplicantIdList(List<String> applicantIdList){
+        this.applicantIdList = applicantIdList;
+    }
+
+    /**
+    * 获取 接件id
+    * @return applicantIdNotList
+    */
+    public List<String> getApplicantIdNotList(){
+        return this.applicantIdNotList;
+    }
+
+    /**
+    * 设置 接件id
+    * @param applicantIdNotList
+    */
+    public void setApplicantIdNotList(List<String> applicantIdNotList){
+        this.applicantIdNotList = applicantIdNotList;
+    }
+
+    /**
+    * 获取 存储信息
+    * @return storageInfoList
+    */
+    public List<String> getStorageInfoList(){
+        return this.storageInfoList;
+    }
+
+    /**
+    * 设置 存储信息
+    * @param storageInfoList
+    */
+    public void setStorageInfoList(List<String> storageInfoList){
+        this.storageInfoList = storageInfoList;
+    }
+
+    /**
+    * 获取 存储信息
+    * @return storageInfoNotList
+    */
+    public List<String> getStorageInfoNotList(){
+        return this.storageInfoNotList;
+    }
+
+    /**
+    * 设置 存储信息
+    * @param storageInfoNotList
+    */
+    public void setStorageInfoNotList(List<String> storageInfoNotList){
+        this.storageInfoNotList = storageInfoNotList;
+    }
+
+    /**
+    * 获取 开始 创建用户
+    * @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 createUserIdNotList
+    */
+    public List<Long> getCreateUserIdNotList(){
+        return this.createUserIdNotList;
+    }
+
+    /**
+    * 设置 创建用户
+    * @param createUserIdNotList
+    */
+    public void setCreateUserIdNotList(List<Long> createUserIdNotList){
+        this.createUserIdNotList = createUserIdNotList;
+    }
+
+
+    /**
+    * 获取 开始 创建时间
+    * @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 updateUserIdStart
+    */
+    public Long getUpdateUserIdStart(){
+        return this.updateUserIdStart;
+    }
+
+    /**
+    * 设置 开始 更新用户
+    * @param updateUserIdStart
+    */
+    public void setUpdateUserIdStart(Long updateUserIdStart){
+        this.updateUserIdStart = updateUserIdStart;
+    }
+
+    /**
+    * 获取 结束 更新用户
+    * @return $updateUserIdEnd
+    */
+    public Long getUpdateUserIdEnd(){
+        return this.updateUserIdEnd;
+    }
+
+    /**
+    * 设置 结束 更新用户
+    * @param updateUserIdEnd
+    */
+    public void setUpdateUserIdEnd(Long updateUserIdEnd){
+        this.updateUserIdEnd = updateUserIdEnd;
+    }
+
+    /**
+    * 获取 增加 更新用户
+    * @return updateUserIdIncrement
+    */
+    public Long getUpdateUserIdIncrement(){
+        return this.updateUserIdIncrement;
+    }
+
+    /**
+    * 设置 增加 更新用户
+    * @param updateUserIdIncrement
+    */
+    public void setUpdateUserIdIncrement(Long updateUserIdIncrement){
+        this.updateUserIdIncrement = updateUserIdIncrement;
+    }
+
+    /**
+    * 获取 更新用户
+    * @return updateUserIdList
+    */
+    public List<Long> getUpdateUserIdList(){
+        return this.updateUserIdList;
+    }
+
+    /**
+    * 设置 更新用户
+    * @param updateUserIdList
+    */
+    public void setUpdateUserIdList(List<Long> updateUserIdList){
+        this.updateUserIdList = updateUserIdList;
+    }
+
+    /**
+    * 获取 更新用户
+    * @return updateUserIdNotList
+    */
+    public List<Long> getUpdateUserIdNotList(){
+        return this.updateUserIdNotList;
+    }
+
+    /**
+    * 设置 更新用户
+    * @param updateUserIdNotList
+    */
+    public void setUpdateUserIdNotList(List<Long> updateUserIdNotList){
+        this.updateUserIdNotList = updateUserIdNotList;
+    }
+
+
+    /**
+    * 获取 开始 更新时间
+    * @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 AcceptQuery id(Long id){
+	    setId(id);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 序号，主键，自增长
+    * @param idStart
+    */
+    public AcceptQuery idStart(Long idStart){
+		this.idStart = idStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 序号，主键，自增长
+    * @param idEnd
+    */
+    public AcceptQuery idEnd(Long idEnd){
+		this.idEnd = idEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 序号，主键，自增长
+    * @param idIncrement
+    */
+    public AcceptQuery idIncrement(Long idIncrement){
+		this.idIncrement = idIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 序号，主键，自增长
+    * @param idList
+    */
+    public AcceptQuery idList(List<Long> idList){
+        this.idList = idList;
+		return this;
+        }
+
+        /**
+        * 设置 序号，主键，自增长
+        * @param idNotList
+        */
+        public AcceptQuery idNotList(List<Long> idNotList){
+        this.idNotList = idNotList;
+        return this;
+        }
+
+
+	/**
+    * 设置 接件id
+    * @param applicantId
+    */
+    public AcceptQuery applicantId(String applicantId){
+        setApplicantId(applicantId);
+		return this;
+    }
+
+    /**
+    * 设置 接件id
+    * @param applicantIdList
+    */
+    public AcceptQuery applicantIdList(List<String> applicantIdList){
+        this.applicantIdList = applicantIdList;
+		return this;
+    }
+
+
+	/**
+    * 设置 存储信息
+    * @param storageInfo
+    */
+    public AcceptQuery storageInfo(String storageInfo){
+        setStorageInfo(storageInfo);
+		return this;
+    }
+
+    /**
+    * 设置 存储信息
+    * @param storageInfoList
+    */
+    public AcceptQuery storageInfoList(List<String> storageInfoList){
+        this.storageInfoList = storageInfoList;
+		return this;
+    }
+
+    /**
+    * 设置  创建用户
+    * @param createUserId
+    */
+    public AcceptQuery createUserId(Long createUserId){
+	    setCreateUserId(createUserId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 创建用户
+    * @param createUserIdStart
+    */
+    public AcceptQuery createUserIdStart(Long createUserIdStart){
+		this.createUserIdStart = createUserIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 创建用户
+    * @param createUserIdEnd
+    */
+    public AcceptQuery createUserIdEnd(Long createUserIdEnd){
+		this.createUserIdEnd = createUserIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 创建用户
+    * @param createUserIdIncrement
+    */
+    public AcceptQuery createUserIdIncrement(Long createUserIdIncrement){
+		this.createUserIdIncrement = createUserIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 创建用户
+    * @param createUserIdList
+    */
+    public AcceptQuery createUserIdList(List<Long> createUserIdList){
+        this.createUserIdList = createUserIdList;
+		return this;
+        }
+
+        /**
+        * 设置 创建用户
+        * @param createUserIdNotList
+        */
+        public AcceptQuery createUserIdNotList(List<Long> createUserIdNotList){
+        this.createUserIdNotList = createUserIdNotList;
+        return this;
+        }
+
+
+    /**
+    * 设置  更新用户
+    * @param updateUserId
+    */
+    public AcceptQuery updateUserId(Long updateUserId){
+	    setUpdateUserId(updateUserId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 更新用户
+    * @param updateUserIdStart
+    */
+    public AcceptQuery updateUserIdStart(Long updateUserIdStart){
+		this.updateUserIdStart = updateUserIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 更新用户
+    * @param updateUserIdEnd
+    */
+    public AcceptQuery updateUserIdEnd(Long updateUserIdEnd){
+		this.updateUserIdEnd = updateUserIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 更新用户
+    * @param updateUserIdIncrement
+    */
+    public AcceptQuery updateUserIdIncrement(Long updateUserIdIncrement){
+		this.updateUserIdIncrement = updateUserIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 更新用户
+    * @param updateUserIdList
+    */
+    public AcceptQuery updateUserIdList(List<Long> updateUserIdList){
+        this.updateUserIdList = updateUserIdList;
+		return this;
+        }
+
+        /**
+        * 设置 更新用户
+        * @param updateUserIdNotList
+        */
+        public AcceptQuery updateUserIdNotList(List<Long> updateUserIdNotList){
+        this.updateUserIdNotList = updateUserIdNotList;
+        return this;
+        }
+
+
+    /**
+    * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+    * @return orConditionList
+    */
+    public List<AcceptQuery> 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<AcceptQuery> 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<AcceptQuery> 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<AcceptQuery> andConditionList){
+        this.andConditionList = andConditionList;
+    }
+
+}
\ No newline at end of file

sst-manager/src/main/java/com/mortals/xhx/module/accept/model/vo/AcceptPdu.java

+package com.mortals.xhx.module.accept.model.vo;
+
+import lombok.Data;
+
+@Data
+public class AcceptPdu {
+    /** 接件id */
+    private String applicantId;
+    /** 寄存柜名称 */
+    private String lockerName;
+    /** 寄存柜编号 */
+    private String lockerNumber;
+    /** 存储时间 */
+    private String dateTime;
+}

sst-manager/src/main/java/com/mortals/xhx/module/accept/model/vo/AcceptVo.java

+package com.mortals.xhx.module.accept.model.vo;
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.accept.model.AcceptEntity;
+import java.util.ArrayList;
+import java.util.List;
+import lombok.Data;
+import com.mortals.framework.annotation.Excel;
+import java.math.BigDecimal;
+import java.util.Date;
+/**
+* 综窗接件信息视图对象
+*
+* @author zxfei
+* @date 2024-04-10
+*/
+@Data
+public class AcceptVo extends BaseEntityLong {
+
+    /** 序号，主键，自增长列表 */
+    private List <Long> idList;
+
+
+}
\ No newline at end of file

sst-manager/src/main/java/com/mortals/xhx/module/accept/service/AcceptService.java

+package com.mortals.xhx.module.accept.service;
+import com.mortals.framework.service.ICRUDService;
+import com.mortals.xhx.module.accept.model.AcceptEntity;
+import com.mortals.xhx.module.accept.dao.AcceptDao;
+/**
+* AcceptService
+*
+* 综窗接件信息 service接口
+*
+* @author zxfei
+* @date 2024-04-10
+*/
+public interface AcceptService extends ICRUDService<AcceptEntity,Long>{
+
+    AcceptDao getDao();
+}
\ No newline at end of file

sst-manager/src/main/java/com/mortals/xhx/module/accept/service/impl/AcceptServiceImpl.java

+package com.mortals.xhx.module.accept.service.impl;
+import org.springframework.stereotype.Service;
+import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.Context;
+import com.mortals.xhx.module.accept.dao.AcceptDao;
+import com.mortals.xhx.module.accept.model.AcceptEntity;
+import com.mortals.xhx.module.accept.service.AcceptService;
+import lombok.extern.slf4j.Slf4j;
+/**
+* AcceptService
+* 综窗接件信息 service实现
+*
+* @author zxfei
+* @date 2024-04-10
+*/
+@Service("acceptService")
+@Slf4j
+public class AcceptServiceImpl extends AbstractCRUDServiceImpl<AcceptDao, AcceptEntity, Long> implements AcceptService {
+    
+}
\ No newline at end of file

sst-manager/src/main/java/com/mortals/xhx/module/accept/web/AcceptController.java

+package com.mortals.xhx.module.accept.web;
+import com.mortals.framework.annotation.RepeatSubmit;
+import com.mortals.framework.annotation.UnAuth;
+import com.mortals.framework.model.BaseEntity;
+import com.mortals.framework.service.IUser;
+import com.mortals.framework.util.DateUtils;
+import com.mortals.framework.utils.BeanUtil;
+import com.mortals.framework.utils.ReflectUtils;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
+import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.module.accept.model.AcceptQuery;
+import com.mortals.xhx.module.accept.model.vo.AcceptPdu;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import com.mortals.framework.model.Context;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
+import com.mortals.xhx.module.accept.model.AcceptEntity;
+import com.mortals.xhx.module.accept.service.AcceptService;
+import org.apache.commons.lang3.ArrayUtils;
+import com.mortals.framework.util.StringUtils;
+
+import java.util.*;
+import java.util.stream.Collectors;
+import com.alibaba.fastjson.JSONObject;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import static com.mortals.framework.ap.SysConstains.*;
+import com.mortals.xhx.common.code.*;
+/**
+*
+* 综窗接件信息
+*
+* @author zxfei
+* @date 2024-04-10
+*/
+@RestController
+@RequestMapping("accept")
+public class AcceptController extends BaseCRUDJsonBodyMappingController<AcceptService,AcceptEntity,Long> {
+
+    @Autowired
+    private ParamService paramService;
+
+    public AcceptController(){
+        super.setModuleDesc( "综窗接件信息");
+    }
+
+    @Override
+    protected void init(Map<String, Object> model, Context context) {
+        super.init(model, context);
+    }
+
+    @PostMapping({"insert"})
+    @UnAuth
+    @RepeatSubmit
+    public String save(@RequestBody AcceptPdu pdu) {
+        Map<String, Object> model = new HashMap();
+        Context context = this.getContext();
+        int code = 1;
+        String busiDesc = "新增" + this.getModuleDesc();
+        AcceptEntity entity = new AcceptEntity();
+        try {
+            entity.setApplicantId(pdu.getApplicantId());
+            if(StringUtils.isEmpty(pdu.getDateTime())){
+                pdu.setDateTime(DateUtils.getCurrStrDateTime());
+            }
+            entity.setStorageInfo(JSONObject.toJSONString(pdu));
+            entity.setCreateUserId(1l);
+            entity.setCreateTime(new Date());
+            this.saveBefore(entity, model, context);
+            this.service.save(entity, context);
+
+            model.put("id", entity.getId());
+            code = this.saveAfter(entity, model, context);
+            model.put("entity", entity);
+            model.put("message_info", busiDesc + "成功");
+            this.recordSysLog(this.request, busiDesc + " 【成功】 [id:" + entity.getId() + "]");
+        } catch (Exception var9) {
+            this.doException(this.request, busiDesc, model, var9);
+            model.put("entity", entity);
+            this.init(model, context);
+            code = this.saveException(entity, model, context, var9);
+        }
+
+        this.init(model, context);
+        JSONObject ret = new JSONObject();
+        ret.put("code", code);
+        ret.put("msg", model.remove("message_info"));
+        ret.put("data", model);
+        return ret.toJSONString();
+    }
+
+
+    @PostMapping({"getInfo"})
+    @UnAuth
+    public String getInfo(@RequestBody AcceptPdu pdu) {
+        Map<String, Object> model = new HashMap();
+        Context context = this.getContext();
+        int code = 1;
+        String busiDesc = "获取" + this.getModuleDesc();
+        try {
+            AcceptEntity entity = this.service.selectOne(new AcceptQuery().applicantId(pdu.getApplicantId()));
+            if(entity!=null){
+                pdu = JSONObject.parseObject(entity.getStorageInfo(),AcceptPdu.class);
+            }
+            model.put("entity", pdu);
+            model.put("message_info", busiDesc + "成功");
+            this.recordSysLog(this.request, busiDesc + " 【成功】 [id:" + entity.getId() + "]");
+        } catch (Exception var9) {
+            this.doException(this.request, busiDesc, model, var9);
+            model.put("entity", pdu);
+            this.init(model, context);
+        }
+        this.init(model, context);
+        JSONObject ret = new JSONObject();
+        ret.put("code", code);
+        ret.put("msg", model.remove("message_info"));
+        ret.put("data", model);
+        return ret.toJSONString();
+    }
+}
\ No newline at end of file

sst-manager/src/main/java/com/mortals/xhx/module/device/model/DeviceEntity.java

@@ -25,7 +25,7 @@ public class DeviceEntity extends DeviceVo {
     /**
      * 设备编码,SN码等，默认为MAC地址
      */
-    @Excel(name = "设备编码")
+    @Excel(name = "设备编码,SN码等，默认为MAC地址")
     private String deviceCode;
     /**
      * 设备的MAC地址
@@ -130,6 +130,7 @@ public class DeviceEntity extends DeviceVo {
     /**
      * 设备图片
      */
+    @Excel(name = "设备图片")
     private String devicePhotoPath;
     /**
      * 设备访问ip
@@ -183,6 +184,7 @@ public class DeviceEntity extends DeviceVo {
     /**
      * 设备SN码
      */
+    @Excel(name = "设备SN码")
     private String deviceSN;
     /**
      * 设备版本
@@ -191,7 +193,6 @@ public class DeviceEntity extends DeviceVo {
     /**
      * 产品编码
      */
-    @Excel(name = "产品类型")
     private String productCode;
     /**
      * 大厅Id
@@ -214,6 +215,18 @@ public class DeviceEntity extends DeviceVo {
      * 是否显示小程序二维码(0.否，1.是)
      */
     private Integer showWechatQrCode;
+    /**
+     * 所属机构
+     */
+    private String orgName;
+    /**
+     * 设备分辨率
+     */
+    private String resolution;
+    /**
+     * 设备分辨率值
+     */
+    private String resolutionValue;
     @Override
     public int hashCode() {
         return this.getId().hashCode();
@@ -231,98 +244,55 @@ public class DeviceEntity extends DeviceVo {
     }
 
     public void initAttrValue(){
-
         this.deviceName = "";
-
         this.deviceCode = "";
-
         this.deviceMac = "";
-
         this.siteId = null;
-
         this.siteCode = "";
-
         this.siteName = "";
-
         this.platformId = null;
-
         this.platformName = "";
-
         this.productId = null;
-
         this.productName = "";
-
         this.skinId = null;
-
         this.skinName = "";
-
         this.homeUrl = "";
-
         this.deviceFirmId = null;
-
         this.deviceFirmname = "";
-
         this.deviceSrc = 2;
-
         this.deviceDataSourceWay = 0;
-
         this.lon = "";
-
         this.lati = "";
-
-        this.deviceInBuilding = null;
-
-        this.deviceInFloor = null;
-
-        this.defectsLiabilityPeriod = null;
-
+        this.deviceInBuilding = 0;
+        this.deviceInFloor = 0;
+        this.defectsLiabilityPeriod = new Date();
         this.leadingOfficial = "";
-
         this.leadingOfficialTelephone = "";
-
         this.isReceiveMess = 0;
-
         this.devicePhotoPath = "";
-
         this.ip = "";
-
         this.centernum = "";
-
         this.port = "";
-
         this.deviceTopic = "";
-
         this.deviceStatus = 0;
-
         this.enabled = 0;
-
         this.deviceAuthCode = "";
-
         this.deviceRemark = "";
-
-        this.onlineTime = null;
-
-        this.offlineTime = null;
-
+        this.onlineTime = new Date();
+        this.offlineTime = new Date();
         this.deleted = 0;
-
         this.source = 1;
-
         this.deviceSN = "";
-
         this.deviceVersion = "";
-
         this.productCode = "";
-
         this.hallId = null;
-
         this.hallName = "";
-
         this.showSms = 1;
-
         this.showPrint = 1;
-
         this.showWechatQrCode = 1;
+        this.orgName = "";
+        this.resolution = "";
+        this.resolutionValue = "";
     }
 
 }

sst-manager/src/main/java/com/mortals/xhx/module/matter/web/MatterDatumFileController.java

@@ -50,7 +50,7 @@ public class MatterDatumFileController extends BaseCRUDJsonBodyMappingController
 
     @Override
     @UnAuth
-    public Rest<Object> list(MatterDatumFileEntity query) {
+    public Rest<Object> list(@RequestBody MatterDatumFileEntity query) {
         return super.list(query);
     }
 }
\ No newline at end of file

sst-manager/src/main/resources/sqlmap/module/accept/AcceptMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"mybatis-3-mapper.dtd">
+<mapper namespace="com.mortals.xhx.module.accept.dao.ibatis.AcceptDaoImpl">
+
+    <!-- 字段和属性映射 -->
+    <resultMap type="AcceptEntity" id="AcceptEntity-Map">
+            <id  property="id" column="id" />
+            <result property="applicantId" column="applicantId" />
+            <result property="storageInfo" column="storageInfo" />
+            <result property="createUserId" column="createUserId" />
+            <result property="createTime" column="createTime" />
+            <result property="updateUserId" column="updateUserId" />
+            <result property="updateTime" column="updateTime" />
+            
+    </resultMap>
+
+
+    <!-- 表所有列 -->
+    <sql id="_columns">
+        <trim suffixOverrides="," suffix="">
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))">
+                    a.id,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('applicantId') or colPickMode == 1 and data.containsKey('applicantId')))">
+                    a.applicantId,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('storageInfo') or colPickMode == 1 and data.containsKey('storageInfo')))">
+                    a.storageInfo,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))">
+                    a.createUserId,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
+                    a.createTime,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateUserId') or colPickMode == 1 and data.containsKey('updateUserId')))">
+                    a.updateUserId,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
+                    a.updateTime,
+                </if>
+        </trim>
+    </sql>
+    <!-- 新增 区分主键自增加还是业务插入 -->
+    <insert id="insert" parameterType="AcceptEntity"  useGeneratedKeys="true" keyProperty="id">
+        insert into mortals_xhx_accept
+        (applicantId,storageInfo,createUserId,createTime,updateUserId,updateTime)
+        VALUES
+        (#{applicantId},#{storageInfo},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
+    </insert>
+
+    <!-- 批量新增 -->
+    <insert id="insertBatch" parameterType="paramDto">
+        insert into mortals_xhx_accept
+        (applicantId,storageInfo,createUserId,createTime,updateUserId,updateTime)
+        VALUES
+        <foreach collection="data.dataList" item="item" index="index" separator="," >
+            (#{item.applicantId},#{item.storageInfo},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
+        </foreach>
+    </insert>
+
+
+    <!-- 根据ParamDto更新 -->
+    <update id="update" parameterType="paramDto">
+        update mortals_xhx_accept as a
+        set
+        <trim suffixOverrides="," suffix="">
+            <if test="(colPickMode==0 and data.containsKey('applicantId')) or (colPickMode==1 and !data.containsKey('applicantId'))">
+                a.applicantId=#{data.applicantId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('storageInfo')) or (colPickMode==1 and !data.containsKey('storageInfo'))">
+                a.storageInfo=#{data.storageInfo},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('createUserId')) or (colPickMode==1 and !data.containsKey('createUserId'))">
+                a.createUserId=#{data.createUserId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('createUserIdIncrement')) or (colPickMode==1 and !data.containsKey('createUserIdIncrement'))">
+                a.createUserId=ifnull(a.createUserId,0) + #{data.createUserIdIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))">
+                a.createTime=#{data.createTime},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('updateUserId')) or (colPickMode==1 and !data.containsKey('updateUserId'))">
+                a.updateUserId=#{data.updateUserId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !data.containsKey('updateUserIdIncrement'))">
+                a.updateUserId=ifnull(a.updateUserId,0) + #{data.updateUserIdIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
+                a.updateTime=#{data.updateTime},
+            </if>
+        </trim>
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </update>
+    <!-- 批量更新 -->
+    <update id="updateBatch" parameterType="paramDto">
+        update mortals_xhx_accept as a
+        <trim prefix="set" suffixOverrides=",">
+                <trim prefix="applicantId=(case" suffix="ELSE applicantId end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('applicantId')) or (colPickMode==1 and !item.containsKey('applicantId'))">
+                            when a.id=#{item.id} then #{item.applicantId}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="storageInfo=(case" suffix="ELSE storageInfo end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('storageInfo')) or (colPickMode==1 and !item.containsKey('storageInfo'))">
+                            when a.id=#{item.id} then #{item.storageInfo}
+                        </if>
+                    </foreach>
+                </trim>
+                        <trim prefix="createUserId=(case" suffix="ELSE createUserId end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))">
+                                        when a.id=#{item.id} then #{item.createUserId}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('createUserIdIncrement')) or (colPickMode==1 and !item.containsKey('createUserIdIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.createUserId,0) + #{item.createUserIdIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                <trim prefix="createTime=(case" suffix="ELSE createTime end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
+                            when a.id=#{item.id} then #{item.createTime}
+                        </if>
+                    </foreach>
+                </trim>
+                        <trim prefix="updateUserId=(case" suffix="ELSE updateUserId end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('updateUserId')) or (colPickMode==1 and !item.containsKey('updateUserId'))">
+                                        when a.id=#{item.id} then #{item.updateUserId}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !item.containsKey('updateUserIdIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.updateUserId,0) + #{item.updateUserIdIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                <trim prefix="updateTime=(case" suffix="ELSE updateTime end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('updateTime')) or (colPickMode==1 and !item.containsKey('updateTime'))">
+                            when a.id=#{item.id} then #{item.updateTime}
+                        </if>
+                    </foreach>
+                </trim>
+        </trim>
+        where id in
+        <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
+            #{item.id}
+        </foreach>
+    </update>
+    <!-- 根据主健查询 -->
+    <select id="getByKey" parameterType="paramDto" resultMap="AcceptEntity-Map">
+        select <include refid="_columns"/>
+        from mortals_xhx_accept as a
+        where a.id=#{condition.id}
+    </select>
+    <!-- 根据主健删除 -->
+    <delete id="deleteByKey" parameterType="paramDto">
+        delete a.* from mortals_xhx_accept as a where a.id=#{condition.id}
+    </delete>
+    <!-- 根据主健删除一批，针对单一主健有效 -->
+    <delete id="deleteByKeys">
+        delete from mortals_xhx_accept where id in
+        <foreach collection="array" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+    <!-- 根据主健列表删除一批，针对单一主健有效 -->
+    <delete id="deleteByKeyList">
+        delete from mortals_xhx_accept where id in
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+
+    <!-- 根据对象列表删除一批，针对单一主健有效 -->
+    <delete id="deleteByEntityList">
+        delete from mortals_xhx_accept where id in
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item.id}
+        </foreach>
+    </delete>
+    <!-- 根据paramDto删除一批 -->
+    <delete id="deleteByMap" parameterType="paramDto">
+        delete a.* from mortals_xhx_accept as a
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </delete>
+    <!-- 获取列表 -->
+    <select id="getList" parameterType="paramDto" resultMap="AcceptEntity-Map">
+        select <include refid="_columns"/>
+        from mortals_xhx_accept as a
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+        <include refid="_orderCols_"/>
+    </select>
+
+
+
+    <!-- 获取 -->
+    <select id="getListCount" parameterType="paramDto" resultType="int">
+        select count(1)
+        from mortals_xhx_accept as a
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </select>
+    <!-- 条件映射 -->
+    <sql id="_condition_">
+        <if test="condition != null and !condition.isEmpty()">
+            <!-- 条件映射-普通条件 -->
+            <include refid="_condition_param_">
+                <property name="_conditionParam_" value="condition"/>
+                <property name="_conditionType_" value="and"/>
+            </include>
+            <!-- 条件映射-集合之间使用AND，集合中元素使用OR-(list[0].1 or list[0].2) and (list[1].3 or list[1].4) -->
+            <if test="condition.containsKey('andConditionList') and !condition.andConditionList.isEmpty()">
+                and
+                <foreach collection="condition.andConditionList" open="(" close=")" index="index" item="andCondition" separator=" and ">
+                    <trim prefixOverrides="or" prefix="(" suffix=")">
+                        <include refid="_condition_param_">
+                            <property name="_conditionParam_" value="andCondition"/>
+                            <property name="_conditionType_" value="or"/>
+                        </include>
+                    </trim>
+                </foreach>
+            </if>
+            <!-- 条件映射-集合之间使用OR，集合中元素使用AND-(list[0].1 and list[0].2) or (list[1].3 and list[1].4) -->
+            <if test="condition.containsKey('orConditionList') and !condition.orConditionList.isEmpty()">
+                and
+                <foreach collection="condition.orConditionList" open="(" close=")" index="index" item="orCondition" separator=" or ">
+                    <trim prefixOverrides="and" prefix="(" suffix=")">
+                        <include refid="_condition_param_">
+                            <property name="_conditionParam_" value="orCondition"/>
+                            <property name="_conditionType_" value="and"/>
+                        </include>
+                    </trim>
+                </foreach>
+            </if>
+        </if>
+    </sql>
+    <!-- 条件映射-代参数 -->
+    <sql id="_condition_param_">
+        <bind name="conditionParamRef" value="${_conditionParam_}"/>
+        <if test="conditionParamRef.containsKey('id')">
+            <if test="conditionParamRef.id != null">
+                ${_conditionType_} a.id=#{${_conditionParam_}.id}
+            </if>
+        </if>
+            <if test="conditionParamRef.containsKey('id')">
+                <if test="conditionParamRef.id != null ">
+                    ${_conditionType_} a.id = #{${_conditionParam_}.id}
+                </if>
+                <if test="conditionParamRef.id == null">
+                    ${_conditionType_} a.id is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
+                ${_conditionType_} a.id in
+                <foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('idNotList') and conditionParamRef.idNotList.size() > 0">
+                ${_conditionType_} a.id not in
+                <foreach collection="conditionParamRef.idNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
+                ${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
+            </if>
+            <if test="conditionParamRef.containsKey('idEnd') and conditionParamRef.idEnd != null">
+                ${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
+            </if>
+
+
+            <if test="conditionParamRef.containsKey('applicantId')">
+                <if test="conditionParamRef.applicantId != null and conditionParamRef.applicantId != ''">
+                    ${_conditionType_} a.applicantId like #{${_conditionParam_}.applicantId}
+                </if>
+                <if test="conditionParamRef.applicantId == null">
+                    ${_conditionType_} a.applicantId is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('applicantIdList') and conditionParamRef.applicantIdList.size() > 0">
+                ${_conditionType_} a.applicantId in
+                <foreach collection="conditionParamRef.applicantIdList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('applicantIdNotList') and conditionParamRef.applicantIdNotList.size() > 0">
+                ${_conditionType_} a.applicantId not in
+                <foreach collection="conditionParamRef.applicantIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('storageInfo')">
+                <if test="conditionParamRef.storageInfo != null and conditionParamRef.storageInfo != ''">
+                    ${_conditionType_} a.storageInfo like #{${_conditionParam_}.storageInfo}
+                </if>
+                <if test="conditionParamRef.storageInfo == null">
+                    ${_conditionType_} a.storageInfo is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('storageInfoList') and conditionParamRef.storageInfoList.size() > 0">
+                ${_conditionType_} a.storageInfo in
+                <foreach collection="conditionParamRef.storageInfoList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('storageInfoNotList') and conditionParamRef.storageInfoNotList.size() > 0">
+                ${_conditionType_} a.storageInfo not in
+                <foreach collection="conditionParamRef.storageInfoNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('createUserId')">
+                <if test="conditionParamRef.createUserId != null ">
+                    ${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
+                </if>
+                <if test="conditionParamRef.createUserId == null">
+                    ${_conditionType_} a.createUserId is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
+                ${_conditionType_} a.createUserId in
+                <foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('createUserIdNotList') and conditionParamRef.createUserIdNotList.size() > 0">
+                ${_conditionType_} a.createUserId not in
+                <foreach collection="conditionParamRef.createUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null">
+                ${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
+            </if>
+            <if test="conditionParamRef.containsKey('createUserIdEnd') and conditionParamRef.createUserIdEnd != null">
+                ${_conditionType_} a.createUserId <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd}
+            </if>
+
+
+            <if test="conditionParamRef.containsKey('createTime')">
+                <if test="conditionParamRef.createTime != null ">
+                    ${_conditionType_} a.createTime = #{${_conditionParam_}.createTime}
+                </if>
+                <if test="conditionParamRef.createTime == null">
+                    ${_conditionType_} a.createTime is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
+                ${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+            <if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''">
+                ${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+            <if test="conditionParamRef.containsKey('updateUserId')">
+                <if test="conditionParamRef.updateUserId != null ">
+                    ${_conditionType_} a.updateUserId = #{${_conditionParam_}.updateUserId}
+                </if>
+                <if test="conditionParamRef.updateUserId == null">
+                    ${_conditionType_} a.updateUserId is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
+                ${_conditionType_} a.updateUserId in
+                <foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('updateUserIdNotList') and conditionParamRef.updateUserIdNotList.size() > 0">
+                ${_conditionType_} a.updateUserId not in
+                <foreach collection="conditionParamRef.updateUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null">
+                ${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart}
+            </if>
+            <if test="conditionParamRef.containsKey('updateUserIdEnd') and conditionParamRef.updateUserIdEnd != null">
+                ${_conditionType_} a.updateUserId <![CDATA[ <= ]]> #{${_conditionParam_}.updateUserIdEnd}
+            </if>
+
+
+            <if test="conditionParamRef.containsKey('updateTime')">
+                <if test="conditionParamRef.updateTime != null ">
+                    ${_conditionType_} a.updateTime = #{${_conditionParam_}.updateTime}
+                </if>
+                <if test="conditionParamRef.updateTime == null">
+                    ${_conditionType_} a.updateTime is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('updateTimeStart') and conditionParamRef.updateTimeStart != null and conditionParamRef.updateTimeStart!=''">
+                ${_conditionType_} a.updateTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+            <if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
+                ${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+    </sql>
+    <sql id="_orderCols_">
+        <if test="orderColList != null and !orderColList.isEmpty()">
+            order by
+                    <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
+                        field(a.id,
+                        <foreach collection="conditionParamRef.idList" open="" close=")" index="index" item="item" separator=",">
+                            #{item}
+                        </foreach>
+                        ,
+                    </if>
+                    <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
+                        field(a.createUserId,
+                        <foreach collection="conditionParamRef.createUserIdList" open="" close=")" index="index" item="item" separator=",">
+                            #{item}
+                        </foreach>
+                        ,
+                    </if>
+                    <if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
+                        field(a.updateUserId,
+                        <foreach collection="conditionParamRef.updateUserIdList" open="" close=")" index="index" item="item" separator=",">
+                            #{item}
+                        </foreach>
+                        ,
+                    </if>
+            <trim suffixOverrides=","  suffix="">
+                <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
+                     a.${item.colName} ${item.sortKind}
+                </foreach>
+            </trim>
+        </if>
+        <if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
+            order by
+                    <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
+                        field(a.id,
+                        <foreach collection="conditionParamRef.idList" open="" close=")" index="index" item="item" separator=",">
+                            #{item}
+                        </foreach>
+                        ,
+                    </if>
+                    <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
+                        field(a.createUserId,
+                        <foreach collection="conditionParamRef.createUserIdList" open="" close=")" index="index" item="item" separator=",">
+                            #{item}
+                        </foreach>
+                        ,
+                    </if>
+                    <if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
+                        field(a.updateUserId,
+                        <foreach collection="conditionParamRef.updateUserIdList" open="" close=")" index="index" item="item" separator=",">
+                            #{item}
+                        </foreach>
+                        ,
+                    </if>
+            <trim suffixOverrides=","  suffix="">
+                    <if test="orderCol.containsKey('id')">
+                        a.id
+                        <if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('applicantId')">
+                        a.applicantId
+                        <if test='orderCol.applicantId != null and "DESC".equalsIgnoreCase(orderCol.applicantId)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('storageInfo')">
+                        a.storageInfo
+                        <if test='orderCol.storageInfo != null and "DESC".equalsIgnoreCase(orderCol.storageInfo)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('createUserId')">
+                        a.createUserId
+                        <if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('createTime')">
+                        a.createTime
+                        <if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('updateUserId')">
+                        a.updateUserId
+                        <if test='orderCol.updateUserId != null and "DESC".equalsIgnoreCase(orderCol.updateUserId)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('updateTime')">
+                        a.updateTime
+                        <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
+                        ,
+                    </if>
+            </trim>
+        </if>
+
+
+    </sql>
+    <sql id="_group_by_">
+        <if test="groupList != null and !groupList.isEmpty()">
+            GROUP BY
+            <trim suffixOverrides=","  suffix="">
+                <foreach collection="groupList" open="" close="" index="index" item="item" separator=",">
+                    ${item}
+                </foreach>
+            </trim>
+        </if>
+    </sql>
+</mapper>
\ No newline at end of file