commit
This commit is contained in:
=
+2
-1
@@ -92,8 +92,9 @@ public class MemberPaymentChartSummaryController {
|
||||
@Param(value = "endYear", required = false) Integer endYear) {
|
||||
Sql sql = Sqls.create("""
|
||||
SELECT
|
||||
mpp.id,
|
||||
mpp.projectName,
|
||||
SUM( pt.tradingAmount * 0.01 ) AS money
|
||||
COALESCE(SUM(pt.tradingAmount * 0.01), 0) AS money
|
||||
FROM
|
||||
member_payment_project mpp
|
||||
LEFT JOIN member_payment_info mpi ON mpi.paymentProjectId = mpp.id
|
||||
|
||||
+6
-9
@@ -75,7 +75,7 @@ public class MemberPaymentSummaryController {
|
||||
public Sql dataSql(String pageOrderName, String pageOrderBy, String searchName, String searchKeyword,
|
||||
String unionId, String unitId, String threeUnitId, String unionGroupId,
|
||||
String personType, String userState, String paymentProjectId, String year,
|
||||
String isPay,String schoolTime,String retireDate,String search) {
|
||||
String isPay,String schoolTime,String search) {
|
||||
Sql sql = Sqls.create("""
|
||||
SELECT
|
||||
mpi.*,
|
||||
@@ -96,8 +96,6 @@ public class MemberPaymentSummaryController {
|
||||
u.mobile,
|
||||
u.birthday,
|
||||
u.schoolTime,
|
||||
u.retireDate,
|
||||
u.workDate,
|
||||
startSalaryDate,
|
||||
renewTime
|
||||
FROM
|
||||
@@ -132,7 +130,7 @@ public class MemberPaymentSummaryController {
|
||||
cnd.andEX("u.personType", "=", personType);
|
||||
cnd.andEX("u.userState", "=", userState);
|
||||
cnd.andEX("u.schoolTime", "=", schoolTime);
|
||||
cnd.andEX("u.retireDate", "=", retireDate);
|
||||
// cnd.andEX("u.retireDate", "=", retireDate);
|
||||
cnd.groupBy("u.id");
|
||||
|
||||
if (StrUtil.isNotBlank(pageOrderName) && StrUtil.isNotBlank(pageOrderBy)) {
|
||||
@@ -165,7 +163,7 @@ public class MemberPaymentSummaryController {
|
||||
@Param(value = "search", required = false) String search) {
|
||||
Sql sql = this.dataSql(pageForm.getPageOrderName(), pageForm.getPageOrderBy(), pageForm.getSearchName(),
|
||||
pageForm.getSearchKeyword(), unionId, unitId, threeUnitId, unionGroupId,
|
||||
personType, userState, paymentProjectId, year, isPay,schoolTime,retireDate,search);
|
||||
personType, userState, paymentProjectId, year, isPay,schoolTime,search);
|
||||
return memberPaymentService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
|
||||
}
|
||||
|
||||
@@ -176,7 +174,7 @@ public class MemberPaymentSummaryController {
|
||||
public Object modify(@Param("ids") String[] ids, String paymentMoney, boolean isPay, String remark) {
|
||||
List<String> idList = Arrays.asList(ids);
|
||||
if (Lang.isNotEmpty(idList)) {
|
||||
if (!isPay) {
|
||||
if (isPay) {
|
||||
//未缴费设为已缴费
|
||||
memberPaymentService.update(Chain.make("paymentMoney", paymentMoney)
|
||||
.add("remark", remark).add("isPayment", 1)
|
||||
@@ -297,11 +295,10 @@ public class MemberPaymentSummaryController {
|
||||
@Param(value = "paymentProjectId", required = false) String paymentProjectId,
|
||||
@Param(value = "year", required = false) String year,
|
||||
@Param(value = "isPay", required = false) String isPay,
|
||||
@Param(value = "isPay", required = false) String schoolTime,
|
||||
@Param(value = "isPay", required = false) String retireDate,
|
||||
@Param(value = "schoolTime", required = false) String schoolTime,
|
||||
boolean isZip, HttpServletResponse response) {
|
||||
Sql sql = this.dataSql(null, null, searchName, searchKeyword, unionId, unitId, threeUnitId,
|
||||
unionGroupId, personType, userState, paymentProjectId, year, isPay,schoolTime,retireDate,"");
|
||||
unionGroupId, personType, userState, paymentProjectId, year, isPay,schoolTime,"");
|
||||
|
||||
List<NutMap> list = memberPaymentService.listMap(sql);
|
||||
NutMap nutMap = list.stream().findFirst().orElse(null);
|
||||
|
||||
@@ -165,8 +165,10 @@ layout("/layouts/platform.html"){
|
||||
label-width="0">
|
||||
<el-select placeholder="请选择缴费模式" v-model="row.payMode"
|
||||
style="width: 100%">
|
||||
<el-option :disabled="row.personType!='非编'" label="固定金额缴纳" value="1"></el-option>
|
||||
<el-option :disabled="row.personType!='在编'" label="按比例缴纳" value="2"></el-option>
|
||||
<!-- <el-option :disabled="row.personType!='非编'" label="固定金额缴纳" value="1"></el-option>-->
|
||||
<!-- <el-option :disabled="row.personType!='在编'" label="按比例缴纳" value="2"></el-option>-->
|
||||
<el-option label="固定金额缴纳" value="1"></el-option>
|
||||
<el-option label="按比例缴纳" value="2"></el-option>
|
||||
<el-option label="导入" value="3"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
|
||||
@@ -157,18 +157,18 @@ layout("/layouts/platform.html"){
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="search-item">
|
||||
<div class="search-item-label">退休时间：</div>
|
||||
<div class="search-item-option">
|
||||
<el-date-picker
|
||||
value-format="yyyy-MM-dd"
|
||||
v-model="pageForm.retireDate"
|
||||
type="date"
|
||||
style="width: 100%"
|
||||
placeholder="选择日期">
|
||||
</el-date-picker>
|
||||
</div>
|
||||
</div>
|
||||
<!-- <div class="search-item">-->
|
||||
<!-- <div class="search-item-label">退休时间：</div>-->
|
||||
<!-- <div class="search-item-option">-->
|
||||
<!-- <el-date-picker-->
|
||||
<!-- value-format="yyyy-MM-dd"-->
|
||||
<!-- v-model="pageForm.retireDate"-->
|
||||
<!-- type="date"-->
|
||||
<!-- style="width: 100%"-->
|
||||
<!-- placeholder="选择日期">-->
|
||||
<!-- </el-date-picker>-->
|
||||
<!-- </div>-->
|
||||
<!-- </div>-->
|
||||
</template>
|
||||
<div class="search-query">
|
||||
<el-button type="primary" icon="el-icon-search" @click="doSearch">搜索</el-button>
|
||||
@@ -295,7 +295,7 @@ layout("/layouts/platform.html"){
|
||||
{ prop: "username", label: "姓名" },
|
||||
{ prop: "mobile", label: "联系电话" },
|
||||
{ prop: "schoolTime", label: "入职时间" },
|
||||
{ prop: "retireDate", label: "退休时间" },
|
||||
// { prop: "retireDate", label: "退休时间" },
|
||||
{ prop: "personType", label: "人员类型", sortable: true },
|
||||
{ prop: "userState", label: "在职状态", sortable: true },
|
||||
{ prop: "unionname", label: "所属工会", sortable: true },
|
||||
|
||||
Reference in New Issue
Block a user