kaifabu/qichenOA
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复bug

Browse Source
This commit is contained in:
RuicyWu
2026-06-12 10:51:42 +08:00
parent 0827050803
commit 7fe45f79d3
5 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps-customize/src/main/java/com/seeyon/apps/src_rent/bill/BillService.java
View File

@@ -103,6 +103,7 @@ public class BillService {
List<FormWhereCondition> conditions = buildConditions(params);
conditions.add(FormWhereCondition.build().display("账单-收款结果反馈").clauseFactor(ClauseFactor.NULL).startWithBracket(true).concatFactor(ClauseFactor.OR));
conditions.add(FormWhereCondition.build().display("账单-收款结果反馈").value(EnumMapUtils.getEnumItemValueByDisplayValue(masterContext.getTableBean(),"账单-收款结果反馈","未收款")).endWithBracket(true));
conditions.add(FormWhereCondition.build().display("账单-租费").value(0).clauseFactor(ClauseFactor.GT));
Long count = FormTableExecutor.count(masterContext, null, conditions);
return count.intValue();
}
@@ -110,6 +111,7 @@ public class BillService {
public PageQueryVo pageQueryContractBill(JSONObject params) throws Exception {
TableContext masterContext = FormTableExecutor.master(getFormNo());
List<FormWhereCondition> conditions = buildConditions(params);
conditions.add(FormWhereCondition.build().display("账单-租费").value(0).clauseFactor(ClauseFactor.GT));
Integer pageNo = params.getInteger("pageNo") == null ? 1 : params.getInteger("pageNo");
Integer pageSize = params.getInteger("pageSize") == null ? 10 : params.getInteger("pageSize");
PageQueryVo<BillVo> pageQueryVo = new PageQueryVo();

3
apps-customize/src/main/java/com/seeyon/apps/src_rent/bill/FeeRecordService.java
View File

@@ -19,6 +19,7 @@ public class FeeRecordService {
private RentConfigProvider configProvider = (RentConfigProvider) AppContext.getBean("rentConfigProvider");
private BillService billService = (BillService) AppContext.getBean("qcBillService");
private WaeBillService waeBillService = (WaeBillService) AppContext.getBean("qcWaeBillService");
private MarginBillService marginBillService = (MarginBillService) AppContext.getBean("qcMarginBillService");
private String getFormNo() {
return configProvider.getBizConfigByKey(RentConstants.FEERECORDFORMNO);
@@ -110,7 +111,7 @@ public class FeeRecordService {
}else if("wae".equals(bizType)){
waeBillService.payCallBack(billNo,payDate);
}else if("margin".equals(bizType)){
marginBillService.payCallBack(billNo,payDate);
}
}
}

1
apps-customize/src/main/java/com/seeyon/apps/src_rent/bill/MarginBillService.java
View File

@@ -73,6 +73,7 @@ public class MarginBillService {
if(StringUtils.isNotBlank(params.getString("endDate"))) {
conditions.add(FormWhereCondition.build().display("合同开始日期").clauseFactor(ClauseFactor.LE).value(params.getString("endDate")));
}
conditions.add(FormWhereCondition.build().display("履约保证金").value(0).clauseFactor(ClauseFactor.GT));
return conditions;
}

4
apps-customize/src/main/java/com/seeyon/apps/src_rent/bill/WaeBillService.java
View File

@@ -62,6 +62,8 @@ public class WaeBillService {
conditions.add(FormWhereCondition.build().display("缴费状态").value(EnumMapUtils.getEnumItemValueByDisplayValue(tableContext.getTableBean(), "缴费状态", "未结清")).endWithBracket(true));
}
}
conditions.add(FormWhereCondition.build().display("本次应缴电费").startWithBracket(true).clauseFactor(ClauseFactor.GT).value(0).concatFactor(ClauseFactor.OR));
conditions.add(FormWhereCondition.build().display("本次应缴水费").clauseFactor(ClauseFactor.GT).value(0).endWithBracket(true));
return conditions;
}
@@ -123,7 +125,7 @@ public class WaeBillService {
BigDecimal powerFee = fieldsMap.get("本次应缴电费") == null ? BigDecimal.ZERO : (BigDecimal) fieldsMap.get("本次应缴电费");
BigDecimal waterFee = fieldsMap.get("本次应缴水费") == null ? BigDecimal.ZERO : (BigDecimal) fieldsMap.get("本次应缴水费");
billVo.setBillAmount((powerFee.add(waterFee)).toString());
billVo.setBillName(BigDecimal.ZERO.equals(powerFee) ? "电费" : "水费");
billVo.setBillName(BigDecimal.ZERO.equals(powerFee) ? "水费" : "电费");
}
public String getBillPayReceiver(String billNo) throws Exception {

6
apps-customize/src/main/java/com/seeyon/apps/src_rent/service/SealService.java
View File

@@ -1,14 +1,12 @@
package com.seeyon.apps.src_rent.service;
import cn.hutool.json.JSONObject;
import com.cedarsoftware.util.io.JsonObject;
import com.seeyon.aicloud.common.JsonUtils;
import com.seeyon.apps.src_rent.config.RentConfigProvider;
import com.seeyon.apps.src_rent.constants.EsignApiUrl;
import com.seeyon.apps.src_rent.constants.RentConstants;
import com.seeyon.ctp.common.exceptions.BusinessException;
import com.seeyon.utils.form.*;
import com.seeyon.cap4.form.bean.FormTableBean;
import com.seeyon.apps.src_rent.po.EsignApiHeader;
import com.seeyon.apps.src_rent.po.EsignBaseResp;
import com.seeyon.apps.src_rent.po.SealInfoVo;
@@ -16,8 +14,6 @@ import com.seeyon.apps.src_rent.utils.HttpClient;
import com.seeyon.ctp.common.AppContext;
import com.seeyon.ctp.services.ServiceException;
import com.seeyon.v3x.services.form.FormFactory;
import com.seeyon.v3x.services.form.bean.FormExport;
import com.seeyon.v3x.services.form.bean.ValueExport;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -38,7 +34,7 @@ public class SealService {
}
public void grantSeal(String appId,Map<String, Object> params) throws Exception {
JsonObject reqParams = new JsonObject();
JSONObject reqParams = new JSONObject();
String sealId = getSealId(appId,(String) params.get("orgId"), (String) params.get("sealName"));
reqParams.put("sealId", sealId);
List<String> authorizedPsnIds = new ArrayList<>();