weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

计费单据查询单价;

Browse Source
This commit is contained in:
王奎兴
2026-05-09 16:17:55 +08:00
parent 0ca5bed1f9
commit 27af017450
5 changed files with 61 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd-common/mhd-common-core/src/main/java/minio/MinIoUploadService.java
+2 -2
View File
@@ -22,7 +22,7 @@ public class MinIoUploadService {
private MinioClient minioClient; private MinioClient minioClient;
private static String bucket="ngwl"; private static String bucket="ngwl";
private static String host="http://10.102.192.5:6000"; private static String host="http://127.0.0.1:6000";
private static String accessKey="minioadmin"; private static String accessKey="minioadmin";
private static String secretKey="gmminioadmin"; private static String secretKey="gmminioadmin";
/** /**
@@ -139,4 +139,4 @@ public class MinIoUploadService {
} }
return FILE_URL; return FILE_URL;
}*/ }*/
} }
mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/contractManage/ContractManageApplicationService.java
+28 -24
View File
@@ -340,11 +340,13 @@ public class ContractManageApplicationService {
public List<SubjectAndPriceReturn> getPrice(String documentTypeCode, String settlementCustomersCode,Long organizationId,Long topOrganizationId) { public List<SubjectAndPriceReturn> getPrice(String documentTypeCode, String settlementCustomersCode,Long organizationId,Long topOrganizationId) {
List<SubjectAndPriceReturn> result = new ArrayList<>(); List<SubjectAndPriceReturn> result = new ArrayList<>();
ContractManagePO contractManagePO = getInfoByCustomerAndOrganizationId(settlementCustomersCode, 1, topOrganizationId, organizationId); ContractManagePO contractManagePO = getInfoByCustomerAndOrganizationId(settlementCustomersCode, 1, topOrganizationId, organizationId);
List<ContractManageDetailPO> detailPOS = contractManageDetailDomainService.queryListByManageId(contractManagePO.getContractManageId());
contractManagePO.setContractManageDetailPOList(detailPOS);
if (contractManagePO != null) { if (contractManagePO != null) {
List<ContractManageDetailPO> contractManageDetailPOList = contractManagePO.getContractManageDetailPOList(); List<ContractManageDetailPO> contractManageDetailPOList = contractManagePO.getContractManageDetailPOList();
if (contractManageDetailPOList != null && contractManageDetailPOList.size() > 0) { if (contractManageDetailPOList != null && contractManageDetailPOList.size() > 0) {
List<ContractManageDetailPO> contractManageDetailPOs = contractManageDetailPOList.stream() List<ContractManageDetailPO> contractManageDetailPOs = contractManageDetailPOList.stream()
.filter(item -> item.getDocumentType().equals(documentTypeCode)) .filter(item -> item.getDocumentTypeCode().equals(documentTypeCode))
.collect(Collectors.toList()); .collect(Collectors.toList());
if (contractManageDetailPOs != null && contractManageDetailPOs.size() > 0) { if (contractManageDetailPOs != null && contractManageDetailPOs.size() > 0) {
for (ContractManageDetailPO contractManageDetailPO : contractManageDetailPOs) { for (ContractManageDetailPO contractManageDetailPO : contractManageDetailPOs) {
@@ -358,28 +360,30 @@ public class ContractManageApplicationService {
Long billingParamsId = billingParam.getBillingParamsId(); Long billingParamsId = billingParam.getBillingParamsId();
List<Map<String, Object>> preSetRulesList = JSON.parseObject(preSetRules, new TypeReference<List<Map<String, Object>>>() {}); List<Map<String, Object>> preSetRulesList = JSON.parseObject(preSetRules, new TypeReference<List<Map<String, Object>>>() {});
List<Map<String, Object>> billingParamsList = JSON.parseObject(billingParamsJson, new TypeReference<List<Map<String, Object>>>() {}); List<Map<String, Object>> billingParamsList = JSON.parseObject(billingParamsJson, new TypeReference<List<Map<String, Object>>>() {});
Map<String, Object> stringObjectMap1 = preSetRulesList.get(0); if (preSetRulesList != null && preSetRulesList.size() > 0) {
for (Map<String, Object> stringObjectMap : billingParamsList) { Map<String, Object> stringObjectMap1 = preSetRulesList.get(0);
String fieldsName = (String) stringObjectMap.get("fieldsName"); for (Map<String, Object> stringObjectMap : billingParamsList) {
String isShow = (String) stringObjectMap.get("isShow"); String fieldsName = (String) stringObjectMap.get("fieldsName");
String isFee = (String) stringObjectMap.get("isFee"); String isShow = (String) stringObjectMap.get("isShow");
String isPush = (String) stringObjectMap.get("isPush"); String isFee = (String) stringObjectMap.get("isFee");
if ("1".equals(isFee)) { String isPush = (String) stringObjectMap.get("isPush");
Integer sort = (Integer) stringObjectMap.get("sort"); if ("1".equals(isFee)) {
String chargingId = (String) stringObjectMap.get("chargingId"); Integer sort = (Integer) stringObjectMap.get("sort");
String fields = (String) stringObjectMap.get("fields"); String chargingId = (String) stringObjectMap.get("chargingId");
String price = (String) stringObjectMap1.get("fields" + sort); String fields = (String) stringObjectMap.get("fields");
SubjectAndPriceReturn subjectAndPriceReturn = new SubjectAndPriceReturn(); String price = (String) stringObjectMap1.get("fields" + sort);
subjectAndPriceReturn.setName(fieldsName); SubjectAndPriceReturn subjectAndPriceReturn = new SubjectAndPriceReturn();
subjectAndPriceReturn.setPrice(new BigDecimal(price)); subjectAndPriceReturn.setName(fieldsName);
subjectAndPriceReturn.setChargingId(chargingId); subjectAndPriceReturn.setPrice(new BigDecimal(price));
subjectAndPriceReturn.setFields(fields); subjectAndPriceReturn.setChargingId(chargingId);
subjectAndPriceReturn.setBillingRulesId(accountingStrategyId); subjectAndPriceReturn.setFields(fields);
subjectAndPriceReturn.setIsShow(isShow); subjectAndPriceReturn.setBillingRulesId(accountingStrategyId);
subjectAndPriceReturn.setIsFee(isFee); subjectAndPriceReturn.setIsShow(isShow);
subjectAndPriceReturn.setIsPush(isPush); subjectAndPriceReturn.setIsFee(isFee);
subjectAndPriceReturn.setRulesId(billingParamsId); subjectAndPriceReturn.setIsPush(isPush);
result.add(subjectAndPriceReturn); subjectAndPriceReturn.setRulesId(billingParamsId);
result.add(subjectAndPriceReturn);
}
} }
} }
//} //}
@@ -392,7 +396,7 @@ public class ContractManageApplicationService {
} else { } else {
throw new ServiceException("合同信息不存在"); throw new ServiceException("合同信息不存在");
} }
return null; return result;
} }
public List<SubjectAndPriceReturn> getSubject(SubjectAndPriceDTO contractManageDTO) { public List<SubjectAndPriceReturn> getSubject(SubjectAndPriceDTO contractManageDTO) {
mhd-modules/mhd-system/src/main/resources/mapper/basic/ExpenseAccountMapper.xml
+11 -7
View File
@@ -107,12 +107,12 @@
<select id="selectCostSubject" parameterType="com.mhd.basic.domain.expenseAccount.repository.todo.ExpenseAccountDO" <select id="selectCostSubject" parameterType="com.mhd.basic.domain.expenseAccount.repository.todo.ExpenseAccountDO"
resultType="com.mhd.basic.domain.expenseAccount.repository.po.ExpenseAccountPO"> resultType="com.mhd.basic.domain.expenseAccount.repository.po.ExpenseAccountPO">
select select
* a.*
from expense_account from expense_account a left join service_items_manage b ON a.service_items_manage_id = b.service_items_manage_id
where where
del_flag = 1 a.del_flag = 1
and status = 1 and a.status = 1
and first_subject_flag = 1 and a.first_subject_flag = 1
<include refid="common_where_two"></include> <include refid="common_where_two"></include>
</select> </select>
<select id="selectAllCostSubject" <select id="selectAllCostSubject"
@@ -149,11 +149,15 @@
<!-- 如果 organizationId 和 topOrganizationId 都为 null，表示查询所有组织的数据（不添加组织过滤条件） --> <!-- 如果 organizationId 和 topOrganizationId 都为 null，表示查询所有组织的数据（不添加组织过滤条件） -->
<if test="expenseAccountDO.organizationId != null"> <if test="expenseAccountDO.organizationId != null">
<!-- 如果设置了 organizationId，添加 organization_id 条件 --> <!-- 如果设置了 organizationId，添加 organization_id 条件 -->
and organization_id = #{expenseAccountDO.organizationId} and a.organization_id = #{expenseAccountDO.organizationId}
</if> </if>
<if test="expenseAccountDO.topOrganizationId != null and expenseAccountDO.organizationId == null"> <if test="expenseAccountDO.topOrganizationId != null and expenseAccountDO.organizationId == null">
<!-- 如果设置了 topOrganizationId 但没有设置 organizationId，添加 top_organization_id 条件 --> <!-- 如果设置了 topOrganizationId 但没有设置 organizationId，添加 top_organization_id 条件 -->
and top_organization_id = #{expenseAccountDO.topOrganizationId} and a.top_organization_id = #{expenseAccountDO.topOrganizationId}
</if>
<if test="expenseAccountDO.serviceItemsCode != null and expenseAccountDO.serviceItemsCode != ''">
<!-- 如果设置了 topOrganizationId 但没有设置 organizationId，添加 top_organization_id 条件 -->
and b.service_items_code = #{expenseAccountDO.serviceItemsCode}
</if> </if>
</sql> </sql>
mhd_bms/src/main/java/com/mhd/bms/domain/settlementCustomers/repository/po/SettlementCustomersPO.java
+3
View File
@@ -93,4 +93,7 @@ public class SettlementCustomersPO extends BaseVOEntity{
@ApiModelProperty(name = "nc编码") @ApiModelProperty(name = "nc编码")
private String ncCode; private String ncCode;
@ApiModelProperty(name = "结算币种")
private String settlementCurrency;
} }
mhd_bms/src/main/resources/mapper/SettlementCustomersMapper.xml
+17 -16
View File
@@ -31,6 +31,7 @@
<result property="updateBy" column="update_by" /> <result property="updateBy" column="update_by" />
<result property="updateByName" column="update_by_name" /> <result property="updateByName" column="update_by_name" />
<result property="delFlag" column="del_flag" /> <result property="delFlag" column="del_flag" />
<result property="settlementCurrency" column="settlement_currency" />
</resultMap> </resultMap>
<sql id="selectSettlementCustomersPo"> <sql id="selectSettlementCustomersPo">
@@ -90,9 +91,9 @@
<select id="queryList" parameterType="com.mhd.bms.domain.settlementCustomers.repository.todo.SettlementCustomersDO" <select id="queryList" parameterType="com.mhd.bms.domain.settlementCustomers.repository.todo.SettlementCustomersDO"
resultMap="SettlementCustomersResult"> resultMap="SettlementCustomersResult">
select select
* a.*,b.SETTLEMENT_CURRENCY
from settlement_customers from settlement_customers a left join "NGWL_TEST_USER"."USER_SHIPPER" b on a.settlement_entity_id = b.user_id
where del_flag = 1 where a.del_flag = 1
<include refid="common_where"/> <include refid="common_where"/>
ORDER BY create_time IS NULL, create_time DESC ORDER BY create_time IS NULL, create_time DESC
</select> </select>
@@ -106,40 +107,40 @@
<sql id="common_where"> <sql id="common_where">
<if test="settlementCustomersDO.settlementEntity != null and settlementCustomersDO.settlementEntity != ''"> <if test="settlementCustomersDO.settlementEntity != null and settlementCustomersDO.settlementEntity != ''">
and settlement_entity like concat('%', #{settlementCustomersDO.settlementEntity}, '%') and a.settlement_entity like concat('%', #{settlementCustomersDO.settlementEntity}, '%')
</if> </if>
<if test="settlementCustomersDO.settlementCustomersCode != null and settlementCustomersDO.settlementCustomersCode != ''"> <if test="settlementCustomersDO.settlementCustomersCode != null and settlementCustomersDO.settlementCustomersCode != ''">
and settlement_customers_code like concat('%', #{settlementCustomersDO.settlementCustomersCode}, '%') and a.settlement_customers_code like concat('%', #{settlementCustomersDO.settlementCustomersCode}, '%')
</if> </if>
<if test="settlementCustomersDO.settlementMethod != null and settlementCustomersDO.settlementMethod != ''"> <if test="settlementCustomersDO.settlementMethod != null and settlementCustomersDO.settlementMethod != ''">
and settlement_method like concat('%', #{settlementCustomersDO.settlementMethod}, '%') and a.settlement_method like concat('%', #{settlementCustomersDO.settlementMethod}, '%')
</if> </if>
<if test="settlementCustomersDO.remark != null and settlementCustomersDO.remark != ''"> <if test="settlementCustomersDO.remark != null and settlementCustomersDO.remark != ''">
and remark like concat('%', #{settlementCustomersDO.remark}, '%') and a.remark like concat('%', #{settlementCustomersDO.remark}, '%')
</if> </if>
<if test="settlementCustomersDO.createTimeStart != null and settlementCustomersDO.createTimeStart != ''"> <if test="settlementCustomersDO.createTimeStart != null and settlementCustomersDO.createTimeStart != ''">
AND date_format(create_time,'%Y-%m-%d') <![CDATA[>=]]> #{settlementCustomersDO.createTimeStart} AND date_format(a.create_time,'%Y-%m-%d') <![CDATA[>=]]> #{settlementCustomersDO.createTimeStart}
</if> </if>
<if test="settlementCustomersDO.createTimeEnd != null and settlementCustomersDO.createTimeEnd != ''"> <if test="settlementCustomersDO.createTimeEnd != null and settlementCustomersDO.createTimeEnd != ''">
AND date_format(create_time,'%Y-%m-%d') <![CDATA[<=]]> #{settlementCustomersDO.createTimeEnd} AND date_format(a.create_time,'%Y-%m-%d') <![CDATA[<=]]> #{settlementCustomersDO.createTimeEnd}
</if> </if>
<if test="settlementCustomersDO.createByName != null and settlementCustomersDO.createByName != ''"> <if test="settlementCustomersDO.createByName != null and settlementCustomersDO.createByName != ''">
and create_by_name like concat('%', #{settlementCustomersDO.createByName}, '%') and a.create_by_name like concat('%', #{settlementCustomersDO.createByName}, '%')
</if> </if>
<if test="settlementCustomersDO.mainRole != null and settlementCustomersDO.mainRole != ''"> <if test="settlementCustomersDO.mainRole != null and settlementCustomersDO.mainRole != ''">
and main_role = #{settlementCustomersDO.mainRole} and a.main_role = #{settlementCustomersDO.mainRole}
</if> </if>
<if test="settlementCustomersDO.organizationId != null"> <if test="settlementCustomersDO.organizationId != null">
and organization_id = #{settlementCustomersDO.organizationId} and a.organization_id = #{settlementCustomersDO.organizationId}
</if> </if>
<if test="settlementCustomersDO.topOrganizationId != null and settlementCustomersDO.topOrganizationId != ''"> <if test="settlementCustomersDO.topOrganizationId != null and settlementCustomersDO.topOrganizationId != ''">
and top_organization_id = #{settlementCustomersDO.topOrganizationId} and a.top_organization_id = #{settlementCustomersDO.topOrganizationId}
</if> </if>
<if test="settlementCustomersDO.customerType != null and settlementCustomersDO.customerType != ''"> <if test="settlementCustomersDO.customerType != null and settlementCustomersDO.customerType != ''">
and customer_type = #{settlementCustomersDO.customerType} and a.customer_type = #{settlementCustomersDO.customerType}
</if> </if>
<if test="settlementCustomersDO.customerTypeCode != null and settlementCustomersDO.customerTypeCode != ''"> <if test="settlementCustomersDO.customerTypeCode != null and settlementCustomersDO.customerTypeCode != ''">
and customer_type_code = #{settlementCustomersDO.customerTypeCode} and a.customer_type_code = #{settlementCustomersDO.customerTypeCode}
</if> </if>
</sql> </sql>
</mapper> </mapper>