@ -9,9 +9,7 @@ import com.qs.serve.common.model.dto.R;
import com.qs.serve.common.model.enums.BizType ;
import com.qs.serve.common.model.enums.BudgetLogOptFlag ;
import com.qs.serve.common.model.enums.SystemModule ;
import com.qs.serve.common.util.AuthContextUtils ;
import com.qs.serve.common.util.PageUtil ;
import com.qs.serve.common.util.StringUtils ;
import com.qs.serve.common.util.* ;
import com.qs.serve.modules.bms.entity.BmsRegion2 ;
import com.qs.serve.modules.bms.service.BmsRegion2Service ;
import com.qs.serve.modules.seeyon.entity.CtpAffairQo ;
@ -23,6 +21,7 @@ import com.qs.serve.modules.sys.service.SysPostUserService;
import com.qs.serve.modules.sys.service.SysUserService ;
import com.qs.serve.modules.tbs.common.util.TbsBudgetLogBuildUtil ;
import com.qs.serve.modules.tbs.entity.TbsBudget ;
import com.qs.serve.modules.tbs.entity.TbsBudgetCostItem ;
import com.qs.serve.modules.tbs.entity.TbsBudgetCostItemPolicy ;
import com.qs.serve.modules.tbs.entity.TbsBudgetLog ;
import com.qs.serve.modules.tbs.entity.bo.TbsAffairCommitBo ;
@ -80,7 +79,7 @@ public class TzcPolicyTestController {
@GetMapping ( "/testSyncPolicy" )
public R < ? > syncPolicy ( Long policyId ) {
tzcPolicyApplicationService . syncPolicyItem ( policyId ) ;
//tzcPolicyApplicationService.syncPolicyItem(policyId);
return R . ok ( ) ;
}
@ -88,7 +87,10 @@ public class TzcPolicyTestController {
@GetMapping ( "/rebulidAllPolicy" )
public R < ? > rebulidAllPolicy ( ) {
Long [ ] ids = new Long [ ] {
//487L,
//555L,
//738L,
775L
} ;
for ( Long id : ids ) {
rebuildPolicy ( id ) ;
@ -98,9 +100,8 @@ public class TzcPolicyTestController {
public R < ? > rebuildPolicy ( Long policyId ) {
// TzcPolicy tzcPolicy = tzcPolicyService.getById(policyId);
//Integer tzcPolicyStatus = tzcPolicy.getPolicyStatus();
//SysUser sysUser = sysUserService.getById(tzcPolicy.getCreateBy());
TzcPolicy tzcPolicy = tzcPolicyService . getById ( policyId ) ;
SysUser sysUser = sysUserService . getById ( tzcPolicy . getCreateBy ( ) ) ;
SysTableTemp sysTableTemp = new SysTableTemp ( ) ;
sysTableTemp . setTableName ( "policyId" ) ;
@ -109,7 +110,7 @@ public class TzcPolicyTestController {
TbsBudgetCostResult result = policyApplicationService . buildBudgetCostResult ( policyId , false , false ) ;
if ( result . getBudgetUnMatchList ( ) ! = null & & result . getBudgetUnMatchList ( ) . size ( ) > 0 ) {
sysTableTemp . setResultMsg ( "政策匹配预算失败" ) ;
sysTableTempMapper . insert ( sysTableTemp ) ;
//sysTableTempMapper.insert(sysTableTemp);
return R . error ( "政策匹配预算失败" ) ;
}
LambdaQueryWrapper < TbsBudgetCostItemPolicy > itemPolicyLqw = new LambdaQueryWrapper < > ( ) ;
@ -132,54 +133,49 @@ public class TzcPolicyTestController {
}
}
//判断是否正常数据
if ( isMatchAll ) {
sysTableTemp . setResultMsg ( "正常" ) ;
sysTableTempMapper . insert ( sysTableTemp ) ;
//sysTableTempMapper.insert(sysTableTemp);
return R . ok ( "正常" ) ;
} else {
sysTableTemp . setResultMsg ( "预算占用错误" ) ;
sysTableTempMapper . insert ( sysTableTemp ) ;
return R . ok ( "预算占用错误" ) ;
//sysTableTemp.setResultMsg("预算占用错误");
//sysTableTempMapper.insert(sysTableTemp);
//return R.ok("预算占用错误");
}
// tbsBudgetCostItemPolicyService.saveBatch(allBudgetItem);
// //保存预算使用日志
// List<TbsBudgetLog> budgetLogList = saveBudgetLog(result, sysUser, tzcPolicy, result.getPolicyBudgetMatchList(),result.getPolicyItemList());
// if(tzcPolicyStatus.equals(TzcPolicyStatus.Status_0_UnCommit)){
// budgetLogService.saveBatch(budgetLogList);
// }else {
// //排除历史记录
// LambdaQueryWrapper<TbsBudgetLog> logLqw = new LambdaQueryWrapper<>();
// logLqw.eq(TbsBudgetLog::getPolicyId,policyId);
// logLqw.eq(TbsBudgetLog::getRollbackFlag, BudgetLogRollbackFlag.State_1);
// List<TbsBudgetLog> oldLogList = budgetLogService.list(logLqw);
// List<TbsBudgetLog> oldLogList4Upd = oldLogList.stream().map(a->{
// TbsBudgetLog budgetLog = new TbsBudgetLog();
// budgetLog.setId(a.getId());
// budgetLog.setRollbackFlag(BudgetLogRollbackFlag.State_2);
// return budgetLog;
// }).collect(Collectors.toList());
// budgetLogService.updateBatchById(oldLogList4Upd);
// for (TbsBudgetLog budgetLog : oldLogList) {
// budgetLog.setCreateBy(null);
// budgetLog.setCreateTime(null);
// budgetLog.setUpdateBy(null);
// budgetLog.setUpdateTime(null);
// budgetLog.setId(null);
// BudgetLogOptFlag optFlag = BudgetLogOptFlag.State_12;
// budgetLog.setAmount(TbsBudgetLogBuildUtil.buildAmount(budgetLog.getAmount(),optFlag));
// budgetLog.setOptType(optFlag.getCode());
// }
// budgetLogService.saveBatch(oldLogList);
// BudgetLogOptFlag optFlag = BudgetLogOptFlag.State_13;
// budgetLogList.forEach(a->{
// a.setOptType(optFlag.getCode());
// a.setAmount(TbsBudgetLogBuildUtil.buildAmount(a.getAmount(),optFlag));
// });
// budgetLogService.saveBatch(budgetLogList);
// }
//return R.ok();
//保存预算使用日志
List < TbsBudgetLog > budgetLogList = saveBudgetLog ( result , sysUser , tzcPolicy , result . getPolicyBudgetMatchList ( ) , result . getPolicyItemList ( ) ) ;
LambdaQueryWrapper < TbsBudgetCostItemPolicy > citemLqw = new LambdaQueryWrapper < > ( ) ;
citemLqw . eq ( TbsBudgetCostItemPolicy : : getPolicyId , policyId ) ;
List < TbsBudgetCostItemPolicy > itemList = tbsBudgetCostItemPolicyService . list ( citemLqw ) ;
//Assert.throwEx("dev");
// 设置remark标记防止误删,移除旧的记录
for ( TbsBudgetCostItemPolicy costItem : itemList ) {
costItem . setRemark ( "toDel" ) ;
}
tbsBudgetCostItemPolicyService . updateBatchById ( itemList ) ;
List < Long > itemIds = itemList . stream ( ) . map ( TbsBudgetCostItemPolicy : : getId ) . collect ( Collectors . toList ( ) ) ;
tbsBudgetCostItemPolicyService . removeBatchByIds ( itemIds ) ;
tbsBudgetCostItemPolicyService . saveBatch ( allBudgetItem ) ;
// 设置remark标记防止误删,移除旧的记录
LambdaQueryWrapper < TbsBudgetLog > bLqw = new LambdaQueryWrapper < > ( ) ;
bLqw . eq ( TbsBudgetLog : : getPolicyId , policyId ) ;
List < TbsBudgetLog > dbbudgetLogs = budgetLogService . list ( bLqw ) ;
for ( TbsBudgetLog budgetLog : dbbudgetLogs ) {
budgetLog . setRemark ( "toDel" ) ;
}
budgetLogService . updateBatchById ( dbbudgetLogs ) ;
List < Long > budIds = dbbudgetLogs . stream ( ) . map ( TbsBudgetLog : : getId ) . collect ( Collectors . toList ( ) ) ;
budgetLogService . removeBatchByIds ( budIds ) ;
//重新保存
if ( CollectionUtil . isNotEmpty ( budgetLogList ) ) {
budgetLogService . saveBatch ( budgetLogList ) ;
}
return R . ok ( ) ;
}
/ * *
@ -218,5 +214,6 @@ public class TzcPolicyTestController {
}
return budgetLogList ;
}
}
