Jelajahi Sumber

修改stagename不存在的bug

seyason 4 tahun lalu
induk
melakukan
fddc1e5ca7

+ 0 - 1
fhKeeper/formulahousekeeper/inva_4_tivo/index.html

@@ -163,7 +163,6 @@
                                 <p>设计师填报工时,公司核算项目费用便捷准确。</p>
                             </div>
                         </div>
-                        
                 </div>
             </div>
             <div class="row">

+ 2 - 2
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/StagesController.java

@@ -119,7 +119,7 @@ public class StagesController {
             });
             stagesService.updateBatchById(afterList);
 
-            return list(item);
+            return msg;
         }
 
         return msg;
@@ -131,7 +131,7 @@ public class StagesController {
      * @return
      */
     @RequestMapping("/list")
-    public HttpRespMsg list(Stages item) {
+    public HttpRespMsg list(Stages item, String order, boolean isDesc) {
         HttpRespMsg msg = new HttpRespMsg();
         QueryWrapper<Stages> stagesQueryWrapper = new QueryWrapper<Stages>();
         stagesQueryWrapper.eq("group_id", item.getGroupId());

+ 7 - 1
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/TaskController.java

@@ -17,7 +17,9 @@ import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * <p>
@@ -278,7 +280,11 @@ public class TaskController {
         List<Task> list = taskService.list(queryWrapper);
         //设置列表名称
         list.forEach(item->{
-            item.setStagesName(stagesList.stream().filter(s->s.getId().equals(item.getStagesId())).findFirst().get().getStagesName());
+            Optional<Stages> first = stagesList.stream().filter(s -> s.getId().equals(item.getStagesId())).findFirst();
+            if (first.isPresent()) {
+                item.setStagesName(first.get().getStagesName());
+            }
+
         });
         msg.data = list;
         return msg;

+ 4 - 4
fhKeeper/formulahousekeeper/management-platform/src/main/resources/application.yml

@@ -14,12 +14,12 @@ spring:
       location: C:/upload/
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-#    url: jdbc:mysql://localhost:3306/man_hour_manager?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
-#    username: root
-#    password: p011430seya1026
-    url: jdbc:mysql://47.100.37.243:7644/man_dev?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+    url: jdbc:mysql://47.100.37.243:7644/man_hour_manager?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
     username: root
     password: Ziyu1026!@
+#    url: jdbc:mysql://47.100.37.243:7644/man_dev?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+#    username: root
+#    password: Ziyu1026!@
     hikari:
       maximum-pool-size: 10
       minimum-idle: 3