pad接口调整：

1、pad首页工单查询
2、服务指令集查询
3、开始工单调整

nursing-unit-api/src/main/java/com/nu/modules/pad/directiveorder/api/ServiceOrderApi.java

@@ -39,18 +39,16 @@ public class ServiceOrderApi {
 
 
     /**
-     * todo 改成服务指令集
+     * 返回服务指令集详细信息
+     *
      * @param directiveOrderInfoEntity
      * @param req
      * @return
      */
     @ApiOperation(value = "服务指令工单-查询工单详细信息", notes = "服务指令工单-查询工单详细信息")
     @GetMapping(value = "/queryOrderInfoList")
-    public Result<List<DirectiveOrderInfoEntity>> queryOrderInfoList(DirectiveOrderInfoEntity directiveOrderInfoEntity, HttpServletRequest req) {
+    public Result<List<DirectiveOrderEntity>> queryOrderInfoList(DirectiveOrderEntity directiveOrderInfoEntity, HttpServletRequest req) {
-        if(StringUtils.isBlank(directiveOrderInfoEntity.getMainId())){
+        List<DirectiveOrderEntity> pageList = directiveOrderApi.queryOrderInfoList(directiveOrderInfoEntity,req);
-            return Result.error("请选择工单");
-        }
-        List<DirectiveOrderInfoEntity> pageList = directiveOrderApi.queryOrderInfoList(directiveOrderInfoEntity,req);
         return Result.OK(pageList);
     }
 

nursing-unit-common/src/main/java/com/nu/entity/DirectiveOrderEntity.java

@@ -180,4 +180,148 @@ public class DirectiveOrderEntity implements Serializable {
 
     /**所属部门*/
     private String sysOrgCode;
+
+
+    /**
+     * 长者体型标签ID（多个，逗号分隔）
+     */
+    private String bodyTagIds;
+    /**
+     * 长者体型标签名称（多个，逗号分隔）
+     */
+    private String bodyTagNames;
+    /**
+     * 长者体型标签价格（多个，逗号分隔）
+     */
+    private String bodyTagPrice;
+    /**
+     * 长者情绪标签ID（多个，逗号分隔）
+     */
+    private String emotionTagIds;
+    /**
+     * 长者情绪标签名称（多个，逗号分隔）
+     */
+    private String emotionTagNames;
+    /**
+     * 长者情绪标签价格（多个，逗号分隔）
+     */
+    private String emotionTagPrice;
+    /**
+     * 实际执行员工ID（多个，逗号分隔）； 主要执行人+协助人
+     */
+    private String employeeIds;
+    /**
+     * 实际执行员工姓名（多个，逗号分隔）； 主要执行人+协助人
+     */
+    private String employeeNames;
+    /**
+     * 服务属性  ds定时 js计时
+     */
+    private String serviceAttribute;
+    /**
+     * 服务预计开始时间
+     */
+    private Date servStartTime;
+    /**
+     * 服务预计结束时间
+     */
+    private Date servEndTime;
+    /**
+     * 员工预计开始时间
+     */
+    private Date empStartTime;
+    /**
+     * 员工预计结束时间
+     */
+    private Date empEndTime;
+    /**
+     * 服务工单预计开始时间
+     */
+    private Date orderStartTime;
+    /**
+     * 服务工单预计结束时间
+     */
+    private Date orderEndTime;
+    /**
+     * 工单执行状态（0待执行、1服务中、2正常完成、3超时完成 4未执行）
+     */
+    private String orderStatus;
+    /**
+     * tplink网络地址（多个，逗号分隔）
+     */
+    private String tplinkPath;
+    /**
+     * tplink监控视频上传任务ID
+     */
+    private String tplinkTaskId;
+    /**
+     * tplink监控视频上传进度(千分制）
+     */
+    private String tplinkrocess;
+    /**
+     * tplink切片md5
+     */
+    private String tplinkMd5;
+    /**
+     * tplink进度查询返回的状态码
+     */
+    private String tplinkResultCode;
+    /**
+     * tplink切片下载次数（次数到达乏值 - 系统参数  且没有 order_end_time 代表彻底失败）
+     */
+    private String tplinkDownCount;
+
+    /**
+     * 接单上限
+     */
+    @TableField(exist = false)
+    private Integer orderCap;
+    /**
+     * 最大时间
+     */
+    @TableField(exist = false)
+    private Date maxTime;
+    /**
+     * 单次
+     */
+    @TableField(exist = false)
+    private Integer orderNum;
+    /**
+     * 总服务时长
+     */
+    @TableField(exist = false)
+    private Integer totalDuration;
+    /**
+     * 总服务收益
+     */
+    @TableField(exist = false)
+    private BigDecimal totalComPrice;
+    /**
+     * 是否空闲 1空闲 0非空闲
+     */
+    @TableField(exist = false)
+    private Integer izFree;
+    /**
+     * 员工身上挂载的工单数，未完成工单即为挂单
+     */
+    @TableField(exist = false)
+    private Integer ownCn;
+    /**
+     * 服务指令id集合逗号分隔
+     */
+    @TableField(exist = false)
+    private String directiveIds;
+    /**
+     * 优先级 数值越高优先级越高
+     */
+    //空闲状态提高3级 指定护理员提高2级
+    @TableField(exist = false)
+    private Integer level;
+    @TableField(exist = false)
+    private String tableName;//表名字
+    /**
+     * 基础价格
+     */
+    @TableField(exist = false)
+    private java.math.BigDecimal totalPrice;
 }

nursing-unit-services/nu-services-api/nu-services-local-api/src/main/java/com/nu/modules/order/api/IDirectiveOrderApi.java

@@ -31,7 +31,7 @@ public interface IDirectiveOrderApi {
 
     IPage<DirectiveOrderEntity> queryOrderList(Integer pageNo, Integer pageSize, DirectiveOrderEntity directiveOrderEntity, HttpServletRequest req);
 
-    List<DirectiveOrderInfoEntity> queryOrderInfoList(DirectiveOrderInfoEntity directiveOrderInfoEntity, HttpServletRequest req);
+    List<DirectiveOrderEntity> queryOrderInfoList(DirectiveOrderEntity directiveOrderInfoEntity, HttpServletRequest req);
 
     Map<String, Object> editSubMp4(DirectiveOrderEntity directiveOrderEntity);
 

nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/entity/DirectiveOrder.java

@@ -216,7 +216,7 @@ public class DirectiveOrder implements Serializable {
     /**
      * tplink监控视频上传进度(千分制）
      */
-    private String tplinkrocess;
+    private String tplinkProcess;
     /**
      * tplink切片md5
      */

nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/mapper/DirectiveOrderInfoMapper.java

@@ -3,6 +3,8 @@ package com.nu.modules.biz.order.mapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.nu.entity.DirectiveOrderEntity;
+import com.nu.entity.DirectiveOrderInfoEntity;
 import com.nu.modules.biz.order.entity.DirectiveOrderInfo;
 import org.apache.ibatis.annotations.Param;
 
@@ -18,5 +20,5 @@ public interface DirectiveOrderInfoMapper extends BaseMapper<DirectiveOrderInfo>
     List<DirectiveOrderInfo> getDirectiveList(@Param("directiveId") String directiveId);
     List<DirectiveOrderInfo> getSubDirectiveList(@Param("packageId") String packageId);
 
-    List<DirectiveOrderInfo> queryOrderInfoList(@Param(Constants.WRAPPER) QueryWrapper<DirectiveOrderInfo> queryWrapper);
+    List<DirectiveOrderEntity> queryOrderInfoList(@Param("dto") DirectiveOrderEntity queryWrapper);
 }

nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/mapper/DirectiveOrderMapper.java

@@ -1,6 +1,9 @@
 package com.nu.modules.biz.order.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.nu.entity.CareDirectiveEntity;
 import com.nu.entity.DirectiveOrderEntity;
 import com.nu.entity.DirectiveOrderInfoEntity;
@@ -44,4 +47,7 @@ public interface DirectiveOrderMapper extends BaseMapper<DirectiveOrder> {
     DirectiveOrder getPackageById(DirectiveOrder orders);
 
     DirectiveOrder getEmployeeById(@Param("employeeId") String employeeId);
+
+    IPage<DirectiveOrderEntity> queryOrderList(Page<DirectiveOrder> page,
+                                         @Param("entity") DirectiveOrderEntity entity);
 }

nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/mapper/xml/DirectiveOrderInfoMapper.xml

@@ -3,8 +3,7 @@
 <mapper namespace="com.nu.modules.biz.order.mapper.DirectiveOrderInfoMapper">
 
     <select id="getDirectiveList" resultType="com.nu.modules.biz.order.entity.DirectiveOrderInfo">
-        select
+        select a.instruction_tag_id as instructionTagId,
-            a.instruction_tag_id as instructionTagId,
                b.instruction_name   as instructionTagName,
                a.category_id        as categoryId,
                c.category_name      AS categoryName,
@@ -29,8 +28,7 @@
     </select>
 
     <select id="getSubDirectiveList" resultType="com.nu.modules.biz.order.entity.DirectiveOrderInfo">
-        SELECT
+        SELECT b.instruction_tag_id AS instructionTagId,
-            b.instruction_tag_id AS instructionTagId,
                e.instruction_name   AS instructionTagName,
                b.category_id        AS categoryId,
                c.category_name      AS categoryName,
@@ -59,9 +57,13 @@
     </select>
 
 
-    <select id="queryOrderInfoList" resultType="com.nu.modules.biz.order.entity.DirectiveOrderInfo">
+    <select id="queryOrderInfoList" resultType="com.nu.entity.DirectiveOrderEntity">
-        select a.*,b.immediate_file,b.immediate_file_focus from nu_biz_nu_directive_order_info a left join nu_config_service_directive b on a.directive_id = b.id
+        select a.*, b.immediate_file, b.immediate_file_focus
-        ${ew.customSqlSegment}
+        from nu_biz_directive_order a
+                 left join nu_config_service_directive b on a.directive_id = b.id
+        where a.nu_id = #{dto.nuId}
+          and a.instruction_id = #{dto.instructionTagId}
+          and a.serv_start_time = #{dto.servStartTime}
     </select>
 
 </mapper>

nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/mapper/xml/DirectiveOrderMapper.xml

@@ -113,8 +113,7 @@
     </resultMap>
 
     <select id="queryDataPoolList" resultType="com.nu.modules.biz.order.entity.DirectiveOrder">
-        select
+        select a.id                                            as poolId,
-            a.id as poolId,
                a.pool_type                                     as orderType,
                a.biz_id                                        as bizId,
                a.nu_id                                         as nuId,
@@ -137,8 +136,7 @@
     </select>
 
     <select id="queryDataPoolListBak" resultType="com.nu.modules.biz.order.entity.DirectiveOrder">
-        select
+        select a.id                                            as poolId,
-            a.id as poolId,
                a.pool_type                                     as orderType,
                a.biz_id                                        as bizId,
                a.nu_id                                         as nuId,
@@ -396,7 +394,8 @@
         FROM nu_biz_directive_order o
                  LEFT JOIN nu_biz_nu_directive_order_info s ON o.id = s.main_id
                  LEFT JOIN sys_dict dict ON dict.dict_code = 'directive_order_opt_type'
-                 LEFT JOIN sys_dict_item mainStatus ON mainStatus.dict_id = dict.id AND mainStatus.item_value = o.opt_type
+                 LEFT JOIN sys_dict_item mainStatus
+                           ON mainStatus.dict_id = dict.id AND mainStatus.item_value = o.opt_type
         WHERE o.order_type = '1'
     </sql>
 
@@ -448,8 +447,7 @@
     </select>
 
     <select id="getInstantById" resultType="com.nu.modules.biz.order.entity.DirectiveOrder">
-        select
+        select m.id                                            as bizId,
-            m.id as bizId,
                m.nu_id                                         as nuId,
                b.nu_name                                       as nuName,
                c.id                                            as elderId,
@@ -460,7 +458,8 @@
                iz_package,
                (case when c.orderly is null then 2 else 1 end) as orderEmp
         from ${tableName} m
-        inner join nu_base_info b on m.nu_id = b.nu_id and b.del_flag = '0' and (case when b.area_flag = 1 then b.status = '2' else 1=1 end)
+                 inner join nu_base_info b on m.nu_id = b.nu_id and b.del_flag = '0' and
+                                              (case when b.area_flag = 1 then b.status = '2' else 1 = 1 end)
                  left join nu_biz_elder_info c on b.elder_id = c.id and c.del_flag = '0'
                  left join view_sys_dict d on m.cycle_type_id = d.item_value and d.dict_code = 'period_type'
         where m.id = #{id}
@@ -468,8 +467,7 @@
     </select>
 
     <select id="getDirectiveById" resultType="com.nu.modules.biz.order.entity.DirectiveOrder">
-        select
+        select a.id                 as directiveId,
-            a.id as directiveId,
                a.directive_name     as directiveName,
                a.preview_file       as previewFile,
                a.preview_file_small as previewFileSmall,
@@ -485,8 +483,7 @@
     </select>
 
     <select id="getPackageById" resultType="com.nu.modules.biz.order.entity.DirectiveOrder">
-        select
+        select a.id               as directiveId,
-            a.id as directiveId,
                a.package_name     as directiveName,
                a.total_duration   as serviceDuration,
                a.description      as serviceContent,
@@ -504,4 +501,93 @@
         where a.id = #{employeeId}
     </select>
 
+    <select id="queryOrderList" resultType="com.nu.entity.DirectiveOrderEntity">
+        SELECT
+        t.id,
+        t.nu_id,
+        t.nu_name,
+        t.elder_id,
+        t.elder_name,
+        t.body_tag_ids,
+        t.body_tag_names,
+        t.body_tag_price,
+        t.emotion_tag_ids,
+        t.emotion_tag_names,
+        t.emotion_tag_price,
+        t.employee_id,
+        t.employee_name,
+        t.opt_type,
+        t.employee_ids,
+        t.employee_names,
+        t.instruction_id,
+        t.instruction_name,
+        t.category_id,
+        t.category_name,
+        t.type_id,
+        t.type_name,
+        t.directive_id,
+        t.directive_name,
+        t.service_attribute,
+        t.service_duration,
+        t.toll_price,
+        t.com_price,
+        t.serv_start_time,
+        t.serv_end_time,
+        t.emp_start_time,
+        t.emp_end_time,
+        t.order_start_time,
+        t.order_end_time,
+        t.order_status,
+        t.create_by,
+        t.create_time,
+        t.update_by,
+        t.update_time,
+        t.del_flag,
+        t.iz_multi,
+        t.tplink_path,
+        t.manually_pic_path,
+        t.manually_mp4_path,
+        t.tplink_task_id,
+        t.tplink_process,
+        t.tplink_md5,
+        t.tplink_result_code,
+        t.tplink_down_count,
+        CASE WHEN t.emp_start_time IS NULL THEN 'N' ELSE 'Y' END AS iz_start,
+        CASE WHEN t.emp_end_time IS NULL THEN 'N' ELSE 'Y' END AS iz_finish,
+        dire.preview_file
+        FROM nu_biz_directive_order t
+        LEFT JOIN nu_config_service_directive dire on t.directive_id = dire.id
+        WHERE t.nu_id = #{entity.nuId} AND t.employee_id = #{entity.employeeId}
+        <choose>
+            <when test="entity.workType == '1'">
+                AND t.serv_end_time >= NOW()
+                AND t.emp_start_time IS NULL
+            </when>
+            <when test="entity.workType == '2'">
+                AND DATE(t.serv_start_time) = CURDATE()
+                AND t.serv_end_time >= NOW()
+                AND t.emp_start_time IS NOT NULL
+            </when>
+            <when test="entity.workType == '3'">
+                AND DATE(t.serv_start_time) = CURDATE()
+                AND t.emp_end_time IS NOT NULL
+            </when>
+            <when test="entity.workType == '4'">
+                AND DATE(t.serv_start_time) = CURDATE()
+                AND t.serv_end_time <![CDATA[ < ]]> NOW()
+                AND t.emp_start_time IS NULL
+            </when>
+            <when test="entity.workType == '5'">
+                AND (
+                (t.serv_start_time <![CDATA[ <= ]]> NOW()
+                AND t.serv_end_time >= NOW()
+                AND t.emp_end_time IS NULL)
+                OR (t.emp_start_time IS NOT NULL AND t.emp_end_time IS NULL)
+                )
+            </when>
+        </choose>
+        ORDER BY t.serv_start_time ASC
+    </select>
+
+
 </mapper>

nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/service/impl/DirectiveOrderPadServiceImpl.java

@@ -12,8 +12,8 @@ import com.nu.modules.biz.order.entity.DirectiveOrder;
 import com.nu.modules.biz.order.entity.DirectiveOrderBizLog;
 import com.nu.modules.biz.order.entity.DirectiveOrderInfo;
 import com.nu.modules.biz.order.mapper.DirectiveOrderBizLogMapper;
-import com.nu.modules.biz.order.mapper.DirectiveOrderMapper;
 import com.nu.modules.biz.order.mapper.DirectiveOrderInfoMapper;
+import com.nu.modules.biz.order.mapper.DirectiveOrderMapper;
 import com.nu.modules.biz.order.service.IDirectiveOrderInfoService;
 import com.nu.modules.biz.order.service.IDirectiveOrderService;
 import com.nu.modules.directiveorder.api.IDirectiveOrderLogApi;
@@ -21,16 +21,17 @@ import com.nu.modules.order.api.IDirectiveOrderApi;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.apache.shiro.SecurityUtils;
-import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.vo.LoginUser;
-import org.jeecg.common.util.DateUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
-import java.util.*;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @Description: 服务指令工单主表
@@ -79,110 +80,37 @@ public class DirectiveOrderPadServiceImpl extends ServiceImpl<DirectiveOrderMapp
      */
     @Override
     public IPage<DirectiveOrderEntity> queryOrderList(Integer pageNo, Integer pageSize, DirectiveOrderEntity directiveOrderEntity, HttpServletRequest req) {
-        String nowDate = DateUtils.formatDate(new Date(), "yyyy-MM-dd");
-        DirectiveOrder directiveOrder = new DirectiveOrder();
-        BeanUtils.copyProperties(directiveOrderEntity, directiveOrder);
-        QueryWrapper<DirectiveOrder> queryWrapper = new QueryWrapper<>();
-        //查询对应护理单元+员工身上的
-        queryWrapper.eq("nu_id", directiveOrderEntity.getNuId());
-        queryWrapper.eq(StringUtils.isNotBlank(directiveOrderEntity.getEmployeeId()), "employee_id", directiveOrderEntity.getEmployeeId());
-
-        //工单类型 1待执行 2已执行 3已完成 4已过期 5待执行或者已执行未完成 空是全部
-        //首页的对应5
-        if (StringUtils.equals("1", directiveOrderEntity.getWorkType())) {
-//            queryWrapper.like("start_time", nowDate);//默认查询当天
-//            queryWrapper.eq("iz_start", "N");
-//            queryWrapper.eq("iz_finish", "N");
-//            queryWrapper.apply("start_time > now()");
-
-            //待执行：未到结束时间 未点开始
-            queryWrapper.and(wrapper ->
-                    wrapper.ge("serv_end_time", new Date())
-                            .isNull("emp_start_time")
-            );
-
-        } else if (StringUtils.equals("2", directiveOrderEntity.getWorkType())) {
-//            queryWrapper.like("start_time", nowDate);//默认查询当天
-//            queryWrapper.eq("iz_start", "Y");
-//            queryWrapper.eq("iz_finish", "N");
-//            queryWrapper.apply("DATE_ADD(end_time, INTERVAL ifnull(timeout_duration,0) MINUTE) > NOW()");
-
-            //已执行 看的是今天要开始执行的指令  没到或刚到最后时间 已经点了开始
-            queryWrapper.and(wrapper ->
-                    wrapper.apply("DATE(serv_start_time) = CURDATE()")
-                            .ge("serv_end_time", new Date())
-                            .isNotNull("emp_start_time")
-            );
-        } else if (StringUtils.equals("3", directiveOrderEntity.getWorkType())) {
-//            queryWrapper.like("start_time", nowDate);//默认查询当天
-//            queryWrapper.eq("iz_start", "Y");
-//            queryWrapper.eq("iz_finish", "Y");
-
-            //已完成：工单开始执行日期是今天  只要有完成时间就算
-            queryWrapper.and(wrapper ->
-                    wrapper.apply("DATE(serv_start_time) = CURDATE()")
-                            .isNotNull("emp_end_time")
-            );
-        } else if (StringUtils.equals("4", directiveOrderEntity.getWorkType())) {
-//            queryWrapper.like("start_time", nowDate);//默认查询当天
-//            queryWrapper.eq("iz_start", "N");
-//            queryWrapper.eq("iz_finish", "N");
-//            queryWrapper.apply("start_time < now()");
-            //已过期：服务应该结束的那天的 过了最后时间了 还没点开始
-            queryWrapper.and(wrapper ->
-                    wrapper.apply("DATE(serv_end_time) = CURDATE()")
-                            .lt("serv_end_time", new Date())
-                            .isNull("emp_start_time")
-            );
-        } else if (StringUtils.equals("5", directiveOrderEntity.getWorkType())) {
-            //首页展示的工单
-            //需求：展示工单开始 ~ 结束时间范围内 未完成的单子     （serv_start_time <= now <= serv_end_time  and emp_end_time = null)
-            // 特殊情况：工单点击开始了 只要不点结束就一直显示       or  (emp_start_time !=null and emp_end_time = null)
-
-            queryWrapper.and(wrapper ->
-                    wrapper.le("serv_start_time", new Date())
-                            .ge("serv_end_time", new Date())
-                            .isNull("emp_end_time")
-            ).or(wrapper ->
-                    wrapper.isNotNull("emp_start_time")
-                            .isNull("emp_end_time")
-            );
-        }
-        queryWrapper.orderByAsc("serv_start_time");
         Page<DirectiveOrder> page = new Page<>(pageNo, pageSize);
-        List<DirectiveOrder> list = baseMapper.selectList(page, queryWrapper);
+        //workType工单类型 1待执行 2已执行 3已完成 4已过期 5待执行或者已执行未完成 空是全部
-        IPage<DirectiveOrderEntity> entityPage = new Page<>(page.getCurrent(), page.getSize(), page.getTotal());
+        return baseMapper.queryOrderList(page, directiveOrderEntity);
-        entityPage.setRecords(BeanUtil.copyToList(list, DirectiveOrderEntity.class));
-        return entityPage;
     }
 
     @Override
-    public List<DirectiveOrderInfoEntity> queryOrderInfoList(DirectiveOrderInfoEntity directiveOrderInfoEntity, HttpServletRequest req) {
+    public List<DirectiveOrderEntity> queryOrderInfoList(DirectiveOrderEntity directiveOrderInfoEntity, HttpServletRequest req) {
-        DirectiveOrderInfo directiveOrderInfo = new DirectiveOrderInfo();
+        List<DirectiveOrderEntity> list = directiveOrderInfoMapper.queryOrderInfoList(directiveOrderInfoEntity);
-        BeanUtils.copyProperties(directiveOrderInfoEntity, directiveOrderInfo);
+        return list;
-        QueryWrapper<DirectiveOrderInfo> queryWrapper = QueryGenerator.initQueryWrapper(directiveOrderInfo, req.getParameterMap());
-        List<DirectiveOrderInfo> list = directiveOrderInfoMapper.queryOrderInfoList(queryWrapper);
-        List<DirectiveOrderInfoEntity> list1 = new ArrayList<>();
-        list1 = BeanUtil.copyToList(list, DirectiveOrderInfoEntity.class);
-        return list1;
     }
 
     @Override
     public Map<String, Object> startOrder(DirectiveOrderEntity directiveOrderEntity) {
         DirectiveOrder directiveOrder = baseMapper.selectById(directiveOrderEntity.getId());
-        directiveOrder.setIzStart("Y");
+        directiveOrder.setEmpStartTime(new Date());
-        directiveOrder.setBeginTime(new Date());
+        if (StringUtils.isEmpty(directiveOrder.getEmployeeIds())) {
+            //如果未进行转单、协助等操作，此时实际执行人字段都为空 需将实际执行人设置为派单时派发的员工
+            directiveOrder.setEmployeeIds(directiveOrder.getEmployeeId());
+            directiveOrder.setEmployeeNames(directiveOrder.getEmployeeNames());
+        }
         baseMapper.updateById(directiveOrder);
 
-        QueryWrapper<DirectiveOrderInfo> queryWrapper = new QueryWrapper<>();
+//        QueryWrapper<DirectiveOrderInfo> queryWrapper = new QueryWrapper<>();
-        List<DirectiveOrderInfo> list = directiveOrderInfoMapper.selectList(queryWrapper);
+//        List<DirectiveOrderInfo> list = directiveOrderInfoMapper.selectList(queryWrapper);
 
 
         Map<String, Object> map = new HashMap<>();
         map.put("success", true);
         map.put("message", "操作成功");
         map.put("directiveOrder", directiveOrder);
-        map.put("directiveOrderInfo", list);
+//        map.put("directiveOrderInfo", list);
         return map;
     }
 
@@ -268,11 +196,11 @@ public class DirectiveOrderPadServiceImpl extends ServiceImpl<DirectiveOrderMapp
         directiveOrderService.updateById(directiveOrder);
 
         //子表
-        DirectiveOrderInfo directiveOrderInfo = new DirectiveOrderInfo();
+//        DirectiveOrderInfo directiveOrderInfo = new DirectiveOrderInfo();
-        directiveOrderInfo.setManuallyMp4Path(directiveOrderEntity.getManuallyMp4Path());
+//        directiveOrderInfo.setManuallyMp4Path(directiveOrderEntity.getManuallyMp4Path());
-        UpdateWrapper<DirectiveOrderInfo> uw = new UpdateWrapper<>();
+//        UpdateWrapper<DirectiveOrderInfo> uw = new UpdateWrapper<>();
-        uw.eq("main_id", directiveOrderEntity.getId());
+//        uw.eq("main_id", directiveOrderEntity.getId());
-        directiveOrderInfoService.update(directiveOrderInfo, uw);
+//        directiveOrderInfoService.update(directiveOrderInfo, uw);
 
         Map<String, Object> map = new HashMap<>();
         map.put("success", true);
@@ -289,11 +217,11 @@ public class DirectiveOrderPadServiceImpl extends ServiceImpl<DirectiveOrderMapp
         directiveOrderService.updateById(directiveOrder);
 
         //子表
-        DirectiveOrderInfo directiveOrderInfo = new DirectiveOrderInfo();
+//        DirectiveOrderInfo directiveOrderInfo = new DirectiveOrderInfo();
-        directiveOrderInfo.setManuallyPicPath(directiveOrderEntity.getManuallyPicPath());
+//        directiveOrderInfo.setManuallyPicPath(directiveOrderEntity.getManuallyPicPath());
-        UpdateWrapper<DirectiveOrderInfo> uw = new UpdateWrapper<>();
+//        UpdateWrapper<DirectiveOrderInfo> uw = new UpdateWrapper<>();
-        uw.eq("main_id", directiveOrderEntity.getId());
+//        uw.eq("main_id", directiveOrderEntity.getId());
-        directiveOrderInfoService.update(directiveOrderInfo, uw);
+//        directiveOrderInfoService.update(directiveOrderInfo, uw);
 
         Map<String, Object> map = new HashMap<>();
         map.put("success", true);
@@ -317,31 +245,21 @@ public class DirectiveOrderPadServiceImpl extends ServiceImpl<DirectiveOrderMapp
     @Override
     public void transferOrder(DirectiveOrderInfoEntity dto) {
         DirectiveOrder main = new DirectiveOrder();
-        DirectiveOrderInfo sub = new DirectiveOrderInfo();
 
         String optType = "3";//转单
 
         //执行类型
         main.setOptType(optType);
-        sub.setOptType(optType);
         //主要执行人
-        main.setEmployeeId(dto.getEmployeeId());
+        main.setEmployeeIds(dto.getEmployeeId());
-        main.setEmployeeName(dto.getEmployeeName());
+        main.setEmployeeNames(dto.getEmployeeName());
-        sub.setEmployeeId(dto.getEmployeeId());
-        sub.setEmployeeName(dto.getEmployeeName());
         //实际执行人
         main.setOptIds(dto.getEmployeeId());
         main.setOptNames(dto.getEmployeeName());
-        sub.setOptIds(dto.getEmployeeId());
-        sub.setOptNames(dto.getEmployeeName());
 
         //修改主表
         main.setId(dto.getMainId());
         directiveOrderService.updateById(main);
-        //修改子表
-        UpdateWrapper<DirectiveOrderInfo> subUW = new UpdateWrapper<>();
-        subUW.eq("main_id", dto.getMainId());
-        directiveOrderInfoMapper.update(sub, subUW);
 
         //日志
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();