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/service/StaffClerkRelationApiService.java

@@ -75,5 +75,11 @@ public interface StaffClerkRelationApiService {
 	 * @return
 	 */
 	StaffClerkRelationDTO getByClerkId(String clerkId);
+	
+	/**
+	 * 删除关联关系
+	 * @param clerkId
+	 */
+	void delByClerkId(String clerkId);
 
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/TabHaobanStaffClerkRelationMapper.java

@@ -74,4 +74,6 @@ public interface TabHaobanStaffClerkRelationMapper {
 	TabHaobanStaffClerkRelation getByClerkId(@Param("clerkId")String clerkId);
 	
 	int delByPrimaryKey(@Param("staffClerkRelationId")String staffClerkRelationId);
+	
+	void delByClerkId(@Param("clerkId")String clerkId);
 }
\ No newline at end of file

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

@@ -243,6 +243,8 @@ public class AuditApiServiceImpl implements AuditApiService{
 			if(org.apache.commons.lang.StringUtils.isNotBlank(batchId)){
 				 insertBatchLog( batchId,AuditRsultType.success.getCode(),tab);
 			}
+			staffClerkRelationApiService.delByClerkId(obj.getClerkId());
+			
 			staffDepartmentRelatedApiService.sendClerkDel(obj.getClerkName(), obj.getClerkCode(),tab.getCommitStoreId(), 1, "");
 		}else if(auditType == AuditType.CLERK_UNBIND.getCode()){
 			//解绑申请，无需审核，直接通过
@@ -281,7 +283,7 @@ public class AuditApiServiceImpl implements AuditApiService{
 			staffDepartmentRelatedApiService.sendClerkAdd(enterpriseId, obj.getClerkCode(), 2, auditReason);
 		}else if(auditType == AuditType.CLERK_DEL.getCode()) {
 			AuditStaffDTO obj = JSONObject.parseObject(oldValue,AuditStaffDTO.class);
-			staffDepartmentRelatedApiService.sendClerkDel(obj.getClerkName(), obj.getClerkCode(),tab.getCommitStoreId(), 2, auditReason);
+			staffDepartmentRelatedApiService.sendClerkDel(obj.getClerkName(), obj.getClerkCode(),tab2.getCommitStoreId(), 2, auditReason);
 		}
 	}
 	@Override

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

@@ -84,6 +84,10 @@ public class MessageApiServiceImpl implements MessageApiService {
 
     @Override
     public void gicMessageReceive(GicMessageDTO gicMessageDTO) {
+        if (true) {
+            log.info("好办3.0去除消息监听");
+            return;
+        }
         GicMQClient clientInstance = GICMQClientUtil.getClientInstance();
         try {
             log.info("发送消息到dealGicMessageMq，{}", JSON.toJSONString(gicMessageDTO));
@@ -193,6 +197,10 @@ public class MessageApiServiceImpl implements MessageApiService {
 
     @Override
     public void dealWxMessage(String param) {
+        if (true) {
+            log.info("不出发更新企业微信变更");
+            return;
+        }
         QywxCallBackDTO dto = JSON.parseObject(param, QywxCallBackDTO.class);
         log.info("【处理微信回调】dto={}",JSON.toJSONString(param));
         if(dto != null){

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

@@ -211,4 +211,8 @@ public class StaffClerkRelationApiServiceImpl implements StaffClerkRelationApiSe
 			 staffClerkRelatinService.insert(staffClerkRelation);
 		}		
 	}
+	@Override
+	public void delByClerkId(String clerkId) {
+		tabHaobanStaffClerkRelationMapper.delByClerkId(clerkId);
+	}
 }

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

@@ -297,6 +297,7 @@ public class StaffDepartmentRelatedApiServiceImpl implements StaffDepartmentRela
         ClerkDTO gicClerk = clerkService.getClerkLeaderByStoreId(storeId);
 		if(gicClerk == null){
 			logger.info("店长不存在，发送消息失败{}",storeId);
+			return ;
 		}
 		TabHaobanStaffClerkRelation tab = tabHaobanStaffClerkRelationMapper.getOneByClerkId(gicClerk.getClerkId());
 		if(tab == null){

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

@@ -389,8 +389,8 @@
 	    select 
 	    <include refid="Base_Column_List" />
 	    from tab_haoban_audit
-	    where 1=1
-			and commit_store_id = #{storeId,jdbcType=VARCHAR}
+	    where 
+			 commit_store_id = #{storeId,jdbcType=VARCHAR}
 			and status_flag = 1
 			<if test="auditType == null || auditType == -1">
 				and audit_type in (2,3,4,5)
@@ -409,8 +409,8 @@
 	    select 
 	    <include refid="Base_Column_List" />
 	    from tab_haoban_audit
-	    where 1=1
-			and status_flag = 1
+	    where 
+			 status_flag = 1
 			and related_Id = #{relatedId}
 			and audit_type = #{auditType}
 			and audit_status = 0
@@ -420,8 +420,8 @@
 	    select 
 	    <include refid="Base_Column_List" />
 	    from tab_haoban_audit
-	    where 1=1
-			and status_flag = 1
+	    where 
+			status_flag = 1
 			and audit_type = 3
 			and audit_status = 0
 			and enterprise_id = #{enterpriseId,jdbcType=VARCHAR}

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

@@ -320,4 +320,13 @@
     	  and status_flag =1
   </update>
   
+  <update id="delByClerkId" >
+    update tab_haoban_staff_clerk_relation
+    set
+    status_flag = 0,
+    update_time = now()
+    where clerk_id = #{clerkId,jdbcType=VARCHAR}
+    	  and status_flag =1
+  </update>
+  
 </mapper>
\ No newline at end of file

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

@@ -321,6 +321,10 @@ public class StaffController extends WebBaseController{
 					if (hasRelationClerkIds.contains(clerkInfoVo.getClerkId())) {
 						clerkInfoVo.setRelationStatus(1);
 					}
+					StoreDTO store = storeService.getStore(clerkInfoVo.getStoreId());
+					if (null != store) {
+						clerkInfoVo.setStoreName(store.getStoreName());
+					}
 				});
 			}
 

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/ClerkInfoVo.java

@@ -11,8 +11,44 @@ public class ClerkInfoVo implements Serializable {
     private String clerkName;
     private String clerkCode;
     private String clerkId;
+    private String enterpriseName;
+    private String enterpriseId;
+    private String storeId;
+    private String storeName;
     private Integer relationStatus=0;
 
+    public String getStoreId() {
+        return storeId;
+    }
+
+    public void setStoreId(String storeId) {
+        this.storeId = storeId;
+    }
+
+    public String getStoreName() {
+        return storeName;
+    }
+
+    public void setStoreName(String storeName) {
+        this.storeName = storeName;
+    }
+
+    public String getEnterpriseName() {
+        return enterpriseName;
+    }
+
+    public void setEnterpriseName(String enterpriseName) {
+        this.enterpriseName = enterpriseName;
+    }
+
+    public String getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(String enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
     public String getClerkName() {
         return clerkName;
     }