update 日程安排修改

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/InspectionItemPlan.java

@@ -34,6 +34,12 @@ public class InspectionItemPlan {
     private Integer userId;
 
     /**
+     * 计划添加人
+     */
+    @ApiModelProperty(value = "计划添加人id")
+    private Integer operatorUserId;
+
+    /**
      * 日程开始时间
      */
     @ApiModelProperty(value = "日程开始时间")
@@ -313,4 +319,12 @@ public class InspectionItemPlan {
     public void setRealName(String realName) {
         this.realName = realName;
     }
+
+    public Integer getOperatorUserId() {
+        return operatorUserId;
+    }
+
+    public void setOperatorUserId(Integer operatorUserId) {
+        this.operatorUserId = operatorUserId;
+    }
 }

mec-biz/src/main/resources/config/mybatis/InspectionItemPlanMapper.xml

@@ -8,6 +8,7 @@
         <result column="inspection_id_" property="inspectionId"/>
         <result column="item_id_" property="itemId"/>
         <result column="user_id_" property="userId"/>
+        <result column="operator_user_id" property="operatorUserId"/>
         <result column="plan_start_" property="planStart"/>
         <result column="plan_end_" property="planEnd"/>
         <result column="organ_id_" property="organId"/>
@@ -26,17 +27,9 @@
         <result column="organName" property="organName"/>
         <result column="realName" property="realName"/>
     </resultMap>
-    <sql id="Base_Column_List">
-        <!--@mbg.generated-->
-        id_, inspection_id_, item_id_, user_id_, plan_start_, plan_end_,organ_id_, cooperation_organ_id_,
-        music_group_id_, school_gps_, submited_gps_, submited_time_, memo_, conclusion_status_, status_, create_time_,
-        update_time_
-    </sql>
     <select id="get" parameterType="java.lang.Long" resultMap="InspectionItemPlan">
         <!--@mbg.generated-->
-        select
-        <include refid="Base_Column_List"/>
-        from inspection_item_plan
+        select * from inspection_item_plan
         where id_ = #{id}
     </select>
     <delete id="delete" parameterType="java.lang.Long">
@@ -47,11 +40,11 @@
     <insert id="insert" keyColumn="id_" keyProperty="id" parameterType="com.ym.mec.biz.dal.entity.InspectionItemPlan"
             useGeneratedKeys="true">
         <!--@mbg.generated-->
-        insert into inspection_item_plan (inspection_id_, item_id_, user_id_, plan_start_, plan_end_,
+        insert into inspection_item_plan (inspection_id_, item_id_, user_id_,operator_user_id, plan_start_, plan_end_,
         organ_id_,cooperation_organ_id_,
         music_group_id_, school_gps_, submited_gps_, submited_time_, memo_, conclusion_status_, status_,
         create_time_, update_time_)
-        values (#{inspectionId}, #{itemId}, #{userId}, #{planStart}, #{planEnd}, #{organId},#{cooperationOrganId},
+        values (#{inspectionId}, #{itemId}, #{userId},#{operatorUserId}, #{planStart}, #{planEnd}, #{organId},#{cooperationOrganId},
         #{musicGroupId}, #{schoolGps}, #{submitedGps}, #{submitedTime}, #{memo},#{conclusionStatus},#{status},
         #{createTime}, #{updateTime})
     </insert>
@@ -68,6 +61,9 @@
             <if test="userId != null">
                 user_id_ = #{userId},
             </if>
+            <if test="operatorUserId != null">
+                operator_user_id = #{userId},
+            </if>
             <if test="planStart != null">
                 plan_start_ = #{planStart},
             </if>

mec-web/src/main/java/com/ym/mec/web/controller/InspectionItemPlanController.java

@@ -47,7 +47,7 @@ public class InspectionItemPlanController extends BaseController {
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
-        inspectionItemPlan.setUserId(sysUser.getId());
+        inspectionItemPlan.setOperatorUserId(sysUser.getId());
         return succeed(inspectionItemPlanService.add(inspectionItemPlan));
     }
 
@@ -59,7 +59,7 @@ public class InspectionItemPlanController extends BaseController {
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
-        inspectionItemPlan.setUserId(sysUser.getId());
+        inspectionItemPlan.setOperatorUserId(sysUser.getId());
         inspectionItemPlanService.updatePlan(inspectionItemPlan);
         return succeed(inspectionItemPlan);
     }
@@ -72,27 +72,24 @@ public class InspectionItemPlanController extends BaseController {
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
-            Employee employee = employeeDao.get(sysUser.getId());
-            if (StringUtils.isEmpty(queryInfo.getOrganId())) {
-                queryInfo.setOrganId(employee.getOrganIdList());
-            } else if (StringUtils.isEmpty(employee.getOrganIdList())) {
-                return failed("用户所在分部异常");
-            } else {
-                List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
-                if (!list.containsAll(Arrays.asList(queryInfo.getOrganId().split(",")))) {
-                    return failed("非法请求");
-                }
+        Employee employee = employeeDao.get(sysUser.getId());
+        if (StringUtils.isEmpty(queryInfo.getOrganId())) {
+            queryInfo.setOrganId(employee.getOrganIdList());
+        } else if (StringUtils.isEmpty(employee.getOrganIdList())) {
+            return failed("用户所在分部异常");
+        } else {
+            List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
+            if (!list.containsAll(Arrays.asList(queryInfo.getOrganId().split(",")))) {
+                return failed("非法请求");
             }
+        }
         if (queryInfo.getStartTime() != null) {
             queryInfo.setStartTime(DateUtil.trunc(queryInfo.getStartTime()));
         }
         if (queryInfo.getEndTime() != null) {
             queryInfo.setEndTime(DateUtil.getLastTimeWithDay(queryInfo.getEndTime()));
         }
-        if (queryInfo.getItemId() != null) {
-            queryInfo.setUserId(sysUser.getId());
-        }
-        String startTime = DateUtil.format(DateUtil.getFirstDayOfMonth(DateUtil.addMonths(new Date(), -2)),DateUtil.ISO_EXPANDED_DATE_FORMAT);
+        String startTime = DateUtil.format(DateUtil.getFirstDayOfMonth(DateUtil.addMonths(new Date(), -2)), DateUtil.ISO_EXPANDED_DATE_FORMAT);
         queryInfo.setSearchStartTime(startTime);
         return succeed(inspectionItemPlanService.queryPage(queryInfo));
     }
@@ -109,6 +106,7 @@ public class InspectionItemPlanController extends BaseController {
         InspectionItemPlan inspectionItemPlan = inspectionItemPlanService.get(id);
         inspectionItemPlan.setMemo(memo);
         inspectionItemPlan.setUpdateTime(new Date());
+        inspectionItemPlan.setOperatorUserId(sysUser.getId());
         inspectionItemPlanService.update(inspectionItemPlan);
         return succeed(inspectionItemPlan);
     }
@@ -117,12 +115,8 @@ public class InspectionItemPlanController extends BaseController {
     @ApiOperation(value = "获取乐团主管的乐团")
     @GetMapping("/getMusicGroup")
     @PreAuthorize("@pcs.hasPermissions('inspectionItemPlan/getMusicGroup')")
-    public HttpResponseResult<List<MusicGroup>> getMusicGroup(Integer organId, String search) {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null) {
-            return failed("用户信息获取失败");
-        }
-        return succeed(musicGroupDao.getByEduTeacher(organId, sysUser.getId(), search));
+    public HttpResponseResult<List<MusicGroup>> getMusicGroup(Integer organId,Integer userId, String search) {
+        return succeed(musicGroupDao.getByEduTeacher(organId, userId, search));
     }
 
 }