加入工作单功能

java110-bean/src/main/java/com/java110/dto/workPool/WorkPoolDto.java

@@ -28,10 +28,16 @@ public class WorkPoolDto extends PageDto implements Serializable {
     private String workName;
     private String workId;
     private String wtId;
+    private String typeName;
+
+
     private String createUserTel;
     private String startTime;
     private String endTime;
     private String state;
+
+    private String stateName;
+
     private String communityId;
 
     private String curStaffName;
@@ -43,6 +49,10 @@ public class WorkPoolDto extends PageDto implements Serializable {
 
     private String statusCd = "0";
 
+    private String queryEndTime;
+
+    private String queryStartTime;
+
 
     public String getWorkCycle() {
         return workCycle;
@@ -172,4 +182,36 @@ public class WorkPoolDto extends PageDto implements Serializable {
     public void setCurCopyName(String curCopyName) {
         this.curCopyName = curCopyName;
     }
+
+    public String getStateName() {
+        return stateName;
+    }
+
+    public void setStateName(String stateName) {
+        this.stateName = stateName;
+    }
+
+    public String getTypeName() {
+        return typeName;
+    }
+
+    public void setTypeName(String typeName) {
+        this.typeName = typeName;
+    }
+
+    public String getQueryEndTime() {
+        return queryEndTime;
+    }
+
+    public void setQueryEndTime(String queryEndTime) {
+        this.queryEndTime = queryEndTime;
+    }
+
+    public String getQueryStartTime() {
+        return queryStartTime;
+    }
+
+    public void setQueryStartTime(String queryStartTime) {
+        this.queryStartTime = queryStartTime;
+    }
 }

java110-db/src/main/resources/mapper/oa/WorkPoolV1ServiceDaoImplMapper.xml

@@ -21,8 +21,11 @@
         createUserId,t.create_user_name,t.create_user_name createUserName,t.status_cd,t.status_cd
         statusCd,t.store_id,t.store_id storeId,t.work_name,t.work_name workName,t.work_id,t.work_id
         workId,t.wt_id,t.wt_id wtId,t.create_user_tel,t.create_user_tel createUserTel,t.start_time,t.start_time
-        startTime,t.end_time,t.end_time endTime,t.state,t.community_id,t.community_id communityId
+        startTime,t.end_time,t.end_time endTime,t.state,t.community_id,t.community_id communityId,t.create_time createTime,
+        td.`name` stateName,wt.type_name typeName
         from work_pool t
+        left join work_type wt on t.wt_id = wt.wt_id
+        left join t_dict td on t.state = td.status_cd and td.table_name = 'work_pool' and td.table_columns = 'state'
         where 1 =1
         <if test="workCycle !=null and workCycle != ''">
             and t.work_cycle= #{workCycle}
@@ -57,6 +60,12 @@
         <if test="endTime !=null and endTime != ''">
             and t.end_time= #{endTime}
         </if>
+        <if test="queryStartTime !=null">
+            and t.create_time &gt;= #{queryStartTime}
+        </if>
+        <if test="queryEndTime !=null">
+            and t.create_time &lt;= #{queryEndTime}
+        </if>
         <if test="state !=null and state != ''">
             and t.state= #{state}
         </if>
@@ -155,6 +164,13 @@
         <if test="endTime !=null and endTime != ''">
             and t.end_time= #{endTime}
         </if>
+
+        <if test="queryStartTime !=null">
+            and t.create_time &gt;= #{queryStartTime}
+        </if>
+        <if test="queryEndTime !=null">
+            and t.create_time &lt;= #{queryEndTime}
+        </if>
         <if test="state !=null and state != ''">
             and t.state= #{state}
         </if>

service-oa/src/main/java/com/java110/oa/dao/impl/WorkPoolV1ServiceDaoImpl.java

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