Merge branch 'dev_nursing_records_20230214' into dev_ch_master

account/account-service/src/main/java/com/hungraim/ltc/account/service/impl/AccountServiceImpl.java

@@ -574,6 +574,7 @@ public class AccountServiceImpl extends ServiceImpl<ChDisabAccountsMapper, ChDis
             chDisabDetailAccounts.setDeductionAmount(deductionAmount.add(amountOfMoney));
             deductionAmountTotal = deductionAmountTotal.add(amountOfMoney);
         }
+        chDisabDetailAccounts.setLcd(new Date());
         int result = chDisabAccountsDetailMapper.updateById(chDisabDetailAccounts);
         chDisabAccounts.setReissueAmountTotal(reissueAmountTotal);
         chDisabAccounts.setDeductionAmountTotal(deductionAmountTotal);
@@ -741,6 +742,7 @@ public class AccountServiceImpl extends ServiceImpl<ChDisabAccountsMapper, ChDis
                 chDisabDetailAccountsDTO.setAccountsAllCost(accountsAllCost.add(limit));
                 chDisabDetailAccountsDTO.setAccountsOverallCost(accountsOverallCost.add(overallCost));
                 chDisabDetailAccountsDTO.setAccountsPersonalCost(accountsPersonalCost.add(personalCost));
+                chDisabDetailAccountsDTO.setLcd(new Date());
                 chDisabAccountsDetailMapper.updateById(chDisabDetailAccountsDTO);
             }
 
@@ -800,6 +802,7 @@ public class AccountServiceImpl extends ServiceImpl<ChDisabAccountsMapper, ChDis
             chDisabDetailAccountsDTO.setDeductionAmount(subtract);
         }
         disabAccountsMapper.updateById(chDisabAccountDTO);
+        chDisabDetailAccountsDTO.setLcd(new Date());
         int result = chDisabAccountsDetailMapper.updateById(chDisabDetailAccountsDTO);
         chDisabFreeRdInfoMapper.deleteById(freeRdId);
         return result;
@@ -834,6 +837,7 @@ public class AccountServiceImpl extends ServiceImpl<ChDisabAccountsMapper, ChDis
         chDisabDetailAccounts.setAccountsDetailId(accountsDetailId);
         chDisabDetailAccounts.setStatus(((short)1));
         chDisabDetailAccounts.setDeclarationTime(new Date());
+        chDisabDetailAccounts.setLcd(new Date());
         int result = chDisabAccountsDetailMapper.updateById(chDisabDetailAccounts);
         return result;
     }
@@ -943,6 +947,7 @@ public class AccountServiceImpl extends ServiceImpl<ChDisabAccountsMapper, ChDis
         chDisabDetailAccounts.setAccountsDetailId(accountsDetailId);
         chDisabDetailAccounts.setStatus(status);
         chDisabDetailAccounts.setAccountsId(accountsId);
+        chDisabDetailAccounts.setLcd(new Date());
         int result = chDisabAccountsDetailMapper.updateById(chDisabDetailAccounts);
         return result;
     }
@@ -1025,6 +1030,7 @@ public class AccountServiceImpl extends ServiceImpl<ChDisabAccountsMapper, ChDis
             chDisabDetailAccountsDTO.setAccountsAllCost(accountsAllCost.add(limit));
             chDisabDetailAccountsDTO.setAccountsOverallCost(accountsOverallCost.add(limit));
             chDisabDetailAccountsDTO.setAccountsPersonalCost(zero);
+            chDisabDetailAccountsDTO.setLcd(new Date());
             chDisabAccountsDetailMapper.updateById(chDisabDetailAccountsDTO);
         }
         return Result.success();
@@ -1119,6 +1125,7 @@ public class AccountServiceImpl extends ServiceImpl<ChDisabAccountsMapper, ChDis
                 chDisabDetailAccounts.setAccountsAllCost(allCostSubtract);
                 chDisabDetailAccounts.setAccountsOverallCost(overCostSubtract);
                 chDisabDetailAccounts.setAccountsPersonalCost(personCostSubtract);
+                chDisabDetailAccounts.setLcd(new Date());
                 chDisabAccountsDetailMapper.updateById(chDisabDetailAccounts);
 
             }

account/account-service/src/main/resources/mapper/ChDisabAccountsDetailMapper.xml

@@ -312,7 +312,8 @@ and organ.SRV_ORGAN_ID = #{req.srvOrganId} order by detail.SRV_DATE desc
             <if test="accountsStatus == 0">
                 d.status = #{accountsStatus},
                 d.REISSUE_AMOUNT = 0,
-                d.DEDUCTION_AMOUNT = 0
+                d.DEDUCTION_AMOUNT = 0,
+                d.lcd = sysdate
             </if>
 
         </set>

apply/apply-service/src/main/resources/mapper/ChSrvTaskDetailMapper.xml

@@ -127,7 +127,7 @@ WHERE TASK_DETAIL_ID =  #{taskDetailId}
 
   <update id = "updateChDisabDetailAccounts">
    UPDATE CH_DISAB_ACCOUNTS_DETAIL d SET  d.ACCOUNTS_ALL_COST = #{accountsAllCostsub}, d.ACCOUNTS_OVERALL_COST =  #{accountsOverallCostsub},
-   d.ACCOUNTS_PERSONAL_COST =  #{accountsPersonalCostsub}
+     d.ACCOUNTS_PERSONAL_COST =  #{accountsPersonalCostsub},d.lcd = sysdate
    WHERE  d.ACCOUNTS_DETAIL_ID =  #{accountsDetailId}
   </update>
 

common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/account/ChDisabDetailAccounts.java

@@ -117,6 +117,8 @@ public class ChDisabDetailAccounts implements Serializable {
 
      private Date declarationTime;
 
+     private Date lcd;
+
 
    private static final long serialVersionUID = 1L;
 }
\ No newline at end of file