Parcourir la source

新增行政公出企业通知

anderx il y a 11 mois
Parent
commit
8786383b18

+ 2 - 2
src/main/java/com/goafanti/common/mapper/TaskDetailsMapper.xml

@@ -1324,8 +1324,8 @@ feature_other = values(feature_other)
             <if test="outSourcingStatus !=null">
                 and b.outsource= #{outSourcingStatus}
             </if>
-            <if test="updateTime !=null">
-                and a.update_time between #{updateTime} and #{updateTime} + interval 1 day
+            <if test="updateStartTime !=null and updateEndTime !=null">
+                and a.update_time between #{updateStartTime} and #{updateEndTime}
             </if>
             <if test="progress !=null">
                 and a.progress = #{progress}

+ 17 - 5
src/main/java/com/goafanti/techproject/bo/InputTaskDetailsBo.java

@@ -31,7 +31,11 @@ public class InputTaskDetailsBo {
     /**
      *更新时间
      */
-    private String updateTime;
+    private String updateStartTime;
+    /**
+     *更新时间
+     */
+    private String updateEndTime;
     /**
      *进度
      */
@@ -128,12 +132,20 @@ public class InputTaskDetailsBo {
         this.outSourcingStatus = outSourcingStatus;
     }
 
-    public String getUpdateTime() {
-        return updateTime;
+    public String getUpdateStartTime() {
+        return updateStartTime;
+    }
+
+    public void setUpdateStartTime(String updateStartTime) {
+        this.updateStartTime = updateStartTime;
+    }
+
+    public String getUpdateEndTime() {
+        return updateEndTime;
     }
 
-    public void setUpdateTime(String updateTime) {
-        this.updateTime = updateTime;
+    public void setUpdateEndTime(String updateEndTime) {
+        this.updateEndTime = updateEndTime;
     }
 
     public String getProgress() {

+ 1 - 1
src/main/java/com/goafanti/techproject/service/impl/TaskDetailsServiceImpl.java

@@ -98,7 +98,7 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
 
     @Override
     public Pagination<TaskDetailsBo> pushDetailsList(InputTaskDetailsBo in) {
-
+        if (StringUtils.isNotBlank(in.getUpdateEndTime()))in.setUpdateEndTime(in.getUpdateEndTime()+" 23:59:59");
         // 0=查询所有,1=查询自己,2=查询下级,3=负责人查询
         if (TokenManager.hasRole(AFTConstants.SUPERADMIN)||TokenManager.hasRole(AFTConstants.APPROVAL_DECISION)){
             in.setRoleStatus(0);