服务指令-请领流程、单元退货流程增加查询工单信息接口

nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/thd/service/impl/ThdServiceImpl.java

@@ -166,7 +166,7 @@ public class ThdServiceImpl implements ITuiHuoApi {
             orderEntity.setFlowCode("dyth_cksh");//指令流程flow_code 看接口有标明
             orderEntity.setPoolId(dto.getId());//退货主表id 入库时会根据更新为对应退货单号（入库时才生成的退货单号）
             orderEntity.setInitiatorId(sysUser.getEmployessId());//员工id
-            invoicingOrdersApi.beginDyHtOrder(orderEntity);
+            invoicingOrdersApi.beginDyThOrder(orderEntity);
 
             return true;
         }

nursing-unit-services/nu-services-api/nu-services-local-api/src/main/java/com/nu/modules/invoicing/api/IInvoicingOrdersApi.java

@@ -23,6 +23,12 @@ public interface IInvoicingOrdersApi {
      */
     Result<String> finishOrder(InvoicingOrdersEntity invoicingOrdersEntity);
 
+    /**
+     * 请领流程-获取指令工单信息
+     * @param invoicingOrdersEntity
+     */
+    InvoicingOrdersEntity getQlOrderInfo(InvoicingOrdersEntity invoicingOrdersEntity);
+
     /**
      * 请领流程-请领申请 ql_sq
      * @param invoicingOrdersEntity
@@ -72,13 +78,25 @@ public interface IInvoicingOrdersApi {
     Result<String> flowDythCksh(InvoicingOrdersEntity invoicingOrdersEntity);
 
     /**
-     * 单元退货流程，库管点击开始
+     * 单元退货-获取指令工单信息
      * @param invoicingOrdersEntity
      */
-    Result<String> beginDyHtOrder(InvoicingOrdersEntity invoicingOrdersEntity);
+    InvoicingOrdersEntity getDyThOrderInfo(InvoicingOrdersEntity invoicingOrdersEntity);
 
     /**
-     * 单元退货流程，库管点击完成
+     * 单元退货-提交时修改业务单号
+     * @param invoicingOrdersEntity
+     */
+    Result<String> updateDyThOrderBizId(InvoicingOrdersEntity invoicingOrdersEntity);
+
+    /**
+     * 单元退货-库管点击开始
+     * @param invoicingOrdersEntity
+     */
+    Result<String> beginDyThOrder(InvoicingOrdersEntity invoicingOrdersEntity);
+
+    /**
+     * 单元退货-库管点击完成
      * @param invoicingOrdersEntity
      */
     Result<String> finishDyThOrder(InvoicingOrdersEntity invoicingOrdersEntity);

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

@@ -27,4 +27,5 @@ public interface InvoicingOrdersMapper extends BaseMapper<InvoicingOrders> {
     List<InvoicingOrders> getFlowList(InvoicingOrdersEntity invoicingOrdersEntity);
     InvoicingOrders getFlowOne(InvoicingOrders invoicingOrders);
     void updateOrder(InvoicingOrders invoicingOrders);
+    InvoicingOrders getOrderOne(InvoicingOrders invoicingOrders);
 }

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

@@ -248,5 +248,81 @@
         </where>
     </update>
 
+    <select id="getOrderOne" resultType="com.nu.modules.biz.invoicing.order.entity.InvoicingOrders">
+        select
+            a.id,
+            a.pool_id as poolId,
+            a.biz_id as bizId,
+            a.biz_type as bizType,
+            a.nu_id as nuId,
+            a.nu_name as nuName,
+            a.elder_id as elderId,
+            a.elder_name as elderName,
+            a.employee_id as employeeId,
+            a.employee_name as employeeName,
+            a.directive_id as directiveId,
+            a.directive_name as directiveName,
+            a.cycle_type_id as cycleTypeId,
+            a.cycle_type as cycleType,
+            a.cycle_value as cycleValue,
+            a.preview_file as previewFile,
+            a.net_preview_file as netPreviewFile,
+            a.preview_file_small as previewFileSmall,
+            a.net_preview_file_small as netPreviewFileSmall,
+            a.mp3_file as mp3File,
+            a.net_mp3_file as netMp3File,
+            a.mp4_file as mp4File,
+            a.net_mp4_file as netMp4File,
+            a.service_duration as serviceDuration,
+            a.service_content as serviceContent,
+            a.toll_price as tollPrice,
+            a.com_price as comPrice,
+            a.real_com_price as realComPrice,
+            a.start_time as startTime,
+            a.end_time as endTime,
+            a.begin_time as beginTime,
+            a.finish_time as finishTime,
+            a.iz_start as izStart,
+            a.iz_finish as izFinish,
+            a.iz_rollback as izRollback,
+            a.create_emp as createEmp,
+            a.create_time as createTime,
+            a.update_emp as updateEmp,
+            a.update_time as updateTime,
+            a.del_flag as delFlag,
+            a.initiator_id as initiatorId,
+            a.initiator_name as initiatorName,
+            a.remarks,
+            a.biz_type as flowCode
+        from nu_biz_nu_invoicing_directive_order a
+        <where>
+            <if test="delFlag != null and delFlag != ''">
+                and del_flag = #{delFlag}
+            </if>
+            <if test="id != null and id != ''">
+                and id = #{id}
+            </if>
+            <if test="poolId != null and poolId != ''">
+                and pool_id = #{poolId}
+            </if>
+            <if test="bizId != null and bizId != ''">
+                and biz_id = #{bizId}
+            </if>
+            <if test="nuId != null and nuId != ''">
+                and nu_id = #{nuId}
+            </if>
+            <if test="elderId != null and elderId != ''">
+                and elder_id = #{elderId}
+            </if>
+            <if test="directiveId != null and directiveId != ''">
+                and directive_id = #{directiveId}
+            </if>
+            <if test="bizType != null and bizType != ''">
+                and biz_type = #{bizType}
+            </if>
+        </where>
+        order by create_time desc
+        limit 1
+    </select>
 
 </mapper>

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

@@ -91,7 +91,7 @@ public class InvoicingOrdersServiceImpl extends ServiceImpl<InvoicingOrdersMappe
             entity.setUpdateEmp(invoicingOrdersEntity.getInitiatorId());
             entity.setUpdateTime(c.getTime());
             entity.setBizType(invoicingOrdersEntity.getFlowCode());
-            baseMapper.updateOrder(entity);
+            baseMapper.updateById(entity);
 //        }catch (Exception e){
 //            return Result.error("开始失败："+e.getMessage());
 //        }
@@ -119,13 +119,44 @@ public class InvoicingOrdersServiceImpl extends ServiceImpl<InvoicingOrdersMappe
             entity.setBizType(invoicingOrdersEntity.getFlowCode());
             entity.setTollPrice(DirectivePrice.getTollPrice());
             entity.setComPrice(DirectivePrice.getComPrice());
-            baseMapper.updateOrder(entity);
+            baseMapper.updateById(entity);
 //        }catch (Exception e){
 //            return Result.error("完成失败："+e.getMessage());
 //        }
         return Result.ok("完成成功");
     }
 
+    /**
+     * 请领流程-获取指令工单信息
+     * @param invoicingOrdersEntity
+     */
+    @Override
+    public InvoicingOrdersEntity getQlOrderInfo(InvoicingOrdersEntity invoicingOrdersEntity){
+        log.info("function:flowQlsq");
+        log.info("UpdateBy:"+invoicingOrdersEntity.getInitiatorId());
+        List<InvoicingOrders> flowList = baseMapper.getFlowList(invoicingOrdersEntity);
+        if(flowList!=null){
+            InvoicingOrders flow = flowList.get(0);
+            log.info("DirectiveId:"+flow.getDirectiveId());
+            log.info("NuId:"+invoicingOrdersEntity.getNuId());
+            log.info("ElderId:"+invoicingOrdersEntity.getElderId());
+            InvoicingOrders io = new InvoicingOrders();
+            io.setDirectiveId(invoicingOrdersEntity.getDirectiveId());
+            io.setNuId(invoicingOrdersEntity.getNuId());
+            io.setElderId(invoicingOrdersEntity.getElderId());
+            io.setIzFinish("N");
+            io.setDelFlag("0");
+            io.setBizType(invoicingOrdersEntity.getFlowCode());
+            InvoicingOrders entity = baseMapper.getOrderOne(io);
+            if(entity!=null){
+                InvoicingOrdersEntity ioe = new InvoicingOrdersEntity();
+                BeanUtils.copyProperties(entity, ioe);
+                return ioe;
+            }
+        }
+        return null;
+    }
+
     /**
      * 请领流程-请领申请
      * @param invoicingOrdersEntity
@@ -286,25 +317,88 @@ public class InvoicingOrdersServiceImpl extends ServiceImpl<InvoicingOrdersMappe
         return Result.ok();
     }
 
+    /**
+     * 单元退货流程中获取指令工单信息
+     * @param invoicingOrdersEntity
+     */
+    @Override
+    public InvoicingOrdersEntity getDyThOrderInfo(InvoicingOrdersEntity invoicingOrdersEntity){
+        log.info("function:getDyThOrderInfo");
+        log.info("PoolId:"+invoicingOrdersEntity.getPoolId());
+        log.info("UpdateBy:"+invoicingOrdersEntity.getInitiatorId());
+        InvoicingOrders io = new InvoicingOrders();
+        io.setPoolId(invoicingOrdersEntity.getPoolId());
+        InvoicingOrders entity = baseMapper.getOrderOne(io);
+        if(entity!=null){
+            InvoicingOrdersEntity ioe = new InvoicingOrdersEntity();
+            BeanUtils.copyProperties(entity, ioe);
+            return ioe;
+        }
+        return null;
+    }
+
+    /**
+     * 单元退货流程中提交时修改业务单号
+     * @param invoicingOrdersEntity
+     */
+    @Override
+    public Result<String> updateDyThOrderBizId(InvoicingOrdersEntity invoicingOrdersEntity){
+
+        log.info("function:updateDyThOrderBizId");
+        log.info("PoolId:"+invoicingOrdersEntity.getPoolId());
+        log.info("BizId:"+invoicingOrdersEntity.getBizId());
+        log.info("UpdateBy:"+invoicingOrdersEntity.getInitiatorId());
+
+        empOrdersService.getNames(invoicingOrdersEntity);
+        List<InvoicingOrders> flowList = baseMapper.getFlowList(invoicingOrdersEntity);
+        if(flowList!=null){
+            InvoicingOrders flow = flowList.get(0);
+
+            log.info("DirectiveId:"+flow.getDirectiveId());
+            log.info("NuId:"+invoicingOrdersEntity.getNuId());
+            log.info("ElderId:"+invoicingOrdersEntity.getElderId());
+
+            QueryWrapper<InvoicingOrders> ioQw = new QueryWrapper<>();
+            ioQw.eq("directive_id", flow.getDirectiveId());
+            ioQw.eq("nu_id", invoicingOrdersEntity.getNuId());
+            ioQw.eq("elder_id", invoicingOrdersEntity.getElderId());
+            ioQw.eq("iz_finish", "N");
+            ioQw.eq("del_flag", "0");
+            ioQw.eq("biz_type", invoicingOrdersEntity.getFlowCode());
+            ioQw.eq("pool_id", invoicingOrdersEntity.getPoolId());
+            InvoicingOrders order = this.getOne(ioQw);
+            log.info("order:"+order);
+            if(order!=null){
+                log.info("OrderId:"+order.getId());
+                //修改请领单的bizId
+                InvoicingOrders entity = new InvoicingOrders();
+                entity.setId(order.getId());
+                entity.setBizId(invoicingOrdersEntity.getBizId());
+                entity.setUpdateEmp(invoicingOrdersEntity.getInitiatorId());
+                entity.setUpdateTime(new Date());
+                baseMapper.updateById(entity);
+            }
+        }
+        return Result.ok("修改业务单号成功");
+    }
+
     /**
      * 单元退货流程，库管点击开始
      * @param invoicingOrdersEntity
      */
     @Override
-    public Result<String> beginDyHtOrder(InvoicingOrdersEntity invoicingOrdersEntity){
+    public Result<String> beginDyThOrder(InvoicingOrdersEntity invoicingOrdersEntity){
 //        try {
-        log.info("PoolId:"+invoicingOrdersEntity.getPoolId());
+        log.info("Id:"+invoicingOrdersEntity.getId());
         log.info("UpdateBy:"+invoicingOrdersEntity.getInitiatorId());
-        log.info("BizType:"+invoicingOrdersEntity.getFlowCode());
             Calendar c = Calendar.getInstance();
             InvoicingOrders entity = new InvoicingOrders();
-            entity.setPoolId(invoicingOrdersEntity.getPoolId());
             entity.setBeginTime(c.getTime());
             entity.setIzStart("Y");
             entity.setUpdateEmp(invoicingOrdersEntity.getInitiatorId());
             entity.setUpdateTime(c.getTime());
-            entity.setBizType(invoicingOrdersEntity.getFlowCode());
+            entity.setId(invoicingOrdersEntity.getId());
-            baseMapper.updateOrder(entity);
+            baseMapper.updateById(entity);
 //        }catch (Exception e){
 //            e.printStackTrace();
 //            return Result.error("开始失败："+e.getMessage());
@@ -319,23 +413,19 @@ public class InvoicingOrdersServiceImpl extends ServiceImpl<InvoicingOrdersMappe
     @Override
     public Result<String> finishDyThOrder(InvoicingOrdersEntity invoicingOrdersEntity){
 //        try {
-        log.info("PoolId:"+invoicingOrdersEntity.getPoolId());
+        log.info("Id:"+invoicingOrdersEntity.getId());
-        log.info("BizId:"+invoicingOrdersEntity.getBizId());
         log.info("UpdateBy:"+invoicingOrdersEntity.getInitiatorId());
-        log.info("BizType:"+invoicingOrdersEntity.getFlowCode());
             Calendar c = Calendar.getInstance();
             QueryWrapper<InvoicingOrders> ioQw = new QueryWrapper<>();
-            ioQw.eq("pool_id", invoicingOrdersEntity.getPoolId());
+            ioQw.eq("id", invoicingOrdersEntity.getId());
             InvoicingOrders order = this.getOne(ioQw);
             InvoicingOrders DirectivePrice = baseMapper.getDirectivePrice(order.getDirectiveId());//获取服务指令价格
             InvoicingOrders entity = new InvoicingOrders();
             entity.setId(order.getId());
-            entity.setBizId(invoicingOrdersEntity.getBizId());
             entity.setFinishTime(c.getTime());
             entity.setIzFinish("Y");
             entity.setUpdateEmp(invoicingOrdersEntity.getInitiatorId());
             entity.setUpdateTime(c.getTime());
-            entity.setBizType(invoicingOrdersEntity.getFlowCode());
             entity.setTollPrice(DirectivePrice.getTollPrice());
             entity.setComPrice(DirectivePrice.getComPrice());
             baseMapper.updateById(entity);

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

@@ -58,10 +58,11 @@ public class ThOrdersServiceImpl extends ServiceImpl<InvoicingOrdersMapper, Invo
                 InvoicingOrders employee = empOrdersService.employeeScreening(flow.getDirectiveId(), invoicingOrdersEntity.getElderId(), c.getTime());
                 insertNextOrder(flow,invoicingOrdersEntity,employee.getEmployeeId(),employee.getEmployeeName(),invoicingOrdersEntity.getInitiatorId(),invoicingOrdersEntity.getInitiatorName(),flow.getFlowCode(),"N");
             }
-
         }
     }
 
+
+
     /**
      * 增加下一步的工单
      * @param invoicingOrdersEntity