事项申请增加申请文件;单事项申请文件配置

single-matter/src/main/java/com/mortals/xhx/module/apply/model/MatterApplyEntity.java

@@ -2,8 +2,6 @@ package com.mortals.xhx.module.apply.model;
 import java.util.Date;
 import java.util.List;
 import java.util.ArrayList;
-
-import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.mortals.framework.annotation.Excel;
 import com.mortals.framework.model.BaseEntityLong;
@@ -13,7 +11,7 @@ import lombok.Data;
  * 单事项申报实体对象
  *
  * @author zxfei
- * @date 2023-05-27
+ * @date 2023-06-07
  */
 @Data
 public class MatterApplyEntity extends MatterApplyVo {
@@ -66,7 +64,6 @@ public class MatterApplyEntity extends MatterApplyVo {
     /**
      * 申请时间
      */
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
     private Date applyTime;
     /**
      * 审批状态0审批中1通过2不通过
@@ -84,6 +81,14 @@ public class MatterApplyEntity extends MatterApplyVo {
      * 微信openId
      */
     private String openId;
+    /**
+     * 事项申请文件名称
+     */
+    private String filename;
+    /**
+     * 事项申请文件地址
+     */
+    private String fileUrl;
     @Override
     public int hashCode() {
         return this.getId().hashCode();
@@ -133,5 +138,9 @@ public class MatterApplyEntity extends MatterApplyVo {
         this.remarks = "";
 
         this.openId = "";
+
+        this.filename = "";
+
+        this.fileUrl = "";
     }
 }
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/apply/model/MatterApplyQuery.java

@@ -7,7 +7,7 @@ import com.mortals.xhx.module.apply.model.MatterApplyEntity;
  * 单事项申报查询对象
  *
  * @author zxfei
- * @date 2023-05-27
+ * @date 2023-06-07
  */
 public class MatterApplyQuery extends MatterApplyEntity {
     /** 开始 序号，主键，自增长 */
@@ -208,6 +208,16 @@ public class MatterApplyQuery extends MatterApplyEntity {
     /** 结束 更新时间 */
     private String updateTimeEnd;
 
+    /** 事项申请文件名称 */
+    private List<String> filenameList;
+
+    /** 事项申请文件名称排除列表 */
+    private List <String> filenameNotList;
+    /** 事项申请文件地址 */
+    private List<String> fileUrlList;
+
+    /** 事项申请文件地址排除列表 */
+    private List <String> fileUrlNotList;
     /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<MatterApplyQuery> orConditionList;
 
@@ -1329,6 +1339,70 @@ public class MatterApplyQuery extends MatterApplyEntity {
         this.updateTimeEnd = updateTimeEnd;
     }
 
+    /**
+     * 获取 事项申请文件名称
+     * @return filenameList
+     */
+    public List<String> getFilenameList(){
+        return this.filenameList;
+    }
+
+    /**
+     * 设置 事项申请文件名称
+     * @param filenameList
+     */
+    public void setFilenameList(List<String> filenameList){
+        this.filenameList = filenameList;
+    }
+
+    /**
+     * 获取 事项申请文件名称
+     * @return filenameNotList
+     */
+    public List<String> getFilenameNotList(){
+        return this.filenameNotList;
+    }
+
+    /**
+     * 设置 事项申请文件名称
+     * @param filenameNotList
+     */
+    public void setFilenameNotList(List<String> filenameNotList){
+        this.filenameNotList = filenameNotList;
+    }
+
+    /**
+     * 获取 事项申请文件地址
+     * @return fileUrlList
+     */
+    public List<String> getFileUrlList(){
+        return this.fileUrlList;
+    }
+
+    /**
+     * 设置 事项申请文件地址
+     * @param fileUrlList
+     */
+    public void setFileUrlList(List<String> fileUrlList){
+        this.fileUrlList = fileUrlList;
+    }
+
+    /**
+     * 获取 事项申请文件地址
+     * @return fileUrlNotList
+     */
+    public List<String> getFileUrlNotList(){
+        return this.fileUrlNotList;
+    }
+
+    /**
+     * 设置 事项申请文件地址
+     * @param fileUrlNotList
+     */
+    public void setFileUrlNotList(List<String> fileUrlNotList){
+        this.fileUrlNotList = fileUrlNotList;
+    }
+
     /**
      * 设置  序号，主键，自增长
      * @param id
@@ -1989,6 +2063,44 @@ public class MatterApplyQuery extends MatterApplyEntity {
     }
 
 
+
+    /**
+     * 设置 事项申请文件名称
+     * @param filename
+     */
+    public MatterApplyQuery filename(String filename){
+        setFilename(filename);
+        return this;
+    }
+
+    /**
+     * 设置 事项申请文件名称
+     * @param filenameList
+     */
+    public MatterApplyQuery filenameList(List<String> filenameList){
+        this.filenameList = filenameList;
+        return this;
+    }
+
+
+    /**
+     * 设置 事项申请文件地址
+     * @param fileUrl
+     */
+    public MatterApplyQuery fileUrl(String fileUrl){
+        setFileUrl(fileUrl);
+        return this;
+    }
+
+    /**
+     * 设置 事项申请文件地址
+     * @param fileUrlList
+     */
+    public MatterApplyQuery fileUrlList(List<String> fileUrlList){
+        this.fileUrlList = fileUrlList;
+        return this;
+    }
+
     /**
      * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
      * @return orConditionList

single-matter/src/main/java/com/mortals/xhx/module/apply/service/MatterApplyDatumService.java

 package com.mortals.xhx.module.apply.service;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.Context;
 import com.mortals.framework.service.ICRUDService;
 import com.mortals.xhx.module.apply.model.MatterApplyDatumEntity;
 import com.mortals.xhx.module.apply.dao.MatterApplyDatumDao;
@@ -13,4 +15,13 @@ import com.mortals.xhx.module.apply.dao.MatterApplyDatumDao;
 public interface MatterApplyDatumService extends ICRUDService<MatterApplyDatumEntity,Long>{
 
     MatterApplyDatumDao getDao();
+
+    /**
+     * 根据申请id删除材料附件
+     * @param applyIds
+     * @param context
+     * @return
+     * @throws AppException
+     */
+    int remobeByApplyIds(Long[] applyIds, Context context) throws AppException;
 }
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/apply/service/impl/MatterApplyDatumServiceImpl.java

@@ -7,6 +7,9 @@ import com.mortals.xhx.module.apply.dao.MatterApplyDatumDao;
 import com.mortals.xhx.module.apply.model.MatterApplyDatumEntity;
 import com.mortals.xhx.module.apply.service.MatterApplyDatumService;
 import lombok.extern.slf4j.Slf4j;
+
+import java.util.*;
+
 /**
 * MatterApplyDatumService
 * 事项申报材料 service实现
@@ -17,5 +20,17 @@ import lombok.extern.slf4j.Slf4j;
 @Service("matterApplyDatumService")
 @Slf4j
 public class MatterApplyDatumServiceImpl extends AbstractCRUDServiceImpl<MatterApplyDatumDao, MatterApplyDatumEntity, Long> implements MatterApplyDatumService {
-    
+
+    @Override
+    public int remobeByApplyIds(Long[] applyIds, Context context) throws AppException {
+        if(applyIds != null) {
+            List<Long> applyIdList = new ArrayList<>(applyIds.length);
+            Collections.addAll(applyIdList,applyIds);
+            Map<String, Object> condition = new HashMap();
+            condition.put("applyIdList", applyIdList);
+            return dao.delete(condition);
+        }else {
+            return 0;
+        }
+    }
 }
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/apply/service/impl/MatterApplyServiceImpl.java

@@ -5,7 +5,6 @@ import com.mortals.framework.model.Context;
 import com.mortals.framework.model.PageInfo;
 import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
 import com.mortals.framework.util.StringUtils;
-import com.mortals.xhx.base.system.user.service.UserService;
 import com.mortals.xhx.module.apply.dao.MatterApplyDao;
 import com.mortals.xhx.module.apply.model.MatterApplyDatumEntity;
 import com.mortals.xhx.module.apply.model.MatterApplyDatumQuery;
@@ -175,4 +174,9 @@ public class MatterApplyServiceImpl extends AbstractCRUDServiceImpl<MatterApplyD
         entity.setAdvisement("");
         this.update(entity,context);
     }
+
+    @Override
+    protected void removeAfter(Long[] ids, Context context, int result) throws AppException {
+        matterApplyDatumService.remobeByApplyIds(ids,context);
+    }
 }
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/apply/web/MatterApplyController.java

@@ -192,4 +192,36 @@ public class MatterApplyController extends BaseCRUDJsonBodyMappingController<Mat
         ret.put("data", model);
         return ret.toJSONString();
     }
+
+    @RequestMapping(
+            value = {"delete"},
+            method = {RequestMethod.POST, RequestMethod.GET}
+    )
+    @UnAuth
+    public String delete(Long[] id) {
+        Context context = this.getContext();
+        if (id == null) {
+            return this.createFailJsonResp("请至少选择一条记录");
+        } else {
+            Map<String, Object> model = new HashMap();
+            int code = 1;
+            String busiDesc = "删除" + this.getModuleDesc();
+
+            try {
+                this.deleteBefore(id, context);
+                int iRet = this.service.remove(id, context);
+                model.put("message_info", this.getModuleDesc() + "删除成功!删除条数:" + iRet);
+                this.recordSysLog(this.request, busiDesc + " 【成功】 [id:" + StringUtils.converArray2Str(id) + "]");
+            } catch (Exception var7) {
+                code = -1;
+                this.doException(this.request, busiDesc, model, var7);
+            }
+
+            JSONObject ret = new JSONObject();
+            ret.put("code", Integer.valueOf(code));
+            ret.put("msg", model.remove("message_info"));
+            ret.put("data", model);
+            return ret.toJSONString();
+        }
+    }
 }
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/single/dao/SingleMatterFileDao.java

+package com.mortals.xhx.module.single.dao;
+
+import com.mortals.framework.dao.ICRUDDao;
+import com.mortals.xhx.module.single.model.SingleMatterFileEntity;
+import java.util.List;
+/**
+* 单事项申请文件Dao
+* 单事项申请文件 DAO接口
+*
+* @author zxfei
+* @date 2023-06-07
+*/
+
+public interface  SingleMatterFileDao extends ICRUDDao<SingleMatterFileEntity,Long>{
+
+
+}

single-matter/src/main/java/com/mortals/xhx/module/single/dao/ibatis/SingleMatterFileDaoImpl.java

+package com.mortals.xhx.module.single.dao.ibatis;
+
+
+import org.springframework.stereotype.Repository;
+import com.mortals.xhx.module.single.dao.SingleMatterFileDao;
+import com.mortals.xhx.module.single.model.SingleMatterFileEntity;
+import java.util.Date;
+import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
+import java.util.List;
+/**
+* 单事项申请文件DaoImpl DAO接口
+*
+* @author zxfei
+* @date 2023-06-07
+*/
+@Repository("singleMatterFileDao")
+public class SingleMatterFileDaoImpl extends BaseCRUDDaoMybatis<SingleMatterFileEntity,Long> implements SingleMatterFileDao {
+
+
+
+}

single-matter/src/main/java/com/mortals/xhx/module/single/model/SingleMatterFileEntity.java

+package com.mortals.xhx.module.single.model;
+import java.util.List;
+import java.util.ArrayList;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mortals.framework.annotation.Excel;
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.single.model.vo.SingleMatterFileVo;
+import lombok.Data;
+/**
+* 单事项申请文件实体对象
+*
+* @author zxfei
+* @date 2023-06-07
+*/
+@Data
+public class SingleMatterFileEntity extends SingleMatterFileVo {
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 站点id
+    */
+    private Long siteId;
+    /**
+    * 基础事项ID
+    */
+    private Long matterId;
+    /**
+    * 事项名称
+    */
+    private String matterName;
+    /**
+    * 事项编码
+    */
+    private String matterCode;
+    /**
+    * 事项申请文件名称
+    */
+    private String filename;
+    /**
+    * 事项申请文件地址
+    */
+    private String fileUrl;
+    @Override
+    public int hashCode() {
+         return this.getId().hashCode();
+    }
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) return false;
+        if (obj instanceof SingleMatterFileEntity) {
+            SingleMatterFileEntity tmp = (SingleMatterFileEntity) obj;
+            if (this.getId() == tmp.getId()) {
+                 return true;
+            }
+        }
+        return false;
+    }
+
+    public void initAttrValue(){
+
+            this.siteId = -1L;
+
+            this.matterId = -1L;
+
+            this.matterName = "";
+
+            this.matterCode = "";
+
+            this.filename = "";
+
+            this.fileUrl = "";
+    }
+}
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/single/model/SingleMatterFileQuery.java

+package com.mortals.xhx.module.single.model;
+
+import java.util.List;
+import com.mortals.xhx.module.single.model.SingleMatterFileEntity;
+/**
+* 单事项申请文件查询对象
+*
+* @author zxfei
+* @date 2023-06-07
+*/
+public class SingleMatterFileQuery extends SingleMatterFileEntity {
+    /** 开始 主键id */
+    private Long idStart;
+
+    /** 结束 主键id */
+    private Long idEnd;
+
+    /** 增加 主键id */
+    private Long idIncrement;
+
+    /** 主键id列表 */
+    private List <Long> idList;
+
+    /** 主键id排除列表 */
+    private List <Long> idNotList;
+
+    /** 开始 站点id */
+    private Long siteIdStart;
+
+    /** 结束 站点id */
+    private Long siteIdEnd;
+
+    /** 增加 站点id */
+    private Long siteIdIncrement;
+
+    /** 站点id列表 */
+    private List <Long> siteIdList;
+
+    /** 站点id排除列表 */
+    private List <Long> siteIdNotList;
+
+    /** 开始 基础事项ID */
+    private Long matterIdStart;
+
+    /** 结束 基础事项ID */
+    private Long matterIdEnd;
+
+    /** 增加 基础事项ID */
+    private Long matterIdIncrement;
+
+    /** 基础事项ID列表 */
+    private List <Long> matterIdList;
+
+    /** 基础事项ID排除列表 */
+    private List <Long> matterIdNotList;
+
+    /** 事项名称 */
+    private List<String> matterNameList;
+
+    /** 事项名称排除列表 */
+    private List <String> matterNameNotList;
+    /** 事项编码 */
+    private List<String> matterCodeList;
+
+    /** 事项编码排除列表 */
+    private List <String> matterCodeNotList;
+    /** 事项申请文件名称 */
+    private List<String> filenameList;
+
+    /** 事项申请文件名称排除列表 */
+    private List <String> filenameNotList;
+    /** 事项申请文件地址 */
+    private List<String> fileUrlList;
+
+    /** 事项申请文件地址排除列表 */
+    private List <String> fileUrlNotList;
+    /** 开始 创建用户 */
+    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<SingleMatterFileQuery> orConditionList;
+
+    /** AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
+    private List<SingleMatterFileQuery> andConditionList;
+
+    public SingleMatterFileQuery(){}
+
+    /**
+    * 获取 开始 主键id
+    * @return idStart
+    */
+    public Long getIdStart(){
+        return this.idStart;
+    }
+
+    /**
+    * 设置 开始 主键id
+    * @param idStart
+    */
+    public void setIdStart(Long idStart){
+        this.idStart = idStart;
+    }
+
+    /**
+    * 获取 结束 主键id
+    * @return $idEnd
+    */
+    public Long getIdEnd(){
+        return this.idEnd;
+    }
+
+    /**
+    * 设置 结束 主键id
+    * @param idEnd
+    */
+    public void setIdEnd(Long idEnd){
+        this.idEnd = idEnd;
+    }
+
+    /**
+    * 获取 增加 主键id
+    * @return idIncrement
+    */
+    public Long getIdIncrement(){
+        return this.idIncrement;
+    }
+
+    /**
+    * 设置 增加 主键id
+    * @param idIncrement
+    */
+    public void setIdIncrement(Long idIncrement){
+        this.idIncrement = idIncrement;
+    }
+
+    /**
+    * 获取 主键id
+    * @return idList
+    */
+    public List<Long> getIdList(){
+        return this.idList;
+    }
+
+    /**
+    * 设置 主键id
+    * @param idList
+    */
+    public void setIdList(List<Long> idList){
+        this.idList = idList;
+    }
+
+    /**
+    * 获取 主键id
+    * @return idNotList
+    */
+    public List<Long> getIdNotList(){
+        return this.idNotList;
+    }
+
+    /**
+    * 设置 主键id
+    * @param idNotList
+    */
+    public void setIdNotList(List<Long> idNotList){
+        this.idNotList = idNotList;
+    }
+
+
+    /**
+    * 获取 开始 站点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;
+    }
+
+    /**
+    * 获取 站点id
+    * @return siteIdNotList
+    */
+    public List<Long> getSiteIdNotList(){
+        return this.siteIdNotList;
+    }
+
+    /**
+    * 设置 站点id
+    * @param siteIdNotList
+    */
+    public void setSiteIdNotList(List<Long> siteIdNotList){
+        this.siteIdNotList = siteIdNotList;
+    }
+
+
+    /**
+    * 获取 开始 基础事项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;
+    }
+
+    /**
+    * 获取 基础事项ID
+    * @return matterIdNotList
+    */
+    public List<Long> getMatterIdNotList(){
+        return this.matterIdNotList;
+    }
+
+    /**
+    * 设置 基础事项ID
+    * @param matterIdNotList
+    */
+    public void setMatterIdNotList(List<Long> matterIdNotList){
+        this.matterIdNotList = matterIdNotList;
+    }
+
+
+    /**
+    * 获取 事项名称
+    * @return matterNameList
+    */
+    public List<String> getMatterNameList(){
+        return this.matterNameList;
+    }
+
+    /**
+    * 设置 事项名称
+    * @param matterNameList
+    */
+    public void setMatterNameList(List<String> matterNameList){
+        this.matterNameList = matterNameList;
+    }
+
+    /**
+    * 获取 事项名称
+    * @return matterNameNotList
+    */
+    public List<String> getMatterNameNotList(){
+        return this.matterNameNotList;
+    }
+
+    /**
+    * 设置 事项名称
+    * @param matterNameNotList
+    */
+    public void setMatterNameNotList(List<String> matterNameNotList){
+        this.matterNameNotList = matterNameNotList;
+    }
+
+    /**
+    * 获取 事项编码
+    * @return matterCodeList
+    */
+    public List<String> getMatterCodeList(){
+        return this.matterCodeList;
+    }
+
+    /**
+    * 设置 事项编码
+    * @param matterCodeList
+    */
+    public void setMatterCodeList(List<String> matterCodeList){
+        this.matterCodeList = matterCodeList;
+    }
+
+    /**
+    * 获取 事项编码
+    * @return matterCodeNotList
+    */
+    public List<String> getMatterCodeNotList(){
+        return this.matterCodeNotList;
+    }
+
+    /**
+    * 设置 事项编码
+    * @param matterCodeNotList
+    */
+    public void setMatterCodeNotList(List<String> matterCodeNotList){
+        this.matterCodeNotList = matterCodeNotList;
+    }
+
+    /**
+    * 获取 事项申请文件名称
+    * @return filenameList
+    */
+    public List<String> getFilenameList(){
+        return this.filenameList;
+    }
+
+    /**
+    * 设置 事项申请文件名称
+    * @param filenameList
+    */
+    public void setFilenameList(List<String> filenameList){
+        this.filenameList = filenameList;
+    }
+
+    /**
+    * 获取 事项申请文件名称
+    * @return filenameNotList
+    */
+    public List<String> getFilenameNotList(){
+        return this.filenameNotList;
+    }
+
+    /**
+    * 设置 事项申请文件名称
+    * @param filenameNotList
+    */
+    public void setFilenameNotList(List<String> filenameNotList){
+        this.filenameNotList = filenameNotList;
+    }
+
+    /**
+    * 获取 事项申请文件地址
+    * @return fileUrlList
+    */
+    public List<String> getFileUrlList(){
+        return this.fileUrlList;
+    }
+
+    /**
+    * 设置 事项申请文件地址
+    * @param fileUrlList
+    */
+    public void setFileUrlList(List<String> fileUrlList){
+        this.fileUrlList = fileUrlList;
+    }
+
+    /**
+    * 获取 事项申请文件地址
+    * @return fileUrlNotList
+    */
+    public List<String> getFileUrlNotList(){
+        return this.fileUrlNotList;
+    }
+
+    /**
+    * 设置 事项申请文件地址
+    * @param fileUrlNotList
+    */
+    public void setFileUrlNotList(List<String> fileUrlNotList){
+        this.fileUrlNotList = fileUrlNotList;
+    }
+
+    /**
+    * 获取 开始 创建用户
+    * @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;
+    }
+
+    /**
+    * 设置  主键id
+    * @param id
+    */
+    public SingleMatterFileQuery id(Long id){
+	    setId(id);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 主键id
+    * @param idStart
+    */
+    public SingleMatterFileQuery idStart(Long idStart){
+		this.idStart = idStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 主键id
+    * @param idEnd
+    */
+    public SingleMatterFileQuery idEnd(Long idEnd){
+		this.idEnd = idEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 主键id
+    * @param idIncrement
+    */
+    public SingleMatterFileQuery idIncrement(Long idIncrement){
+		this.idIncrement = idIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 主键id
+    * @param idList
+    */
+    public SingleMatterFileQuery idList(List<Long> idList){
+        this.idList = idList;
+		return this;
+        }
+
+        /**
+        * 设置 主键id
+        * @param idNotList
+        */
+        public SingleMatterFileQuery idNotList(List<Long> idNotList){
+        this.idNotList = idNotList;
+        return this;
+        }
+
+    /**
+    * 设置  站点id
+    * @param siteId
+    */
+    public SingleMatterFileQuery siteId(Long siteId){
+	    setSiteId(siteId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 站点id
+    * @param siteIdStart
+    */
+    public SingleMatterFileQuery siteIdStart(Long siteIdStart){
+		this.siteIdStart = siteIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 站点id
+    * @param siteIdEnd
+    */
+    public SingleMatterFileQuery siteIdEnd(Long siteIdEnd){
+		this.siteIdEnd = siteIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 站点id
+    * @param siteIdIncrement
+    */
+    public SingleMatterFileQuery siteIdIncrement(Long siteIdIncrement){
+		this.siteIdIncrement = siteIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 站点id
+    * @param siteIdList
+    */
+    public SingleMatterFileQuery siteIdList(List<Long> siteIdList){
+        this.siteIdList = siteIdList;
+		return this;
+        }
+
+        /**
+        * 设置 站点id
+        * @param siteIdNotList
+        */
+        public SingleMatterFileQuery siteIdNotList(List<Long> siteIdNotList){
+        this.siteIdNotList = siteIdNotList;
+        return this;
+        }
+
+    /**
+    * 设置  基础事项ID
+    * @param matterId
+    */
+    public SingleMatterFileQuery matterId(Long matterId){
+	    setMatterId(matterId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 基础事项ID
+    * @param matterIdStart
+    */
+    public SingleMatterFileQuery matterIdStart(Long matterIdStart){
+		this.matterIdStart = matterIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 基础事项ID
+    * @param matterIdEnd
+    */
+    public SingleMatterFileQuery matterIdEnd(Long matterIdEnd){
+		this.matterIdEnd = matterIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 基础事项ID
+    * @param matterIdIncrement
+    */
+    public SingleMatterFileQuery matterIdIncrement(Long matterIdIncrement){
+		this.matterIdIncrement = matterIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 基础事项ID
+    * @param matterIdList
+    */
+    public SingleMatterFileQuery matterIdList(List<Long> matterIdList){
+        this.matterIdList = matterIdList;
+		return this;
+        }
+
+        /**
+        * 设置 基础事项ID
+        * @param matterIdNotList
+        */
+        public SingleMatterFileQuery matterIdNotList(List<Long> matterIdNotList){
+        this.matterIdNotList = matterIdNotList;
+        return this;
+        }
+
+
+	/**
+    * 设置 事项名称
+    * @param matterName
+    */
+    public SingleMatterFileQuery matterName(String matterName){
+        setMatterName(matterName);
+		return this;
+    }
+
+    /**
+    * 设置 事项名称
+    * @param matterNameList
+    */
+    public SingleMatterFileQuery matterNameList(List<String> matterNameList){
+        this.matterNameList = matterNameList;
+		return this;
+    }
+
+
+	/**
+    * 设置 事项编码
+    * @param matterCode
+    */
+    public SingleMatterFileQuery matterCode(String matterCode){
+        setMatterCode(matterCode);
+		return this;
+    }
+
+    /**
+    * 设置 事项编码
+    * @param matterCodeList
+    */
+    public SingleMatterFileQuery matterCodeList(List<String> matterCodeList){
+        this.matterCodeList = matterCodeList;
+		return this;
+    }
+
+
+	/**
+    * 设置 事项申请文件名称
+    * @param filename
+    */
+    public SingleMatterFileQuery filename(String filename){
+        setFilename(filename);
+		return this;
+    }
+
+    /**
+    * 设置 事项申请文件名称
+    * @param filenameList
+    */
+    public SingleMatterFileQuery filenameList(List<String> filenameList){
+        this.filenameList = filenameList;
+		return this;
+    }
+
+
+	/**
+    * 设置 事项申请文件地址
+    * @param fileUrl
+    */
+    public SingleMatterFileQuery fileUrl(String fileUrl){
+        setFileUrl(fileUrl);
+		return this;
+    }
+
+    /**
+    * 设置 事项申请文件地址
+    * @param fileUrlList
+    */
+    public SingleMatterFileQuery fileUrlList(List<String> fileUrlList){
+        this.fileUrlList = fileUrlList;
+		return this;
+    }
+
+    /**
+    * 设置  创建用户
+    * @param createUserId
+    */
+    public SingleMatterFileQuery createUserId(Long createUserId){
+	    setCreateUserId(createUserId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 创建用户
+    * @param createUserIdStart
+    */
+    public SingleMatterFileQuery createUserIdStart(Long createUserIdStart){
+		this.createUserIdStart = createUserIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 创建用户
+    * @param createUserIdEnd
+    */
+    public SingleMatterFileQuery createUserIdEnd(Long createUserIdEnd){
+		this.createUserIdEnd = createUserIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 创建用户
+    * @param createUserIdIncrement
+    */
+    public SingleMatterFileQuery createUserIdIncrement(Long createUserIdIncrement){
+		this.createUserIdIncrement = createUserIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 创建用户
+    * @param createUserIdList
+    */
+    public SingleMatterFileQuery createUserIdList(List<Long> createUserIdList){
+        this.createUserIdList = createUserIdList;
+		return this;
+        }
+
+        /**
+        * 设置 创建用户
+        * @param createUserIdNotList
+        */
+        public SingleMatterFileQuery createUserIdNotList(List<Long> createUserIdNotList){
+        this.createUserIdNotList = createUserIdNotList;
+        return this;
+        }
+
+
+    /**
+    * 设置  更新用户
+    * @param updateUserId
+    */
+    public SingleMatterFileQuery updateUserId(Long updateUserId){
+	    setUpdateUserId(updateUserId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 更新用户
+    * @param updateUserIdStart
+    */
+    public SingleMatterFileQuery updateUserIdStart(Long updateUserIdStart){
+		this.updateUserIdStart = updateUserIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 更新用户
+    * @param updateUserIdEnd
+    */
+    public SingleMatterFileQuery updateUserIdEnd(Long updateUserIdEnd){
+		this.updateUserIdEnd = updateUserIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 更新用户
+    * @param updateUserIdIncrement
+    */
+    public SingleMatterFileQuery updateUserIdIncrement(Long updateUserIdIncrement){
+		this.updateUserIdIncrement = updateUserIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 更新用户
+    * @param updateUserIdList
+    */
+    public SingleMatterFileQuery updateUserIdList(List<Long> updateUserIdList){
+        this.updateUserIdList = updateUserIdList;
+		return this;
+        }
+
+        /**
+        * 设置 更新用户
+        * @param updateUserIdNotList
+        */
+        public SingleMatterFileQuery 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<SingleMatterFileQuery> 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<SingleMatterFileQuery> 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<SingleMatterFileQuery> 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<SingleMatterFileQuery> andConditionList){
+        this.andConditionList = andConditionList;
+    }
+
+}
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/single/model/vo/SingleMatterFileVo.java

+package com.mortals.xhx.module.single.model.vo;
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.single.model.SingleMatterFileEntity;
+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 2023-06-07
+*/
+@Data
+public class SingleMatterFileVo extends BaseEntityLong {
+
+
+
+}
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/single/model/vo/SingleMatterVo.java

@@ -12,5 +12,8 @@ import lombok.Data;
 public class SingleMatterVo extends BaseEntityLong {
     /** 材料数量 */
     private Integer datumCount = 0;
-
+    /** 是否有申请表 0否 1是 */
+    private Integer hasApplyForm = 0;
+    /** 申请表下载地址 */
+    private String applyFormUrl;
 }
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/single/service/SingleMatterFileService.java

+package com.mortals.xhx.module.single.service;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.Context;
+import com.mortals.framework.service.ICRUDService;
+import com.mortals.xhx.module.single.model.SingleMatterFileEntity;
+import com.mortals.xhx.module.single.dao.SingleMatterFileDao;
+/**
+* SingleMatterFileService
+*
+* 单事项申请文件 service接口
+*
+* @author zxfei
+* @date 2023-06-07
+*/
+public interface SingleMatterFileService extends ICRUDService<SingleMatterFileEntity,Long>{
+
+    SingleMatterFileDao getDao();
+
+    /**
+     * 保存申请文件
+     * @param entity
+     * @param context
+     * @return
+     * @throws AppException
+     */
+    SingleMatterFileEntity saveFile(SingleMatterFileEntity entity, Context context) throws AppException;
+}
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/single/service/impl/SingleMatterFileServiceImpl.java

+package com.mortals.xhx.module.single.service.impl;
+
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.Context;
+import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
+import com.mortals.framework.util.StringUtils;
+import com.mortals.xhx.module.matter.model.MatterEntity;
+import com.mortals.xhx.module.matter.service.MatterService;
+import com.mortals.xhx.module.single.dao.SingleMatterFileDao;
+import com.mortals.xhx.module.single.model.SingleMatterFileEntity;
+import com.mortals.xhx.module.single.model.SingleMatterFileQuery;
+import com.mortals.xhx.module.single.service.SingleMatterFileService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+
+/**
+* SingleMatterFileService
+* 单事项申请文件 service实现
+*
+* @author zxfei
+* @date 2023-06-07
+*/
+@Service("singleMatterFileService")
+@Slf4j
+public class SingleMatterFileServiceImpl extends AbstractCRUDServiceImpl<SingleMatterFileDao, SingleMatterFileEntity, Long> implements SingleMatterFileService {
+
+    @Autowired
+    private MatterService matterService;
+
+    @Override
+    protected void validData(SingleMatterFileEntity entity, Context context) throws AppException {
+        if(entity.getMatterId()==null){
+            throw new AppException("基础事项id不能为空");
+        }
+        if(StringUtils.isEmpty(entity.getFilename())){
+            throw new AppException("文件名称不能为空");
+        }
+        if(StringUtils.isEmpty(entity.getFileUrl())){
+            throw new AppException("上传文件不能为空");
+        }
+    }
+
+    @Override
+    public SingleMatterFileEntity saveFile(SingleMatterFileEntity entity, Context context) throws AppException {
+        this.validData(entity,context);
+        SingleMatterFileEntity temp = this.selectOne(new SingleMatterFileQuery().matterId(entity.getMatterId()));
+        if(temp!=null){
+            if(!temp.getFileUrl().equals(entity.getFileUrl())){
+                SingleMatterFileEntity update = new SingleMatterFileEntity();
+                update.setId(temp.getId());
+                update.setFilename(entity.getFilename());
+                update.setFileUrl(entity.getFileUrl());
+                update.setUpdateTime(new Date());
+                if(context!=null && context.getUser()!=null){
+                    entity.setUpdateUserId(context.getUser().getId());
+                }
+                dao.update(update);
+            }
+        }else {
+            MatterEntity matterEntity = matterService.get(entity.getMatterId());
+            if(matterEntity==null){
+                throw new AppException("基础事项id不正确,查不到对应的事项");
+            }
+            entity.setMatterCode(matterEntity.getMatterNo());
+            entity.setMatterName(matterEntity.getMatterName());
+            if(entity.getSiteId()==null) {
+                entity.setSiteId(matterEntity.getSiteId());
+            }
+            if(context!=null && context.getUser()!=null){
+                entity.setCreateUserId(context.getUser().getId());
+            }
+            entity.setCreateTime(new Date());
+            dao.insert(entity);
+        }
+        return entity;
+    }
+}
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/single/service/impl/SingleMatterServiceImpl.java

@@ -3,6 +3,9 @@ import com.mortals.framework.model.PageInfo;
 import com.mortals.xhx.module.matter.model.MatterDatumEntity;
 import com.mortals.xhx.module.matter.model.MatterDatumQuery;
 import com.mortals.xhx.module.matter.service.MatterDatumService;
+import com.mortals.xhx.module.single.model.SingleMatterFileEntity;
+import com.mortals.xhx.module.single.model.SingleMatterFileQuery;
+import com.mortals.xhx.module.single.service.SingleMatterFileService;
 import com.mortals.xhx.module.site.model.SiteMatterEntity;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -30,6 +33,8 @@ public class SingleMatterServiceImpl extends AbstractCRUDServiceImpl<SingleMatte
 
     @Autowired
     private MatterDatumService matterDatumService;
+    @Autowired
+    private SingleMatterFileService singleMatterFileService;
 
     @Override
     protected void findAfter(SingleMatterEntity params, PageInfo pageInfo, Context context, List<SingleMatterEntity> list) throws AppException {
@@ -40,6 +45,11 @@ public class SingleMatterServiceImpl extends AbstractCRUDServiceImpl<SingleMatte
             }else {
                 item.setDatumCount(0);
             }
+            SingleMatterFileEntity singleMatterFileEntity = singleMatterFileService.selectOne(new SingleMatterFileQuery().matterId(item.getMatterId()));
+            if(singleMatterFileEntity!=null){
+                item.setHasApplyForm(1);
+                item.setApplyFormUrl(singleMatterFileEntity.getFileUrl());
+            }
         }).count();
         super.findAfter(params, context, list);
     }
@@ -53,6 +63,11 @@ public class SingleMatterServiceImpl extends AbstractCRUDServiceImpl<SingleMatte
             }else {
                 item.setDatumCount(0);
             }
+            SingleMatterFileEntity singleMatterFileEntity = singleMatterFileService.selectOne(new SingleMatterFileQuery().matterId(item.getMatterId()));
+            if(singleMatterFileEntity!=null){
+                item.setHasApplyForm(1);
+                item.setApplyFormUrl(singleMatterFileEntity.getFileUrl());
+            }
         }).count();
         super.findAfter(params, context, list);
     }

single-matter/src/main/java/com/mortals/xhx/module/single/web/SingleMatterFileController.java

+package com.mortals.xhx.module.single.web;
+import com.mortals.framework.annotation.RepeatSubmit;
+import com.mortals.framework.model.BaseEntity;
+import com.mortals.framework.service.IUser;
+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 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.single.model.SingleMatterFileEntity;
+import com.mortals.xhx.module.single.service.SingleMatterFileService;
+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.*;
+/**
+*
+* 单事项申请文件
+*
+* @author zxfei
+* @date 2023-06-07
+*/
+@RestController
+@RequestMapping("single/matter/file")
+public class SingleMatterFileController extends BaseCRUDJsonBodyMappingController<SingleMatterFileService,SingleMatterFileEntity,Long> {
+
+    @Autowired
+    private ParamService paramService;
+
+    public SingleMatterFileController(){
+        super.setModuleDesc( "单事项申请文件");
+    }
+
+    @Override
+    protected void init(Map<String, Object> model, Context context) {
+        super.init(model, context);
+    }
+
+
+    @PostMapping({"save"})
+    @RepeatSubmit
+    public String save(@RequestBody SingleMatterFileEntity entity) {
+        Map<String, Object> model = new HashMap();
+        Context context = this.getContext();
+        int code = 1;
+        String busiDesc = "保存" + this.getModuleDesc();
+        try {
+            this.service.saveFile(entity,context);
+            model.put("id", entity.getId());
+            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();
+    }
+}
\ No newline at end of file

single-matter/src/main/resources/sqlmap/module/apply/MatterApplyMapper.xml

@@ -26,6 +26,8 @@
         <result property="createTime" column="createTime" />
         <result property="updateUserId" column="updateUserId" />
         <result property="updateTime" column="updateTime" />
+        <result property="filename" column="filename" />
+        <result property="fileUrl" column="fileUrl" />
 
     </resultMap>
 
@@ -96,23 +98,29 @@
             <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
                 a.updateTime,
             </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('filename') or colPickMode == 1 and data.containsKey('filename')))">
+                a.filename,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('fileUrl') or colPickMode == 1 and data.containsKey('fileUrl')))">
+                a.fileUrl,
+            </if>
         </trim>
     </sql>
     <!-- 新增 区分主键自增加还是业务插入 -->
     <insert id="insert" parameterType="MatterApplyEntity"  useGeneratedKeys="true" keyProperty="id">
         insert into mortals_sys_matter_apply
-        (siteId,singleMatterId,matterId,deptCode,matterName,applyPerson,sexual,phoneNum,idCard,address,applyType,applyTime,applyState,advisement,remarks,openId,createUserId,createTime,updateUserId,updateTime)
+        (siteId,singleMatterId,matterId,deptCode,matterName,applyPerson,sexual,phoneNum,idCard,address,applyType,applyTime,applyState,advisement,remarks,openId,createUserId,createTime,updateUserId,updateTime,filename,fileUrl)
         VALUES
-        (#{siteId},#{singleMatterId},#{matterId},#{deptCode},#{matterName},#{applyPerson},#{sexual},#{phoneNum},#{idCard},#{address},#{applyType},#{applyTime},#{applyState},#{advisement},#{remarks},#{openId},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
+        (#{siteId},#{singleMatterId},#{matterId},#{deptCode},#{matterName},#{applyPerson},#{sexual},#{phoneNum},#{idCard},#{address},#{applyType},#{applyTime},#{applyState},#{advisement},#{remarks},#{openId},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{filename},#{fileUrl})
     </insert>
 
     <!-- 批量新增 -->
     <insert id="insertBatch" parameterType="paramDto">
         insert into mortals_sys_matter_apply
-        (siteId,singleMatterId,matterId,deptCode,matterName,applyPerson,sexual,phoneNum,idCard,address,applyType,applyTime,applyState,advisement,remarks,openId,createUserId,createTime,updateUserId,updateTime)
+        (siteId,singleMatterId,matterId,deptCode,matterName,applyPerson,sexual,phoneNum,idCard,address,applyType,applyTime,applyState,advisement,remarks,openId,createUserId,createTime,updateUserId,updateTime,filename,fileUrl)
         VALUES
         <foreach collection="data.dataList" item="item" index="index" separator="," >
-            (#{item.siteId},#{item.singleMatterId},#{item.matterId},#{item.deptCode},#{item.matterName},#{item.applyPerson},#{item.sexual},#{item.phoneNum},#{item.idCard},#{item.address},#{item.applyType},#{item.applyTime},#{item.applyState},#{item.advisement},#{item.remarks},#{item.openId},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
+            (#{item.siteId},#{item.singleMatterId},#{item.matterId},#{item.deptCode},#{item.matterName},#{item.applyPerson},#{item.sexual},#{item.phoneNum},#{item.idCard},#{item.address},#{item.applyType},#{item.applyTime},#{item.applyState},#{item.advisement},#{item.remarks},#{item.openId},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.filename},#{item.fileUrl})
         </foreach>
     </insert>
 
@@ -206,6 +214,12 @@
             <if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
                 a.updateTime=#{data.updateTime},
             </if>
+            <if test="(colPickMode==0 and data.containsKey('filename')) or (colPickMode==1 and !data.containsKey('filename'))">
+                a.filename=#{data.filename},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('fileUrl')) or (colPickMode==1 and !data.containsKey('fileUrl'))">
+                a.fileUrl=#{data.fileUrl},
+            </if>
         </trim>
         <trim suffixOverrides="where" suffix="">
             where
@@ -398,6 +412,20 @@
                     </if>
                 </foreach>
             </trim>
+            <trim prefix="filename=(case" suffix="ELSE filename end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('filename')) or (colPickMode==1 and !item.containsKey('filename'))">
+                        when a.id=#{item.id} then #{item.filename}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="fileUrl=(case" suffix="ELSE fileUrl end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('fileUrl')) or (colPickMode==1 and !item.containsKey('fileUrl'))">
+                        when a.id=#{item.id} then #{item.fileUrl}
+                    </if>
+                </foreach>
+            </trim>
         </trim>
         where id in
         <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
@@ -991,6 +1019,48 @@
         <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>
+
+        <if test="conditionParamRef.containsKey('filename')">
+            <if test="conditionParamRef.filename != null and conditionParamRef.filename != ''">
+                ${_conditionType_} a.filename like #{${_conditionParam_}.filename}
+            </if>
+            <if test="conditionParamRef.filename == null">
+                ${_conditionType_} a.filename is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('filenameList') and conditionParamRef.filenameList.size() > 0">
+            ${_conditionType_} a.filename in
+            <foreach collection="conditionParamRef.filenameList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('filenameNotList') and conditionParamRef.filenameNotList.size() > 0">
+            ${_conditionType_} a.filename not in
+            <foreach collection="conditionParamRef.filenameNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+
+        <if test="conditionParamRef.containsKey('fileUrl')">
+            <if test="conditionParamRef.fileUrl != null and conditionParamRef.fileUrl != ''">
+                ${_conditionType_} a.fileUrl like #{${_conditionParam_}.fileUrl}
+            </if>
+            <if test="conditionParamRef.fileUrl == null">
+                ${_conditionType_} a.fileUrl is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('fileUrlList') and conditionParamRef.fileUrlList.size() > 0">
+            ${_conditionType_} a.fileUrl in
+            <foreach collection="conditionParamRef.fileUrlList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('fileUrlNotList') and conditionParamRef.fileUrlNotList.size() > 0">
+            ${_conditionType_} a.fileUrl not in
+            <foreach collection="conditionParamRef.fileUrlNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
     </sql>
     <sql id="_orderCols_">
         <if test="orderColList != null and !orderColList.isEmpty()">
@@ -1109,6 +1179,16 @@
                     <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
                     ,
                 </if>
+                <if test="orderCol.containsKey('filename')">
+                    a.filename
+                    <if test='orderCol.filename != null and "DESC".equalsIgnoreCase(orderCol.filename)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('fileUrl')">
+                    a.fileUrl
+                    <if test='orderCol.fileUrl != null and "DESC".equalsIgnoreCase(orderCol.fileUrl)'>DESC</if>
+                    ,
+                </if>
             </trim>
         </if>
     </sql>

single-matter/src/main/resources/sqlmap/module/single/SingleMatterFileMapper.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.single.dao.ibatis.SingleMatterFileDaoImpl">
+
+    <!-- 字段和属性映射 -->
+    <resultMap type="SingleMatterFileEntity" id="SingleMatterFileEntity-Map">
+        <id  property="id" column="id" />
+        <result property="siteId" column="siteId" />
+        <result property="matterId" column="matterId" />
+        <result property="matterName" column="matterName" />
+        <result property="matterCode" column="matterCode" />
+        <result property="filename" column="filename" />
+        <result property="fileUrl" column="fileUrl" />
+        <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('siteId') or colPickMode == 1 and data.containsKey('siteId')))">
+                a.siteId,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('matterId') or colPickMode == 1 and data.containsKey('matterId')))">
+                a.matterId,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('matterName') or colPickMode == 1 and data.containsKey('matterName')))">
+                a.matterName,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('matterCode') or colPickMode == 1 and data.containsKey('matterCode')))">
+                a.matterCode,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('filename') or colPickMode == 1 and data.containsKey('filename')))">
+                a.filename,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('fileUrl') or colPickMode == 1 and data.containsKey('fileUrl')))">
+                a.fileUrl,
+            </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="SingleMatterFileEntity"  useGeneratedKeys="true" keyProperty="id">
+        insert into mortals_sys_single_matter_file
+        (siteId,matterId,matterName,matterCode,filename,fileUrl,createUserId,createTime,updateUserId,updateTime)
+        VALUES
+        (#{siteId},#{matterId},#{matterName},#{matterCode},#{filename},#{fileUrl},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
+    </insert>
+
+    <!-- 批量新增 -->
+    <insert id="insertBatch" parameterType="paramDto">
+        insert into mortals_sys_single_matter_file
+        (siteId,matterId,matterName,matterCode,filename,fileUrl,createUserId,createTime,updateUserId,updateTime)
+        VALUES
+        <foreach collection="data.dataList" item="item" index="index" separator="," >
+            (#{item.siteId},#{item.matterId},#{item.matterName},#{item.matterCode},#{item.filename},#{item.fileUrl},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
+        </foreach>
+    </insert>
+
+
+    <!-- 根据ParamDto更新 -->
+    <update id="update" parameterType="paramDto">
+        update mortals_sys_single_matter_file as a
+        set
+        <trim suffixOverrides="," suffix="">
+            <if test="(colPickMode==0 and data.containsKey('siteId')) or (colPickMode==1 and !data.containsKey('siteId'))">
+                a.siteId=#{data.siteId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('siteIdIncrement')) or (colPickMode==1 and !data.containsKey('siteIdIncrement'))">
+                a.siteId=ifnull(a.siteId,0) + #{data.siteIdIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('matterId')) or (colPickMode==1 and !data.containsKey('matterId'))">
+                a.matterId=#{data.matterId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('matterIdIncrement')) or (colPickMode==1 and !data.containsKey('matterIdIncrement'))">
+                a.matterId=ifnull(a.matterId,0) + #{data.matterIdIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('matterName')) or (colPickMode==1 and !data.containsKey('matterName'))">
+                a.matterName=#{data.matterName},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('matterCode')) or (colPickMode==1 and !data.containsKey('matterCode'))">
+                a.matterCode=#{data.matterCode},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('filename')) or (colPickMode==1 and !data.containsKey('filename'))">
+                a.filename=#{data.filename},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('fileUrl')) or (colPickMode==1 and !data.containsKey('fileUrl'))">
+                a.fileUrl=#{data.fileUrl},
+            </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_sys_single_matter_file as a
+        <trim prefix="set" suffixOverrides=",">
+            <trim prefix="siteId=(case" suffix="ELSE siteId end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <choose>
+                        <when test="(colPickMode==0 and item.containsKey('siteId')) or (colPickMode==1 and !item.containsKey('siteId'))">
+                            when a.id=#{item.id} then #{item.siteId}
+                        </when>
+                        <when test="(colPickMode==0 and item.containsKey('siteIdIncrement')) or (colPickMode==1 and !item.containsKey('siteIdIncrement'))">
+                            when a.id=#{item.id} then ifnull(a.siteId,0) + #{item.siteIdIncrement}
+                        </when>
+                    </choose>
+                </foreach>
+            </trim>
+            <trim prefix="matterId=(case" suffix="ELSE matterId end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <choose>
+                        <when test="(colPickMode==0 and item.containsKey('matterId')) or (colPickMode==1 and !item.containsKey('matterId'))">
+                            when a.id=#{item.id} then #{item.matterId}
+                        </when>
+                        <when test="(colPickMode==0 and item.containsKey('matterIdIncrement')) or (colPickMode==1 and !item.containsKey('matterIdIncrement'))">
+                            when a.id=#{item.id} then ifnull(a.matterId,0) + #{item.matterIdIncrement}
+                        </when>
+                    </choose>
+                </foreach>
+            </trim>
+            <trim prefix="matterName=(case" suffix="ELSE matterName end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('matterName')) or (colPickMode==1 and !item.containsKey('matterName'))">
+                        when a.id=#{item.id} then #{item.matterName}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="matterCode=(case" suffix="ELSE matterCode end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('matterCode')) or (colPickMode==1 and !item.containsKey('matterCode'))">
+                        when a.id=#{item.id} then #{item.matterCode}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="filename=(case" suffix="ELSE filename end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('filename')) or (colPickMode==1 and !item.containsKey('filename'))">
+                        when a.id=#{item.id} then #{item.filename}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="fileUrl=(case" suffix="ELSE fileUrl end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('fileUrl')) or (colPickMode==1 and !item.containsKey('fileUrl'))">
+                        when a.id=#{item.id} then #{item.fileUrl}
+                    </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="SingleMatterFileEntity-Map">
+        select <include refid="_columns"/>
+        from mortals_sys_single_matter_file as a
+        where a.id=#{condition.id}
+    </select>
+    <!-- 根据主健删除 -->
+    <delete id="deleteByKey" parameterType="paramDto">
+        delete a.* from mortals_sys_single_matter_file as a where a.id=#{condition.id}
+    </delete>
+    <!-- 根据主健删除一批，针对单一主健有效 -->
+    <delete id="deleteByKeys">
+        delete from mortals_sys_single_matter_file where id in
+        <foreach collection="array" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+    <!-- 根据主健列表删除一批，针对单一主健有效 -->
+    <delete id="deleteByKeyList">
+        delete from mortals_sys_single_matter_file where id in
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+
+    <!-- 根据对象列表删除一批，针对单一主健有效 -->
+    <delete id="deleteByEntityList">
+        delete from mortals_sys_single_matter_file 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_sys_single_matter_file as a
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </delete>
+    <!-- 获取列表 -->
+    <select id="getList" parameterType="paramDto" resultMap="SingleMatterFileEntity-Map">
+        select <include refid="_columns"/>
+        from mortals_sys_single_matter_file 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_sys_single_matter_file 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('siteId')">
+            <if test="conditionParamRef.siteId != null ">
+                ${_conditionType_} a.siteId = #{${_conditionParam_}.siteId}
+            </if>
+            <if test="conditionParamRef.siteId == null">
+                ${_conditionType_} a.siteId is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
+            ${_conditionType_} a.siteId in
+            <foreach collection="conditionParamRef.siteIdList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('siteIdNotList') and conditionParamRef.siteIdNotList.size() > 0">
+            ${_conditionType_} a.siteId not in
+            <foreach collection="conditionParamRef.siteIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('siteIdStart') and conditionParamRef.siteIdStart != null">
+            ${_conditionType_} a.siteId <![CDATA[ >= ]]> #{${_conditionParam_}.siteIdStart}
+        </if>
+        <if test="conditionParamRef.containsKey('siteIdEnd') and conditionParamRef.siteIdEnd != null">
+            ${_conditionType_} a.siteId <![CDATA[ <= ]]> #{${_conditionParam_}.siteIdEnd}
+        </if>
+
+        <if test="conditionParamRef.containsKey('matterId')">
+            <if test="conditionParamRef.matterId != null ">
+                ${_conditionType_} a.matterId = #{${_conditionParam_}.matterId}
+            </if>
+            <if test="conditionParamRef.matterId == null">
+                ${_conditionType_} a.matterId is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('matterIdList') and conditionParamRef.matterIdList.size() > 0">
+            ${_conditionType_} a.matterId in
+            <foreach collection="conditionParamRef.matterIdList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('matterIdNotList') and conditionParamRef.matterIdNotList.size() > 0">
+            ${_conditionType_} a.matterId not in
+            <foreach collection="conditionParamRef.matterIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('matterIdStart') and conditionParamRef.matterIdStart != null">
+            ${_conditionType_} a.matterId <![CDATA[ >= ]]> #{${_conditionParam_}.matterIdStart}
+        </if>
+        <if test="conditionParamRef.containsKey('matterIdEnd') and conditionParamRef.matterIdEnd != null">
+            ${_conditionType_} a.matterId <![CDATA[ <= ]]> #{${_conditionParam_}.matterIdEnd}
+        </if>
+
+
+        <if test="conditionParamRef.containsKey('matterName')">
+            <if test="conditionParamRef.matterName != null and conditionParamRef.matterName != ''">
+                ${_conditionType_} a.matterName like #{${_conditionParam_}.matterName}
+            </if>
+            <if test="conditionParamRef.matterName == null">
+                ${_conditionType_} a.matterName is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('matterNameList') and conditionParamRef.matterNameList.size() > 0">
+            ${_conditionType_} a.matterName in
+            <foreach collection="conditionParamRef.matterNameList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('matterNameNotList') and conditionParamRef.matterNameNotList.size() > 0">
+            ${_conditionType_} a.matterName not in
+            <foreach collection="conditionParamRef.matterNameNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+
+        <if test="conditionParamRef.containsKey('matterCode')">
+            <if test="conditionParamRef.matterCode != null and conditionParamRef.matterCode != ''">
+                ${_conditionType_} a.matterCode like #{${_conditionParam_}.matterCode}
+            </if>
+            <if test="conditionParamRef.matterCode == null">
+                ${_conditionType_} a.matterCode is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('matterCodeList') and conditionParamRef.matterCodeList.size() > 0">
+            ${_conditionType_} a.matterCode in
+            <foreach collection="conditionParamRef.matterCodeList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('matterCodeNotList') and conditionParamRef.matterCodeNotList.size() > 0">
+            ${_conditionType_} a.matterCode not in
+            <foreach collection="conditionParamRef.matterCodeNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+
+        <if test="conditionParamRef.containsKey('filename')">
+            <if test="conditionParamRef.filename != null and conditionParamRef.filename != ''">
+                ${_conditionType_} a.filename like #{${_conditionParam_}.filename}
+            </if>
+            <if test="conditionParamRef.filename == null">
+                ${_conditionType_} a.filename is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('filenameList') and conditionParamRef.filenameList.size() > 0">
+            ${_conditionType_} a.filename in
+            <foreach collection="conditionParamRef.filenameList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('filenameNotList') and conditionParamRef.filenameNotList.size() > 0">
+            ${_conditionType_} a.filename not in
+            <foreach collection="conditionParamRef.filenameNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+
+        <if test="conditionParamRef.containsKey('fileUrl')">
+            <if test="conditionParamRef.fileUrl != null and conditionParamRef.fileUrl != ''">
+                ${_conditionType_} a.fileUrl like #{${_conditionParam_}.fileUrl}
+            </if>
+            <if test="conditionParamRef.fileUrl == null">
+                ${_conditionType_} a.fileUrl is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('fileUrlList') and conditionParamRef.fileUrlList.size() > 0">
+            ${_conditionType_} a.fileUrl in
+            <foreach collection="conditionParamRef.fileUrlList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('fileUrlNotList') and conditionParamRef.fileUrlNotList.size() > 0">
+            ${_conditionType_} a.fileUrl not in
+            <foreach collection="conditionParamRef.fileUrlNotList" 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
+            <trim suffixOverrides=","  suffix="">
+                <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
+                    ${item.colName} ${item.sortKind}
+                </foreach>
+            </trim>
+        </if>
+        <if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
+            order by
+            <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('siteId')">
+                    a.siteId
+                    <if test='orderCol.siteId != null and "DESC".equalsIgnoreCase(orderCol.siteId)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('matterId')">
+                    a.matterId
+                    <if test='orderCol.matterId != null and "DESC".equalsIgnoreCase(orderCol.matterId)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('matterName')">
+                    a.matterName
+                    <if test='orderCol.matterName != null and "DESC".equalsIgnoreCase(orderCol.matterName)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('matterCode')">
+                    a.matterCode
+                    <if test='orderCol.matterCode != null and "DESC".equalsIgnoreCase(orderCol.matterCode)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('filename')">
+                    a.filename
+                    <if test='orderCol.filename != null and "DESC".equalsIgnoreCase(orderCol.filename)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('fileUrl')">
+                    a.fileUrl
+                    <if test='orderCol.fileUrl != null and "DESC".equalsIgnoreCase(orderCol.fileUrl)'>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