111

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/AuditSettingDTO.java

@@ -16,9 +16,20 @@ public class AuditSettingDTO implements Serializable {
 
     private Integer statusFlag;
 
+    private Integer clerkChangeFlag;
+
     private static final long serialVersionUID = 1L;
 
-    public String getSettingId() {
+
+	public Integer getClerkChangeFlag() {
+		return clerkChangeFlag;
+	}
+
+	public void setClerkChangeFlag(Integer clerkChangeFlag) {
+		this.clerkChangeFlag = clerkChangeFlag;
+	}
+
+	public String getSettingId() {
         return settingId;
     }
 

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/AuditSettingApiService.java

@@ -7,7 +7,7 @@ import com.gic.haoban.manage.api.dto.AuditSettingDTO;
  */
 public interface AuditSettingApiService {
 	
-	void saveSetting(String wxEnterpriseId , int auditFlag);
+	void saveSetting(String wxEnterpriseId , int auditFlag,int clerkChangeFlag);
 
 	AuditSettingDTO findSettingByWxEnterpriseId(String wxEnterpriseId);
 

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/AuditSettingMapper.java → haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/TabHaobanAuditSettingMapper.java

@@ -2,7 +2,7 @@ package com.gic.haoban.manage.service.dao.mapper;
 
 import com.gic.haoban.manage.service.entity.TabHaobanAuditSetting;
 
-public interface AuditSettingMapper {
+public interface TabHaobanAuditSettingMapper {
     int deleteByPrimaryKey(String settingId);
 
     int insert(TabHaobanAuditSetting record);

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/TabHaobanAuditSetting.java

@@ -16,6 +16,8 @@ public class TabHaobanAuditSetting implements Serializable {
 
     private Integer statusFlag;
 
+    private Integer clerkChangeFlag;
+
     private static final long serialVersionUID = 1L;
 
     public String getSettingId() {
@@ -65,4 +67,12 @@ public class TabHaobanAuditSetting implements Serializable {
     public void setStatusFlag(Integer statusFlag) {
         this.statusFlag = statusFlag;
     }
+
+    public Integer getClerkChangeFlag() {
+        return clerkChangeFlag;
+    }
+
+    public void setClerkChangeFlag(Integer clerkChangeFlag) {
+        this.clerkChangeFlag = clerkChangeFlag;
+    }
 }
\ No newline at end of file

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/AuditSettingApiServiceImpl.java

@@ -9,7 +9,8 @@ import com.gic.commons.util.EntityUtil;
 import com.gic.haoban.common.utils.UuidUtil;
 import com.gic.haoban.manage.api.dto.AuditSettingDTO;
 import com.gic.haoban.manage.api.service.AuditSettingApiService;
-import com.gic.haoban.manage.service.dao.mapper.AuditSettingMapper;
+import com.gic.haoban.manage.service.dao.mapper.TabHaobanAuditMapper;
+import com.gic.haoban.manage.service.dao.mapper.TabHaobanAuditSettingMapper;
 import com.gic.haoban.manage.service.entity.TabHaobanAuditSetting;
 
 /**
@@ -18,10 +19,10 @@ import com.gic.haoban.manage.service.entity.TabHaobanAuditSetting;
 @Service
 public class AuditSettingApiServiceImpl implements AuditSettingApiService{
 	@Autowired
-	private AuditSettingMapper auditSettingMapper;
+	private TabHaobanAuditSettingMapper auditSettingMapper;
 
 	@Override
-	public void saveSetting(String wxEnterpriseId, int auditFlag) {
+	public void saveSetting(String wxEnterpriseId, int auditFlag,int clerkChangeFlag) {
 		TabHaobanAuditSetting tab = auditSettingMapper.findSetting(wxEnterpriseId);
 		if(tab == null){
 			tab = new TabHaobanAuditSetting();
@@ -31,9 +32,11 @@ public class AuditSettingApiServiceImpl implements AuditSettingApiService{
 			tab.setSettingId(UuidUtil.randomUUID());
 			tab.setStatusFlag(1);
 			tab.setWxEnterpriseId(wxEnterpriseId);
+			tab.setClerkChangeFlag(clerkChangeFlag);
 			auditSettingMapper.insert(tab);
 		}else{
 			tab.setAuditFlag(auditFlag);
+			tab.setClerkChangeFlag(clerkChangeFlag);
 			tab.setUpdateTime(new Date());
 			auditSettingMapper.updateByPrimaryKeySelective(tab);
 		}

haoban-manage3-service/src/main/resources/mapper/AuditSettingMapper.xml → haoban-manage3-service/src/main/resources/mapper/TabHaobanAuditSettingMapper.xml

 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.gic.haoban.manage.service.dao.mapper.AuditSettingMapper" >
+<mapper namespace="com.gic.haoban.manage.service.dao.mapper.TabHaobanAuditSettingMapper" >
   <resultMap id="BaseResultMap" type="com.gic.haoban.manage.service.entity.TabHaobanAuditSetting" >
     <id column="setting_id" property="settingId" jdbcType="VARCHAR" />
     <result column="wx_enterprise_id" property="wxEnterpriseId" jdbcType="VARCHAR" />
@@ -8,9 +8,11 @@
     <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
     <result column="update_time" property="updateTime" jdbcType="TIMESTAMP" />
     <result column="status_flag" property="statusFlag" jdbcType="INTEGER" />
+    <result column="clerk_change_flag" property="clerkChangeFlag" jdbcType="INTEGER" />
   </resultMap>
   <sql id="Base_Column_List" >
-    setting_id, wx_enterprise_id, audit_flag, create_time, update_time, status_flag
+    setting_id, wx_enterprise_id, audit_flag, create_time, update_time, status_flag, 
+    clerk_change_flag
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
     select 
@@ -24,11 +26,11 @@
   </delete>
   <insert id="insert" parameterType="com.gic.haoban.manage.service.entity.TabHaobanAuditSetting" >
     insert into tab_haoban_audit_setting (setting_id, wx_enterprise_id, audit_flag, 
-      create_time, update_time, status_flag
-      )
+      create_time, update_time, status_flag, 
+      clerk_change_flag)
     values (#{settingId,jdbcType=VARCHAR}, #{wxEnterpriseId,jdbcType=VARCHAR}, #{auditFlag,jdbcType=INTEGER}, 
-      #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{statusFlag,jdbcType=INTEGER}
-      )
+      #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{statusFlag,jdbcType=INTEGER}, 
+      #{clerkChangeFlag,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="com.gic.haoban.manage.service.entity.TabHaobanAuditSetting" >
     insert into tab_haoban_audit_setting
@@ -51,6 +53,9 @@
       <if test="statusFlag != null" >
         status_flag,
       </if>
+      <if test="clerkChangeFlag != null" >
+        clerk_change_flag,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="settingId != null" >
@@ -71,6 +76,9 @@
       <if test="statusFlag != null" >
         #{statusFlag,jdbcType=INTEGER},
       </if>
+      <if test="clerkChangeFlag != null" >
+        #{clerkChangeFlag,jdbcType=INTEGER},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.gic.haoban.manage.service.entity.TabHaobanAuditSetting" >
@@ -91,6 +99,9 @@
       <if test="statusFlag != null" >
         status_flag = #{statusFlag,jdbcType=INTEGER},
       </if>
+      <if test="clerkChangeFlag != null" >
+        clerk_change_flag = #{clerkChangeFlag,jdbcType=INTEGER},
+      </if>
     </set>
     where setting_id = #{settingId,jdbcType=VARCHAR}
   </update>
@@ -100,15 +111,16 @@
       audit_flag = #{auditFlag,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP},
-      status_flag = #{statusFlag,jdbcType=INTEGER}
+      status_flag = #{statusFlag,jdbcType=INTEGER},
+      clerk_change_flag = #{clerkChangeFlag,jdbcType=INTEGER}
     where setting_id = #{settingId,jdbcType=VARCHAR}
   </update>
-      <select id="findSetting" resultMap="BaseResultMap" parameterType="java.lang.String" >
+  
+        <select id="findSetting" resultMap="BaseResultMap" parameterType="java.lang.String" >
     select 
     <include refid="Base_Column_List" />
     from tab_haoban_audit_setting
     where  wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR}
     	and status_flag = 1
   </select>
-  
 </mapper>
\ No newline at end of file

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/AuditController.java

@@ -44,14 +44,14 @@ public class AuditController extends WebBaseController{
 	//设置保存
 	@HttpLimit
 	@RequestMapping("open-or-close")
-	public HaobanResponse openOrClose(String wxEnterpriseId,Integer auditFlag) {
+	public HaobanResponse openOrClose(String wxEnterpriseId,Integer auditFlag,int clerkChangeFlag) {
 		if(StringUtils.isAnyBlank(wxEnterpriseId)){
 			return resultResponse(HaoBanErrCode.ERR_2);
 		}
 		if(auditFlag == null){
 			return resultResponse(HaoBanErrCode.ERR_2);
 		}
-		auditSettingApiService.saveSetting(wxEnterpriseId, auditFlag);
+		auditSettingApiService.saveSetting(wxEnterpriseId, auditFlag,clerkChangeFlag);
 		return resultResponse(HaoBanErrCode.ERR_1);
 	}
 	//设置查看
@@ -64,6 +64,7 @@ public class AuditController extends WebBaseController{
 		if(auditSettingDTO == null){
 			auditSettingDTO = new AuditSettingDTO();
 			auditSettingDTO.setAuditFlag(1);
+			auditSettingDTO.setClerkChangeFlag(1);
 		}
 		return resultResponse(HaoBanErrCode.ERR_1,auditSettingDTO);
 	}