111

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/enums/AuditStatus.java

+package com.gic.haoban.manage.api.enums;
+
+/**
+ * Created by tgs on 2020/2/20.
+ */
+public enum AuditStatus {
+    NO_AUDIT(0, "未审核"),
+    AGREE(1,"已同意"),
+    REFUSE(2,"已拒绝"),
+    CANCEL(3,"已取消"),
+    NOT_NEED_AUDIT(4,"无需审核"),
+    AUDIT_FAIL(5,"审核失败");
+    
+    AuditStatus(Integer type, String desc){
+        this.code = type;
+        this.desc = desc;
+    }
+
+    private int code;
+    private String desc;
+
+    public String getDesc() {
+        return desc;
+    }
+
+    public void setDesc(String desc) {
+        this.desc = desc;
+    }
+
+    public int getCode() {
+        return code;
+    }
+
+    public void setCode(int code) {
+        this.code = code;
+    }
+}

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

@@ -46,6 +46,7 @@ import com.gic.haoban.manage.api.dto.StaffDTO;
 import com.gic.haoban.manage.api.dto.StaffDepartmentRelatedDTO;
 import com.gic.haoban.manage.api.dto.WxEnterpriseDTO;
 import com.gic.haoban.manage.api.enums.AppPageType;
+import com.gic.haoban.manage.api.enums.AuditStatus;
 import com.gic.haoban.manage.api.enums.AuditType;
 import com.gic.haoban.manage.api.service.AuditApiService;
 import com.gic.haoban.manage.api.service.AuditSettingApiService;
@@ -236,7 +237,7 @@ public class ClerkController extends WebBaseController{
 			audit.setCommitStaffImg(staff.getHeadImg());
 			audit.setCommitStoreId(storeId);
 			audit.setCommitStoreName(store.getStoreName());
-			audit.setAuditStatus(0);
+			audit.setAuditStatus(AuditStatus.NO_AUDIT.getCode());
 			audit.setWxEnterpriseId(wxEnterpriseId);
 			audit.setEnterpriseId(store.getEnterpriseId());
 			audit.setStatusFlag(1);
@@ -252,10 +253,39 @@ public class ClerkController extends WebBaseController{
 
 			audit.setOldValue(json.toJSONString());
 			audit.setCommitTime(new Date());
-			audit.setAuditType(3);
+			audit.setAuditType(AuditType.CLERK_ADD.getCode());
 			audit.setRelatedId(clerkCode);
 			auditApiService.insert(audit);
 			return resultResponse(HaoBanErrCode.ERR_1);
+		}else{
+			//不用审核
+			StaffDTO staff = staffApiService.selectById(staffDTO.getStaffId());
+			AuditDTO audit = new AuditDTO();
+			audit.setCommitStaffName(commitName);
+			audit.setCommitStaffId(staffDTO.getStaffId());
+			audit.setCommitStaffImg(staff.getHeadImg());
+			audit.setCommitStoreId(storeId);
+			audit.setCommitStoreName(store.getStoreName());
+			audit.setAuditStatus(AuditStatus.NOT_NEED_AUDIT.getCode());
+			audit.setWxEnterpriseId(wxEnterpriseId);
+			audit.setEnterpriseId(store.getEnterpriseId());
+			audit.setStatusFlag(1);
+			audit.setAuditName(commitName);
+			
+			JSONObject json = new JSONObject();
+			json.put("clerkCode", clerkCode);
+			json.put("clerkName", staffName);
+			json.put("headPic", staff.getHeadImg());
+			json.put("sex", sex);
+			json.put("postion", postion);
+			json.put("phoneNumber", phoneNumber);
+			json.put("nationcode", nationcode);
+
+			audit.setOldValue(json.toJSONString());
+			audit.setCommitTime(new Date());
+			audit.setAuditType(AuditType.CLERK_ADD.getCode());
+			audit.setRelatedId(clerkCode);
+			auditApiService.insert(audit);
 		}
 		//只新增gic那边的，不新增好办这边
 		boolean flag = syncHaobanToGicServiceApi.syncClerkToGicClerkAdd(storeId, clerkCode, sex, staffName, phoneNumber, nationcode, postion);
@@ -272,15 +302,14 @@ public class ClerkController extends WebBaseController{
 		if(StringUtils.isAnyBlank(clerkIds)) {
 			return resultResponse(HaoBanErrCode.ERR_2);
 		}
+		com.gic.enterprise.api.dto.StoreDTO store = storeService.getStoreByIdNoStatus(storeId);
+		//校验手机是否唯一
+		if (store == null) {
+			return resultResponse(HaoBanErrCode.ERR_400001);
+		}
 		AuditSettingDTO dto = auditSettingApiService.findSettingByWxEnterpriseId(wxEnterpriseId);
 		if(dto.getClerkChangeFlag() == 1){
 			//需要审核
-			com.gic.enterprise.api.dto.StoreDTO store = storeService.getStoreByIdNoStatus(storeId);
-			//校验手机是否唯一
-			if (store == null) {
-				return resultResponse(HaoBanErrCode.ERR_400001);
-			}
-			StaffDTO staff = staffApiService.selectById(staffId);
 			String[] clerkIdArr = clerkIds.split(",");
 			for (String clerkId : clerkIdArr) {
 				AuditDTO auditDTO =auditApiService.findByBindRelatedIdAndAuditType(clerkId, AuditType.CLERK_DEL.getCode());
@@ -293,13 +322,14 @@ public class ClerkController extends WebBaseController{
 					logger.info("导购不存在",clerkId);
 					continue;
 				}
+				StaffDTO staff = staffApiService.selectById(staffId);
 				AuditDTO audit = new AuditDTO();
 				audit.setCommitStaffName(staff.getStaffName());
 				audit.setCommitStaffId(staffId);
 				audit.setCommitStaffImg(staff.getHeadImg());
 				audit.setCommitStoreId(storeId);
 				audit.setCommitStoreName(store.getStoreName());
-				audit.setAuditStatus(0);
+				audit.setAuditStatus(AuditStatus.NO_AUDIT.getCode());
 				audit.setWxEnterpriseId(wxEnterpriseId);
 				audit.setEnterpriseId(store.getEnterpriseId());
 				audit.setStatusFlag(1);
@@ -311,7 +341,7 @@ public class ClerkController extends WebBaseController{
 				json.put("clerkName", clerkDTO.getClerkName());
 				audit.setOldValue(json.toJSONString());
 				audit.setCommitTime(new Date());
-				audit.setAuditType(4);
+				audit.setAuditType(AuditType.CLERK_DEL.getCode());
 				auditApiService.insert(audit);
 			}
 		}else{
@@ -329,6 +359,29 @@ public class ClerkController extends WebBaseController{
 						continue;
 					}
 				}
+				StaffDTO staff = staffApiService.selectById(staffId);
+				AuditDTO audit = new AuditDTO();
+				audit.setCommitStaffName(staff.getStaffName());
+				audit.setCommitStaffId(staffId);
+				audit.setCommitStaffImg(staff.getHeadImg());
+				audit.setCommitStoreId(storeId);
+				audit.setCommitStoreName(store.getStoreName());
+				audit.setAuditStatus(AuditStatus.NOT_NEED_AUDIT.getCode());
+				audit.setWxEnterpriseId(wxEnterpriseId);
+				audit.setEnterpriseId(store.getEnterpriseId());
+				audit.setStatusFlag(1);
+				audit.setRelatedId(clerkId);
+				audit.setAuditName(staff.getStaffName());
+				
+				JSONObject json = new JSONObject();
+				json.put("clerkId", clerkId);
+				json.put("clerkCode", clerkDTO.getClerkCode());
+				json.put("clerkName", clerkDTO.getClerkName());
+				audit.setOldValue(json.toJSONString());
+				audit.setCommitTime(new Date());
+				audit.setAuditType(AuditType.CLERK_DEL.getCode());
+				auditApiService.insert(audit);
+				
 				syncHaobanToGicServiceApi.delGicClerk(clerkId);
 			}
 		}
@@ -481,12 +534,13 @@ public class ClerkController extends WebBaseController{
 			audit.setCommitStaffImg(staff.getHeadImg());
 			audit.setCommitStoreId(clerk.getStoreId());
 			audit.setCommitStoreName(store.getStoreName());
-			audit.setAuditStatus(4);
+			audit.setAuditStatus(AuditStatus.NOT_NEED_AUDIT.getCode());
 			audit.setWxEnterpriseId(wxEnterpriseId);
 			audit.setEnterpriseId(store.getEnterpriseId());
 			audit.setStatusFlag(1);
 			audit.setRelatedId(clerkId);
-
+			audit.setAuditName(staff.getStaffName());
+			
 			JSONObject json = new JSONObject();
 			json.put("clerkId", clerkId);
 			json.put("clerkCode", clerkCode);