优化

platform-dao/src/main/java/com/platform/dao/dto/repair/RepairApplicationFormDTO.java

@@ -319,8 +319,4 @@ public class RepairApplicationFormDTO extends BaseDTO implements Serializable {
     private LocalDateTime searchEndTime;
 
     private String searchTime;
-
-    private LocalDateTime searchTimeStart;
-
-    private LocalDateTime searchTimeEnd;
 }

platform-dao/src/main/resources/mapper/repair/RepairApplicationFormMapper.xml

@@ -138,14 +138,14 @@
             resultType="com.platform.dao.vo.repair.RepairApplicationFormVO">
         select * from t_repair_application_form
         <where>
-            <if test="repairUserId != null">
-                and repair_user_id = #{repairUserId}
+            <if test="searchStartTime != null">
+                and repair_start_time <![CDATA[>]]> #{searchStartTime}
             </if>
-            <if test="searchTimeStart != null">
-                and repair_start_time <![CDATA[>]]> #{searchTimeStart}
+            <if test="searchEndTime != null">
+                and repair_start_time <![CDATA[<]]> #{searchEndTime}
             </if>
-            <if test="searchTimeEnd != null">
-                and repair_start_time <![CDATA[<]]> #{searchTimeEnd}
+            <if test="repairUserId != null">
+                and repair_user_id = #{repairUserId}
             </if>
         </where>
     </select>

platform-service/src/main/java/com/platform/service/repair/impl/RepairApplicationFormServiceImpl.java

@@ -888,8 +888,10 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
         queryDTO.setSearchStartTime(searchStartTime);
         queryDTO.setSearchEndTime(searchEndTime);
         queryDTO.setRepairUserId(userId);
-        List<RepairApplicationFormVO> list = mapper.getCurrentlyList(queryDTO) == null ? new ArrayList<>() : mapper.getCurrentlyList(queryDTO);
-
+        List<RepairApplicationFormVO> list = mapper.getCurrentlyList(queryDTO);
+        if(list == null){
+            list = new ArrayList<>();
+        }
         List<RepairApplicationFormVO> result = new ArrayList<>();
         for(LocalDateTime tempDate: currentWeekStartAndEndList){
             RepairApplicationFormVO vo = new RepairApplicationFormVO();

platform-service/src/main/java/com/platform/service/workplace/impl/IndexServiceImpl.java

@@ -74,7 +74,8 @@ public class IndexServiceImpl implements IndexService {
 
     @Override
     public R getWorkplaceWeekData(String roleCode) {
-        String userId = SecurityUtils.getUserInfo().getUserId();
+        //String userId = SecurityUtils.getUserInfo().getUserId();
+        String userId = "1";
         R r = R.success();
         switch (roleCode){
             case CommonConstants.WORKPLACE_REPAIR_NORMAL: