Przeglądaj źródła

fix(修改群列表返回大小写问题)

gengyang 5 lat temu
rodzic
commit
73fb82fcdd

+ 1 - 3
src/main/java/com/mokamrp/privates/controller/WorkContactEmployeeController.java

@@ -50,7 +50,7 @@ public class WorkContactEmployeeController extends BaseController<WorkContactEmp
     private WorkContactEmployeeService WorkContactEmployeeService;
 
 
-    @RequestMapping("/listt")
+    @RequestMapping("/list")
     @ResponseBody
     public Object getList(
             Integer gender, Integer status,
@@ -79,8 +79,6 @@ public class WorkContactEmployeeController extends BaseController<WorkContactEmp
             Integer group_id, Integer corp_id,@RequestParam List employee_id, @RequestParam List tag_id , Integer channel_code_id
     ){
 
-        System.out.println("============>"+Thread.currentThread().getName());
-
         WorkContactEmployeeService.export(gender, status,name,
                 start_deleted_at, end_deleted_at,
                 start_created_at, end_created_at,

+ 81 - 85
src/main/java/com/mokamrp/privates/mapper/vo/WorkRoomVo.java

@@ -13,161 +13,157 @@ import java.util.Date;
 public class WorkRoomVo {
 
     private Integer id;
-    private Integer corp_id;
-    private String wx_chat_id;
+    private Integer corpId;
+    private String wxChatId;
     private String name;
-    private Integer owner_id;
+    private Integer ownerId;
     private String notice;
     private Integer status;
-    private Date create_time;
-    private Integer room_max;
-    private Date deleted_at;
+    private Date createTime;
+    private Integer roomMax;
+    private Date deletedAt;
+    private Integer companyGroupId;
+    private String corpName;
+    private String employeeName;
+    private Integer totalNum;
+    private Integer addNum;
+    private Integer leftNum;
+    private String tagNames;
 
-    public Integer getTotal_num() {
-        return total_num;
+    public Integer getCorpId() {
+        return corpId;
     }
 
-    public void setTotal_num(Integer total_num) {
-        this.total_num = total_num;
+    public void setCorpId(Integer corpId) {
+        this.corpId = corpId;
     }
 
-    public Integer getAdd_num() {
-        return add_num;
+    public String getWxChatId() {
+        return wxChatId;
     }
 
-    public void setAdd_num(Integer add_num) {
-        this.add_num = add_num;
+    public void setWxChatId(String wxChatId) {
+        this.wxChatId = wxChatId;
     }
 
-    public Integer getLeft_num() {
-        return left_num;
+    public Integer getOwnerId() {
+        return ownerId;
     }
 
-    public void setLeft_num(Integer delete_num) {
-        this.left_num = delete_num;
+    public void setOwnerId(Integer ownerId) {
+        this.ownerId = ownerId;
     }
 
-    private Integer company_group_id;
-    private String corp_name;
-
-    private String employee_name;
-    private Integer total_num;
-    private Integer add_num;
-    private Integer left_num;
-
-    public String getTag_names() {
-        return tag_names;
+    public Date getCreateTime() {
+        return createTime;
     }
 
-    public void setTag_names(String tag_names) {
-        this.tag_names = tag_names;
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
     }
 
-    private String tag_names;
-
-    public Integer getId() {
-        return id;
+    public Integer getRoomMax() {
+        return roomMax;
     }
 
-    public void setId(Integer id) {
-        this.id = id;
+    public void setRoomMax(Integer roomMax) {
+        this.roomMax = roomMax;
     }
 
-    public Integer getCorp_id() {
-        return corp_id;
+    public Date getDeletedAt() {
+        return deletedAt;
     }
 
-    public void setCorp_id(Integer corp_id) {
-        this.corp_id = corp_id;
+    public void setDeletedAt(Date deletedAt) {
+        this.deletedAt = deletedAt;
     }
 
-    public String getWx_chat_id() {
-        return wx_chat_id;
+    public Integer getCompanyGroupId() {
+        return companyGroupId;
     }
 
-    public void setWx_chat_id(String wx_chat_id) {
-        this.wx_chat_id = wx_chat_id;
+    public void setCompanyGroupId(Integer companyGroupId) {
+        this.companyGroupId = companyGroupId;
     }
 
-    public String getName() {
-        return name;
+    public String getCorpName() {
+        return corpName;
     }
 
-    public void setName(String name) {
-        this.name = name;
+    public void setCorpName(String corpName) {
+        this.corpName = corpName;
     }
 
-    public Integer getOwner_id() {
-        return owner_id;
+    public String getEmployeeName() {
+        return employeeName;
     }
 
-    public void setOwner_id(Integer owner_id) {
-        this.owner_id = owner_id;
+    public void setEmployeeName(String employeeName) {
+        this.employeeName = employeeName;
     }
 
-    public String getNotice() {
-        return notice;
+    public Integer getTotalNum() {
+        return totalNum;
     }
 
-    public void setNotice(String notice) {
-        this.notice = notice;
+    public void setTotalNum(Integer totalNum) {
+        this.totalNum = totalNum;
     }
 
-    public Integer getStatus() {
-        return status;
+    public Integer getAddNum() {
+        return addNum;
     }
 
-    public void setStatus(Integer status) {
-        this.status = status;
+    public void setAddNum(Integer addNum) {
+        this.addNum = addNum;
     }
 
-    public Date getCreate_time() {
-        return create_time;
+    public Integer getLeftNum() {
+        return leftNum;
     }
 
-    public void setCreate_time(Date create_time) {
-        this.create_time = create_time;
+    public void setLeftNum(Integer leftNum) {
+        this.leftNum = leftNum;
     }
 
-    public Integer getRoom_max() {
-        return room_max;
+    public String getTagNames() {
+        return tagNames;
     }
 
-    public void setRoom_max(Integer room_max) {
-        this.room_max = room_max;
+    public void setTagNames(String tagNames) {
+        this.tagNames = tagNames;
     }
 
-    public Date getDeleted_at() {
-        return deleted_at;
+    public Integer getId() {
+        return id;
     }
 
-    public void setDeleted_at(Date deleted_at) {
-        this.deleted_at = deleted_at;
+    public void setId(Integer id) {
+        this.id = id;
     }
 
-    public Integer getCompany_group_id() {
-        return company_group_id;
+    public String getName() {
+        return name;
     }
 
-    public void setCompany_group_id(Integer company_group_id) {
-        this.company_group_id = company_group_id;
+    public void setName(String name) {
+        this.name = name;
     }
 
-    public String getCorp_name() {
-        return corp_name;
+    public String getNotice() {
+        return notice;
     }
 
-    public void setCorp_name(String corp_name) {
-        this.corp_name = corp_name;
+    public void setNotice(String notice) {
+        this.notice = notice;
     }
 
-    public String getEmployee_name() {
-        return employee_name;
+    public Integer getStatus() {
+        return status;
     }
 
-    public void setEmployee_name(String employee_name) {
-        this.employee_name = employee_name;
+    public void setStatus(Integer status) {
+        this.status = status;
     }
 
-
 }

+ 4 - 4
src/main/java/com/mokamrp/privates/service/impl/WorkRoomServiceImpl.java

@@ -111,9 +111,9 @@ public class WorkRoomServiceImpl extends ServiceImpl<WorkRoomMapper, WorkRoom> i
                     BeanUtils.copyProperties(WorkRwoomVo, detail);
                     if(dataById.get(detail.getId()) != null){
                         ;
-                        detail.setTotal_num((dataById.get(detail.getId()).get("total")));
-                        detail.setAdd_num(dataById.get(detail.getId()).get("add_num"));
-                        detail.setLeft_num(dataById.get(detail.getId()).get("left_num"));
+                        detail.setTotalNum((dataById.get(detail.getId()).get("total")));
+                        detail.setAddNum(dataById.get(detail.getId()).get("add_num"));
+                        detail.setLeftNum(dataById.get(detail.getId()).get("left_num"));
 
                     }
 
@@ -279,7 +279,7 @@ public class WorkRoomServiceImpl extends ServiceImpl<WorkRoomMapper, WorkRoom> i
 
         HashMap<String, Integer> tempSetAdd = new HashMap<String, Integer>();
         for (WorkContactRoomGroupDataVo o : todayAdds) {
-            if(dataById.get(o.getRoom_id())==null){//不存在
+            if(dataById.get(o.getRoom_id())==null){
                 temp.put("total",0);
                 temp.put("add_num",o.getNum());
                 temp.put("left_num",0);