Parcourir la source

优化周期性

wuxw il y a 2 ans
Parent
commit
1e6ca047e8

+ 67 - 48
java110-bean/src/main/java/com/java110/dto/workCycle/WorkCycleDto.java

@@ -1,6 +1,7 @@
 package com.java110.dto.workCycle;
 
 import com.java110.dto.PageDto;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -15,19 +16,18 @@ import java.util.Date;
 public class WorkCycleDto extends PageDto implements Serializable {
 
     private String workCycle;
-private String period;
-private String beforeTime;
-private String cycleId;
-private String periodWorkday;
-private String cycleStartTime;
-private String storeId;
-private String workId;
-private String cycleEndTime;
-private String staffName;
-private String periodMonth;
-private String communityId;
-private String staffId;
-private String periodDay;
+    private String period;
+    private String beforeTime;
+    private String cycleId;
+    private String periodWorkday;
+    private String hours;
+    private String storeId;
+    private String workId;
+    private String staffName;
+    private String periodMonth;
+    private String communityId;
+    private String staffId;
+    private String periodDay;
 
 
     private Date createTime;
@@ -38,85 +38,96 @@ private String periodDay;
     public String getWorkCycle() {
         return workCycle;
     }
-public void setWorkCycle(String workCycle) {
+
+    public void setWorkCycle(String workCycle) {
         this.workCycle = workCycle;
     }
-public String getPeriod() {
+
+    public String getPeriod() {
         return period;
     }
-public void setPeriod(String period) {
+
+    public void setPeriod(String period) {
         this.period = period;
     }
-public String getBeforeTime() {
+
+    public String getBeforeTime() {
         return beforeTime;
     }
-public void setBeforeTime(String beforeTime) {
+
+    public void setBeforeTime(String beforeTime) {
         this.beforeTime = beforeTime;
     }
-public String getCycleId() {
+
+    public String getCycleId() {
         return cycleId;
     }
-public void setCycleId(String cycleId) {
+
+    public void setCycleId(String cycleId) {
         this.cycleId = cycleId;
     }
-public String getPeriodWorkday() {
+
+    public String getPeriodWorkday() {
         return periodWorkday;
     }
-public void setPeriodWorkday(String periodWorkday) {
+
+    public void setPeriodWorkday(String periodWorkday) {
         this.periodWorkday = periodWorkday;
     }
-public String getCycleStartTime() {
-        return cycleStartTime;
-    }
-public void setCycleStartTime(String cycleStartTime) {
-        this.cycleStartTime = cycleStartTime;
-    }
-public String getStoreId() {
+
+    public String getStoreId() {
         return storeId;
     }
-public void setStoreId(String storeId) {
+
+    public void setStoreId(String storeId) {
         this.storeId = storeId;
     }
-public String getWorkId() {
+
+    public String getWorkId() {
         return workId;
     }
-public void setWorkId(String workId) {
+
+    public void setWorkId(String workId) {
         this.workId = workId;
     }
-public String getCycleEndTime() {
-        return cycleEndTime;
-    }
-public void setCycleEndTime(String cycleEndTime) {
-        this.cycleEndTime = cycleEndTime;
-    }
-public String getStaffName() {
+
+    public String getStaffName() {
         return staffName;
     }
-public void setStaffName(String staffName) {
+
+    public void setStaffName(String staffName) {
         this.staffName = staffName;
     }
-public String getPeriodMonth() {
+
+    public String getPeriodMonth() {
         return periodMonth;
     }
-public void setPeriodMonth(String periodMonth) {
+
+    public void setPeriodMonth(String periodMonth) {
         this.periodMonth = periodMonth;
     }
-public String getCommunityId() {
+
+    public String getCommunityId() {
         return communityId;
     }
-public void setCommunityId(String communityId) {
+
+    public void setCommunityId(String communityId) {
         this.communityId = communityId;
     }
-public String getStaffId() {
+
+    public String getStaffId() {
         return staffId;
     }
-public void setStaffId(String staffId) {
+
+    public void setStaffId(String staffId) {
         this.staffId = staffId;
     }
-public String getPeriodDay() {
+
+    public String getPeriodDay() {
         return periodDay;
     }
-public void setPeriodDay(String periodDay) {
+
+    public void setPeriodDay(String periodDay) {
         this.periodDay = periodDay;
     }
 
@@ -136,4 +147,12 @@ public void setPeriodDay(String periodDay) {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String getHours() {
+        return hours;
+    }
+
+    public void setHours(String hours) {
+        this.hours = hours;
+    }
 }

+ 74 - 53
java110-bean/src/main/java/com/java110/po/workCycle/WorkCyclePo.java

@@ -17,6 +17,7 @@ package com.java110.po.workCycle;
 
 import java.io.Serializable;
 import java.util.Date;
+
 /**
  * 类表述: Po 数据模型实体对象 基本保持与数据库模型一直 用于 增加修改删除 等时的数据载体
  * add by 吴学文 at 2023-12-25 15:38:11 mail: 928255095@qq.com
@@ -28,111 +29,131 @@ import java.util.Date;
 public class WorkCyclePo implements Serializable {
 
     private String workCycle;
-private String period;
-private String beforeTime;
-private String cycleId;
-private String periodWorkday;
-private String statusCd = "0";
-private String cycleStartTime;
-private String storeId;
-private String workId;
-private String cycleEndTime;
-private String staffName;
-private String periodMonth;
-private String communityId;
-private String staffId;
-private String periodDay;
-public String getWorkCycle() {
+    private String period;
+    private String beforeTime;
+    private String cycleId;
+    private String periodWorkday;
+    private String statusCd = "0";
+    private String hours;
+
+    private String storeId;
+    private String workId;
+    private String staffName;
+    private String periodMonth;
+    private String communityId;
+    private String staffId;
+    private String periodDay;
+
+    public String getWorkCycle() {
         return workCycle;
     }
-public void setWorkCycle(String workCycle) {
+
+    public void setWorkCycle(String workCycle) {
         this.workCycle = workCycle;
     }
-public String getPeriod() {
+
+    public String getPeriod() {
         return period;
     }
-public void setPeriod(String period) {
+
+    public void setPeriod(String period) {
         this.period = period;
     }
-public String getBeforeTime() {
+
+    public String getBeforeTime() {
         return beforeTime;
     }
-public void setBeforeTime(String beforeTime) {
+
+    public void setBeforeTime(String beforeTime) {
         this.beforeTime = beforeTime;
     }
-public String getCycleId() {
+
+    public String getCycleId() {
         return cycleId;
     }
-public void setCycleId(String cycleId) {
+
+    public void setCycleId(String cycleId) {
         this.cycleId = cycleId;
     }
-public String getPeriodWorkday() {
+
+    public String getPeriodWorkday() {
         return periodWorkday;
     }
-public void setPeriodWorkday(String periodWorkday) {
+
+    public void setPeriodWorkday(String periodWorkday) {
         this.periodWorkday = periodWorkday;
     }
-public String getStatusCd() {
+
+    public String getStatusCd() {
         return statusCd;
     }
-public void setStatusCd(String statusCd) {
+
+    public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
-public String getCycleStartTime() {
-        return cycleStartTime;
-    }
-public void setCycleStartTime(String cycleStartTime) {
-        this.cycleStartTime = cycleStartTime;
-    }
-public String getStoreId() {
+
+    public String getStoreId() {
         return storeId;
     }
-public void setStoreId(String storeId) {
+
+    public void setStoreId(String storeId) {
         this.storeId = storeId;
     }
-public String getWorkId() {
+
+    public String getWorkId() {
         return workId;
     }
-public void setWorkId(String workId) {
+
+    public void setWorkId(String workId) {
         this.workId = workId;
     }
-public String getCycleEndTime() {
-        return cycleEndTime;
-    }
-public void setCycleEndTime(String cycleEndTime) {
-        this.cycleEndTime = cycleEndTime;
-    }
-public String getStaffName() {
+
+
+    public String getStaffName() {
         return staffName;
     }
-public void setStaffName(String staffName) {
+
+    public void setStaffName(String staffName) {
         this.staffName = staffName;
     }
-public String getPeriodMonth() {
+
+    public String getPeriodMonth() {
         return periodMonth;
     }
-public void setPeriodMonth(String periodMonth) {
+
+    public void setPeriodMonth(String periodMonth) {
         this.periodMonth = periodMonth;
     }
-public String getCommunityId() {
+
+    public String getCommunityId() {
         return communityId;
     }
-public void setCommunityId(String communityId) {
+
+    public void setCommunityId(String communityId) {
         this.communityId = communityId;
     }
-public String getStaffId() {
+
+    public String getStaffId() {
         return staffId;
     }
-public void setStaffId(String staffId) {
+
+    public void setStaffId(String staffId) {
         this.staffId = staffId;
     }
-public String getPeriodDay() {
+
+    public String getPeriodDay() {
         return periodDay;
     }
-public void setPeriodDay(String periodDay) {
+
+    public void setPeriodDay(String periodDay) {
         this.periodDay = periodDay;
     }
 
+    public String getHours() {
+        return hours;
+    }
 
-
+    public void setHours(String hours) {
+        this.hours = hours;
+    }
 }

Fichier diff supprimé car celui-ci est trop grand
+ 149 - 158
java110-db/src/main/resources/mapper/oa/WorkCycleV1ServiceDaoImplMapper.xml


+ 5 - 5
service-oa/src/main/java/com/java110/oa/dao/impl/WorkCycleV1ServiceDaoImpl.java

@@ -71,9 +71,9 @@ public class WorkCycleV1ServiceDaoImpl extends BaseServiceDao implements IWorkCy
     public List<Map> getWorkCycleInfo(Map info) throws DAOException {
         logger.debug("查询 getWorkCycleInfo 入参 info : {}",info);
 
-        List<Map> businessWorkCycleInfos = sqlSessionTemplate.selectList("workCycleV1ServiceDaoImpl.getWorkCycleInfo",info);
+        List<Map> infos = sqlSessionTemplate.selectList("workCycleV1ServiceDaoImpl.getWorkCycleInfo",info);
 
-        return businessWorkCycleInfos;
+        return infos;
     }
 
 
@@ -100,12 +100,12 @@ public class WorkCycleV1ServiceDaoImpl extends BaseServiceDao implements IWorkCy
     public int queryWorkCyclesCount(Map info) {
         logger.debug("查询 queryWorkCyclesCount 入参 info : {}",info);
 
-        List<Map> businessWorkCycleInfos = sqlSessionTemplate.selectList("workCycleV1ServiceDaoImpl.queryWorkCyclesCount", info);
-        if (businessWorkCycleInfos.size() < 1) {
+        List<Map> infos = sqlSessionTemplate.selectList("workCycleV1ServiceDaoImpl.queryWorkCyclesCount", info);
+        if (infos.size() < 1) {
             return 0;
         }
 
-        return Integer.parseInt(businessWorkCycleInfos.get(0).get("count").toString());
+        return Integer.parseInt(infos.get(0).get("count").toString());
     }