LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 处理历史数据接口

Browse Source
This commit is contained in:
lijiarao
2024-07-17 17:54:25 +08:00
parent a006657b68
commit 8b745c1c55
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyProjectServiceImpl.java
+3 -5
View File
@@ -451,13 +451,10 @@ public class PayPackCompanyProjectServiceImpl extends ServiceImpl<PayPackCompany
PayWorkingGroup payWorkingGroup = payWorkingGroupMapper.selectById(workingGroupId);
BigDecimal yearChargeA = payWorkingGroup.getYearChargeA();
if (yearChargeA == null || new BigDecimal("0.00").equals(yearChargeA)){
continue;
yearChargeA = new BigDecimal("0.00");
}
PayWorkingGroupSubItem payWorking = null;
List<JSONObject> jsonObjects1 = sysBaseAPI.getLogByRequestParam(projectId);
if (jsonObjects1.isEmpty()){
continue;
}
for (JSONObject jsonObject : jsonObjects1) {
String logContent = jsonObject.getString("logContent");
if ("工作组成员-添加".equals(logContent)||"工作组成员-修改".equals(logContent)||"企业端-工作组成员-修改".equals(logContent)){
@@ -465,7 +462,7 @@ public class PayPackCompanyProjectServiceImpl extends ServiceImpl<PayPackCompany
requestParam = requestParam.substring(1,requestParam.length()-1);
PayWorkingGroupSubItem obj = JSONObject.parseObject(requestParam, PayWorkingGroupSubItem.class);
BigDecimal receivableAmount = obj.getReceivableAmount();
if (new BigDecimal("0.00").equals(receivableAmount)){
if (new BigDecimal("0.00").equals(receivableAmount) || receivableAmount == null){
continue;
}else {
payWorking = obj;
@@ -527,6 +524,7 @@ public class PayPackCompanyProjectServiceImpl extends ServiceImpl<PayPackCompany
}else {
amountReceivable = new BigDecimal("2000");
}
tbMember.setId(projectId);
tbMember.setAmountReceivable(amountReceivable);
BigDecimal noTaxAmount1 = amountReceivable.divide(StaticConfig.TAX_RATE_CALCULATE, 2, RoundingMode.HALF_UP);
tbMember.setNoTaxAmount(noTaxAmount1);
jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysBaseApiImpl.java
+1
View File
@@ -1160,6 +1160,7 @@ public class SysBaseApiImpl implements ISysBaseAPI {
wrapper.like(SysLog::getRequestParam,requestParam);
wrapper.ne(SysLog::getLogContent,"打包项目维护-添加");
wrapper.ne(SysLog::getLogContent,"收入合同-关联");
wrapper.orderByAsc(SysLog::getCreateTime);
List<SysLog> sysLogs = sysLogMapper.selectList(wrapper);
List<JSONObject> jsonObjects = new ArrayList<>();
for (SysLog sysLog : sysLogs) {