工人上下料站智能操作正在进行中的工序，已完成改成分页根据当前登录用户查询自己已完成的任务，工人操作了task表更新用户改成工人

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/operationManagementCenter/dao/TaskLoadUnloadBizMapper.java

@@ -0,0 +1,23 @@
+package com.github.zuihou.business.operationManagementCenter.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.operationManagementCenter.entity.TTask;
+import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+/**
+ * <p>
+ * Mapper 接口
+ * 工人上下料任务
+ * </p>
+ *
+ * @author imcs
+ * @date 2020-12-29
+ */
+@Repository
+public interface TaskLoadUnloadBizMapper extends SuperMapper<TTask> {
+    IPage<TTask> pageList(IPage page,   @Param(Constants.WRAPPER) LbqWrapper<TTask> wrapper);
+}

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

@@ -0,0 +1,20 @@
+package com.github.zuihou.business.operationManagementCenter.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.zuihou.base.service.SuperService;
+import com.github.zuihou.business.operationManagementCenter.entity.TTask;
+import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
+
+/**
+ * <p>
+ * 业务接口
+ * 工人上下料
+ * </p>
+ *
+ * @author imcs
+ * @date 2020-12-29
+ */
+public interface TaskLoadUnloadBizService extends SuperService<TTask> {
+
+    IPage<TTask> pageList(IPage<TTask> page, LbqWrapper<TTask> wrapper);
+}

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

@@ -0,0 +1,30 @@
+package com.github.zuihou.business.operationManagementCenter.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.zuihou.base.service.SuperServiceImpl;
+import com.github.zuihou.business.operationManagementCenter.dao.TaskBizMapper;
+import com.github.zuihou.business.operationManagementCenter.dao.TaskLoadUnloadBizMapper;
+import com.github.zuihou.business.operationManagementCenter.entity.TTask;
+import com.github.zuihou.business.operationManagementCenter.service.TaskBizService;
+import com.github.zuihou.business.operationManagementCenter.service.TaskLoadUnloadBizService;
+import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 业务实现类
+ * 工人上下料任务
+ * </p>
+ *
+ * @author imcs
+ * @date 2020-12-29
+ */
+@Slf4j
+@Service
+public class TaskLoadUnloadBizServiceImpl extends SuperServiceImpl<TaskLoadUnloadBizMapper, TTask> implements TaskLoadUnloadBizService {
+    @Override
+    public IPage<TTask> pageList(IPage<TTask> page, LbqWrapper<TTask> wrapper) {
+        return baseMapper.pageList(page, wrapper);
+    }
+}

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

@@ -1461,6 +1461,9 @@ public class TaskNodeServiceImpl extends SuperServiceImpl<TaskNodeMapper, TaskNo
 
             msgUtil.redis_set(CacheKey.TASK_CURRENT_NODE_PERCENT + "_" + task.getResourceId(), numberFormat.format(100 * (float) (n + 1) / (float) taskNodeList.size()));
             task.setProcess(Double.parseDouble(numberFormat.format(100 * (float) (n + 1) / (float) taskNodeList.size())));
+            if(null != callBackJson.getString("updateUser")){
+                task.setUpdateUser(Long.valueOf(callBackJson.getString("updateUser")));
+            }
 
             if (this.isLastTask(n, taskNode, taskNodeList)) {
                 task.setStatus("3").setEndTime(new Date());

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

@@ -1061,6 +1061,7 @@ public class TaskServiceImpl extends SuperServiceImpl<TTaskMapper, TTask> implem
             // 调用rfid读取接口判断rfid里面是否子盘信息，写入原材料信息
 
             String processType = map.get("processType").toString();
+            String updateUser = map.get("updateUser").toString();
             // 判断当前工件是否存在夹具，没有夹具stock表插入夹具信息
 //            List<StockInfo> stockInfos = stockInfoService.list(Wraps.<StockInfo>lbQ().eq(StockInfo::getCompleteBatchNo, tTask.getCompleteBatchNo()));
 //
@@ -1090,6 +1091,7 @@ public class TaskServiceImpl extends SuperServiceImpl<TTaskMapper, TTask> implem
 
             Storge currstorge = workpieceService.getWorkPieceStock(taskNode.getCompleteBatchNo(), false);
             if(currstorge!=null){
+                jsonObject.put("updateUser", updateUser);
                 if("1".equals(processType)){
                     String meterialId = map.get("meterialId").toString();
                     String uniqueCode = map.get("uniqueCode").toString();

imcs-admin-boot/imcs-business-biz/src/main/resources/mapper_business/base/operationManagementCenter/TTaskLoadUnloadBizMapper.xml

@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.github.zuihou.business.operationManagementCenter.dao.TaskLoadUnloadBizMapper">
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.github.zuihou.business.operationManagementCenter.entity.TTask">
+        <id column="id" jdbcType="BIGINT" property="id"/>
+        <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
+        <result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
+        <result column="update_user" jdbcType="VARCHAR" property="updateUser"/>
+        <result column="order_id" jdbcType="BIGINT" property="orderId"/>
+        <result column="order_no" jdbcType="VARCHAR" property="orderNo"/>
+        <result column="plan_id" jdbcType="BIGINT" property="planId"/>
+        <result column="plan_no" jdbcType="VARCHAR" property="planNo"/>
+        <result column="resource_id" jdbcType="BIGINT" property="resourceId"/>
+        <result column="procedure_id" jdbcType="BIGINT" property="procedureId"/>
+        <result column="procedure_name" jdbcType="BIGINT" property="procedureName"/>
+        <result column="task_no" jdbcType="VARCHAR" property="taskNo"/>
+        <result column="status" jdbcType="VARCHAR" property="status"/>
+        <result column="expect_start_time" jdbcType="TIMESTAMP" property="expectStartTime"/>
+        <result column="expect_end_time" jdbcType="TIMESTAMP" property="expectEndTime"/>
+        <result column="start_time" jdbcType="TIMESTAMP" property="startTime"/>
+        <result column="end_time" jdbcType="TIMESTAMP" property="endTime"/>
+        <result column="create_user" jdbcType="VARCHAR" property="createUser"/>
+        <result column="prority" jdbcType="INTEGER" property="prority"/>
+        <result column="draft_flag" jdbcType="VARCHAR" property="draftFlag"/>
+        <result column="executor_id" jdbcType="BIGINT" property="executorId"/>
+        <result column="executor_type" jdbcType="VARCHAR" property="executorType"/>
+        <result column="executor_name" jdbcType="BIGINT" property="executorName"/>
+        <result column="procedure_meterial_id" jdbcType="BIGINT" property="procedureMeterialId"/>
+        <result column="procedure_tray_group_id" jdbcType="BIGINT" property="procedureTrayGroupId"/>
+        <result column="procedure_program_id" jdbcType="BIGINT" property="procedureProgramId"/>
+        <result column="task_batch_no" jdbcType="VARCHAR" property="taskBatchNo"/>
+        <result column="bom_batch_no" jdbcType="VARCHAR" property="bomBatchNo"/>
+        <result column="procedure_no" jdbcType="VARCHAR" property="procedureNo"/>
+        <result column="process" jdbcType="FLOAT" property="process"/>
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id,
+    </sql>
+
+    <!-- 分页 -->
+    <select id="pageList" resultType="com.github.zuihou.business.operationManagementCenter.entity.TTask">
+    select
+        *,(activeTime - ratedWorkHours) AS overTime
+    from (
+        SELECT
+          itt.id,
+          ibb.name,
+          itt.procedure_no,
+          itt.procedure_name,
+          ibbp.rated_workHours AS ratedWorkHours,
+          TIMESTAMPDIFF(MINUTE, itt.start_time, itt.end_time) AS activeTime,
+          itt.start_time,
+          itt.end_time,
+          itt.status,
+          itt.update_user
+        FROM imcs_t_task itt,
+             imcs_b_bom_procedure ibbp,
+             imcs_b_bom ibb
+        WHERE 1=1
+        AND itt.status = '3'
+        AND itt.procedure_id = ibbp.id
+        AND itt.bom_id = ibb.id) s ${ew.customSqlSegment}
+    </select>
+
+</mapper>

imcs-admin-boot/imcs-business-biz/src/main/resources/mapper_business/base/operationManagementCenter/TTaskMapper.xml

@@ -286,15 +286,16 @@
           imm.meterial_code AS meterialCode,
           imm.equipment_name AS equipmentName,
           imm.trade_mark AS tradeMark,
-          ibbpt.armor_pic AS armorPic
+          ibbpt.armor_pic AS armorPic,
+          (select ittn.interface_type  from imcs_t_task_node ittn where ittn.task_id = itt.id and exe_status = '2') AS interfaceType
         FROM imcs_t_task itt,
              imcs_b_bom_procedure ibbp,
              imcs_b_bom_procedure_tray ibbpt,
              imcs_b_bom ibb,
-
              imcs_m_frock_clamp imfc,
              imcs_m_meterial imm
-        WHERE itt.status IN  ('1','2')
+        WHERE 1=1
+        AND itt.status IN  ('1','2')
         AND ibbp.id = itt.procedure_id
         AND ibbp.bom_id = ibb.id
         AND ibbpt.procedure_id = ibbp.id

imcs-admin-boot/imcs-business-controller/src/main/java/com/github/zuihou/business/controller/operationManagementCenter/TaskLoadUnloadBizController.java

@@ -0,0 +1,48 @@
+package com.github.zuihou.business.controller.operationManagementCenter;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.zuihou.base.controller.SuperController;
+import com.github.zuihou.base.request.PageParams;
+import com.github.zuihou.business.operationManagementCenter.dto.TTaskPageDTO;
+import com.github.zuihou.business.operationManagementCenter.dto.TTaskSaveDTO;
+import com.github.zuihou.business.operationManagementCenter.dto.TTaskUpdateDTO;
+import com.github.zuihou.business.operationManagementCenter.entity.TTask;
+import com.github.zuihou.business.operationManagementCenter.service.TaskBizService;
+import com.github.zuihou.business.operationManagementCenter.service.TaskLoadUnloadBizService;
+import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
+import com.github.zuihou.database.mybatis.conditions.query.QueryWrap;
+import com.github.zuihou.log.annotation.SysLog;
+import io.swagger.annotations.Api;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+/**
+ * <p>
+ * 前端控制器
+ * 计划表
+ * </p>
+ *
+ * @author imcs
+ * @date 2020-12-29
+ */
+@Slf4j
+@Validated
+@RestController
+@RequestMapping("/taskLoadUnload")
+@Api(value = "taskLoadUnload", tags = "人工上下料")
+@SysLog(enabled = true)
+public class TaskLoadUnloadBizController extends SuperController<TaskLoadUnloadBizService, Long, TTask, TTaskPageDTO, TTaskSaveDTO, TTaskUpdateDTO> {
+    @Override
+    public void query(PageParams<TTaskPageDTO> params, IPage<TTask> page, Long defSize) {
+        TTaskPageDTO data = params.getModel();
+        QueryWrap<TTask> wrap = handlerWrapper(null, params);
+        LbqWrapper<TTask> wrapper = wrap.lambda();
+        TTask task = BeanUtil.toBean(data, TTask.class);
+        wrapper.eq(TTask::getUpdateUser,task.getUpdateUser()).orderByDesc(TTask::getEndTime);
+        baseService.pageList(page, wrapper);
+    }
+}

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/operationManagementCenter/dto/TTaskPageDTO.java

@@ -160,4 +160,6 @@ public class TTaskPageDTO implements Serializable {
     @ApiModelProperty(value = "完整产品加工批次号(一个bom的完整流程的批次号)")
     @Length(max = 36, message = "完整产品加工批次号(一个bom的完整流程的批次号)长度不能超过36")
     private String completeBatchNo;
+
+    private Long updateUser;
 }

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/operationManagementCenter/entity/TTask.java

@@ -578,6 +578,14 @@ public class TTask extends Entity<Long> implements Serializable {
     @TableField(exist = false)
     private String resourceName;
 
+
+    @TableField(exist = false)
+    private String name;
+    @TableField(exist = false)
+    private String activeTime;
+    @TableField(exist = false)
+    private int overTime;
+
     @Override
     public String toString() {
         return "TTask{" +