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

修改对接前端出现的问题

Browse Source
This commit is contained in:
sunzheng
2024-01-08 16:01:50 +08:00
parent 3c279e0a62
commit 6b1e77be08
4 changed files with 26 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupController.java
+10 -7
View File
@@ -81,6 +81,9 @@ public class PayDraftingGroupController extends JeroController<PayDraftingGroup,
if(!StringUtils.isBlank(payDraftingGroup.getDraftingGroupProject())){
payDraftingGroup.setDraftingGroupProject(oConvertUtils.replaceAllPercent(payDraftingGroup.getDraftingGroupProject()));
}
if(!StringUtils.isBlank(payDraftingGroup.getWorkingGroupName())){
payDraftingGroup.setWorkingGroupName(oConvertUtils.replaceAllPercent(payDraftingGroup.getWorkingGroupName()));
}
IPage<PayDraftingGroupVo> pageList = payDraftingGroupService.queryPageList(page,payDraftingGroup);
if (!Objects.isNull(pageList)) {
@@ -92,13 +95,6 @@ public class PayDraftingGroupController extends JeroController<PayDraftingGroup,
}else{
p.setCheckoutOperation(PayProjectCommon.CHECKOUT_OPERATION1);
}
// 根据工作组id查询对应的工作组名称
if (StringUtils.isNotBlank(p.getWorkingGroupId())) {
PayWorkingGroup payWorkingGroup = payDraftingGroupService.getPayWorkingGroupNameById(p.getWorkingGroupId());
if (!Objects.isNull(payWorkingGroup)) {
p.setWorkingGroupName(payWorkingGroup.getWorkingGroupProject());
}
}
});
pageList.setRecords(listPayDraftingGroupVo);
}
@@ -222,6 +218,13 @@ public class PayDraftingGroupController extends JeroController<PayDraftingGroup,
if(Objects.isNull(payDraftingGroup)) {
return Result.error("未找到对应数据");
}
// 根据工作组id查询对应的工作组名称
if (StringUtils.isNotBlank(payDraftingGroup.getWorkingGroupId())) {
PayWorkingGroup payWorkingGroup = payDraftingGroupService.getPayWorkingGroupNameById(payDraftingGroup.getWorkingGroupId());
if (!Objects.isNull(payWorkingGroup)) {
payDraftingGroup.setWorkingGroupName(payWorkingGroup.getWorkingGroupProject());
}
}
return Result.OK(payDraftingGroup);
}
jero-boot-incoming-payment/src/main/java/com/jero/drafting/entity/PayDraftingGroup.java
+5
View File
@@ -52,6 +52,11 @@ public class PayDraftingGroup implements Serializable {
@NotEmpty(message = "工作组id不能为空")
@Size(max = 50,message = "工作组id长度不能大于50个字符")
private String workingGroupId;
@ApiModelProperty(value = "工作组名称")
@TableField(exist = false)
private String workingGroupName;
/**运行年份*/
@Excel(name = "运行年份", width = 15)
@ApiModelProperty(value = "运行年份")
jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupMapper.xml
+11 -3
View File
@@ -19,10 +19,12 @@
pdg.update_by AS updateBy,
pdg.update_time AS updateTime,
su.realname AS principalNameA,
su1.realname AS principalNameB
su1.realname AS principalNameB,
pwg.working_group_project AS workingGroupName
FROM pay_drafting_group pdg
left join sys_user su on pdg.principal_id_a = su.id
left join sys_user su1 on pdg.principal_id_b = su1.id
left join pay_working_group pwg on pwg.id = pdg.working_group_id
<if test="(payDraftingGroup.companyContactName != null and payDraftingGroup.companyContactName != '')
or (payDraftingGroup.companyName != null and payDraftingGroup.companyName != '')">
left join pay_drafting_group_subitem pdgs on pdg.id = pdgs.drafting_group_id
@@ -33,10 +35,16 @@
AND drafting_group_project LIKE concat('%',concat(#{payDraftingGroup.draftingGroupProject},'%'))
</if>
<if test="payDraftingGroup.principalIdA != null and payDraftingGroup.principalIdA != ''">
AND principal_id_a = #{payDraftingGroup.principalIdA}
AND pdg.principal_id_a = #{payDraftingGroup.principalIdA}
</if>
<if test="payDraftingGroup.year != null and payDraftingGroup.year != ''">
AND year = #{payDraftingGroup.year}
AND pdg.year = #{payDraftingGroup.year}
</if>
<if test="payDraftingGroup.workingGroupId != null and payDraftingGroup.workingGroupId != ''">
AND working_group_id = #{payDraftingGroup.workingGroupId}
</if>
<if test="payDraftingGroup.workingGroupName != null and payDraftingGroup.workingGroupName != ''">
AND pwg.working_group_project like concat('%', #{payDraftingGroup.workingGroupName}, '%')
</if>
<if test="payDraftingGroup.companyContactName != null and payDraftingGroup.companyContactName != ''">
and pdgsc.contacts_temporary_name like concat('%', #{payDraftingGroup.companyContactName}, '%')
jero-boot-incoming-payment/src/main/java/com/jero/drafting/vo/PayDraftingGroupVo.java
-5
View File
@@ -21,9 +21,4 @@ public class PayDraftingGroupVo extends PayDraftingGroup {
* 当前登录人是否可以操作(1为可操作，2为不可操作)
*/
private Integer checkoutOperation;
/**
* 工作组名称
*/
private String workingGroupName;
}