申请事项增加审批时间字段

single-matter/db/add_table.sql

@@ -81,4 +81,6 @@ INSERT INTO `mortals_xhx_param` (`name`, `firstOrganize`, `secondOrganize`, `par
 
 -- 2024-06-20
 INSERT INTO `mortals_xhx_param` (`name`, `firstOrganize`, `secondOrganize`, `paramKey`, `paramValue`, `validStatus`, `modStatus`, `displayType`, `remark`, `createTime`, `createUserId`, `createUserName`) VALUES ('审批状态', 'MatterApply', 'applyState', '3', '已撤销', '1', '4', '0', 'applyState', NULL, NULL, NULL);
-INSERT INTO `mortals_xhx_param` (`name`, `firstOrganize`, `secondOrganize`, `paramKey`, `paramValue`, `validStatus`, `modStatus`, `displayType`, `remark`, `createTime`, `createUserId`, `createUserName`) VALUES ('审批状态', 'MatterApply', 'applyState', '-1', '审批中', '1', '4', '0', 'applyState', NULL, NULL, NULL);
\ No newline at end of file
+INSERT INTO `mortals_xhx_param` (`name`, `firstOrganize`, `secondOrganize`, `paramKey`, `paramValue`, `validStatus`, `modStatus`, `displayType`, `remark`, `createTime`, `createUserId`, `createUserName`) VALUES ('审批状态', 'MatterApply', 'applyState', '-1', '审批中', '1', '4', '0', 'applyState', NULL, NULL, NULL);
+
+ALTER TABLE mortals_sys_matter_apply ADD COLUMN `examineTime` datetime  DEFAULT NULL COMMENT '审批时间' AFTER `applyState`;

single-matter/src/main/java/com/mortals/xhx/common/utils/MatterApplyDelayTask.java

@@ -36,6 +36,7 @@ public class MatterApplyDelayTask implements Runnable, Delayed {
             MatterApplyEntity update = new MatterApplyEntity();
             update.setId(entity.getId());
             update.setApplyState(0);
+            update.setApplyTime(new Date());
             update.setUpdateTime(new Date());
             matterApplyService.update(update);
         }

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

@@ -2,6 +2,9 @@ package com.mortals.xhx.module.apply.model;
 import java.util.Date;
 import java.util.List;
 import java.util.ArrayList;
+import java.math.BigDecimal;
+import cn.hutool.core.date.DateUtil;
+import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.mortals.framework.annotation.Excel;
 import com.mortals.framework.model.BaseEntityLong;
@@ -11,7 +14,7 @@ import lombok.Data;
  * 单事项申报实体对象
  *
  * @author zxfei
- * @date 2023-06-07
+ * @date 2024-06-25
  */
 @Data
 public class MatterApplyEntity extends MatterApplyVo {
@@ -89,6 +92,10 @@ public class MatterApplyEntity extends MatterApplyVo {
      * 事项申请文件地址
      */
     private String fileUrl;
+    /**
+     * 审批时间
+     */
+    private Date examineTime;
     @Override
     public int hashCode() {
         return this.getId().hashCode();
@@ -106,41 +113,24 @@ public class MatterApplyEntity extends MatterApplyVo {
     }
 
     public void initAttrValue(){
-
         this.siteId = null;
-
         this.singleMatterId = null;
-
         this.matterId = null;
-
         this.deptCode = "";
-
         this.matterName = "";
-
         this.applyPerson = "";
-
         this.sexual = 1;
-
         this.phoneNum = "";
-
         this.idCard = "";
-
         this.address = "";
-
         this.applyType = 1;
-
         this.applyTime = null;
-
         this.applyState = 0;
-
         this.advisement = "";
-
         this.remarks = "";
-
         this.openId = "";
-
         this.filename = "";
-
         this.fileUrl = "";
+        this.examineTime = null;
     }
 }
\ 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-06-07
+ * @date 2024-06-25
  */
 public class MatterApplyQuery extends MatterApplyEntity {
     /** 开始 序号，主键，自增长 */
@@ -218,6 +218,12 @@ public class MatterApplyQuery extends MatterApplyEntity {
 
     /** 事项申请文件地址排除列表 */
     private List <String> fileUrlNotList;
+    /** 开始 审批时间 */
+    private String examineTimeStart;
+
+    /** 结束 审批时间 */
+    private String examineTimeEnd;
+
     /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<MatterApplyQuery> orConditionList;
 
@@ -1403,6 +1409,38 @@ public class MatterApplyQuery extends MatterApplyEntity {
         this.fileUrlNotList = fileUrlNotList;
     }
 
+    /**
+     * 获取 开始 审批时间
+     * @return examineTimeStart
+     */
+    public String getExamineTimeStart(){
+        return this.examineTimeStart;
+    }
+
+    /**
+     * 设置 开始 审批时间
+     * @param examineTimeStart
+     */
+    public void setExamineTimeStart(String examineTimeStart){
+        this.examineTimeStart = examineTimeStart;
+    }
+
+    /**
+     * 获取 结束 审批时间
+     * @return examineTimeEnd
+     */
+    public String getExamineTimeEnd(){
+        return this.examineTimeEnd;
+    }
+
+    /**
+     * 设置 结束 审批时间
+     * @param examineTimeEnd
+     */
+    public void setExamineTimeEnd(String examineTimeEnd){
+        this.examineTimeEnd = examineTimeEnd;
+    }
+
     /**
      * 设置  序号，主键，自增长
      * @param id
@@ -2101,6 +2139,7 @@ public class MatterApplyQuery extends MatterApplyEntity {
         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/impl/MatterApplyServiceImpl.java

@@ -79,7 +79,7 @@ public class MatterApplyServiceImpl extends AbstractCRUDServiceImpl<MatterApplyD
             entity.setMatterName(singleMatterEntity.getMatterName());
         }
         entity.setSiteId(1l);
-        entity.setApplyTime(entity.getCreateTime());
+        //entity.setApplyTime(entity.getCreateTime());
         entity.setApplyState(-1);
     }
 
@@ -275,6 +275,7 @@ public class MatterApplyServiceImpl extends AbstractCRUDServiceImpl<MatterApplyD
         update.setId(entity.getId());
         update.setApplyState(entity.getApplyState());
         update.setAdvisement(entity.getAdvisement());
+        update.setExamineTime(new Date());
         if(context!=null && context.getUser()!=null){
             update.setUpdateUserId(context.getUser().getId());
         }