Merge branch 'feature/202310月零散迭代' into 'master'

Feature/202310月零散迭代

See merge request !1559

haoban-manage3-service/src/main/resources/mapper/chat/GroupChatPlanOwnerLogMapper.xml

@@ -170,14 +170,16 @@
   	  	<if test="null != searchParams">
   	  		and b.name like #{searchParams}
   	  	</if>
-  	    <if test="1==clerkTaskStatus">
-			and b.end_time > now()
-		</if>
-  	    <if test="2==clerkTaskStatus">
-			and b.end_time <![CDATA[<=]]> now()
-		</if>
-  	  	group by b.plan_id
-  	  	order by b.end_time desc ,  a.create_time desc
+	  <if test="1==clerkTaskStatus">
+		  group by b.plan_id
+		  having ( notSendCount > 0  AND  b.`end_time` <![CDATA[>=]]>  NOW() )
+		  order by b.end_time desc ,  a.create_time desc
+	  </if>
+	  <if test="2==clerkTaskStatus">
+		  group by b.plan_id
+		  having ( notSendCount = 0  or (sendCount > 0 and  b.`end_time` <![CDATA[<]]>  NOW() ) )
+		  order by b.end_time desc ,  a.create_time desc
+	  </if>
   </select>
   
   <select id="listOwnerLogPageForWxa"  parameterType="com.gic.haoban.manage.api.dto.qdto.chat.GroupChatPlanSearchQDTO" resultType="com.gic.haoban.manage.api.dto.chat.GroupChatPlanOwnerLogDTO">

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

@@ -363,7 +363,7 @@ public class WxStaffController extends WebBaseController {
     }
 
     @RequestMapping("/staff-add-json")
-    public HaobanResponse staffAdd(StaffAddVO vo) {
+    public HaobanResponse staffAdd(@RequestBody StaffAddVO vo) {
         logger.info(JSONObject.toJSONString(vo));
         StaffDTO staffDTO = EntityUtil.changeEntityByJSON(StaffDTO.class,vo) ;
         String storeId = vo.getStoreId() ;

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/qo/StaffAddVO.java

 package com.gic.haoban.manage.web.qo;
 
+import com.gic.haoban.manage.api.dto.DepartmentDTO;
 import com.gic.haoban.manage.api.dto.StaffDTO;
 
-public class StaffAddVO extends StaffDTO {
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
 
+public class StaffAddVO implements Serializable {
+
+    /**
+     * 员工id
+     */
+    private String staffId;
+    /**
+     * 企业微信id
+     */
+    private String wxEnterpriseId;
+    /**
+     * 手机号
+     */
+    private String phoneNumber;
+    /**
+     * 员工姓名
+     */
+    private String staffName;
+    /**
+     * 国家码
+     */
+    private String nationCode;
+    /**
+     * 昵称
+     */
+    private String nickName;
+    /**
+     * 性别
+     */
+    private Integer sex;
+    /**
+     * 职位
+     */
+    private String postion;
+    private String clerkCode;
+
+
+    private int clerkType;
+
+    private String clerkId;
     private String storeId ;
-    private String clerkCode ;
     private String commitName ;
     private Integer version ;
 
-    @Override
-    public String getStoreId() {
-        return storeId;
+    public String getStaffId() {
+        return staffId;
     }
 
-    @Override
-    public void setStoreId(String storeId) {
-        this.storeId = storeId;
+    public void setStaffId(String staffId) {
+        this.staffId = staffId;
+    }
+
+    public String getWxEnterpriseId() {
+        return wxEnterpriseId;
+    }
+
+    public void setWxEnterpriseId(String wxEnterpriseId) {
+        this.wxEnterpriseId = wxEnterpriseId;
+    }
+
+    public String getPhoneNumber() {
+        return phoneNumber;
+    }
+
+    public void setPhoneNumber(String phoneNumber) {
+        this.phoneNumber = phoneNumber;
+    }
+
+    public String getStaffName() {
+        return staffName;
+    }
+
+    public void setStaffName(String staffName) {
+        this.staffName = staffName;
+    }
+
+    public String getNationCode() {
+        return nationCode;
+    }
+
+    public void setNationCode(String nationCode) {
+        this.nationCode = nationCode;
+    }
+
+    public String getNickName() {
+        return nickName;
+    }
+
+    public void setNickName(String nickName) {
+        this.nickName = nickName;
+    }
+
+    public Integer getSex() {
+        return sex;
+    }
+
+    public void setSex(Integer sex) {
+        this.sex = sex;
+    }
+
+    public String getPostion() {
+        return postion;
+    }
+
+    public void setPostion(String postion) {
+        this.postion = postion;
     }
 
-    @Override
     public String getClerkCode() {
         return clerkCode;
     }
 
-    @Override
     public void setClerkCode(String clerkCode) {
         this.clerkCode = clerkCode;
     }
 
+    public int getClerkType() {
+        return clerkType;
+    }
+
+    public void setClerkType(int clerkType) {
+        this.clerkType = clerkType;
+    }
+
+    public String getClerkId() {
+        return clerkId;
+    }
+
+    public void setClerkId(String clerkId) {
+        this.clerkId = clerkId;
+    }
+
+    public String getStoreId() {
+        return storeId;
+    }
+
+    public void setStoreId(String storeId) {
+        this.storeId = storeId;
+    }
+
     public String getCommitName() {
         return commitName;
     }