添加审核状态

src/main/java/com/tenlion/twoduty/pojo/dtos/dutylistform/HeartTalkDTO.java

@@ -42,6 +42,8 @@ public class HeartTalkDTO {
     private String talkObjSign;
     @ApiModelProperty(name = "signDataTime", value = "签字日期")
     private String signDataTime;
+    @ApiModelProperty(name = "auditStatus", value = "审核状态")
+    private String auditStatus;
 
     public String getReportId() {
         return reportId == null ? "" : reportId;
@@ -170,4 +172,12 @@ public class HeartTalkDTO {
     public void setSignDataTime(String signDataTime) {
         this.signDataTime = signDataTime;
     }
+
+    public String getAuditStatus() {
+        return auditStatus == null ? "" : auditStatus;
+    }
+
+    public void setAuditStatus(String auditStatus) {
+        this.auditStatus = auditStatus;
+    }
 }

src/main/java/com/tenlion/twoduty/pojo/dtos/dutylistform/PartyCleanMeetingDTO.java

@@ -40,6 +40,8 @@ public class PartyCleanMeetingDTO {
     private String partySecretaryTalk;
     @ApiModelProperty(name = "remarks", value = "备注")
     private String remarks;
+    @ApiModelProperty(name = "auditStatus", value = "审核状态")
+    private String auditStatus;
 
     public String getReportId() {
         return reportId == null ? "" : reportId;
@@ -160,4 +162,12 @@ public class PartyCleanMeetingDTO {
     public void setRemarks(String remarks) {
         this.remarks = remarks;
     }
+
+    public String getAuditStatus() {
+        return auditStatus == null ? "" : auditStatus;
+    }
+
+    public void setAuditStatus(String auditStatus) {
+        this.auditStatus = auditStatus;
+    }
 }

src/main/java/com/tenlion/twoduty/service/dutylistform/impl/DutyListFormServiceImpl.java

@@ -7,11 +7,13 @@ import com.tenlion.twoduty.pojo.dtos.dutylistform.HeartTalkDTO;
 import com.tenlion.twoduty.pojo.dtos.dutylistform.PartyCleanMeetingDTO;
 import com.tenlion.twoduty.pojo.vos.dutylistform.PartyCleanMeetingVO;
 import com.tenlion.twoduty.service.dutylistform.IDutyListFormService;
+import com.tenlion.twoduty.utils.AuditStatusEnum;
 import ink.wgink.common.base.DefaultBaseService;
 import ink.wgink.pojo.ListPage;
 import ink.wgink.pojo.result.SuccessResultList;
 import ink.wgink.util.UUIDUtil;
 import ink.wgink.util.map.HashMapUtil;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -47,6 +49,9 @@ public class DutyListFormServiceImpl extends DefaultBaseService implements IDuty
         Map<String,Object> params = HashMapUtil.beanToMap(partyCleanMeetingVO);
         String id = UUIDUtil.getUUID();
         params.put("reportId",id);
+        if(StringUtils.isBlank(partyCleanMeetingVO.getAuditStatus())){
+            params.put("auditStatus",AuditStatusEnum.NORMAL);
+        }
         setSaveInfo(params);
         dutyListFormDao.savePartyCleanMeeting(params);
     }
@@ -83,6 +88,9 @@ public class DutyListFormServiceImpl extends DefaultBaseService implements IDuty
         Map<String,Object> params = HashMapUtil.beanToMap(heartTalkDTO);
         String id = UUIDUtil.getUUID();
         params.put("reportId",id);
+        if(StringUtils.isBlank(heartTalkDTO.getAuditStatus())){
+            params.put("auditStatus",AuditStatusEnum.NORMAL);
+        }
         setSaveInfo(params);
         dutyListFormDao.saveHeartTalk(params);
     }

src/main/java/com/tenlion/twoduty/utils/AuditStatusEnum.java

@@ -0,0 +1,25 @@
+package com.tenlion.twoduty.utils;
+
+/**
+ *
+ * 审核状态Enum
+ * @author xwangs
+ * @create 2021-04-15 10:30
+ * @description
+ */
+public enum AuditStatusEnum {
+
+    WAIT("1"), PASS("2"), UN_PASS("-1"), FILE("2"), NORMAL("0");
+
+    private final String auditStatus;
+
+    AuditStatusEnum(String s){
+        this.auditStatus = s;
+    }
+
+    public String getAuditStatus(){
+        return auditStatus;
+    }
+
+
+}

src/main/resources/mybatis/mapper/dutylistform/dutylistform-mapper.xml

@@ -19,6 +19,7 @@
         <result column="host_content" property="hostContent"/>
         <result column="party_secretary_talk" property="partySecretaryTalk"/>
         <result column="remarks" property="remarks"/>
+        <result column="audit_status" property="auditStatus"/>
     </resultMap>
 
     <select id="listPartyCleanMeeting" parameterType="map" resultMap="partyCleanMeetingDTO">
@@ -28,6 +29,9 @@
         <if test="dutyIndexLibId != null and dutyIndexLibId != ''">
             AND t1.duty_index_lib_id = #{dutyIndexLibId}
         </if>
+        <if test="auditStatus != null and auditStatus != ''">
+            AND t1.audit_status = #{auditStatus}
+        </if>
         <if test="keywords != null and keywords != ''">
             AND (
                 t1.title LIKE CONCAT('%', #{keywords}, '%')
@@ -52,11 +56,11 @@
         INSERT INTO t_party_clean_meeting (
             report_id,duty_index_lib_id,title,meeting_time,meeting_place,meeting_host,note_taker,
             join_person,join_person_count,meeting_content,meeting_arrange,meeting_agenda,host_content,
-            party_secretary_talk,remarks,creator,gmt_create,modifier,gmt_modified,is_delete
+            party_secretary_talk,remarks,audit_status,creator,gmt_create,modifier,gmt_modified,is_delete
         ) VALUES (
             #{reportId},#{dutyIndexLibId},#{title},#{meetingTime},#{meetingPlace},#{meetingHost},#{noteTaker},
             #{joinPerson},#{joinPersonCount},#{meetingContent},#{meetingArrange},#{meetingAgenda},#{hostContent},
-            #{partySecretaryTalk},#{remarks},#{creator},#{gmtCreate},#{modifier},#{gmtModified},#{isDelete}
+            #{partySecretaryTalk},#{auditStatus},#{remarks},#{creator},#{gmtCreate},#{modifier},#{gmtModified},#{isDelete}
         )
     </insert>
 
@@ -104,6 +108,9 @@
         <if test="remarks != null and remarks != ''">
             remarks = #{remarks},
         </if>
+        <if test="auditStatus != null and auditStatus != ''">
+            audit_status = #{auditStatus},
+        </if>
         <if test="gmtModified != null and gmtModified != ''">
             gmt_modified = #{gmtModified},
         </if>
@@ -141,6 +148,7 @@
         <result column="talk_obj_opinion" property="talkObjOpinion"/>
         <result column="talk_obj_sign" property="talkObjSign"/>
         <result column="sign_data_time" property="signDataTime"/>
+        <result column="audit_status" property="auditStatus"/>
     </resultMap>
 
     <select id="listHeartTalk" parameterType="map" resultMap="heartTalkDTO">
@@ -157,6 +165,9 @@
             t1.talk_obj LIKE CONCAT('%', #{keywords}, '%')
             )
         </if>
+        <if test="auditStatus != null and auditStatus != ''">
+            t1.audit_status = #{auditStatus}
+        </if>
         <if test="startTime != null and startTime != ''">
             AND LEFT(t1.talk_date_time, 10) <![CDATA[ >= ]]> #{startTime}
         </if>
@@ -176,11 +187,11 @@
         INSERT INTO t_heart_talk (
             report_id,duty_index_lib_id,org_name,talk_obj,political_status,org_job,talk_reason,
             talk_person,talk_person_org_job,note_taker,talk_date_time,talk_place,talk_content,
-            talk_obj_opinion,talk_obj_sign,sign_data_time,creator,gmt_create,modifier,gmt_modified,is_delete
+            talk_obj_opinion,talk_obj_sign,sign_data_time,audit_status,creator,gmt_create,modifier,gmt_modified,is_delete
         ) VALUES (
             #{reportId},#{dutyIndexLibId},#{orgName},#{talkObj},#{politicalStatus},#{orgJob},#{talkReason},
             #{talkPerson},#{talkPersonOrgJob},#{noteTaker},#{talkDateTime},#{talkPlace},#{talkContent},
-            #{talkObjOpinion},#{talkObjSign},#{signDataTime},#{creator},#{gmtCreate},#{modifier},#{gmtModified},#{isDelete}
+            #{talkObjOpinion},#{talkObjSign},#{signDataTime},#{auditStatus},#{creator},#{gmtCreate},#{modifier},#{gmtModified},#{isDelete}
         )
     </insert>
 
@@ -231,6 +242,9 @@
         <if test="signDataTime != null and signDataTime != ''">
             sign_data_time = #{signDataTime},
         </if>
+        <if test="auditStatus != null and auditStatus != ''">
+            audit_status = #{auditStatus},
+        </if>
         <if test="gmtModified != null and gmtModified != ''">
             gmt_modified = #{gmtModified},
         </if>

src/main/resources/static/route/hearttalk/save-heart-talk.html

@@ -187,8 +187,8 @@
         var laytpl = layui.laytpl;
         var laydate = layui.laydate;
         var viewerObj = {};
-        var indexLibParentId = top.restAjax.params(window.location.href).indexLibParentId;
+        var dutyIndexLibId = top.restAjax.params(window.location.href).dutyIndexLibId;
-        if(typeof (indexLibParentId) == 'undefined' || indexLibParentId  == ''){
+        if(typeof (dutyIndexLibId) == 'undefined' || dutyIndexLibId  == ''){
             $('.submit-btn').remove()
         }
 
@@ -297,7 +297,7 @@
 
         // 提交表单
         form.on('submit(submitForm)', function(formData) {
-            formData.field['indexLibParentId'] = indexLibParentId;
+            formData.field['dutyIndexLibId'] = dutyIndexLibId;
             top.dialog.confirm(top.dataMessage.commit, function(index) {
                 top.dialog.close(index);
                 var loadLayerIndex;

src/main/resources/static/route/partycleanmeeting/save-party-clean-meeting.html

@@ -151,8 +151,8 @@
         var form = layui.form;
         var laytpl = layui.laytpl;
         var laydate = layui.laydate;
-        var indexLibParentId = top.restAjax.params(window.location.href).indexLibParentId;
+        var dutyIndexLibId = top.restAjax.params(window.location.href).dutyIndexLibId;
-        if(typeof (indexLibParentId) == 'undefined' || indexLibParentId  == ''){
+        if(typeof (dutyIndexLibId) == 'undefined' || dutyIndexLibId  == ''){
             $('.submit-btn').remove()
         }
 
@@ -168,7 +168,7 @@
 
         // 提交表单
         form.on('submit(submitForm)', function(formData) {
-            formData.field['indexLibParentId'] = indexLibParentId;
+            formData.field['dutyIndexLibId'] = dutyIndexLibId;
             top.dialog.confirm(top.dataMessage.commit, function(index) {
                 top.dialog.close(index);
                 var loadLayerIndex;