新增

1、消费券删除同步退住结算单
修改
1、轮候模块调整
2、公共区域消毒、尿不湿情况、纸尿裤领用调整

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskServiceImpl.java

@@ -653,11 +653,11 @@ public class BpmTaskServiceImpl implements BpmTaskService {
         LogRecordContext.putVariable("nickname", SecurityFrameworkUtils.getLoginUserNickname());
         LogRecordContext.putVariable("instanceName", instance.getName());
         Set<Long> copyUserIdList = getCopyUserIdList(task.getTaskDefinitionKey());
-        copyUserIdList.addAll(reqVO.getCopyUserIds());
         if (CollUtil.isNotEmpty(reqVO.getCopyUserIds())) {
+            copyUserIdList.addAll(reqVO.getCopyUserIds());
             //processInstanceCopyService.createProcessInstanceCopy(reqVO.getCopyUserIds(), reqVO.getId());
-            processInstanceCopyService.createProcessInstanceCopy(copyUserIdList, task);
         }
+        processInstanceCopyService.createProcessInstanceCopy(copyUserIdList, task);
     }
 
     /**
@@ -682,8 +682,8 @@ public class BpmTaskServiceImpl implements BpmTaskService {
             return;
         }
         if ("second_approve".equals(key)) {
-            reqVO.setAuditName(parseString(variables, "firstAuditName"));
-            if (StrUtil.isNotBlank(reqVO.getAuditName())) {
+            reqVO.setFirstAuditName(parseString(variables, "firstAuditName"));
+            if (StrUtil.isNotBlank(reqVO.getFirstAuditName())) {
                 checkInWaitApi.updateSecondReviewInfo(reqVO);
             }
             checkInWaitApi.updateCheckInWaitStatusByBusinessId(businessForm.getBusinessId(),

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/biz/vo/diapersgetrecord/ElderlyDiapersGetRecordRespVO.java

@@ -42,7 +42,7 @@ public class ElderlyDiapersGetRecordRespVO {
     @Schema(description = "登记日期")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
     @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY, timezone = "GMT+8")
-    private LocalDate[] assessDate;
+    private LocalDate assessDate;
 
     @Schema(description = "登记数据")
     private String assessData;

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/biz/ElderlyConsumerVouchersServiceImpl.java

@@ -85,6 +85,7 @@ public class ElderlyConsumerVouchersServiceImpl implements ElderlyConsumerVouche
         expenseOrderMapper.updateById(expenseOrderDO);
         expenseOrderItemMapper.deleteById(expenseOrderItemDO);
         elderlyConsumerVouchersMapper.deleteById(id);
+        deleteRefundOrderItem(id);
     }
 
     @Override
@@ -276,4 +277,19 @@ public class ElderlyConsumerVouchersServiceImpl implements ElderlyConsumerVouche
         vouchers.setStatus(1);
         elderlyConsumerVouchersMapper.updateById(vouchers);
     }
+
+    /**
+     * 删除退住账单对应的记录
+     */
+    private void deleteRefundOrderItem(Long vouchersId){
+        RefundSettlementOrderItemDO refundSettlementOrderItemDO = refundSettlementOrderItemMapper.selectOne(new LambdaQueryWrapperX<RefundSettlementOrderItemDO>()
+                .eq(RefundSettlementOrderItemDO::getSourceItemId, vouchersId));
+        if(refundSettlementOrderItemDO == null){
+            return;
+        }
+        RefundSettlementOrderDO refundSettlementOrderDO = refundSettlementOrderMapper.selectById(refundSettlementOrderItemDO.getRefundSettlementOrderId());
+        refundSettlementOrderDO.setRefundAmount(refundSettlementOrderDO.getRefundAmount().subtract(refundSettlementOrderItemDO.getActualRefundAmount()));
+        refundSettlementOrderMapper.updateById(refundSettlementOrderDO);
+        refundSettlementOrderItemMapper.deleteById(refundSettlementOrderItemDO);
+    }
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/biz/RefundSettlementOrderServiceImpl.java

@@ -101,6 +101,8 @@ public class RefundSettlementOrderServiceImpl implements RefundSettlementOrderSe
     private NotifyMessageSendApi notifyMessageSendApi;
     @Resource
     private ExpenseSubsidyMapper expenseSubsidyMapper;
+    @Autowired
+    private ElderlyConsumerVouchersMapper elderlyConsumerVouchersMapper;
 
     @Resource
     private BizUtil bizUtil;
@@ -1652,10 +1654,21 @@ public class RefundSettlementOrderServiceImpl implements RefundSettlementOrderSe
     }
 
     /**
-     * 处理其他费用（如长护险、日常费用等）
+     * 处理其他费用（如长护险、消费券、日常费用等）
      */
     private void processOtherExpenses(Long elderId,ExpenseOrderItemDO item, LocalDate costDeadlineDate, ExpenseOrderItemVO itemVO) {
         YearMonth costDeadlineYearMonth = YearMonth.from(costDeadlineDate);
+        if(StringUtils.isNotBlank(item.getExpenseSource()) && item.getExpenseSource().equals("consumer_voucher")){
+            if(item.getPayStatus().equals(BooleanEnum.TRUE.getValue())){
+                return;
+            }
+            ElderlyConsumerVouchersDO voucher = elderlyConsumerVouchersMapper.selectById(item.getSourceExpenseItemId());
+            itemVO.setAmount(voucher.getAmount());
+            itemVO.setPrice(voucher.getAmount());
+            itemVO.setRemarks(voucher.getRemarks());
+            itemVO.setItemId(voucher.getId());
+            return;
+        }
         // 处理长护险
         if (((item.getItemCategoryName() != null && item.getItemCategoryName().contains("长护险")) || (item.getItemName() != null && item.getItemName().contains("长护险")))) {
             itemVO.setItemName("长护险");

yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/ElderlyDiaperUsageRecodMapper.xml

@@ -21,10 +21,10 @@
             AND edur.floor_id = #{reqVO.floorId}
         </if>
         <if test="reqVO.assessMonth != null and reqVO.assessMonth.length >= 1">
-            AND edur.assess_month gt;= #{reqVO.assessMonth[0]}
+            AND edur.assess_month &gt;= #{reqVO.assessMonth[0]}
         </if>
         <if test="reqVO.assessMonth != null and reqVO.assessMonth.length == 2">
-            AND edur.assess_month lt;= #{reqVO.assessMonth[1]}
+            AND edur.assess_month &lt;= #{reqVO.assessMonth[1]}
         </if>
         ORDER BY edur.assess_month DESC, edur.id DESC
     </select>

yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/ElderlyDisinfectRecordMapper.xml

@@ -21,10 +21,10 @@
             AND edr.floor_id = #{reqVO.floorId}
         </if>
         <if test="reqVO.assessDate != null and reqVO.assessDate.length >= 1">
-            AND  edr.assess_date &gt; #{reqVO.assessDate[0]}
+            AND  edr.assess_date &gt;= #{reqVO.assessDate[0]}
         </if>
         <if test="reqVO.assessDate != null and reqVO.assessDate.length == 2">
-            AND  edr.assess_date &lt; #{reqVO.assessDate[1]}
+            AND  edr.assess_date &lt;= #{reqVO.assessDate[1]}
         </if>
         ORDER BY edr.assess_date DESC, edr.id DESC
     </select>