Commit 215234b9 authored by 王晓旭's avatar 王晓旭
parents 4e98dabf a5a6d5ae
......@@ -182,8 +182,8 @@ export default {
fuzzy: false,
},
{
name: "date",
type: "date",
name: "createTime",
type: "datetime",
label: "请选择日期",
fuzzy: false,
},
......@@ -249,7 +249,11 @@ export default {
{ label: "说明", prop: "checkDesc" },
{ label: "巡查人员", prop: "createUserId", formatter: this.formatter },
{
label: "巡查人员",
prop: "createUserId",
formatter: this.formatter,
},
{ label: "核查人员", prop: "checkPerson" },
......
......@@ -189,8 +189,8 @@ export default {
fuzzy: false,
},
{
name: "date",
type: "date",
name: "createTime",
type: "datetime",
label: "请选择日期",
fuzzy: false,
},
......
......@@ -183,9 +183,9 @@ export default {
},
{
name: "date",
type: "date",
label: "请选择日期",
name: "createTime",
type: "datetime",
label: "请选择开始日期",
fuzzy: false,
},
{
......
......@@ -183,8 +183,8 @@ export default {
fuzzy: false,
},
{
name: "date",
type: "date",
name: "createTime",
type: "datetime",
label: "请选择日期",
fuzzy: false,
},
......
......@@ -182,8 +182,8 @@ export default {
fuzzy: false,
},
{
name: "date",
type: "date",
name: "createTime",
type: "datetime",
label: "请选择日期",
fuzzy: false,
},
......
......@@ -188,8 +188,8 @@ export default {
fuzzy: false,
},
{
name: "date",
type: "date",
name: "createTime",
type: "datetime",
label: "请选择日期",
fuzzy: false,
},
......
......@@ -92,7 +92,7 @@ export default {
},
methods: {
handleCellClick(row, column, event, cell) {
if ((column.label == "图片凭证")) {
if (column.label == "图片凭证") {
const suffix = `(bmp|jpg|png|tif|gif|pcx|tga|exif|fpx|svg|psd|cdr|pcd|dxf|ufo|eps|ai|raw|WMF|webp|jpeg)`;
const regular = new RegExp(`.*\.${suffix}`);
regular.test(row.filePaths);
......@@ -197,7 +197,7 @@ export default {
},
{
name: "date",
type: "date",
type: "datetime",
label: "请选择日期",
fuzzy: false,
},
......
......@@ -82,7 +82,7 @@ export default {
created() {},
methods: {
handleCellClick(row, column, event, cell) {
if ((column.label == "图片凭证")) {
if (column.label == "图片凭证") {
const suffix = `(bmp|jpg|png|tif|gif|pcx|tga|exif|fpx|svg|psd|cdr|pcd|dxf|ufo|eps|ai|raw|WMF|webp|jpeg)`;
const regular = new RegExp(`.*\.${suffix}`);
regular.test(row.filePaths);
......@@ -190,8 +190,8 @@ export default {
fuzzy: false,
},
{
name: "date",
type: "date",
name: "createTime",
type: "datetime",
label: "请选择日期",
fuzzy: false,
},
......
......@@ -82,7 +82,7 @@ export default {
created() {},
methods: {
handleCellClick(row, column, event, cell) {
if ((column.label == "图片凭证")) {
if (column.label == "图片凭证") {
const suffix = `(bmp|jpg|png|tif|gif|pcx|tga|exif|fpx|svg|psd|cdr|pcd|dxf|ufo|eps|ai|raw|WMF|webp|jpeg)`;
const regular = new RegExp(`.*\.${suffix}`);
regular.test(row.filePaths);
......@@ -196,8 +196,8 @@ export default {
fuzzy: false,
},
{
name: "date",
type: "date",
name: "createTime",
type: "datetime",
label: "请选择日期",
fuzzy: false,
},
......
......@@ -82,7 +82,7 @@ export default {
created() {},
methods: {
handleCellClick(row, column, event, cell) {
if ((column.label == "图片凭证")) {
if (column.label == "图片凭证") {
const suffix = `(bmp|jpg|png|tif|gif|pcx|tga|exif|fpx|svg|psd|cdr|pcd|dxf|ufo|eps|ai|raw|WMF|webp|jpeg)`;
const regular = new RegExp(`.*\.${suffix}`);
regular.test(row.filePaths);
......@@ -191,8 +191,8 @@ export default {
},
{
name: "date",
type: "date",
name: "createTime",
type: "datetime",
label: "请选择日期",
fuzzy: false,
},
......
......@@ -82,7 +82,7 @@ export default {
created() {},
methods: {
handleCellClick(row, column, event, cell) {
if ((column.label == "图片凭证")) {
if (column.label == "图片凭证") {
const suffix = `(bmp|jpg|png|tif|gif|pcx|tga|exif|fpx|svg|psd|cdr|pcd|dxf|ufo|eps|ai|raw|WMF|webp|jpeg)`;
const regular = new RegExp(`.*\.${suffix}`);
regular.test(row.filePaths);
......@@ -190,8 +190,8 @@ export default {
fuzzy: false,
},
{
name: "date",
type: "date",
name: "createTime",
type: "datetime",
label: "请选择日期",
fuzzy: false,
},
......
......@@ -82,7 +82,7 @@ export default {
created() {},
methods: {
handleCellClick(row, column, event, cell) {
if ((column.label == "图片凭证")) {
if (column.label == "图片凭证") {
const suffix = `(bmp|jpg|png|tif|gif|pcx|tga|exif|fpx|svg|psd|cdr|pcd|dxf|ufo|eps|ai|raw|WMF|webp|jpeg)`;
const regular = new RegExp(`.*\.${suffix}`);
regular.test(row.filePaths);
......@@ -190,8 +190,8 @@ export default {
fuzzy: false,
},
{
name: "date",
type: "date",
name: "createTime",
type: "datetime",
label: "请选择日期",
fuzzy: false,
},
......
......@@ -196,8 +196,8 @@ export default {
fuzzy: false,
},
{
name: "date",
type: "date",
name: "createTime",
type: "datetime",
label: "请选择日期",
fuzzy: false,
},
......
package com.mortals.xhx.module.attendance.model.vo;
import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.attendance.model.AttendanceLeaveRecordEntity;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
/**
......@@ -9,6 +11,8 @@ import java.util.List;
* @author zxfei
* @date 2023-04-07
*/
@Data
public class AttendanceLeaveRecordVo extends BaseEntityLong {
/** 序号,主键,自增长列表 */
private List <Long> idList;
}
\ No newline at end of file
......@@ -15,5 +15,9 @@ import java.util.Date;
*/
@Data
public class CheckAttendRecordVo extends BaseEntityLong {
/** 开始 创建时间 */
private String createTimeStart;
/** 结束 创建时间 */
private String createTimeEnd;
}
\ No newline at end of file
......@@ -15,5 +15,9 @@ import java.util.Date;
*/
@Data
public class CheckComplainRecordVo extends BaseEntityLong {
/** 开始 创建时间 */
private String createTimeStart;
/** 结束 创建时间 */
private String createTimeEnd;
}
\ No newline at end of file
......@@ -15,5 +15,9 @@ import java.util.Date;
*/
@Data
public class CheckEffectRecordVo extends BaseEntityLong {
/** 开始 创建时间 */
private String createTimeStart;
/** 结束 创建时间 */
private String createTimeEnd;
}
\ No newline at end of file
......@@ -15,5 +15,9 @@ import java.util.Date;
*/
@Data
public class CheckGoworkRecordVo extends BaseEntityLong {
/** 开始 创建时间 */
private String createTimeStart;
/** 结束 创建时间 */
private String createTimeEnd;
}
\ No newline at end of file
......@@ -15,5 +15,9 @@ import java.util.Date;
*/
@Data
public class CheckOtherRecordVo extends BaseEntityLong {
/** 开始 创建时间 */
private String createTimeStart;
/** 结束 创建时间 */
private String createTimeEnd;
}
\ No newline at end of file
......@@ -15,5 +15,9 @@ import java.util.Date;
*/
@Data
public class CheckReviewRecordVo extends BaseEntityLong {
/** 开始 创建时间 */
private String createTimeStart;
/** 结束 创建时间 */
private String createTimeEnd;
}
\ No newline at end of file
package com.mortals.xhx.module.check.web;
import cn.hutool.core.date.DateUtil;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.OrderCol;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
......@@ -71,7 +72,6 @@ public class CheckAttendRecordController extends BaseCRUDJsonBodyMappingControll
this.addDict(model, "deptId", deptService.find(new DeptQuery()).stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getDeptName())));
Map<String, String> collect = userService.find(new UserQuery(), getContext()).stream()
.collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getRealName(), (o, n) -> n));
......@@ -88,6 +88,11 @@ public class CheckAttendRecordController extends BaseCRUDJsonBodyMappingControll
} else {
query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
}
if(!ObjectUtils.isEmpty(query.getCreateTime())){
query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime()));
query.setCreateTimeEnd(DateUtil.formatDate(query.getCreateTime()));
}
super.doListBefore(query, model, context);
}
......
package com.mortals.xhx.module.check.web;
import cn.hutool.core.date.DateUtil;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.OrderCol;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
......@@ -80,6 +81,11 @@ public class CheckComplainRecordController extends BaseCRUDJsonBodyMappingContro
} else {
query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
}
if(!ObjectUtils.isEmpty(query.getCreateTime())){
query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime()));
query.setCreateTimeEnd(DateUtil.formatDate(query.getCreateTime()));
}
}
/**
......
package com.mortals.xhx.module.check.web;
import cn.hutool.core.date.DateUtil;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.OrderCol;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
......@@ -91,6 +92,11 @@ public class CheckEffectRecordController extends BaseCRUDJsonBodyMappingControll
} else {
query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
}
if(!ObjectUtils.isEmpty(query.getCreateTime())){
query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime()));
query.setCreateTimeEnd(DateUtil.formatDate(query.getCreateTime()));
}
}
/**
......
package com.mortals.xhx.module.check.web;
import cn.hutool.core.date.DateUtil;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.OrderCol;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
......@@ -79,6 +80,11 @@ public class CheckGoworkRecordController extends BaseCRUDJsonBodyMappingControll
} else {
query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
}
if(!ObjectUtils.isEmpty(query.getCreateTime())){
query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime()));
query.setCreateTimeEnd(DateUtil.formatDate(query.getCreateTime()));
}
}
/**
......
package com.mortals.xhx.module.check.web;
import cn.hutool.core.date.DateUtil;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.OrderCol;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
......@@ -79,6 +80,11 @@ public class CheckOtherRecordController extends BaseCRUDJsonBodyMappingControlle
} else {
query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
}
if(!ObjectUtils.isEmpty(query.getCreateTime())){
query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime()));
query.setCreateTimeEnd(DateUtil.formatDate(query.getCreateTime()));
}
}
/**
......
package com.mortals.xhx.module.check.web;
import cn.hutool.core.date.DateUtil;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.OrderCol;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
......@@ -92,6 +93,11 @@ public class CheckReviewRecordController extends BaseCRUDJsonBodyMappingControll
} else {
query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
}
if(!ObjectUtils.isEmpty(query.getCreateTime())){
query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime()));
query.setCreateTimeEnd(DateUtil.formatDate(query.getCreateTime()));
}
}
/**
......
......@@ -26,4 +26,10 @@ public class PerformAttendAppealVo extends BaseEntityLong {
private String performTypeStr;
/** 开始 创建时间 */
private String createTimeStart;
/** 结束 创建时间 */
private String createTimeEnd;
}
\ No newline at end of file
......@@ -15,5 +15,9 @@ import java.util.Date;
*/
@Data
public class PerformAttendRecordVo extends BaseEntityLong {
/** 开始 创建时间 */
private String createTimeStart;
/** 结束 创建时间 */
private String createTimeEnd;
}
\ No newline at end of file
......@@ -15,5 +15,9 @@ import java.util.Date;
*/
@Data
public class PerformComplainRecordVo extends BaseEntityLong {
/** 开始 创建时间 */
private String createTimeStart;
/** 结束 创建时间 */
private String createTimeEnd;
}
\ No newline at end of file
......@@ -15,5 +15,9 @@ import java.util.Date;
*/
@Data
public class PerformEffectRecordVo extends BaseEntityLong {
/** 开始 创建时间 */
private String createTimeStart;
/** 结束 创建时间 */
private String createTimeEnd;
}
\ No newline at end of file
......@@ -15,5 +15,9 @@ import java.util.Date;
*/
@Data
public class PerformGoworkRecordVo extends BaseEntityLong {
/** 开始 创建时间 */
private String createTimeStart;
/** 结束 创建时间 */
private String createTimeEnd;
}
\ No newline at end of file
......@@ -15,5 +15,9 @@ import java.util.Date;
*/
@Data
public class PerformOtherRecordVo extends BaseEntityLong {
/** 开始 创建时间 */
private String createTimeStart;
/** 结束 创建时间 */
private String createTimeEnd;
}
\ No newline at end of file
......@@ -15,5 +15,9 @@ import java.util.Date;
*/
@Data
public class PerformReviewRecordVo extends BaseEntityLong {
/** 开始 创建时间 */
private String createTimeStart;
/** 结束 创建时间 */
private String createTimeEnd;
}
\ No newline at end of file
package com.mortals.xhx.module.perform.web;
import cn.hutool.core.date.DateUtil;
import com.mortals.framework.annotation.UnAuth;
import com.mortals.framework.common.Rest;
import com.mortals.framework.exception.AppException;
......@@ -95,6 +96,10 @@ public class PerformAttendAppealController extends BaseCRUDJsonBodyMappingContro
} else {
query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
}
if(!ObjectUtils.isEmpty(query.getCreateTime())){
query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime()));
query.setCreateTimeEnd(DateUtil.formatDate(query.getCreateTime()));
}
}
/**
......
package com.mortals.xhx.module.perform.web;
import cn.hutool.core.date.DateUtil;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.OrderCol;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
......@@ -77,5 +78,10 @@ public class PerformAttendRecordController extends BaseCRUDJsonBodyMappingContro
} else {
query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
}
if(!ObjectUtils.isEmpty(query.getCreateTime())){
query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime()));
query.setCreateTimeEnd(DateUtil.formatDate(query.getCreateTime()));
}
}
}
\ No newline at end of file
package com.mortals.xhx.module.perform.web;
import cn.hutool.core.date.DateUtil;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.OrderCol;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService;
import com.mortals.xhx.base.system.user.model.UserQuery;
......@@ -8,12 +11,14 @@ import com.mortals.xhx.common.code.*;
import com.mortals.xhx.module.dept.model.DeptQuery;
import com.mortals.xhx.module.dept.service.DeptService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.mortals.framework.model.Context;
import com.mortals.xhx.module.perform.model.PerformComplainRecordEntity;
import com.mortals.xhx.module.perform.service.PerformComplainRecordService;
import java.util.Arrays;
import java.util.Map;
import java.util.stream.Collectors;
......@@ -58,5 +63,18 @@ public class PerformComplainRecordController extends BaseCRUDJsonBodyMappingCont
super.init(model, context);
}
@Override
protected void doListBefore(PerformComplainRecordEntity query, Map<String, Object> model, Context context) throws AppException {
if (ObjectUtils.isEmpty(query.getOrderColList())) {
query.setOrderColList(Arrays.asList(new OrderCol("createTime", OrderCol.DESCENDING)));
} else {
query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
}
if(!ObjectUtils.isEmpty(query.getCreateTime())){
query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime()));
query.setCreateTimeEnd(DateUtil.formatDate(query.getCreateTime()));
}
}
}
\ No newline at end of file
package com.mortals.xhx.module.perform.web;
import cn.hutool.core.date.DateUtil;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.OrderCol;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
......@@ -76,5 +77,10 @@ public class PerformEffectRecordController extends BaseCRUDJsonBodyMappingContro
} else {
query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
}
if(!ObjectUtils.isEmpty(query.getCreateTime())){
query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime()));
query.setCreateTimeEnd(DateUtil.formatDate(query.getCreateTime()));
}
}
}
\ No newline at end of file
package com.mortals.xhx.module.perform.web;
import cn.hutool.core.date.DateUtil;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.OrderCol;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
......@@ -76,5 +77,10 @@ public class PerformGoworkRecordController extends BaseCRUDJsonBodyMappingContro
} else {
query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
}
if(!ObjectUtils.isEmpty(query.getCreateTime())){
query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime()));
query.setCreateTimeEnd(DateUtil.formatDate(query.getCreateTime()));
}
}
}
\ No newline at end of file
package com.mortals.xhx.module.perform.web;
import cn.hutool.core.date.DateUtil;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.OrderCol;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
......@@ -77,5 +78,10 @@ public class PerformOtherRecordController extends BaseCRUDJsonBodyMappingControl
} else {
query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
}
if(!ObjectUtils.isEmpty(query.getCreateTime())){
query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime()));
query.setCreateTimeEnd(DateUtil.formatDate(query.getCreateTime()));
}
}
}
\ No newline at end of file
package com.mortals.xhx.module.perform.web;
import cn.hutool.core.date.DateUtil;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.OrderCol;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
......@@ -79,5 +80,11 @@ public class PerformReviewRecordController extends BaseCRUDJsonBodyMappingContro
} else {
query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
}
if(!ObjectUtils.isEmpty(query.getCreateTime())){
query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime()));
query.setCreateTimeEnd(DateUtil.formatDate(query.getCreateTime()));
}
}
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment