Merge branch 'developer' of http://115.159.76.241/haoban3.0/haoban-manage3.0.git into developer

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

@@ -48,8 +48,18 @@ public class AuditDTO implements Serializable {
 
     private String relatedId;
 
+    private String auditStaffId;
+
     private static final long serialVersionUID = 1L;
 
+	public String getAuditStaffId() {
+		return auditStaffId;
+	}
+
+	public void setAuditStaffId(String auditStaffId) {
+		this.auditStaffId = auditStaffId;
+	}
+
 	public String getRelatedId() {
 		return relatedId;
 	}

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

@@ -17,7 +17,7 @@ public interface AuditApiService {
 	
 	String audit(String batchId,String auditId,String aduitName,String optStaffId);
 	
-	void refuse(String auditId,String auditReason,String aduitName);
+	void refuse(String auditId,String auditReason,String aduitStaffId,String aduitName);
 	
 	int save(Integer auditType,String wxEnterpriseId,String enterpriseId,String commitStaffId,String commitStoreId,String changeField,String oldValue,String newValue);
 	

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

@@ -44,8 +44,18 @@ public class TabHaobanAudit implements Serializable {
 
     private String relatedId;
 
+    private String auditStaffId;
+
     private static final long serialVersionUID = 1L;
 
+    public String getAuditStaffId() {
+		return auditStaffId;
+	}
+
+	public void setAuditStaffId(String auditStaffId) {
+		this.auditStaffId = auditStaffId;
+	}
+
 	public String getRelatedId() {
 		return relatedId;
 	}

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

@@ -166,6 +166,7 @@ public class AuditApiServiceImpl implements AuditApiService{
 		tab.setAuditId(auditId);
 		tab.setUpdateTime(new Date());
 		tab.setAuditName(auditName);
+		tab.setAuditStaffId(optStaffId);
 		if(auditType == AuditType.STORE_CHANGE.getCode()){
 			//门店信息变更
 			String storeId = tab.getCommitStoreId();
@@ -274,13 +275,14 @@ public class AuditApiServiceImpl implements AuditApiService{
 		return "";
 	}
 	@Override
-	public void refuse(String auditId, String auditReason,String auditName) {
+	public void refuse(String auditId, String auditReason,String auditStaffId,String auditName) {
 		TabHaobanAudit tab = new TabHaobanAudit();
 		tab.setAuditId(auditId);
 		tab.setAuditStatus(2);
 		tab.setUpdateTime(new Date());
 		tab.setAuditReason(auditReason);
 		tab.setAuditName(auditName);
+		tab.setAuditStaffId(auditStaffId);
 		auditMapper.updateByPrimaryKeySelective(tab);	
 		TabHaobanAudit tab2 = auditMapper.selectByPrimaryKey(auditId);
 		int auditType = tab2.getAuditType();

haoban-manage3-service/src/main/resources/mapper/TabHaobanAuditMapper.xml

@@ -22,11 +22,12 @@
     <result column="status_flag" property="statusFlag" jdbcType="INTEGER" />
     <result column="wx_enterprise_id" property="wxEnterpriseId" jdbcType="VARCHAR" />
     <result column="related_id" property="relatedId" jdbcType="VARCHAR" />
+    <result column="audit_staff_id" property="auditStaffId" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Base_Column_List" >
     audit_id, audit_type, commit_name, commit_staff_id, commit_staff_name, commit_staff_img, 
     commit_store_id, change_field, old_value, new_value, commit_time, enterprise_id, 
-    audit_name, audit_status, audit_reason, create_time, update_time, status_flag, wx_enterprise_id,related_id
+    audit_name, audit_status, audit_reason, create_time, update_time, status_flag, wx_enterprise_id,related_id,audit_staff_id
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
     select 
@@ -45,14 +46,14 @@
       new_value, commit_time, enterprise_id, 
       audit_name, audit_status, audit_reason, 
       create_time, update_time, status_flag, 
-      wx_enterprise_id,related_id)
+      wx_enterprise_id,related_id,audit_staff_id)
     values (#{auditId,jdbcType=VARCHAR}, #{auditType,jdbcType=INTEGER}, #{commitName,jdbcType=VARCHAR}, 
       #{commitStaffId,jdbcType=VARCHAR}, #{commitStaffName,jdbcType=VARCHAR}, #{commitStaffImg,jdbcType=VARCHAR}, 
       #{commitStoreId,jdbcType=VARCHAR}, #{changeField,jdbcType=VARCHAR}, #{oldValue,jdbcType=VARCHAR}, 
       #{newValue,jdbcType=VARCHAR}, #{commitTime,jdbcType=TIMESTAMP}, #{enterpriseId,jdbcType=VARCHAR}, 
       #{auditName,jdbcType=VARCHAR}, #{auditStatus,jdbcType=INTEGER}, #{auditReason,jdbcType=VARCHAR}, 
       #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{statusFlag,jdbcType=INTEGER}, 
-      #{wxEnterpriseId,jdbcType=VARCHAR},#{relatedId,jdbcType=VARCHAR})
+      #{wxEnterpriseId,jdbcType=VARCHAR},#{relatedId,jdbcType=VARCHAR},#{auditStaffId,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.gic.haoban.manage.service.entity.TabHaobanAudit" >
     insert into tab_haoban_audit
@@ -117,6 +118,9 @@
       <if test="relatedId != null" >
         related_id,
       </if>
+      <if test="auditStaffId != null" >
+        audit_staff_id,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="auditId != null" >
@@ -179,6 +183,9 @@
       <if test="relatedId != null" >
 		#{relatedId,jdbcType=VARCHAR},
       </if>
+      <if test="auditStaffId != null" >
+		#{auditStaffId,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.gic.haoban.manage.service.entity.TabHaobanAudit" >
@@ -241,6 +248,9 @@
             <if test="relatedId != null" >
         related_id = #{relatedId,jdbcType=VARCHAR},
       </if>
+      <if test="auditStaffId != null" >
+        audit_staff_id = #{auditStaffId,jdbcType=VARCHAR},
+      </if>
     </set>
     where audit_id = #{auditId,jdbcType=VARCHAR}
   </update>
@@ -264,7 +274,8 @@
       update_time = #{updateTime,jdbcType=TIMESTAMP},
       status_flag = #{statusFlag,jdbcType=INTEGER},
       wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR},
-      related_id = #{relatedId,jdbcType=VARCHAR}
+      related_id = #{relatedId,jdbcType=VARCHAR},
+      audit_staff_id = #{auditStaffId,jdbcType=VARCHAR}
     where audit_id = #{auditId,jdbcType=VARCHAR}
   </update>
     <sql id="storeSql">

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

@@ -160,20 +160,19 @@ public class AuditController extends WebBaseController{
 	@HttpLimit
 	@RequestMapping("batch-approve")
 	public HaobanResponse batchApprove(String auditIds,String auditName ) {
-		LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser();
-		StaffDTO loginStaffDTO = login.getStaffDTO();
-		if (null == loginStaffDTO) {
-			return resultResponse(HaoBanErrCode.ERR_4);
-		}
 		if(StringUtils.isAnyBlank(auditIds,auditName)){
 			return resultResponse(HaoBanErrCode.ERR_2);
 		}
+		LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser();
+		String staffId = login.getStaffDTO().getStaffId();
+		String staffName = login.getStaffDTO().getStaffName();
 		String[] s = auditIds.split(",");
 		int successCount = 0;
 		int failCount = 0;
 		String batchId = UuidUtil.randomUUID();
 		for(String auditId : s){
-			String result = auditApiService.audit(batchId,auditId,auditName,loginStaffDTO.getStaffId());
+			String result = auditApiService.audit(batchId,auditId,staffName,staffId);
+//			String result = auditApiService.audit(batchId,auditId,auditName,loginStaffDTO.getStaffId());
 			if(StringUtils.isEmpty(result)){
 				successCount = successCount+1;
 			}else{
@@ -194,7 +193,10 @@ public class AuditController extends WebBaseController{
 		if(StringUtils.isAnyBlank(auditId,auditReason,auditName)){
 			return resultResponse(HaoBanErrCode.ERR_2);
 		}
-		auditApiService.refuse(auditId, auditReason,auditName);
+		LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser();
+		String staffId = login.getStaffDTO().getStaffId();
+		String staffName = login.getStaffDTO().getStaffName();
+		auditApiService.refuse(auditId, auditReason,staffName,staffId);
 		return resultResponse(HaoBanErrCode.ERR_1);
 	}
 	//审核同意
@@ -203,13 +205,15 @@ public class AuditController extends WebBaseController{
 	public HaobanResponse audit(String auditId,String auditName ) {
 		LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser();
 		StaffDTO loginStaffDTO = login.getStaffDTO();
-		if (null == loginStaffDTO) {
+		if (null == login) {
 			return resultResponse(HaoBanErrCode.ERR_4);
 		}
+		String staffId = login.getStaffDTO().getStaffId();
+		String staffName = login.getStaffDTO().getStaffName();
 		if(StringUtils.isAnyBlank(auditId)){
 			return resultResponse(HaoBanErrCode.ERR_2);
 		}
-		String result = auditApiService.audit("",auditId,auditName,loginStaffDTO.getStaffId());
+		String result = auditApiService.audit("",auditId,staffName,staffId);
 		if(StringUtils.isEmpty(result)){
 			return resultResponse(HaoBanErrCode.ERR_1);
 		}else{