计费单据查询单价;
This commit is contained in:
王奎兴
@@ -22,7 +22,7 @@ public class MinIoUploadService {
|
||||
private MinioClient minioClient;
|
||||
|
||||
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 secretKey="gmminioadmin";
|
||||
/**
|
||||
@@ -139,4 +139,4 @@ public class MinIoUploadService {
|
||||
}
|
||||
return FILE_URL;
|
||||
}*/
|
||||
}
|
||||
}
|
||||
+28
-24
@@ -340,11 +340,13 @@ public class ContractManageApplicationService {
|
||||
public List<SubjectAndPriceReturn> getPrice(String documentTypeCode, String settlementCustomersCode,Long organizationId,Long topOrganizationId) {
|
||||
List<SubjectAndPriceReturn> result = new ArrayList<>();
|
||||
ContractManagePO contractManagePO = getInfoByCustomerAndOrganizationId(settlementCustomersCode, 1, topOrganizationId, organizationId);
|
||||
List<ContractManageDetailPO> detailPOS = contractManageDetailDomainService.queryListByManageId(contractManagePO.getContractManageId());
|
||||
contractManagePO.setContractManageDetailPOList(detailPOS);
|
||||
if (contractManagePO != null) {
|
||||
List<ContractManageDetailPO> contractManageDetailPOList = contractManagePO.getContractManageDetailPOList();
|
||||
if (contractManageDetailPOList != null && contractManageDetailPOList.size() > 0) {
|
||||
List<ContractManageDetailPO> contractManageDetailPOs = contractManageDetailPOList.stream()
|
||||
.filter(item -> item.getDocumentType().equals(documentTypeCode))
|
||||
.filter(item -> item.getDocumentTypeCode().equals(documentTypeCode))
|
||||
.collect(Collectors.toList());
|
||||
if (contractManageDetailPOs != null && contractManageDetailPOs.size() > 0) {
|
||||
for (ContractManageDetailPO contractManageDetailPO : contractManageDetailPOs) {
|
||||
@@ -358,28 +360,30 @@ public class ContractManageApplicationService {
|
||||
Long billingParamsId = billingParam.getBillingParamsId();
|
||||
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>>>() {});
|
||||
Map<String, Object> stringObjectMap1 = preSetRulesList.get(0);
|
||||
for (Map<String, Object> stringObjectMap : billingParamsList) {
|
||||
String fieldsName = (String) stringObjectMap.get("fieldsName");
|
||||
String isShow = (String) stringObjectMap.get("isShow");
|
||||
String isFee = (String) stringObjectMap.get("isFee");
|
||||
String isPush = (String) stringObjectMap.get("isPush");
|
||||
if ("1".equals(isFee)) {
|
||||
Integer sort = (Integer) stringObjectMap.get("sort");
|
||||
String chargingId = (String) stringObjectMap.get("chargingId");
|
||||
String fields = (String) stringObjectMap.get("fields");
|
||||
String price = (String) stringObjectMap1.get("fields" + sort);
|
||||
SubjectAndPriceReturn subjectAndPriceReturn = new SubjectAndPriceReturn();
|
||||
subjectAndPriceReturn.setName(fieldsName);
|
||||
subjectAndPriceReturn.setPrice(new BigDecimal(price));
|
||||
subjectAndPriceReturn.setChargingId(chargingId);
|
||||
subjectAndPriceReturn.setFields(fields);
|
||||
subjectAndPriceReturn.setBillingRulesId(accountingStrategyId);
|
||||
subjectAndPriceReturn.setIsShow(isShow);
|
||||
subjectAndPriceReturn.setIsFee(isFee);
|
||||
subjectAndPriceReturn.setIsPush(isPush);
|
||||
subjectAndPriceReturn.setRulesId(billingParamsId);
|
||||
result.add(subjectAndPriceReturn);
|
||||
if (preSetRulesList != null && preSetRulesList.size() > 0) {
|
||||
Map<String, Object> stringObjectMap1 = preSetRulesList.get(0);
|
||||
for (Map<String, Object> stringObjectMap : billingParamsList) {
|
||||
String fieldsName = (String) stringObjectMap.get("fieldsName");
|
||||
String isShow = (String) stringObjectMap.get("isShow");
|
||||
String isFee = (String) stringObjectMap.get("isFee");
|
||||
String isPush = (String) stringObjectMap.get("isPush");
|
||||
if ("1".equals(isFee)) {
|
||||
Integer sort = (Integer) stringObjectMap.get("sort");
|
||||
String chargingId = (String) stringObjectMap.get("chargingId");
|
||||
String fields = (String) stringObjectMap.get("fields");
|
||||
String price = (String) stringObjectMap1.get("fields" + sort);
|
||||
SubjectAndPriceReturn subjectAndPriceReturn = new SubjectAndPriceReturn();
|
||||
subjectAndPriceReturn.setName(fieldsName);
|
||||
subjectAndPriceReturn.setPrice(new BigDecimal(price));
|
||||
subjectAndPriceReturn.setChargingId(chargingId);
|
||||
subjectAndPriceReturn.setFields(fields);
|
||||
subjectAndPriceReturn.setBillingRulesId(accountingStrategyId);
|
||||
subjectAndPriceReturn.setIsShow(isShow);
|
||||
subjectAndPriceReturn.setIsFee(isFee);
|
||||
subjectAndPriceReturn.setIsPush(isPush);
|
||||
subjectAndPriceReturn.setRulesId(billingParamsId);
|
||||
result.add(subjectAndPriceReturn);
|
||||
}
|
||||
}
|
||||
}
|
||||
//}
|
||||
@@ -392,7 +396,7 @@ public class ContractManageApplicationService {
|
||||
} else {
|
||||
throw new ServiceException("合同信息不存在");
|
||||
}
|
||||
return null;
|
||||
return result;
|
||||
}
|
||||
|
||||
public List<SubjectAndPriceReturn> getSubject(SubjectAndPriceDTO contractManageDTO) {
|
||||
|
||||
@@ -107,12 +107,12 @@
|
||||
<select id="selectCostSubject" parameterType="com.mhd.basic.domain.expenseAccount.repository.todo.ExpenseAccountDO"
|
||||
resultType="com.mhd.basic.domain.expenseAccount.repository.po.ExpenseAccountPO">
|
||||
select
|
||||
*
|
||||
from expense_account
|
||||
a.*
|
||||
from expense_account a left join service_items_manage b ON a.service_items_manage_id = b.service_items_manage_id
|
||||
where
|
||||
del_flag = 1
|
||||
and status = 1
|
||||
and first_subject_flag = 1
|
||||
a.del_flag = 1
|
||||
and a.status = 1
|
||||
and a.first_subject_flag = 1
|
||||
<include refid="common_where_two"></include>
|
||||
</select>
|
||||
<select id="selectAllCostSubject"
|
||||
@@ -149,11 +149,15 @@
|
||||
<!-- 如果 organizationId 和 topOrganizationId 都为 null，表示查询所有组织的数据（不添加组织过滤条件） -->
|
||||
<if test="expenseAccountDO.organizationId != null">
|
||||
<!-- 如果设置了 organizationId，添加 organization_id 条件 -->
|
||||
and organization_id = #{expenseAccountDO.organizationId}
|
||||
and a.organization_id = #{expenseAccountDO.organizationId}
|
||||
</if>
|
||||
<if test="expenseAccountDO.topOrganizationId != null and expenseAccountDO.organizationId == null">
|
||||
<!-- 如果设置了 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>
|
||||
</sql>
|
||||
|
||||
|
||||
+3
@@ -93,4 +93,7 @@ public class SettlementCustomersPO extends BaseVOEntity{
|
||||
@ApiModelProperty(name = "nc编码")
|
||||
private String ncCode;
|
||||
|
||||
@ApiModelProperty(name = "结算币种")
|
||||
private String settlementCurrency;
|
||||
|
||||
}
|
||||
@@ -31,6 +31,7 @@
|
||||
<result property="updateBy" column="update_by" />
|
||||
<result property="updateByName" column="update_by_name" />
|
||||
<result property="delFlag" column="del_flag" />
|
||||
<result property="settlementCurrency" column="settlement_currency" />
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectSettlementCustomersPo">
|
||||
@@ -90,9 +91,9 @@
|
||||
<select id="queryList" parameterType="com.mhd.bms.domain.settlementCustomers.repository.todo.SettlementCustomersDO"
|
||||
resultMap="SettlementCustomersResult">
|
||||
select
|
||||
*
|
||||
from settlement_customers
|
||||
where del_flag = 1
|
||||
a.*,b.SETTLEMENT_CURRENCY
|
||||
from settlement_customers a left join "NGWL_TEST_USER"."USER_SHIPPER" b on a.settlement_entity_id = b.user_id
|
||||
where a.del_flag = 1
|
||||
<include refid="common_where"/>
|
||||
ORDER BY create_time IS NULL, create_time DESC
|
||||
</select>
|
||||
@@ -106,40 +107,40 @@
|
||||
|
||||
<sql id="common_where">
|
||||
<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 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 test="settlementCustomersDO.settlementMethod != null and settlementCustomersDO.settlementMethod != ''">
|
||||
and settlement_method like concat('%', #{settlementCustomersDO.settlementMethod}, '%')
|
||||
and a.settlement_method like concat('%', #{settlementCustomersDO.settlementMethod}, '%')
|
||||
</if>
|
||||
<if test="settlementCustomersDO.remark != null and settlementCustomersDO.remark != ''">
|
||||
and remark like concat('%', #{settlementCustomersDO.remark}, '%')
|
||||
and a.remark like concat('%', #{settlementCustomersDO.remark}, '%')
|
||||
</if>
|
||||
<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 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 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 test="settlementCustomersDO.mainRole != null and settlementCustomersDO.mainRole != ''">
|
||||
and main_role = #{settlementCustomersDO.mainRole}
|
||||
and a.main_role = #{settlementCustomersDO.mainRole}
|
||||
</if>
|
||||
<if test="settlementCustomersDO.organizationId != null">
|
||||
and organization_id = #{settlementCustomersDO.organizationId}
|
||||
and a.organization_id = #{settlementCustomersDO.organizationId}
|
||||
</if>
|
||||
<if test="settlementCustomersDO.topOrganizationId != null and settlementCustomersDO.topOrganizationId != ''">
|
||||
and top_organization_id = #{settlementCustomersDO.topOrganizationId}
|
||||
and a.top_organization_id = #{settlementCustomersDO.topOrganizationId}
|
||||
</if>
|
||||
<if test="settlementCustomersDO.customerType != null and settlementCustomersDO.customerType != ''">
|
||||
and customer_type = #{settlementCustomersDO.customerType}
|
||||
and a.customer_type = #{settlementCustomersDO.customerType}
|
||||
</if>
|
||||
<if test="settlementCustomersDO.customerTypeCode != null and settlementCustomersDO.customerTypeCode != ''">
|
||||
and customer_type_code = #{settlementCustomersDO.customerTypeCode}
|
||||
and a.customer_type_code = #{settlementCustomersDO.customerTypeCode}
|
||||
</if>
|
||||
</sql>
|
||||
</mapper>
|
||||
</mapper>
|
||||
Reference in New Issue
Block a user