修改事项材料，用户事项申请，增加用户事项申请审批

sst-manager/db/add_db.sql

@@ -49,7 +49,7 @@ PRIMARY KEY  (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='申报事项';
 
 -- ----------------------------
--- 事项申请材料表
+-- 事项材料表
 -- ----------------------------
 DROP TABLE IF EXISTS `mortals_sys_matter_datum`;
 CREATE TABLE mortals_sys_matter_datum(
@@ -59,8 +59,11 @@ CREATE TABLE mortals_sys_matter_datum(
     `matterId` bigint(20)      COMMENT '事项id',
     `matterCode` varchar(512)      COMMENT '事项编码',
     `shortName` varchar(512)      COMMENT '材料简称',
-    `fullName` varchar(512) NOT NULL     COMMENT '材料全称',
-    `uselType` tinyint(2) NOT NULL   DEFAULT '1'  COMMENT '使用方式（1.拍照上传，2.在线填写)',
+    `fullName` varchar(512)      COMMENT '材料全称',
+    `needType` tinyint(2)    DEFAULT '0'  COMMENT '是否必要0不选1必要2非必要',
+    `datumType` tinyint(2)    DEFAULT '0'  COMMENT '材料形式0不选1纸质2电子3纸质-电子',
+    `needOriginal` tinyint(2)    DEFAULT '0'  COMMENT '提交原件0不需要1需要',
+    `uselType` tinyint(2)    DEFAULT '1'  COMMENT '使用方式（1.拍照上传，2.在线填写)',
     `suggest` tinyint(2)    DEFAULT '0'  COMMENT '是否推荐（0否1是）',
     `fillSum` int(8)    DEFAULT '1'  COMMENT '填写次数',
     `createTime` datetime      COMMENT '创建时间',
@@ -68,7 +71,7 @@ CREATE TABLE mortals_sys_matter_datum(
     `updateUserId` bigint(20)      COMMENT '更新用户',
     `updateTime` datetime      COMMENT '修改时间',
 PRIMARY KEY  (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='事项申请材料';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='事项材料';
 
 
 
@@ -95,7 +98,6 @@ PRIMARY KEY  (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='材料附件';
 
 
-
 -- ----------------------------
 -- 站点材料公共库表
 -- ----------------------------
@@ -106,8 +108,13 @@ CREATE TABLE mortals_sys_datum_library(
     `siteName` varchar(255)      COMMENT '站点名称',
     `datumId` bigint(20)      COMMENT '材料id',
     `shortName` varchar(512)      COMMENT '材料简称',
-    `fullName` varchar(512) NOT NULL     COMMENT '材料全称',
-    `uselType` tinyint(2) NOT NULL   DEFAULT '1'  COMMENT '使用方式（1.拍照上传，2.在线填写)',
+    `fullName` varchar(512)      COMMENT '材料全称',
+    `needType` tinyint(2)    DEFAULT '0'  COMMENT '是否必要0不选1必要2非必要',
+    `datumType` tinyint(2)    DEFAULT '0'  COMMENT '材料形式0不选1纸质2电子3纸质-电子',
+    `needOriginal` tinyint(2)    DEFAULT '0'  COMMENT '提交原件0不需要1需要',
+    `uselType` tinyint(2)    DEFAULT '1'  COMMENT '使用方式（1.拍照上传，2.在线填写)',
+    `suggest` tinyint(2)    DEFAULT '0'  COMMENT '是否推荐（0否1是）',
+    `fillSum` int(8)    DEFAULT '1'  COMMENT '填写次数',
     `createTime` datetime      COMMENT '创建时间',
     `createUserId` bigint(20)      COMMENT '创建用户',
     `updateUserId` bigint(20)      COMMENT '更新用户',
@@ -115,6 +122,7 @@ CREATE TABLE mortals_sys_datum_library(
 PRIMARY KEY  (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='站点材料公共库';
 
+
 -- ----------------------------
 -- 用户申报信息表
 -- ----------------------------
@@ -126,9 +134,18 @@ CREATE TABLE mortals_xhx_user_matter_apply(
     `matterName` varchar(1024)      COMMENT '事项名称',
     `matterCode` varchar(512)      COMMENT '事项编码',
     `applyCode` varchar(512)      COMMENT '申报编号',
-    `applyAddr` varchar(512)      COMMENT '申报地址名称',
+    `applyAddr` varchar(512)      COMMENT '申报地址',
     `deviceName` varchar(512)      COMMENT '申报设备名称',
     `applyPerson` varchar(512)      COMMENT '申请人姓名',
+    `phoneNum` varchar(128)      COMMENT '联系电话',
+    `idCard` varchar(128)      COMMENT '证件号码',
+    `deptName` varchar(128)      COMMENT '事项所属部门',
+    `applyDate` datetime      COMMENT '申报时间',
+    `status` tinyint(2)    DEFAULT '0'  COMMENT '受理状态0未受理1已受理',
+    `applyWay` varchar(128)      COMMENT '申报方式',
+    `storeDevice` varchar(128)      COMMENT '存储设备',
+    `boxNum` varchar(128)      COMMENT '箱体编号',
+    `storeDate` datetime      COMMENT '存件时间',
     `createUserId` bigint(20)      COMMENT '创建用户',
     `createTime` datetime      COMMENT '创建时间',
     `updateUserId` bigint(20)      COMMENT '更新用户',
@@ -160,3 +177,20 @@ CREATE TABLE mortals_xhx_user_matter_details(
 PRIMARY KEY  (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='用户申报明细';
 
+-- ----------------------------
+-- 用户申报事项审批表
+-- ----------------------------
+DROP TABLE IF EXISTS `mortals_xhx_user_matter_examine`;
+CREATE TABLE mortals_xhx_user_matter_examine(
+    `id` bigint(20)   AUTO_INCREMENT   COMMENT '序号，主键，自增长',
+    `applyrId` bigint(20) NOT NULL     COMMENT '用户申报id',
+    `acceptPerson` varchar(64)      COMMENT '受理人员',
+    `acceptResult` tinyint(2)      COMMENT '受理结果1通过2拒绝',
+    `acceptOpinion` varchar(512)      COMMENT '受理意见',
+    `acceptDate` datetime      COMMENT '受理时间',
+    `createUserId` bigint(20)      COMMENT '创建用户',
+    `createTime` datetime      COMMENT '创建时间',
+    `updateUserId` bigint(20)      COMMENT '更新用户',
+    `updateTime` datetime      COMMENT '更新时间',
+PRIMARY KEY  (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='用户申报事项审批';
\ No newline at end of file

sst-manager/db/init_data.sql

+INSERT INTO `mortals_xhx_param` (`name`, `firstOrganize`, `secondOrganize`, `paramKey`, `paramValue`, `validStatus`, `modStatus`, `displayType`, `remark`, `createTime`, `createUserId`, `createUserName`) VALUES ('事项来源', 'MatterApply', 'source', '0', '政务网', '1', '4', '0', NULL, NULL, NULL, NULL);
+INSERT INTO `mortals_xhx_param` (`name`, `firstOrganize`, `secondOrganize`, `paramKey`, `paramValue`, `validStatus`, `modStatus`, `displayType`, `remark`, `createTime`, `createUserId`, `createUserName`) VALUES ('事项来源', 'MatterApply', 'source', '1', '自定义', '1', '4', '0', NULL, NULL, NULL, NULL);
+
+INSERT INTO `mortals_xhx_param` (`name`, `firstOrganize`, `secondOrganize`, `paramKey`, `paramValue`, `validStatus`, `modStatus`, `displayType`, `remark`, `createTime`, `createUserId`, `createUserName`) VALUES ('是否必要', 'MatterDatum', 'needType', '0', '不选', '1', '4', '0', NULL, NULL, NULL, NULL);
+INSERT INTO `mortals_xhx_param` (`name`, `firstOrganize`, `secondOrganize`, `paramKey`, `paramValue`, `validStatus`, `modStatus`, `displayType`, `remark`, `createTime`, `createUserId`, `createUserName`) VALUES ('是否必要', 'MatterDatum', 'needType', '1', '必要', '1', '4', '0', NULL, NULL, NULL, NULL);
+INSERT INTO `mortals_xhx_param` (`name`, `firstOrganize`, `secondOrganize`, `paramKey`, `paramValue`, `validStatus`, `modStatus`, `displayType`, `remark`, `createTime`, `createUserId`, `createUserName`) VALUES ('是否必要', 'MatterDatum', 'needType', '2', '非必要', '1', '4', '0', NULL, NULL, NULL, NULL);
+
+INSERT INTO `mortals_xhx_param` (`name`, `firstOrganize`, `secondOrganize`, `paramKey`, `paramValue`, `validStatus`, `modStatus`, `displayType`, `remark`, `createTime`, `createUserId`, `createUserName`) VALUES ('材料形式', 'MatterDatum', 'datumType', '0', '不选', '1', '4', '0', NULL, NULL, NULL, NULL);
+INSERT INTO `mortals_xhx_param` (`name`, `firstOrganize`, `secondOrganize`, `paramKey`, `paramValue`, `validStatus`, `modStatus`, `displayType`, `remark`, `createTime`, `createUserId`, `createUserName`) VALUES ('材料形式', 'MatterDatum', 'datumType', '1', '纸质', '1', '4', '0', NULL, NULL, NULL, NULL);
+INSERT INTO `mortals_xhx_param` (`name`, `firstOrganize`, `secondOrganize`, `paramKey`, `paramValue`, `validStatus`, `modStatus`, `displayType`, `remark`, `createTime`, `createUserId`, `createUserName`) VALUES ('材料形式', 'MatterDatum', 'datumType', '2', '电子', '1', '4', '0', NULL, NULL, NULL, NULL);
+INSERT INTO `mortals_xhx_param` (`name`, `firstOrganize`, `secondOrganize`, `paramKey`, `paramValue`, `validStatus`, `modStatus`, `displayType`, `remark`, `createTime`, `createUserId`, `createUserName`) VALUES ('材料形式', 'MatterDatum', 'datumType', '3', '纸质-电子', '1', '4', '0', NULL, NULL, NULL, NULL);
+
+INSERT INTO `mortals_xhx_param` (`name`, `firstOrganize`, `secondOrganize`, `paramKey`, `paramValue`, `validStatus`, `modStatus`, `displayType`, `remark`, `createTime`, `createUserId`, `createUserName`) VALUES ('提交原件', 'MatterDatum', 'needOriginal', '0', '不需要', '1', '4', '0', NULL, NULL, NULL, NULL);
+INSERT INTO `mortals_xhx_param` (`name`, `firstOrganize`, `secondOrganize`, `paramKey`, `paramValue`, `validStatus`, `modStatus`, `displayType`, `remark`, `createTime`, `createUserId`, `createUserName`) VALUES ('提交原件', 'MatterDatum', 'needOriginal', '1', '需要', '1', '4', '0', NULL, NULL, NULL, NULL);
+
+INSERT INTO `mortals_xhx_param` (`name`, `firstOrganize`, `secondOrganize`, `paramKey`, `paramValue`, `validStatus`, `modStatus`, `displayType`, `remark`, `createTime`, `createUserId`, `createUserName`) VALUES ('使用方式', 'MatterDatum', 'uselType', '1', '拍照上传', '1', '4', '0', NULL, NULL, NULL, NULL);
+INSERT INTO `mortals_xhx_param` (`name`, `firstOrganize`, `secondOrganize`, `paramKey`, `paramValue`, `validStatus`, `modStatus`, `displayType`, `remark`, `createTime`, `createUserId`, `createUserName`) VALUES ('使用方式', 'MatterDatum', 'uselType', '2', '在线填写', '1', '4', '0', NULL, NULL, NULL, NULL);
+
+INSERT INTO `mortals_xhx_param` (`name`, `firstOrganize`, `secondOrganize`, `paramKey`, `paramValue`, `validStatus`, `modStatus`, `displayType`, `remark`, `createTime`, `createUserId`, `createUserName`) VALUES ('是否推荐', 'MatterDatum', 'suggest', '0', '否', '1', '4', '0', NULL, NULL, NULL, NULL);
+INSERT INTO `mortals_xhx_param` (`name`, `firstOrganize`, `secondOrganize`, `paramKey`, `paramValue`, `validStatus`, `modStatus`, `displayType`, `remark`, `createTime`, `createUserId`, `createUserName`) VALUES ('是否推荐', 'MatterDatum', 'suggest', '1', '是', '1', '4', '0', NULL, NULL, NULL, NULL);
+
+INSERT INTO `mortals_xhx_param` (`name`, `firstOrganize`, `secondOrganize`, `paramKey`, `paramValue`, `validStatus`, `modStatus`, `displayType`, `remark`, `createTime`, `createUserId`, `createUserName`) VALUES ('附件类型', 'MatterDatumFile', 'filetype', '1', '示例样表', '1', '4', '0', NULL, NULL, NULL, NULL);
+INSERT INTO `mortals_xhx_param` (`name`, `firstOrganize`, `secondOrganize`, `paramKey`, `paramValue`, `validStatus`, `modStatus`, `displayType`, `remark`, `createTime`, `createUserId`, `createUserName`) VALUES ('附件类型', 'MatterDatumFile', 'filetype', '2', '空白表格', '1', '4', '0', NULL, NULL, NULL, NULL);
+
+INSERT INTO `mortals_xhx_param` (`name`, `firstOrganize`, `secondOrganize`, `paramKey`, `paramValue`, `validStatus`, `modStatus`, `displayType`, `remark`, `createTime`, `createUserId`, `createUserName`) VALUES ('受理状态', 'UserMatterApply', 'status', '0', '未受理', '1', '4', '0', NULL, NULL, NULL, NULL);
+INSERT INTO `mortals_xhx_param` (`name`, `firstOrganize`, `secondOrganize`, `paramKey`, `paramValue`, `validStatus`, `modStatus`, `displayType`, `remark`, `createTime`, `createUserId`, `createUserName`) VALUES ('受理状态', 'UserMatterApply', 'status', '1', '已受理', '1', '4', '0', NULL, NULL, NULL, NULL);
+
+INSERT INTO `mortals_xhx_param` (`name`, `firstOrganize`, `secondOrganize`, `paramKey`, `paramValue`, `validStatus`, `modStatus`, `displayType`, `remark`, `createTime`, `createUserId`, `createUserName`) VALUES ('受理结果', 'UserMatterExamine', 'acceptResult', '1', '通过', '1', '4', '0', NULL, NULL, NULL, NULL);
+INSERT INTO `mortals_xhx_param` (`name`, `firstOrganize`, `secondOrganize`, `paramKey`, `paramValue`, `validStatus`, `modStatus`, `displayType`, `remark`, `createTime`, `createUserId`, `createUserName`) VALUES ('受理结果', 'UserMatterExamine', 'acceptResult', '0', '拒绝', '1', '4', '0', NULL, NULL, NULL, NULL);
\ No newline at end of file

sst-manager/src/main/java/com/mortals/xhx/module/matter/dao/UserMatterExamineDao.java

+package com.mortals.xhx.module.matter.dao;
+
+import com.mortals.framework.dao.ICRUDDao;
+import com.mortals.xhx.module.matter.model.UserMatterExamineEntity;
+import java.util.List;
+/**
+* 用户申报事项审批Dao
+* 用户申报事项审批 DAO接口
+*
+* @author zxfei
+* @date 2023-04-11
+*/
+
+public interface  UserMatterExamineDao extends ICRUDDao<UserMatterExamineEntity,Long>{
+
+
+}

sst-manager/src/main/java/com/mortals/xhx/module/matter/dao/ibatis/UserMatterExamineDaoImpl.java

+package com.mortals.xhx.module.matter.dao.ibatis;
+
+
+import org.springframework.stereotype.Repository;
+import com.mortals.xhx.module.matter.dao.UserMatterExamineDao;
+import com.mortals.xhx.module.matter.model.UserMatterExamineEntity;
+import java.util.Date;
+import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
+import java.util.List;
+/**
+* 用户申报事项审批DaoImpl DAO接口
+*
+* @author zxfei
+* @date 2023-04-11
+*/
+@Repository("userMatterExamineDao")
+public class UserMatterExamineDaoImpl extends BaseCRUDDaoMybatis<UserMatterExamineEntity,Long> implements UserMatterExamineDao {
+
+
+
+}

sst-manager/src/main/java/com/mortals/xhx/module/matter/model/DatumLibraryEntity.java

@@ -10,7 +10,7 @@ import com.mortals.xhx.module.matter.model.vo.DatumLibraryVo;
  * 站点材料公共库实体对象
  *
  * @author zxfei
- * @date 2023-04-10
+ * @date 2023-04-11
  */
 
 public class DatumLibraryEntity extends DatumLibraryVo {
@@ -36,10 +36,30 @@ public class DatumLibraryEntity extends DatumLibraryVo {
      * 材料全称
      */
     private String fullName;
+    /**
+     * 是否必要0不选1必要2非必要
+     */
+    private Integer needType;
+    /**
+     * 材料形式0不选1纸质2电子3纸质-电子
+     */
+    private Integer datumType;
+    /**
+     * 提交原件0不需要1需要
+     */
+    private Integer needOriginal;
     /**
      * 使用方式（1.拍照上传，2.在线填写)
      */
     private Integer uselType;
+    /**
+     * 是否推荐（0否1是）
+     */
+    private Integer suggest;
+    /**
+     * 填写次数
+     */
+    private Integer fillSum;
 
 
 
@@ -114,6 +134,48 @@ public class DatumLibraryEntity extends DatumLibraryVo {
     public void setFullName(String fullName){
         this.fullName = fullName;
     }
+    /**
+     * 获取 是否必要0不选1必要2非必要
+     * @return Integer
+     */
+    public Integer getNeedType(){
+        return needType;
+    }
+    /**
+     * 设置 是否必要0不选1必要2非必要
+     * @param needType
+     */
+    public void setNeedType(Integer needType){
+        this.needType = needType;
+    }
+    /**
+     * 获取 材料形式0不选1纸质2电子3纸质-电子
+     * @return Integer
+     */
+    public Integer getDatumType(){
+        return datumType;
+    }
+    /**
+     * 设置 材料形式0不选1纸质2电子3纸质-电子
+     * @param datumType
+     */
+    public void setDatumType(Integer datumType){
+        this.datumType = datumType;
+    }
+    /**
+     * 获取 提交原件0不需要1需要
+     * @return Integer
+     */
+    public Integer getNeedOriginal(){
+        return needOriginal;
+    }
+    /**
+     * 设置 提交原件0不需要1需要
+     * @param needOriginal
+     */
+    public void setNeedOriginal(Integer needOriginal){
+        this.needOriginal = needOriginal;
+    }
     /**
      * 获取 使用方式（1.拍照上传，2.在线填写)
      * @return Integer
@@ -128,6 +190,34 @@ public class DatumLibraryEntity extends DatumLibraryVo {
     public void setUselType(Integer uselType){
         this.uselType = uselType;
     }
+    /**
+     * 获取 是否推荐（0否1是）
+     * @return Integer
+     */
+    public Integer getSuggest(){
+        return suggest;
+    }
+    /**
+     * 设置 是否推荐（0否1是）
+     * @param suggest
+     */
+    public void setSuggest(Integer suggest){
+        this.suggest = suggest;
+    }
+    /**
+     * 获取 填写次数
+     * @return Integer
+     */
+    public Integer getFillSum(){
+        return fillSum;
+    }
+    /**
+     * 设置 填写次数
+     * @param fillSum
+     */
+    public void setFillSum(Integer fillSum){
+        this.fillSum = fillSum;
+    }
 
 
 
@@ -155,7 +245,12 @@ public class DatumLibraryEntity extends DatumLibraryVo {
         sb.append(",datumId:").append(getDatumId());
         sb.append(",shortName:").append(getShortName());
         sb.append(",fullName:").append(getFullName());
+        sb.append(",needType:").append(getNeedType());
+        sb.append(",datumType:").append(getDatumType());
+        sb.append(",needOriginal:").append(getNeedOriginal());
         sb.append(",uselType:").append(getUselType());
+        sb.append(",suggest:").append(getSuggest());
+        sb.append(",fillSum:").append(getFillSum());
         return sb.toString();
     }
 
@@ -171,6 +266,16 @@ public class DatumLibraryEntity extends DatumLibraryVo {
 
         this.fullName = "";
 
+        this.needType = 0;
+
+        this.datumType = 0;
+
+        this.needOriginal = 0;
+
         this.uselType = 1;
+
+        this.suggest = 0;
+
+        this.fillSum = 1;
     }
 }
\ No newline at end of file

sst-manager/src/main/java/com/mortals/xhx/module/matter/model/MatterDatumEntity.java

@@ -7,11 +7,11 @@ import com.mortals.framework.annotation.Excel;
 import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.matter.model.vo.MatterDatumVo;
 /**
- * 事项申请材料实体对象
- *
- * @author zxfei
- * @date 2023-04-10
- */
+* 事项材料实体对象
+*
+* @author zxfei
+* @date 2023-04-11
+*/
 
 public class MatterDatumEntity extends MatterDatumVo {
     private static final long serialVersionUID = 1L;
@@ -41,6 +41,18 @@ public class MatterDatumEntity extends MatterDatumVo {
     */
     private String fullName;
     /**
+    * 是否必要0不选1必要2非必要
+    */
+    private Integer needType;
+    /**
+    * 材料形式0不选1纸质2电子3纸质-电子
+    */
+    private Integer datumType;
+    /**
+    * 提交原件0不需要1需要
+    */
+    private Integer needOriginal;
+    /**
     * 使用方式（1.拍照上传，2.在线填写)
     */
     private Integer uselType;
@@ -141,6 +153,48 @@ public class MatterDatumEntity extends MatterDatumVo {
         this.fullName = fullName;
     }
     /**
+    * 获取 是否必要0不选1必要2非必要
+    * @return Integer
+    */
+    public Integer getNeedType(){
+        return needType;
+    }
+    /**
+    * 设置 是否必要0不选1必要2非必要
+    * @param needType
+    */
+    public void setNeedType(Integer needType){
+        this.needType = needType;
+    }
+    /**
+    * 获取 材料形式0不选1纸质2电子3纸质-电子
+    * @return Integer
+    */
+    public Integer getDatumType(){
+        return datumType;
+    }
+    /**
+    * 设置 材料形式0不选1纸质2电子3纸质-电子
+    * @param datumType
+    */
+    public void setDatumType(Integer datumType){
+        this.datumType = datumType;
+    }
+    /**
+    * 获取 提交原件0不需要1需要
+    * @return Integer
+    */
+    public Integer getNeedOriginal(){
+        return needOriginal;
+    }
+    /**
+    * 设置 提交原件0不需要1需要
+    * @param needOriginal
+    */
+    public void setNeedOriginal(Integer needOriginal){
+        this.needOriginal = needOriginal;
+    }
+    /**
     * 获取 使用方式（1.拍照上传，2.在线填写)
     * @return Integer
     */
@@ -210,6 +264,9 @@ public class MatterDatumEntity extends MatterDatumVo {
         sb.append(",matterCode:").append(getMatterCode());
         sb.append(",shortName:").append(getShortName());
         sb.append(",fullName:").append(getFullName());
+        sb.append(",needType:").append(getNeedType());
+        sb.append(",datumType:").append(getDatumType());
+        sb.append(",needOriginal:").append(getNeedOriginal());
         sb.append(",uselType:").append(getUselType());
         sb.append(",suggest:").append(getSuggest());
         sb.append(",fillSum:").append(getFillSum());
@@ -230,6 +287,12 @@ public class MatterDatumEntity extends MatterDatumVo {
 
             this.fullName = "";
 
+            this.needType = 0;
+
+            this.datumType = 0;
+
+            this.needOriginal = 0;
+
             this.uselType = 1;
 
             this.suggest = 0;

sst-manager/src/main/java/com/mortals/xhx/module/matter/model/UserMatterApplyEntity.java

 package com.mortals.xhx.module.matter.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;
@@ -10,7 +13,7 @@ import com.mortals.xhx.module.matter.model.vo.UserMatterApplyVo;
 * 用户申报信息实体对象
 *
 * @author zxfei
-* @date 2023-04-10
+* @date 2023-04-11
 */
 
 public class UserMatterApplyEntity extends UserMatterApplyVo {
@@ -37,7 +40,7 @@ public class UserMatterApplyEntity extends UserMatterApplyVo {
     */
     private String applyCode;
     /**
-    * 申报地址名称
+    * 申报地址
     */
     private String applyAddr;
     /**
@@ -48,6 +51,44 @@ public class UserMatterApplyEntity extends UserMatterApplyVo {
     * 申请人姓名
     */
     private String applyPerson;
+    /**
+    * 联系电话
+    */
+    private String phoneNum;
+    /**
+    * 证件号码
+    */
+    private String idCard;
+    /**
+    * 事项所属部门
+    */
+    private String deptName;
+    /**
+    * 申报时间
+    */
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    private Date applyDate;
+    /**
+    * 受理状态0未受理1已受理
+    */
+    private Integer status;
+    /**
+    * 申报方式
+    */
+    private String applyWay;
+    /**
+    * 存储设备
+    */
+    private String storeDevice;
+    /**
+    * 箱体编号
+    */
+    private String boxNum;
+    /**
+    * 存件时间
+    */
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    private Date storeDate;
 
 
 
@@ -123,14 +164,14 @@ public class UserMatterApplyEntity extends UserMatterApplyVo {
         this.applyCode = applyCode;
     }
     /**
-    * 获取 申报地址名称
+    * 获取 申报地址
     * @return String
     */
     public String getApplyAddr(){
         return applyAddr;
     }
     /**
-    * 设置 申报地址名称
+    * 设置 申报地址
     * @param applyAddr
     */
     public void setApplyAddr(String applyAddr){
@@ -164,6 +205,132 @@ public class UserMatterApplyEntity extends UserMatterApplyVo {
     public void setApplyPerson(String applyPerson){
         this.applyPerson = applyPerson;
     }
+    /**
+    * 获取 联系电话
+    * @return String
+    */
+    public String getPhoneNum(){
+        return phoneNum;
+    }
+    /**
+    * 设置 联系电话
+    * @param phoneNum
+    */
+    public void setPhoneNum(String phoneNum){
+        this.phoneNum = phoneNum;
+    }
+    /**
+    * 获取 证件号码
+    * @return String
+    */
+    public String getIdCard(){
+        return idCard;
+    }
+    /**
+    * 设置 证件号码
+    * @param idCard
+    */
+    public void setIdCard(String idCard){
+        this.idCard = idCard;
+    }
+    /**
+    * 获取 事项所属部门
+    * @return String
+    */
+    public String getDeptName(){
+        return deptName;
+    }
+    /**
+    * 设置 事项所属部门
+    * @param deptName
+    */
+    public void setDeptName(String deptName){
+        this.deptName = deptName;
+    }
+    /**
+    * 获取 申报时间
+    * @return Date
+    */
+    public Date getApplyDate(){
+        return applyDate;
+    }
+    /**
+    * 设置 申报时间
+    * @param applyDate
+    */
+    public void setApplyDate(Date applyDate){
+        this.applyDate = applyDate;
+    }
+    /**
+    * 获取 受理状态0未受理1已受理
+    * @return Integer
+    */
+    public Integer getStatus(){
+        return status;
+    }
+    /**
+    * 设置 受理状态0未受理1已受理
+    * @param status
+    */
+    public void setStatus(Integer status){
+        this.status = status;
+    }
+    /**
+    * 获取 申报方式
+    * @return String
+    */
+    public String getApplyWay(){
+        return applyWay;
+    }
+    /**
+    * 设置 申报方式
+    * @param applyWay
+    */
+    public void setApplyWay(String applyWay){
+        this.applyWay = applyWay;
+    }
+    /**
+    * 获取 存储设备
+    * @return String
+    */
+    public String getStoreDevice(){
+        return storeDevice;
+    }
+    /**
+    * 设置 存储设备
+    * @param storeDevice
+    */
+    public void setStoreDevice(String storeDevice){
+        this.storeDevice = storeDevice;
+    }
+    /**
+    * 获取 箱体编号
+    * @return String
+    */
+    public String getBoxNum(){
+        return boxNum;
+    }
+    /**
+    * 设置 箱体编号
+    * @param boxNum
+    */
+    public void setBoxNum(String boxNum){
+        this.boxNum = boxNum;
+    }
+    /**
+    * 获取 存件时间
+    * @return Date
+    */
+    public Date getStoreDate(){
+        return storeDate;
+    }
+    /**
+    * 设置 存件时间
+    * @param storeDate
+    */
+    public void setStoreDate(Date storeDate){
+        this.storeDate = storeDate;
+    }
 
 
 
@@ -194,6 +361,15 @@ public class UserMatterApplyEntity extends UserMatterApplyVo {
         sb.append(",applyAddr:").append(getApplyAddr());
         sb.append(",deviceName:").append(getDeviceName());
         sb.append(",applyPerson:").append(getApplyPerson());
+        sb.append(",phoneNum:").append(getPhoneNum());
+        sb.append(",idCard:").append(getIdCard());
+        sb.append(",deptName:").append(getDeptName());
+        sb.append(",applyDate:").append(getApplyDate());
+        sb.append(",status:").append(getStatus());
+        sb.append(",applyWay:").append(getApplyWay());
+        sb.append(",storeDevice:").append(getStoreDevice());
+        sb.append(",boxNum:").append(getBoxNum());
+        sb.append(",storeDate:").append(getStoreDate());
         return sb.toString();
     }
 
@@ -214,5 +390,23 @@ public class UserMatterApplyEntity extends UserMatterApplyVo {
             this.deviceName = "";
 
             this.applyPerson = "";
+
+            this.phoneNum = "";
+
+            this.idCard = "";
+
+            this.deptName = "";
+
+            this.applyDate = null;
+
+            this.status = 0;
+
+            this.applyWay = "";
+
+            this.storeDevice = "";
+
+            this.boxNum = "";
+
+            this.storeDate = null;
     }
 }
\ No newline at end of file

sst-manager/src/main/java/com/mortals/xhx/module/matter/model/UserMatterDetailsEntity.java

@@ -10,7 +10,7 @@ import com.mortals.xhx.module.matter.model.vo.UserMatterDetailsVo;
 * 用户申报明细实体对象
 *
 * @author zxfei
-* @date 2023-04-10
+* @date 2023-04-11
 */
 
 public class UserMatterDetailsEntity extends UserMatterDetailsVo {

sst-manager/src/main/java/com/mortals/xhx/module/matter/model/UserMatterDetailsQuery.java

@@ -6,7 +6,7 @@ import com.mortals.xhx.module.matter.model.UserMatterDetailsEntity;
 * 用户申报明细查询对象
 *
 * @author zxfei
-* @date 2023-04-10
+* @date 2023-04-11
 */
 public class UserMatterDetailsQuery extends UserMatterDetailsEntity {
     /** 开始 序号，主键，自增长 */

sst-manager/src/main/java/com/mortals/xhx/module/matter/model/UserMatterExamineEntity.java

+package com.mortals.xhx.module.matter.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;
+import com.mortals.xhx.module.matter.model.vo.UserMatterExamineVo;
+/**
+* 用户申报事项审批实体对象
+*
+* @author zxfei
+* @date 2023-04-11
+*/
+
+public class UserMatterExamineEntity extends UserMatterExamineVo {
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 用户申报id
+    */
+    private Long applyrId;
+    /**
+    * 受理人员
+    */
+    private String acceptPerson;
+    /**
+    * 受理结果1通过2拒绝
+    */
+    private Integer acceptResult;
+    /**
+    * 受理意见
+    */
+    private String acceptOpinion;
+    /**
+    * 受理时间
+    */
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    private Date acceptDate;
+
+
+
+    public UserMatterExamineEntity(){}
+    /**
+    * 获取 用户申报id
+    * @return Long
+    */
+    public Long getApplyrId(){
+        return applyrId;
+    }
+    /**
+    * 设置 用户申报id
+    * @param applyrId
+    */
+    public void setApplyrId(Long applyrId){
+        this.applyrId = applyrId;
+    }
+    /**
+    * 获取 受理人员
+    * @return String
+    */
+    public String getAcceptPerson(){
+        return acceptPerson;
+    }
+    /**
+    * 设置 受理人员
+    * @param acceptPerson
+    */
+    public void setAcceptPerson(String acceptPerson){
+        this.acceptPerson = acceptPerson;
+    }
+    /**
+    * 获取 受理结果1通过2拒绝
+    * @return Integer
+    */
+    public Integer getAcceptResult(){
+        return acceptResult;
+    }
+    /**
+    * 设置 受理结果1通过2拒绝
+    * @param acceptResult
+    */
+    public void setAcceptResult(Integer acceptResult){
+        this.acceptResult = acceptResult;
+    }
+    /**
+    * 获取 受理意见
+    * @return String
+    */
+    public String getAcceptOpinion(){
+        return acceptOpinion;
+    }
+    /**
+    * 设置 受理意见
+    * @param acceptOpinion
+    */
+    public void setAcceptOpinion(String acceptOpinion){
+        this.acceptOpinion = acceptOpinion;
+    }
+    /**
+    * 获取 受理时间
+    * @return Date
+    */
+    public Date getAcceptDate(){
+        return acceptDate;
+    }
+    /**
+    * 设置 受理时间
+    * @param acceptDate
+    */
+    public void setAcceptDate(Date acceptDate){
+        this.acceptDate = acceptDate;
+    }
+
+
+
+
+    @Override
+    public int hashCode() {
+         return this.getId().hashCode();
+    }
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) return false;
+        if (obj instanceof UserMatterExamineEntity) {
+            UserMatterExamineEntity tmp = (UserMatterExamineEntity) obj;
+            if (this.getId() == tmp.getId()) {
+                 return true;
+            }
+        }
+        return false;
+    }
+
+    public String toString(){
+        StringBuilder sb = new StringBuilder("");
+        sb.append(",applyrId:").append(getApplyrId());
+        sb.append(",acceptPerson:").append(getAcceptPerson());
+        sb.append(",acceptResult:").append(getAcceptResult());
+        sb.append(",acceptOpinion:").append(getAcceptOpinion());
+        sb.append(",acceptDate:").append(getAcceptDate());
+        return sb.toString();
+    }
+
+    public void initAttrValue(){
+
+            this.applyrId = null;
+
+            this.acceptPerson = "";
+
+            this.acceptResult = null;
+
+            this.acceptOpinion = "";
+
+            this.acceptDate = null;
+    }
+}
\ No newline at end of file

sst-manager/src/main/java/com/mortals/xhx/module/matter/model/vo/MatterDatumVo.java

@@ -18,4 +18,6 @@ public class MatterDatumVo extends BaseEntityLong {
     private List<MatterDatumFileEntity> matterDatumFileList;
     /** 序号，主键，自增长列表 */
     private List <Long> idList;
+    /** 是否加入公共库 0否1是 */
+    private Integer isAddLibrary;
 }
\ No newline at end of file

sst-manager/src/main/java/com/mortals/xhx/module/matter/model/vo/UserMatterExamineVo.java

+package com.mortals.xhx.module.matter.model.vo;
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.matter.model.UserMatterExamineEntity;
+import java.util.ArrayList;
+import java.util.List;
+/**
+* 用户申报事项审批视图对象
+*
+* @author zxfei
+* @date 2023-04-11
+*/
+public class UserMatterExamineVo extends BaseEntityLong {
+
+}
\ No newline at end of file

sst-manager/src/main/java/com/mortals/xhx/module/matter/service/UserMatterExamineService.java

+package com.mortals.xhx.module.matter.service;
+import com.mortals.framework.service.ICRUDService;
+import com.mortals.xhx.module.matter.model.UserMatterExamineEntity;
+/**
+* UserMatterExamineService
+*
+* 用户申报事项审批 service接口
+*
+* @author zxfei
+* @date 2023-04-11
+*/
+public interface UserMatterExamineService extends ICRUDService<UserMatterExamineEntity,Long>{
+
+}
\ No newline at end of file

sst-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterDatumServiceImpl.java

@@ -64,6 +64,15 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD
         super.saveBefore(entity,context);
         entity.setFillSum(0);
         entity.setSuggest(0);
+        if(entity.getNeedType()==null){
+            entity.setNeedType(0);
+        }
+        if(entity.getDatumType()==null){
+            entity.setDatumType(0);
+        }
+        if(entity.getNeedOriginal()==null){
+            entity.setNeedOriginal(0);
+        }
     }
     @Override
     protected void saveAfter(MatterDatumEntity entity, Context context) throws AppException {
@@ -76,6 +85,9 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD
             }).count();
             matterDatumFileService.save(entity.getMatterDatumFileList());
         }
+        if(entity.getIsAddLibrary()!=null && entity.getIsAddLibrary()==1){
+            addToLibrary(entity.getId()+"", context);
+        }
         super.saveAfter(entity, context);
     }
 

sst-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/UserMatterApplyServiceImpl.java

@@ -41,7 +41,7 @@ public class UserMatterApplyServiceImpl extends AbstractCRUDServiceImpl<UserMatt
         list.stream().peek(item->{
             List<UserMatterDetailsEntity> matterDetailsFileEntities = userMatterDetailsService.find(new UserMatterDetailsQuery().applyrId(item.getId()));
             item.setUserMatterDetails(matterDetailsFileEntities);
-            item.setApplyPerson(desensitizedName(item.getApplyPerson()));
+            //item.setApplyPerson(desensitizedName(item.getApplyPerson()));
         }).count();
         super.findAfter(params, context, list);
     }
@@ -52,7 +52,7 @@ public class UserMatterApplyServiceImpl extends AbstractCRUDServiceImpl<UserMatt
         list.stream().peek(item->{
             List<UserMatterDetailsEntity> matterDetailsFileEntities = userMatterDetailsService.find(new UserMatterDetailsQuery().applyrId(item.getId()));
             item.setUserMatterDetails(matterDetailsFileEntities);
-            item.setApplyPerson(desensitizedName(item.getApplyPerson()));
+            //item.setApplyPerson(desensitizedName(item.getApplyPerson()));
         }).count();
         super.findAfter(params, context, list);
     }
@@ -61,6 +61,7 @@ public class UserMatterApplyServiceImpl extends AbstractCRUDServiceImpl<UserMatt
     protected void saveBefore(UserMatterApplyEntity entity, Context context) throws AppException {
         super.saveBefore(entity,context);
         entity.setApplyCode("SQ"+ new Date().getTime());
+        entity.setStatus(0);
         if(entity.getMatterId()==null){
             throw new AppException("申请事项不能为空");
         }else {
@@ -68,8 +69,11 @@ public class UserMatterApplyServiceImpl extends AbstractCRUDServiceImpl<UserMatt
             if(matterApplyEntity!=null){
                 entity.setMatterCode(matterApplyEntity.getMatterCode());
                 entity.setMatterName(matterApplyEntity.getMatterName());
+                entity.setDeptName(matterApplyEntity.getDeptName());
             }
         }
+        entity.setApplyDate(new Date());
+        entity.setStoreDate(new Date());
     }
 
     @Override
@@ -78,6 +82,7 @@ public class UserMatterApplyServiceImpl extends AbstractCRUDServiceImpl<UserMatt
             List<UserMatterDetailsEntity> details = doSaveAfer(entity, context);
             userMatterDetailsService.save(details);
         }
+        matterApplyService.addReportCount(entity.getMatterId());
         super.saveAfter(entity, context);
     }
 
@@ -99,8 +104,14 @@ public class UserMatterApplyServiceImpl extends AbstractCRUDServiceImpl<UserMatt
                         matterDetailsEntity.setFullName(datumEntity.getFullName());
                         matterDetailsEntity.setShortName(datumEntity.getShortName());
                         matterDetailsEntity.setFileName(datumFile.getFileName());
+                        if(StringUtils.isNotEmpty(item.getPreviewUrl())){
+                            matterDetailsEntity.setPreviewUrl(item.getPreviewUrl());
+                        }else {
                             matterDetailsEntity.setPreviewUrl(datumFile.getPreviewUrl());
+                        }
                         matterDetailsEntity.setTemplateUrl(datumFile.getTemplatePath());
+                        matterDetailsEntity.setFormContent(item.getFormContent());
+                        matterDetailsEntity.setFormTemplate(datumFile.getFormContent());
                         matterDetailsEntity.setCreateTime(new Date());
                         details.add(matterDetailsEntity);
                     }

sst-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/UserMatterExamineServiceImpl.java

+package com.mortals.xhx.module.matter.service.impl;
+import com.mortals.framework.service.IUser;
+import com.mortals.xhx.module.matter.model.UserMatterApplyEntity;
+import com.mortals.xhx.module.matter.service.UserMatterApplyService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.Context;
+import com.mortals.xhx.module.matter.dao.UserMatterExamineDao;
+import com.mortals.xhx.module.matter.model.UserMatterExamineEntity;
+import com.mortals.xhx.module.matter.service.UserMatterExamineService;
+
+import java.util.Date;
+
+/**
+* UserMatterExamineService
+* 用户申报事项审批 service实现
+*
+* @author zxfei
+* @date 2023-04-11
+*/
+@Service("userMatterExamineService")
+public class UserMatterExamineServiceImpl extends AbstractCRUDServiceImpl<UserMatterExamineDao, UserMatterExamineEntity, Long> implements UserMatterExamineService {
+
+    @Autowired
+    private UserMatterApplyService userMatterApplyService;
+
+    @Override
+    protected void saveBefore(UserMatterExamineEntity entity, Context context) throws AppException {
+        if(context!=null && context.getUser()!=null){
+            IUser user = context.getUser();
+            entity.setAcceptPerson(user.getRealName());
+        }
+    }
+
+    @Override
+    protected void saveAfter(UserMatterExamineEntity entity, Context context) throws AppException {
+        if(entity.getAcceptResult()==1){
+            UserMatterApplyEntity updateEntity = new UserMatterApplyEntity();
+            updateEntity.setId(entity.getApplyrId());
+            updateEntity.setStatus(1);
+            updateEntity.setUpdateTime(new Date());
+            userMatterApplyService.update(updateEntity);
+        }
+    }
+}
\ No newline at end of file

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

@@ -45,16 +45,11 @@ public class DatumLibraryController extends BaseCRUDJsonBodyMappingController<Da
 
     @Override
     protected void init(Map<String, Object> model, Context context) {
-        this.addDict(model, "isMust", paramService.getParamBySecondOrganize("DatumLibrary","isMust"));
-        this.addDict(model, "materialType", paramService.getParamBySecondOrganize("DatumLibrary","materialType"));
-        this.addDict(model, "materialProperty", paramService.getParamBySecondOrganize("DatumLibrary","materialProperty"));
-        this.addDict(model, "electronicgs", paramService.getParamBySecondOrganize("DatumLibrary","electronicgs"));
-        this.addDict(model, "materialSource", paramService.getParamBySecondOrganize("DatumLibrary","materialSource"));
-        this.addDict(model, "paperNum", paramService.getParamBySecondOrganize("DatumLibrary","paperNum"));
-        this.addDict(model, "jianmMs", paramService.getParamBySecondOrganize("DatumLibrary","jianmMs"));
-        this.addDict(model, "isjianm", paramService.getParamBySecondOrganize("DatumLibrary","isjianm"));
-        this.addDict(model, "isLack", paramService.getParamBySecondOrganize("DatumLibrary","isLack"));
-        this.addDict(model, "source", paramService.getParamBySecondOrganize("DatumLibrary","source"));
+        this.addDict(model, "needType", paramService.getParamBySecondOrganize("MatterDatum","needType"));
+        this.addDict(model, "datumType", paramService.getParamBySecondOrganize("MatterDatum","datumType"));
+        this.addDict(model, "needOriginal", paramService.getParamBySecondOrganize("MatterDatum","needOriginal"));
+        this.addDict(model, "uselType", paramService.getParamBySecondOrganize("MatterDatum","uselType"));
+        this.addDict(model, "suggest", paramService.getParamBySecondOrganize("MatterDatum","suggest"));
         super.init(model, context);
     }
 

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

@@ -55,7 +55,7 @@ public class MatterApplyController extends BaseCRUDJsonBodyMappingController<Mat
     @Override
     protected void init(Map<String, Object> model, Context context) {
         this.addDict(model, "source", paramService.getParamBySecondOrganize("MatterApply","source"));
-        this.addDict(model, "isConvert", paramService.getParamBySecondOrganize("MatterApply","isConvert"));
+
         super.init(model, context);
     }
 

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

@@ -44,7 +44,11 @@ public class MatterDatumController extends BaseCRUDJsonBodyMappingController<Mat
 
     @Override
     protected void init(Map<String, Object> model, Context context) {
-        this.addDict(model, "source", paramService.getParamBySecondOrganize("MatterDatum","source"));
+        this.addDict(model, "needType", paramService.getParamBySecondOrganize("MatterDatum","needType"));
+        this.addDict(model, "datumType", paramService.getParamBySecondOrganize("MatterDatum","datumType"));
+        this.addDict(model, "needOriginal", paramService.getParamBySecondOrganize("MatterDatum","needOriginal"));
+        this.addDict(model, "uselType", paramService.getParamBySecondOrganize("MatterDatum","uselType"));
+        this.addDict(model, "suggest", paramService.getParamBySecondOrganize("MatterDatum","suggest"));
         super.init(model, context);
     }
 

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

@@ -43,7 +43,6 @@ public class MatterDatumFileController extends BaseCRUDJsonBodyMappingController
     @Override
     protected void init(Map<String, Object> model, Context context) {
         this.addDict(model, "filetype", paramService.getParamBySecondOrganize("MatterDatumFile","filetype"));
-        this.addDict(model, "source", paramService.getParamBySecondOrganize("MatterDatumFile","source"));
         super.init(model, context);
     }
 

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

@@ -42,6 +42,7 @@ public class UserMatterApplyController extends BaseCRUDJsonBodyMappingController
 
     @Override
     protected void init(Map<String, Object> model, Context context) {
+        this.addDict(model, "status", paramService.getParamBySecondOrganize("UserMatterApply","status"));
         super.init(model, context);
     }
 

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

+package com.mortals.xhx.module.matter.web;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
+import com.mortals.xhx.base.system.param.service.ParamService;
+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.matter.model.UserMatterExamineEntity;
+import com.mortals.xhx.module.matter.service.UserMatterExamineService;
+import org.apache.commons.lang3.ArrayUtils;
+import com.mortals.framework.util.StringUtils;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import com.alibaba.fastjson.JSONObject;
+import java.util.Arrays;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import static com.mortals.framework.ap.SysConstains.*;
+/**
+*
+* 用户申报事项审批
+*
+* @author zxfei
+* @date 2023-04-11
+*/
+@RestController
+@RequestMapping("user/matter/examine")
+public class UserMatterExamineController extends BaseCRUDJsonBodyMappingController<UserMatterExamineService,UserMatterExamineEntity,Long> {
+
+    @Autowired
+    private ParamService paramService;
+
+    public UserMatterExamineController(){
+        super.setModuleDesc( "用户申报事项审批");
+    }
+
+    @Override
+    protected void init(Map<String, Object> model, Context context) {
+        this.addDict(model, "acceptResult", paramService.getParamBySecondOrganize("UserMatterExamine","acceptResult"));
+        super.init(model, context);
+    }
+
+
+}
\ No newline at end of file