111

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

@@ -393,12 +393,14 @@
 			and commit_store_id = #{storeId,jdbcType=VARCHAR}
 			and status_flag = 1
 			<if test="auditType == null || auditType == -1">
-			and audit_type in (2,3,4,5)
+				and audit_type in (2,3,4,5)
 			</if>
 			<if test="auditType != null and auditType != -1">
-			and audit_type = #{auditType}
+				and audit_type = #{auditType}
+			</if>
+			<if test="auditStatus != null and auditStatus != -1">
+				and audit_status = #{auditStatus}
 			</if>
-			and audit_status = #{auditStatus}
 			order by create_time desc
 	</select>
   

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

@@ -555,6 +555,32 @@ public class ClerkController extends WebBaseController{
 			staffClerkRelation.setWxUserId(wxUserId);
 			staffClerkRelation.setStaffId(staffId);
 			staffClerkRelationApiService.insert(staffClerkRelation);
+			
+			//无需审核
+			AuditDTO audit = new AuditDTO();
+			audit.setCommitStaffName(clerk.getClerkName());
+			audit.setCommitStaffId(staffId);
+			audit.setCommitStaffImg(staff.getHeadImg());
+			audit.setCommitStoreId(clerk.getStoreId());
+			audit.setCommitStoreName(store.getStoreName());
+			audit.setAuditStatus(4);
+			audit.setWxEnterpriseId(wxEnterpriseId);
+			audit.setEnterpriseId(store.getEnterpriseId());
+			audit.setStatusFlag(1);
+			audit.setRelatedId(staffId);
+
+			JSONObject json = new JSONObject();
+			json.put("clerkId", clerkId);
+			json.put("clerkCode", clerkCode);
+			json.put("clerkName", clerk.getClerkName());
+			json.put("staffName", staff.getStaffName());
+			json.put("staffId", staffId);
+			json.put("wxUserId", wxUserId);
+			json.put("headPic", staff.getHeadImg());
+			audit.setOldValue(json.toJSONString());
+			audit.setCommitTime(new Date());
+			audit.setAuditType(2);
+			auditApiService.insert(audit);
 			return resultResponse(HaoBanErrCode.ERR_1);
 		}else{
 			//需要审核
@@ -568,7 +594,8 @@ public class ClerkController extends WebBaseController{
 			audit.setWxEnterpriseId(wxEnterpriseId);
 			audit.setEnterpriseId(store.getEnterpriseId());
 			audit.setStatusFlag(1);
-			
+			audit.setRelatedId(staffId);
+
 			JSONObject json = new JSONObject();
 			json.put("clerkId", clerkId);
 			json.put("clerkCode", clerkCode);
@@ -615,6 +642,7 @@ public class ClerkController extends WebBaseController{
 		audit.setWxEnterpriseId(staffClerkRelation.getWxEnterpriseId());
 		audit.setEnterpriseId(store.getEnterpriseId());
 		audit.setStatusFlag(1);
+		audit.setRelatedId(staffId);
 		
 		JSONObject json = new JSONObject();
 		json.put("clerkId", clerkId);