wangbo преди 4 години
родител
ревизия
261bd43df3

+ 2 - 2
operation_manager/src/main/java/com/huaxu/task/controller/PlanManageController.java

@@ -92,9 +92,9 @@ public class PlanManageController {
         map.put("endDate",endDate);
         map.put("permissonType",loginUser.getPermissonType());
 
-
         IPage<List<PlanManage>> iPage = new Page<>(pageNum, pageSize);
 
+
 //        iPage = planManageService.selectPlanByIdAndDate(iPage, alarmSettingDto);
 //        Pagination<AlarmSettingDto> pages = new Pagination<>(iPage);
 //        for(AlarmSettingDto alarm : pages.getList()){
@@ -103,7 +103,7 @@ public class PlanManageController {
 //        }
 //        return new AjaxMessage<>(ResultStatus.OK, pages);
 
-//        List<PlanManage> list = planManageService.selectPlanByIdAndDate(map);
+        List<PlanManage> list = planManageService.selectPlanByIdAndDate(map);
 
 
 

+ 16 - 16
operation_manager/src/main/resources/mapper/task/PlanManageMapper.xml

@@ -26,25 +26,25 @@
     <result column="update_by" property="updateBy" jdbcType="VARCHAR" />
     <result column="date_update" property="dateUpdate" jdbcType="TIMESTAMP" />
 
-   <association property="planUser" javaType="com.huaxu.entity.UserEntity">
-      <id column="plan_user_id" property="id" jdbcType="INTEGER"/>
-      <result column="plan_user_name" property="username"/>
-    </association>
+<!--   <association property="planUser" javaType="com.huaxu.entity.UserEntity">-->
+<!--      <id column="plan_user_id" property="id" jdbcType="INTEGER"/>-->
+<!--      <result column="plan_user_name" property="username"/>-->
+<!--    </association>-->
 
-    <association property="user" javaType="com.huaxu.entity.UserEntity">
-      <id column="user_id" property="id" jdbcType="INTEGER"/>
-      <result column="user_name" property="username"/>
-    </association>
+<!--    <association property="user" javaType="com.huaxu.entity.UserEntity">-->
+<!--      <id column="user_id" property="id" jdbcType="INTEGER"/>-->
+<!--      <result column="user_name" property="username"/>-->
+<!--    </association>-->
 
-    <association property="createBy" javaType="com.huaxu.entity.UserEntity">
-      <id column="create_by_id" property="id" jdbcType="INTEGER"/>
-      <result column="create_by_name" property="username"/>
-    </association>
+<!--    <association property="createBy" javaType="com.huaxu.entity.UserEntity">-->
+<!--      <id column="create_by_id" property="id" jdbcType="INTEGER"/>-->
+<!--      <result column="create_by_name" property="username"/>-->
+<!--    </association>-->
 
-    <association property="updateBy" javaType="com.huaxu.entity.UserEntity">
-      <id column="update_by_id" property="id" jdbcType="INTEGER"/>
-      <result column="update_by_name" property="username"/>
-    </association>
+<!--    <association property="updateBy" javaType="com.huaxu.entity.UserEntity">-->
+<!--      <id column="update_by_id" property="id" jdbcType="INTEGER"/>-->
+<!--      <result column="update_by_name" property="username"/>-->
+<!--    </association>-->