Merge remote-tracking branch 'origin/master' into master

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/classSchedule/dao/ScheduleMonthMapper.java

@@ -1,8 +1,13 @@
 package com.github.zuihou.business.classSchedule.dao;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.github.zuihou.base.mapper.SuperMapper;
 import com.github.zuihou.business.classSchedule.entity.ScheduleMonth;
 
+import com.github.zuihou.database.mybatis.auth.DataScope;
+import com.github.zuihou.database.mybatis.conditions.query.QueryWrap;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 /**
@@ -17,4 +22,5 @@ import org.springframework.stereotype.Repository;
 @Repository
 public interface ScheduleMonthMapper extends SuperMapper<ScheduleMonth> {
 
+    IPage<ScheduleMonth> pageList(IPage<ScheduleMonth> page, @Param(Constants.WRAPPER) QueryWrap<ScheduleMonth> wrapper, DataScope dataScope);
 }

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/classSchedule/service/ScheduleMonthService.java

@@ -1,9 +1,11 @@
 package com.github.zuihou.business.classSchedule.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.zuihou.base.service.SuperService;
 import com.github.zuihou.business.classSchedule.dto.ScheduleMonthSaveDTO;
 import com.github.zuihou.business.classSchedule.dto.ScheduleMonthUpdateDTO;
 import com.github.zuihou.business.classSchedule.entity.ScheduleMonth;
+import com.github.zuihou.database.mybatis.conditions.query.QueryWrap;
 
 /**
  * <p>
@@ -33,4 +35,11 @@ public interface ScheduleMonthService extends SuperService<ScheduleMonth> {
      */
     Boolean delete(ScheduleMonth model);
 
+    /**
+     * 删除
+     *
+     * @param
+     * @return
+     */
+    IPage<ScheduleMonth> pageList(IPage<ScheduleMonth> page, QueryWrap<ScheduleMonth> wrapper);
 }

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/classSchedule/service/impl/ScheduleMonthServiceImpl.java

@@ -1,6 +1,7 @@
 package com.github.zuihou.business.classSchedule.service.impl;
 
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.zuihou.business.classSchedule.dao.ScheduleMonthMapper;
 import com.github.zuihou.business.classSchedule.dto.ScheduleMonthSaveDTO;
 import com.github.zuihou.business.classSchedule.dto.ScheduleMonthUpdateDTO;
@@ -9,7 +10,9 @@ import com.github.zuihou.business.classSchedule.service.ScheduleMonthService;
 import com.github.zuihou.base.service.SuperServiceImpl;
 
 import com.github.zuihou.business.modelingCenter.entity.MModuleInfo;
+import com.github.zuihou.database.mybatis.auth.DataScope;
 import com.github.zuihou.database.mybatis.conditions.Wraps;
+import com.github.zuihou.database.mybatis.conditions.query.QueryWrap;
 import com.github.zuihou.utils.BeanPlusUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -87,4 +90,9 @@ public class ScheduleMonthServiceImpl extends SuperServiceImpl<ScheduleMonthMapp
     public Boolean delete(ScheduleMonth model) {
         return removeById(model.getId());
     }
+
+    @Override
+    public IPage<ScheduleMonth> pageList(IPage<ScheduleMonth> page, QueryWrap<ScheduleMonth> wrapper) {
+        return baseMapper.pageList(page, wrapper, new DataScope());
+    }
 }

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/operationManagementCenter/service/impl/TaskServiceImpl.java

@@ -438,10 +438,10 @@ public class TaskServiceImpl extends SuperServiceImpl<TTaskMapper, TTask> implem
             }
 
             // 人工上下料没有程序的情况直接用工序时间
-            if (null != bomProcedureProgram && null != bomProcedureProgram.getRunTime()) {
+            if (null != bomProcedureProgram && null != bomProcedureProgram.getWorkTime()) {
                 candidateProcess.setProcedureId(bomProcedureProgram.getProcedureId());
-                candidateProcess.setDuration(bomProcedureProgram.getRunTime().intValue());
-                candidateProcess.setRunTime(bomProcedureProgram.getRunTime());
+                candidateProcess.setDuration(bomProcedureProgram.getWorkTime().intValue());
+                candidateProcess.setRunTime(bomProcedureProgram.getWorkTime());
             } else {
                 candidateProcess.setProcedureId(bomProcedure.getId());
                 //candidateProcess.setDuration(bomProcedure.getPrepareWorkhours().intValue() + bomProcedure.getRatedWorkhours().intValue());

imcs-admin-boot/imcs-business-biz/src/main/resources/mapper_business/base/classSchedule/ScheduleMonthMapper.xml

@@ -19,7 +19,16 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id,create_time,create_user,update_time,update_user,
-        year, month, audit_status, audit_user, audit_user_name
+        year, month, audit_status, audit_user, audit_user_name, org_id, applyDesc
     </sql>
 
+    <select id="pageList" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from (
+        select a.*,u.name as applyDesc, u.org_id from imcs_s_schedule_month a
+         left join c_auth_user u on u.id = a.create_user
+        ) s ${ew.customSqlSegment}
+    </select>
+
 </mapper>

imcs-admin-boot/imcs-business-biz/src/main/resources/mapper_business/base/classSchedule/ScheduleUserChangeMapper.xml

@@ -21,7 +21,7 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id,create_time,create_user,update_time,update_user,
-        apply_user_id, apply_time, change_user_id, change_time, audit_status, audit_user, audit_time,applyDesc,applyDictionary,changeDesc,changeDictionary
+        apply_user_id, apply_time, change_user_id, change_time, audit_status, audit_user, audit_time,applyDesc,applyDictionary,changeDesc,changeDictionary,org_id
     </sql>
 
     <!-- 分页 -->
@@ -29,7 +29,7 @@
         select
         <include refid="Base_Column_List"/>
         from (
-            select a.*,b.name as applyDesc,c.applyDictionary,d.name as changeDesc,f.changeDictionary from imcs_s_schedule_user_change a
+            select a.*,b.name as applyDesc,b.org_id, c.applyDictionary,d.name as changeDesc,f.changeDictionary from imcs_s_schedule_user_change a
             left join c_auth_user b on a.apply_user_id = b.id
             <!-- 申请人部分 -->
             left join (

imcs-admin-boot/imcs-business-controller/src/main/java/com/github/zuihou/business/controller/classSchedule/ScheduleMonthController.java

@@ -68,17 +68,10 @@ public class ScheduleMonthController extends SuperController<ScheduleMonthServic
         ScheduleMonth model = BeanUtil.toBean(params.getModel(),ScheduleMonth.class);
         QueryWrap<ScheduleMonth> wrapper = this.handlerWrapper(model, params);
         BaseContextHandler.setTenant("0000");
-        Long userId = BaseContextHandler.getUserId();
-        Map<String, Object> orgMap = userService.getDataScopeById(userId);
-        List<Long> orgIds = orgMap.containsKey("orgIds")? (List)orgMap.get("orgIds") : Lists.newArrayList();
-        if(CollectionUtil.isNotEmpty(orgIds)){
-            wrapper.in("org_id", orgIds);
-        }
-        baseService.page(page, wrapper);
+        baseService.pageList(page, wrapper);
     }
 
 
-
     @ApiOperation(value = "修改排班月份", notes = "修改排班月份")
     @PostMapping("/update")
     public R<ScheduleMonth> update(ScheduleMonthUpdateDTO model) {