GTsoft/mps-platform
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
SGK\17962 2025-10-21 21:08:58 +08:00
commit 14e16824e0
18 changed files with 48 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cds-fontend-2025.V1/src/views/mps/market/index.vue
View File

@ -156,7 +156,7 @@ const {
align: 'center', align: 'center',
minWidth: 120, minWidth: 120,
ellipsis: true, ellipsis: true,
resizable: true, resizable: true
}, },
{ {
key: 'deptName', key: 'deptName',
@ -544,7 +544,7 @@ async function getSubcategoryOptions() {
:show-export="false" :show-export="false"
@add="handleAdd" @add="handleAdd"
@delete="handleBatchDelete" @delete="handleBatchDelete"
@export="handleExport" @export="true"
@refresh="getData" @refresh="getData"
> >
<!-- <template #after>--> <!-- <template #after>-->

4
cds-fontend-2025.V1/src/views/report/detail-entry/modules/detail-entry-search.vue
View File

@ -135,8 +135,8 @@ if(userInfo.roles.includes('operation')){
<NFormItemGi span="24 s:12 m:6" label="数据日期" path="date" class="pr-24px"> <NFormItemGi span="24 s:12 m:6" label="数据日期" path="date" class="pr-24px">
<NDatePicker <NDatePicker
v-model:formatted-value="model.date" v-model:formatted-value="model.date"
type="datetime" type="month"
value-format="yyyy-MM-dd" value-format="yyyy-MM"
clearable clearable
/> />
</NFormItemGi> </NFormItemGi>

1
cds-fontend-2025.V1/src/views/report/performance-MD/index.vue
View File

@ -1263,7 +1263,6 @@ const {
return ( return (
<div class="flex-center gap-8px"> <div class="flex-center gap-8px">
{editBtn()}
</div> </div>
); );
} }

2
cds-fontend-2025.V1/src/views/report/performance-h/index.vue
View File

@ -1263,7 +1263,7 @@ const {
return ( return (
<div class="flex-center gap-8px"> <div class="flex-center gap-8px">
{editBtn()}
</div> </div>
); );
} }

1
cds-fontend-2025.V1/src/views/report/performance-m/index.vue
View File

@ -1263,7 +1263,6 @@ const {
return ( return (
<div class="flex-center gap-8px"> <div class="flex-center gap-8px">
{editBtn()}
</div> </div>
); );
} }

1
cds-fontend-2025.V1/src/views/report/performance-q/index.vue
View File

@ -1263,7 +1263,6 @@ const {
return ( return (
<div class="flex-center gap-8px"> <div class="flex-center gap-8px">
{editBtn()}
</div> </div>
); );
} }

1
cds-fontend-2025.V1/src/views/report/performance-y/index.vue
View File

@ -1263,7 +1263,6 @@ const {
return ( return (
<div class="flex-center gap-8px"> <div class="flex-center gap-8px">
{editBtn()}
</div> </div>
); );
} }

1
cds-fontend-2025.V1/src/views/report/performance/index.vue
View File

@ -1262,7 +1262,6 @@ const {
return ( return (
<div class="flex-center gap-8px"> <div class="flex-center gap-8px">
{editBtn()}
</div> </div>
); );
} }

1
cds-fontend-2025.V1/src/views/report/pricing-summary-m/index.vue
View File

@ -215,7 +215,6 @@ const {
return ( return (
<div class="flex-center gap-8px"> <div class="flex-center gap-8px">
{editBtn()}
</div> </div>
); );
} }

1
cds-fontend-2025.V1/src/views/report/pricing-summary-q/index.vue
View File

@ -215,7 +215,6 @@ const {
return ( return (
<div class="flex-center gap-8px"> <div class="flex-center gap-8px">
{editBtn()}
</div> </div>
); );
} }

1
cds-fontend-2025.V1/src/views/report/pricing-summary-y/index.vue
View File

@ -215,7 +215,6 @@ const {
return ( return (
<div class="flex-center gap-8px"> <div class="flex-center gap-8px">
{editBtn()}
</div> </div>
); );
} }

20
cds-fontend-2025.V1/src/views/report/valid-invalid/index.vue
View File

@ -115,17 +115,17 @@ const {
ellipsis: true, ellipsis: true,
resizable: true resizable: true
}, },
{ // {
key: 'invalidBusiness', // key: 'invalidBusiness',
title: '无效的中间业务计价项目', // title: '无效的中间业务计价项目',
align: 'center', // align: 'center',
minWidth: 120, // minWidth: 120,
ellipsis: true, // ellipsis: true,
resizable: true // resizable: true
}, // },
{ {
key: 'validBusiness', key: 'validBusiness',
title: '有效的中间业务计价项目', title: '中间业务计价项目',
align: 'center', align: 'center',
minWidth: 120, minWidth: 120,
ellipsis: true, ellipsis: true,
@ -226,7 +226,7 @@ const {
); );
}; };
return <div class="flex-center gap-8px">{editBtn()}</div>; return <div class="flex-center gap-8px">{}</div>;
} }
} }
] ]

5
cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/domain/bo/MpsDetailEntryBo.java
View File

@ -1,5 +1,7 @@
package org.dromara.mps.domain.bo; package org.dromara.mps.domain.bo;
import org.dromara.common.translation.annotation.Translation;
import org.dromara.common.translation.constant.TransConstant;
import org.dromara.mps.domain.MpsDetailEntry; import org.dromara.mps.domain.MpsDetailEntry;
import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.AddGroup;
@ -64,8 +66,7 @@ public class MpsDetailEntryBo extends BaseEntity {
/** /**
* 数据日期 * 数据日期
*/ */
@NotNull(message = "数据日期不能为空", groups = { AddGroup.class, EditGroup.class }) private String date;
private Date date;
/** /**
* 部门名称 * 部门名称

8
cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/domain/vo/MpsDetailEntryVo.java
View File

@ -4,7 +4,10 @@ import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
import cn.idev.excel.annotation.ExcelIgnore; import cn.idev.excel.annotation.ExcelIgnore;
import cn.idev.excel.annotation.format.DateTimeFormat;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.common.translation.annotation.Translation;
import org.dromara.common.translation.constant.TransConstant;
import org.dromara.mps.domain.MpsDetailEntry; import org.dromara.mps.domain.MpsDetailEntry;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty; import cn.idev.excel.annotation.ExcelProperty;
@ -79,19 +82,22 @@ public class MpsDetailEntryVo implements Serializable {
* 数据日期 * 数据日期
*/ */
@ExcelProperty(value = "数据日期") @ExcelProperty(value = "数据日期")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat("yyyy-MM-dd")
private Date date; private Date date;
/** /**
* 部门名称 * 部门名称
*/ */
@ExcelProperty(value = "部门名称") @ExcelProperty(value = "部门名称")
@Translation(type = TransConstant.DEPT_ID_TO_NAME, mapper = "deptId")
private String deptName; private String deptName;
/** /**
* 部门id * 部门id
*/ */
@ExcelProperty(value = "部门id") @ExcelProperty(value = "部门id")
private BigDecimal deptId; private Long deptId;
/** /**
* 客户类型（1-个人，2-对公） * 客户类型（1-个人，2-对公）

8
cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/mapper/MpsDetailEntryMapper.java
View File

@ -45,12 +45,14 @@ public interface MpsDetailEntryMapper extends BaseMapperPlus<MpsDetailEntry, Mps
"c.old_card_no as oldCardNo , c.new_card_no as newCardNo, c.replace_method as affair ," + "c.old_card_no as oldCardNo , c.new_card_no as newCardNo, c.replace_method as affair ," +
"t.traffic_no as trafficNo ,t.traffic_amt as trafficAmt, " + "t.traffic_no as trafficNo ,t.traffic_amt as trafficAmt, " +
"m.* ," + "m.* ," +
"d.dept_name AS yxDeptName " + "d.dept_name AS yxDeptName ," +
"de.dept_name AS deptName " +
"from mps_market m " + "from mps_market m " +
" left join mps_traffic t on m.traffic_id = t.traffic_id " + " left join mps_traffic t on m.traffic_id = t.traffic_id " +
" left join mps_magneticcard c on m.magnetic_card_id = c.magnetic_card_id " + " left join mps_magneticcard c on m.magnetic_card_id = c.magnetic_card_id " +
" LEFT JOIN sys_user s ON m.yx_id = s.mkt_no "+ " LEFT JOIN sys_user s ON m.yx_id = s.mkt_no and m.del_flag = '0'"+
" LEFT JOIN sys_dept d ON s.dept_id = d.dept_id "+ " inner JOIN sys_dept d ON s.dept_id = d.dept_id "+
" inner JOIN sys_dept de ON m.dept_id = de.dept_id "+
"${ew.customSqlSegment}"+ "${ew.customSqlSegment}"+
"and m.del_flag = '0' order by m.entry_date desc" "and m.del_flag = '0' order by m.entry_date desc"
}) })

2
cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/service/impl/MpsDetailEntryServiceImpl.java
View File

@ -122,7 +122,7 @@ public class MpsDetailEntryServiceImpl implements IMpsDetailEntryService {
lqw.like(StringUtils.isNotBlank(bo.getJbName()), MpsDetailEntry::getJbName, bo.getJbName()); lqw.like(StringUtils.isNotBlank(bo.getJbName()), MpsDetailEntry::getJbName, bo.getJbName());
lqw.eq(StringUtils.isNotBlank(bo.getYxId()), MpsDetailEntry::getYxId, bo.getYxId()); lqw.eq(StringUtils.isNotBlank(bo.getYxId()), MpsDetailEntry::getYxId, bo.getYxId());
lqw.eq(StringUtils.isNotBlank(bo.getJbId()), MpsDetailEntry::getJbId, bo.getJbId()); lqw.eq(StringUtils.isNotBlank(bo.getJbId()), MpsDetailEntry::getJbId, bo.getJbId());
lqw.eq(bo.getDate() != null, MpsDetailEntry::getDate, bo.getDate()); lqw.like(bo.getDate() != null, MpsDetailEntry::getDate, bo.getDate());
lqw.like(StringUtils.isNotBlank(bo.getDeptName()), MpsDetailEntry::getDeptName, bo.getDeptName()); lqw.like(StringUtils.isNotBlank(bo.getDeptName()), MpsDetailEntry::getDeptName, bo.getDeptName());
lqw.eq(bo.getDeptId() != null, MpsDetailEntry::getDeptId, bo.getDeptId()); lqw.eq(bo.getDeptId() != null, MpsDetailEntry::getDeptId, bo.getDeptId());
lqw.eq(StringUtils.isNotBlank(bo.getCustType()), MpsDetailEntry::getCustType, bo.getCustType()); lqw.eq(StringUtils.isNotBlank(bo.getCustType()), MpsDetailEntry::getCustType, bo.getCustType());

15
cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/report/domain/vo/MarketingValidInvalidImportVo.java
View File

@ -66,11 +66,11 @@ public class MarketingValidInvalidImportVo implements Serializable {
@ExcelProperty(value = "客户身份证号") @ExcelProperty(value = "客户身份证号")
private String customerId; private String customerId;
/** // /**
* 无效的中间业务计价项目 // * 无效的中间业务计价项目
*/ // */
@ExcelProperty(value = "无效的中间业务计价项目") // @ExcelProperty(value = "无效的中间业务计价项目")
private String invalidBusiness; // private String invalidBusiness;
/** /**
* 有效的中间业务计价项目 * 有效的中间业务计价项目
@ -79,9 +79,10 @@ public class MarketingValidInvalidImportVo implements Serializable {
private String validBusiness; private String validBusiness;
/** /**
* 有效无效标识 * 有效无效标识 1有效 9 无效
*/ */
@ExcelProperty(value = "有效无效标识") @ExcelProperty(value = "有效无效标识", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "report_valid_invalid")
private String checkFlag; private String checkFlag;
/** /**

15
cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/report/domain/vo/MarketingValidInvalidVo.java
View File

@ -64,22 +64,23 @@ public class MarketingValidInvalidVo implements Serializable {
@ExcelProperty(value = "客户身份证号") @ExcelProperty(value = "客户身份证号")
private String customerId; private String customerId;
/** // /**
* 无效的中间业务计价项目 // * 无效的中间业务计价项目
*/ // */
@ExcelProperty(value = "无效的中间业务计价项目") // @ExcelProperty(value = "无效的中间业务计价项目")
private String invalidBusiness; // private String invalidBusiness;
/** /**
* 有效的中间业务计价项目 * 有效的中间业务计价项目
*/ */
@ExcelProperty(value = "有效的中间业务计价项目") @ExcelProperty(value = "中间业务计价项目")
private String validBusiness; private String validBusiness;
/** /**
* 有效无效标识 * 有效无效标识
*/ */
@ExcelProperty(value = "有效无效标识") @ExcelProperty(value = "有效无效标识", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "report_valid_invalid")
private String checkFlag; private String checkFlag;
/** /**