Merge branch 'master' of http://47.100.37.243:10080/wutt/manHourHousekeeper

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/ProjectRequirementController.java

@@ -89,8 +89,8 @@ public class ProjectRequirementController {
             projectIds = taskGroups.stream().map(TaskGroup::getProjectId).collect(Collectors.toList());
         }
         List<ProjectRequirement> projectRequirements = projectRequirementMapper.customSelect(companyId, startDate, projectId, projectIds.size()==0?null:projectIds, startIndex, pageSize,reStartDate,reEndDate);
-        List<Integer> collect = projectRequirements.stream().map(pr -> pr.getProjectId()).collect(Collectors.toList());
-        List<Task> milepostList=taskMapper.selectMilepost(collect);
+        List<Integer> ids = projectRequirements.stream().map(pr -> pr.getProjectId()).collect(Collectors.toList());
+        List<Task> milepostList=taskMapper.selectMilepost(ids.size()==0?null:ids);
         projectRequirements.forEach(pr->{
             milepostList.forEach(mp->{
                 if(pr.getProjectId().equals(mp.getProjectId())){

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/User.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -175,6 +176,7 @@ public class User extends Model<User> {
     /**
      * 离职日期
      */
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     @TableField("inactive_date")
     private LocalDate inactiveDate;
 

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/mapper/TaskMapper.java

@@ -42,5 +42,5 @@ public interface TaskMapper extends BaseMapper<Task> {
     @Update("update task set executor_id = null, executor_name = null, executor_color=null where id=#{id}")
     void removeTaskExecutor(Integer id);
 
-    List<Task> selectMilepost(List<Integer> collect);
+    List<Task> selectMilepost(@Param("ids") List<Integer> ids);
 }

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/TaskMapper.xml

@@ -190,15 +190,23 @@
         and task_status = 0 order by task.id desc limit 50
     </select>
     <select id="selectMilepost" resultType="com.management.platform.entity.Task">
-        select * from task where task.project_id in
-        <foreach collection="list" index="index" item="item" open="(" close=")" separator=",">
-            #{item}
-        </foreach>
-        and task.task_type=1 and task.finish_date in
-        (select MAX(task.finish_date)from task where  task.project_id in
-        <foreach collection="list" index="index" item="item" open="(" close=")" separator=",">
-            #{item}
-        </foreach>
-         and task.task_type=1   group by project_id) group by task.project_id
+        select * from task where
+        task.task_type=1
+        <if test="ids!=null">
+        and task.project_id in
+            <foreach collection="ids" index="index" close=")" open="(" separator="," item="item">
+                #{item}
+            </foreach>
+        </if>
+        and task.finish_date in
+        (select MAX(task.finish_date)from task where
+        task.task_type=1
+        <if test="ids!=null">
+            and task.project_id in
+            <foreach collection="ids" index="index" close=")" open="(" separator="," item="item">
+                #{item}
+            </foreach>
+        </if>
+        group by project_id) group by task.project_id
     </select>
 </mapper>