1、小程序长者端-审核界面排序

2、pad服务指令手动拍照/录像:子表数据处理

nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/appraisal/controller/DirectiveAppraisalController.java

@@ -74,8 +74,7 @@ public class DirectiveAppraisalController extends JeecgController<DirectiveAppra
         Page<DirectiveAppraisal> page = new Page<DirectiveAppraisal>(pageNo, pageSize);
 
         //排序：先撤回的放前面 再是未考核的 再是应该执行时间倒序
-        queryWrapper.orderByAsc("CASE WHEN revocation IS NOT NULL AND revocation != '' THEN 0 ELSE 1 END");
+        queryWrapper.orderByAsc("CASE WHEN status = 4 THEN 0 WHEN status = 1 THEN 1 WHEN status = 2 THEN 999 WHEN status = 3 THEN 999 ELSE 999 END");
-        queryWrapper.orderByAsc("CASE WHEN status = 0 THEN 0 ELSE 1 END");
         queryWrapper.orderByDesc("start_time");
 
         IPage<DirectiveAppraisal> pageList = directiveAppraisalService.page(page, queryWrapper);

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

@@ -14,6 +14,7 @@ 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.service.IDirectiveOrderInfoService;
 import com.nu.modules.biz.order.service.IDirectiveOrderService;
 import com.nu.modules.directiveorder.api.IDirectiveOrderLogApi;
 import com.nu.modules.order.api.IDirectiveOrderApi;
@@ -49,6 +50,8 @@ public class DirectiveOrderPadServiceImpl extends ServiceImpl<DirectiveOrderMapp
     private DirectiveOrderBizLogMapper directiveOrderBizLogMapper;
     @Autowired
     private IDirectiveOrderLogApi directiveOrderLogApi;
+    @Autowired
+    private IDirectiveOrderInfoService directiveOrderInfoService;
 
     @Override
     public List<DirectiveOrderInfoEntity> queryList(DirectiveOrderInfoEntity dto) {
@@ -208,10 +211,19 @@ public class DirectiveOrderPadServiceImpl extends ServiceImpl<DirectiveOrderMapp
 
     @Override
     public Map<String, Object> editSubMp4(DirectiveOrderEntity directiveOrderEntity) {
+        //主表
         DirectiveOrder directiveOrder = new DirectiveOrder();
         directiveOrder.setId(directiveOrderEntity.getId());
         directiveOrder.setManuallyMp4Path(directiveOrderEntity.getManuallyMp4Path());
         directiveOrderService.updateById(directiveOrder);
+
+        //子表
+        DirectiveOrderInfo directiveOrderInfo = new DirectiveOrderInfo();
+        directiveOrderInfo.setManuallyMp4Path(directiveOrderEntity.getManuallyMp4Path());
+        UpdateWrapper<DirectiveOrderInfo> uw = new UpdateWrapper<>();
+        uw.eq("main_id",directiveOrderEntity.getId());
+        directiveOrderInfoService.update(directiveOrderInfo,uw);
+
         Map<String, Object> map = new HashMap<>();
         map.put("success", true);
         map.put("message", "操作成功");
@@ -220,10 +232,19 @@ public class DirectiveOrderPadServiceImpl extends ServiceImpl<DirectiveOrderMapp
 
     @Override
     public Map<String, Object> editSubPicPath(DirectiveOrderEntity directiveOrderEntity) {
+        //主表
         DirectiveOrder directiveOrder = new DirectiveOrder();
         directiveOrder.setId(directiveOrderEntity.getId());
         directiveOrder.setManuallyPicPath(directiveOrderEntity.getManuallyPicPath());
         directiveOrderService.updateById(directiveOrder);
+
+        //子表
+        DirectiveOrderInfo directiveOrderInfo = new DirectiveOrderInfo();
+        directiveOrderInfo.setManuallyPicPath(directiveOrderEntity.getManuallyPicPath());
+        UpdateWrapper<DirectiveOrderInfo> uw = new UpdateWrapper<>();
+        uw.eq("main_id",directiveOrderEntity.getId());
+        directiveOrderInfoService.update(directiveOrderInfo,uw);
+
         Map<String, Object> map = new HashMap<>();
         map.put("success", true);
         map.put("message", "操作成功");