diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml index 37b38226..f47690b3 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml @@ -51,10 +51,8 @@ mt.type_name like concat('%', #{keyWord}, '%') ) - - and (lod.create_time like concat('%', #{startTime}, '%') or - lod.create_time like concat('%', #{endTime}, '%') - ) + + AND lod.create_time BETWEEN CONCAT(#{startTime}, ' 00:00:00') AND CONCAT(#{endTime}, ' 23:59:59') ORDER BY lod.create_time DESC diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/RepairMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/RepairMapper.xml index b4f7bf68..6d3b53be 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/RepairMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/RepairMapper.xml @@ -110,7 +110,7 @@ AND tt.task_status = #{repairStatus} - AND ts.create_time between #{startTime} and #{endTime} + AND tt.create_time BETWEEN CONCAT(#{startTime}, ' 00:00:00') AND CONCAT(#{endTime}, ' 23:59:59') GROUP BY rd.task_id,bui.unit_name,bpi.lot_name,bai.code,su.user_name order by tt.create_time desc @@ -172,7 +172,7 @@ AND tt.task_status = #{repairStatus} - AND ts.create_time between #{startTime} and #{endTime} + AND tt.create_time BETWEEN CONCAT(#{startTime}, ' 00:00:00') AND CONCAT(#{endTime}, ' 23:59:59') ORDER BY tt.create_time DESC diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/BackRecordController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/BackRecordController.java new file mode 100644 index 00000000..202cd13b --- /dev/null +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/BackRecordController.java @@ -0,0 +1,59 @@ +package com.bonus.sgzb.material.controller; + +import com.bonus.sgzb.common.core.utils.poi.ExcelUtil; +import com.bonus.sgzb.common.core.web.controller.BaseController; +import com.bonus.sgzb.common.core.web.domain.AjaxResult; +import com.bonus.sgzb.common.log.annotation.Log; +import com.bonus.sgzb.common.log.enums.BusinessType; +import com.bonus.sgzb.material.domain.BackRecord; +import com.bonus.sgzb.material.domain.LeaseRecord; +import com.bonus.sgzb.material.service.BackRecordService; +import com.bonus.sgzb.material.service.LeaseRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +/** +* @description 综合查询--退料记录查询 +* @author hay +* @date 2024/2/26 14:15 +*/ +@Api(tags = "综合查询--退料记录查询") +@RestController +@RequestMapping("/backRecord") +public class BackRecordController extends BaseController { + @Autowired + private BackRecordService backRecordService; + + /** + * 退料记录列表 + */ + @ApiOperation(value = "综合查询--退料记录列表") + @GetMapping("/getBackRecordList") + public AjaxResult getBackRecordList(BackRecord bean) { + startPage(); + List list = backRecordService.getBackRecordList(bean); + return AjaxResult.success(getDataTable(list)); + } + + /** + * 导出综合查询退料记录列表 + */ + @ApiOperation("导出综合查询退料记录列表") + @Log(title = "导出综合查询退料记录列表", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, BackRecord bean) + { + List list = backRecordService.getBackRecordList(bean); + ExcelUtil util = new ExcelUtil(BackRecord.class); + util.exportExcel(response, list, "综合查询--退料记录"); + } + +} diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/LeaseRecordController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/LeaseRecordController.java new file mode 100644 index 00000000..0eee3491 --- /dev/null +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/LeaseRecordController.java @@ -0,0 +1,57 @@ +package com.bonus.sgzb.material.controller; + +import com.bonus.sgzb.common.core.utils.poi.ExcelUtil; +import com.bonus.sgzb.common.core.web.controller.BaseController; +import com.bonus.sgzb.common.core.web.domain.AjaxResult; +import com.bonus.sgzb.common.log.annotation.Log; +import com.bonus.sgzb.common.log.enums.BusinessType; +import com.bonus.sgzb.material.domain.BackApplyInfo; +import com.bonus.sgzb.material.domain.LeaseRecord; +import com.bonus.sgzb.material.domain.PurchaseCheckInfo; +import com.bonus.sgzb.material.service.BackApplyService; +import com.bonus.sgzb.material.service.LeaseRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +/** +* @description 综合查询--领料记录查询 +* @author hay +* @date 2024/2/26 14:15 +*/ +@Api(tags = "综合查询--领料记录查询") +@RestController +@RequestMapping("/leaseRecord") +public class LeaseRecordController extends BaseController { + @Autowired + private LeaseRecordService leaseRecordService; + + /** + * 领料记录列表 + */ + @ApiOperation(value = "综合查询--领料记录列表") + @GetMapping("/getLeaseRecordList") + public AjaxResult getLeaseRecordList(LeaseRecord bean) { + startPage(); + List list = leaseRecordService.getLeaseRecordList(bean); + return AjaxResult.success(getDataTable(list)); + } + + /** + * 导出综合查询领料记录列表 + */ + @ApiOperation("导出综合查询领料记录列表") + @Log(title = "导出综合查询领料记录列表", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, LeaseRecord bean) + { + List list = leaseRecordService.getLeaseRecordList(bean); + ExcelUtil util = new ExcelUtil(LeaseRecord.class); + util.exportExcel(response, list, "综合查询--领料记录"); + } + +} diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/BackRecord.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/BackRecord.java new file mode 100644 index 00000000..ab1d4661 --- /dev/null +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/BackRecord.java @@ -0,0 +1,186 @@ +package com.bonus.sgzb.material.domain; + +import com.bonus.sgzb.common.core.annotation.Excel; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + +/** +* @description 综合查询--退料查询 +* @author hay +* @date 2024/2/26 14:51 +*/ +@ApiModel(description = "退料查询") +@Data +public class BackRecord { + + private static final long serialVersionUID = 2227217051604273598L; + + @ApiModelProperty(value = "") + private Integer id; + + /** + * 类型名称 + */ + @ApiModelProperty(value = "类型名称") + @Excel(name = "机具名称") + private String typeName; + + /** + * 规格ID + */ + @ApiModelProperty(value = "规格ID") + private Integer typeId; + + /** + * 规格型号 + */ + @ApiModelProperty(value = "规格型号") + @Excel(name = "机具规格") + private String typeModelName; + + /** + * 退料单号 + */ + @ApiModelProperty(value = "退料单号") + @Excel(name = "退料单号") + private String code; + + /** + * 协议号 + */ + @ApiModelProperty(value = "协议号") + private String agreementCode; + + /** + * 设备编码 + */ + @ApiModelProperty(value = "设备编码") + @Excel(name = "设备编码") + private String maCode; + + /** + * 计量单位 + */ + @ApiModelProperty(value = "计量单位") + private String unit; + + /** + * 退料数量 + */ + @ApiModelProperty(value = "退料数量") + @Excel(name = "退料数量",cellType = Excel.ColumnType.NUMERIC) + private Double backNum; + + /** + * 退料人 + */ + @ApiModelProperty(value = "退料人") + @Excel(name = "退料人") + private String backPerson; + + + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者") + private String createBy; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "退料日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date createTime; + + /** + * 更新者 + */ + @ApiModelProperty(value = "更新者") + private String updateBy; + + /** + * 更新时间 + */ + @ApiModelProperty(value = "更新时间 ") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date updateTime; + + /** + * 退料单位Id + */ + @ApiModelProperty(value = "退料单位Id") + private Integer unitId; + + /** + * 退料单位 + */ + @ApiModelProperty(value = "退料单位") + @Excel(name = "退料单位") + private String unitName; + + /** + * 退料工程Id + */ + @ApiModelProperty(value = "退料工程Id") + private Integer proId; + + /** + * 退料工程 + */ + @ApiModelProperty(value = "退料工程") + @Excel(name = "退料工程") + private String proName; + + /** + * 备注 + */ + @ApiModelProperty(value = "备注") + private String remark; + + /** + * 关键字 + */ + @ApiModelProperty(value = "关键字") + private String keyWord; + + @ApiModelProperty(value="开始时间") + private String startTime; + + @ApiModelProperty(value="结束时间") + private String endTime; + + + /** + * 设备所属类型 + */ + @ApiModelProperty(value = "数据所属组织") + private Integer companyId; + + /** + * 装备管理方式(0编号 1计数) + */ + @ApiModelProperty(value = "装备管理方式") + private int manageType; + + /** + * 装备管理方式(0编号 1计数) + */ + @ApiModelProperty(value = "装备管理方式名称") + private String manageTypeName; + + /** + * 实时库存 + */ + @ApiModelProperty(value = "实时库存") + private Double num; + +} \ No newline at end of file diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/LeaseRecord.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/LeaseRecord.java new file mode 100644 index 00000000..88cb727a --- /dev/null +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/LeaseRecord.java @@ -0,0 +1,182 @@ +package com.bonus.sgzb.material.domain; + +import com.bonus.sgzb.common.core.annotation.Excel; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.util.Date; + +/** +* @description 综合查询--领料查询 +* @author hay +* @date 2024/2/26 14:51 +*/ +@ApiModel(description = "领料查询") +@Data +public class LeaseRecord{ + + private static final long serialVersionUID = 2227217051604273598L; + + @ApiModelProperty(value = "") + private Integer id; + + /** + * 类型名称 + */ + @ApiModelProperty(value = "类型名称") + @Excel(name = "机具名称") + private String typeName; + + /** + * 规格ID + */ + @ApiModelProperty(value = "规格ID") + private Integer typeId; + + /** + * 规格型号 + */ + @ApiModelProperty(value = "规格型号") + @Excel(name = "机具规格") + private String typeModelName; + + /** + * 协议号 + */ + @ApiModelProperty(value = "协议号") + @Excel(name = "协议号") + private String agreementCode; + + /** + * 设备编码 + */ + @ApiModelProperty(value = "设备编码") + @Excel(name = "设备编码") + private String maCode; + + /** + * 计量单位 + */ + @ApiModelProperty(value = "计量单位") + @Excel(name = "单位") + private String unit; + + /** + * 预领料数 + */ + @ApiModelProperty(value = "预领料数") + @Excel(name = "领料数量",cellType = Excel.ColumnType.NUMERIC) + private Double preNum; + + /** + * 领料人 + */ + @ApiModelProperty(value = "领料人") + @Excel(name = "领料人") + private String leasePerson; + + + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者") + private String createBy; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "领料日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date createTime; + + /** + * 更新者 + */ + @ApiModelProperty(value = "更新者") + private String updateBy; + + /** + * 更新时间 + */ + @ApiModelProperty(value = "更新时间 ") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date updateTime; + + /** + * 领料单位Id + */ + @ApiModelProperty(value = "领料单位Id") + private Integer unitId; + + /** + * 领料单位 + */ + @ApiModelProperty(value = "领料单位") + @Excel(name = "领料单位") + private String unitName; + + /** + * 领料工程Id + */ + @ApiModelProperty(value = "领料工程Id") + private Integer proId; + + /** + * 领料工程 + */ + @ApiModelProperty(value = "领料工程") + @Excel(name = "领料工程") + private String proName; + + /** + * 备注 + */ + @ApiModelProperty(value = "备注") + private String remark; + + /** + * 关键字 + */ + @ApiModelProperty(value = "关键字") + private String keyWord; + + @ApiModelProperty(value="开始时间") + private String startTime; + + @ApiModelProperty(value="结束时间") + private String endTime; + + + /** + * 设备所属类型 + */ + @ApiModelProperty(value = "数据所属组织") + private Integer companyId; + + /** + * 装备管理方式(0编号 1计数) + */ + @ApiModelProperty(value = "装备管理方式") + private int manageType; + + /** + * 装备管理方式(0编号 1计数) + */ + @ApiModelProperty(value = "装备管理方式名称") + private String manageTypeName; + + /** + * 实时库存 + */ + @ApiModelProperty(value = "实时库存") + private Double num; + +} \ No newline at end of file diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/BackRecordMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/BackRecordMapper.java new file mode 100644 index 00000000..5879b2da --- /dev/null +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/BackRecordMapper.java @@ -0,0 +1,23 @@ +package com.bonus.sgzb.material.mapper; + +import com.bonus.sgzb.material.domain.BackRecord; +import com.bonus.sgzb.material.domain.LeaseRecord; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * @description 综合查询--退料记录查询 + * @author hay + * @date 2024/2/26 14:19 + */ +@Mapper +public interface BackRecordMapper { + + /** + * 综合查询--退料记录列表 + * @param bean + * @return List + */ + List getBackRecordList(BackRecord bean); +} diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/LeaseRecordMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/LeaseRecordMapper.java new file mode 100644 index 00000000..1c1e46a3 --- /dev/null +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/LeaseRecordMapper.java @@ -0,0 +1,26 @@ +package com.bonus.sgzb.material.mapper; + +import com.bonus.sgzb.material.domain.BackApplyInfo; +import com.bonus.sgzb.material.domain.LeaseRecord; +import com.bonus.sgzb.material.domain.TypeTreeNode; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.Date; +import java.util.List; + +/** + * @description 综合查询--领料记录查询 + * @author hay + * @date 2024/2/26 14:19 + */ +@Mapper +public interface LeaseRecordMapper { + + /** + * 综合查询--领料记录列表 + * @param bean + * @return List + */ + List getLeaseRecordList(LeaseRecord bean); +} diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/BackRecordService.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/BackRecordService.java new file mode 100644 index 00000000..d6f69a2b --- /dev/null +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/BackRecordService.java @@ -0,0 +1,21 @@ +package com.bonus.sgzb.material.service; + +import com.bonus.sgzb.material.domain.BackRecord; +import com.bonus.sgzb.material.domain.LeaseRecord; + +import java.util.List; + +/** +* @description 综合查询--退料记录查询 +* @author hay +* @date 2024/2/26 14:19 +*/ +public interface BackRecordService { + + /** + * 综合查询--退料记录列表 + * @param bean + * @return List + */ + List getBackRecordList(BackRecord bean); +} diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/LeaseRecordService.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/LeaseRecordService.java new file mode 100644 index 00000000..45fb422d --- /dev/null +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/LeaseRecordService.java @@ -0,0 +1,22 @@ +package com.bonus.sgzb.material.service; + +import com.bonus.sgzb.common.core.web.domain.AjaxResult; +import com.bonus.sgzb.material.domain.BackApplyInfo; +import com.bonus.sgzb.material.domain.LeaseRecord; + +import java.util.List; + +/** +* @description 综合查询--领料记录查询 +* @author hay +* @date 2024/2/26 14:19 +*/ +public interface LeaseRecordService { + + /** + * 综合查询--领料记录列表 + * @param bean + * @return List + */ + List getLeaseRecordList(LeaseRecord bean); +} diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackRecordServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackRecordServiceImpl.java new file mode 100644 index 00000000..a053dee1 --- /dev/null +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackRecordServiceImpl.java @@ -0,0 +1,29 @@ +package com.bonus.sgzb.material.service.impl; + +import com.bonus.sgzb.material.domain.BackRecord; +import com.bonus.sgzb.material.domain.LeaseRecord; +import com.bonus.sgzb.material.mapper.BackRecordMapper; +import com.bonus.sgzb.material.mapper.LeaseRecordMapper; +import com.bonus.sgzb.material.service.BackRecordService; +import com.bonus.sgzb.material.service.LeaseRecordService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @author hay + * @date 2023/12/20 14:55 + */ +@Service +public class BackRecordServiceImpl implements BackRecordService { + + @Autowired + private BackRecordMapper backRecordMapper; + + + @Override + public List getBackRecordList(BackRecord bean) { + return backRecordMapper.getBackRecordList(bean); + } +} diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/LeaseRecordServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/LeaseRecordServiceImpl.java new file mode 100644 index 00000000..1fee1e93 --- /dev/null +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/LeaseRecordServiceImpl.java @@ -0,0 +1,43 @@ +package com.bonus.sgzb.material.service.impl; + +import cn.hutool.core.collection.CollUtil; +import com.bonus.sgzb.common.core.utils.DateUtils; +import com.bonus.sgzb.common.core.utils.StringUtils; +import com.bonus.sgzb.common.core.web.domain.AjaxResult; +import com.bonus.sgzb.common.security.utils.SecurityUtils; +import com.bonus.sgzb.material.domain.BackApplyInfo; +import com.bonus.sgzb.material.domain.LeaseRecord; +import com.bonus.sgzb.material.domain.TypeTreeNode; +import com.bonus.sgzb.material.mapper.BackApplyMapper; +import com.bonus.sgzb.material.mapper.LeaseRecordMapper; +import com.bonus.sgzb.material.mapper.TaskMapper; +import com.bonus.sgzb.material.service.BackApplyService; +import com.bonus.sgzb.material.service.LeaseRecordService; +import com.bonus.sgzb.material.vo.GlobalContants; +import com.bonus.sgzb.material.vo.TypeTreeBuild; +import org.apache.commons.collections4.CollectionUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Set; + +/** + * @author hay + * @date 2023/12/20 14:55 + */ +@Service +public class LeaseRecordServiceImpl implements LeaseRecordService { + + @Autowired + private LeaseRecordMapper leaseRecordMapper; + + + @Override + public List getLeaseRecordList(LeaseRecord bean) { + return leaseRecordMapper.getLeaseRecordList(bean); + } +} diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackRecordMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackRecordMapper.xml new file mode 100644 index 00000000..78901d13 --- /dev/null +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackRecordMapper.xml @@ -0,0 +1,54 @@ + + + + + + \ No newline at end of file diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/LeaseRecordMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/LeaseRecordMapper.xml new file mode 100644 index 00000000..13b90c6f --- /dev/null +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/LeaseRecordMapper.xml @@ -0,0 +1,52 @@ + + + + + + + \ No newline at end of file diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ToDoMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ToDoMapper.xml index 93e687db..662536ef 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ToDoMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ToDoMapper.xml @@ -27,9 +27,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and tt.`code` like concat('%', #{taskCode}, '%') - - AND (tt.create_time like concat('%', #{startTime}, '%') - OR tt.create_time like concat('%', #{endTime}, '%')) + + AND tt.create_time BETWEEN CONCAT(#{startTime}, ' 00:00:00') AND CONCAT(#{endTime}, ' 23:59:59') and sd2.`name` like concat('%', #{keyWord}, '%') or diff --git a/sgzb-ui/src/api/stquery/backRecord.js b/sgzb-ui/src/api/stquery/backRecord.js new file mode 100644 index 00000000..6c8c87af --- /dev/null +++ b/sgzb-ui/src/api/stquery/backRecord.js @@ -0,0 +1,52 @@ +import request from '@/utils/request' + +//综合查询 +// 查询领料记录列表 +export function backRecord(query) { + return request({ + url: '/material/backRecord/getBackRecordList', + method: 'get', + params: query + }) +} + +// 列表导出 +export function exportList(params = {}){ + return request({ + url: '/material/backRecord/export', + method: 'post', + data: params + }) +} + +// 获取 来往单位 列表 +export function getUnitData(params = {}){ + return request({ + url: '/system/select/getUnitCbx', + method: 'post', + data: params + }) +} + +// 获取 工程 列表 +export function getProData(params = {}){ + return request({ + url: '/system/select/getSectionEngineeringCbx', + method: 'post', + data: params + }) +} + + + + + + + + + + + + + + diff --git a/sgzb-ui/src/api/stquery/stquery.js b/sgzb-ui/src/api/stquery/stquery.js index 0c7a9eda..8645e8be 100644 --- a/sgzb-ui/src/api/stquery/stquery.js +++ b/sgzb-ui/src/api/stquery/stquery.js @@ -4,11 +4,21 @@ import request from '@/utils/request' // 查询领料记录列表 export function leaseRecord(query) { return request({ - url: '/base/lease/leaseRecord', + url: '/material/leaseRecord/getLeaseRecordList', method: 'get', params: query }) } + +// 列表导出 +export function exportList(params = {}){ + return request({ + url: '/material/leaseRecord/export', + method: 'post', + data: params + }) +} + // 获取 来往单位 列表 export function getUnitData(params = {}){ return request({ diff --git a/sgzb-ui/src/views/stquery/backRecord.vue b/sgzb-ui/src/views/stquery/backRecord.vue new file mode 100644 index 00000000..dc1c88fd --- /dev/null +++ b/sgzb-ui/src/views/stquery/backRecord.vue @@ -0,0 +1,254 @@ + + + + diff --git a/sgzb-ui/src/views/stquery/leaseRecord.vue b/sgzb-ui/src/views/stquery/leaseRecord.vue index 7b1f5153..0d215530 100644 --- a/sgzb-ui/src/views/stquery/leaseRecord.vue +++ b/sgzb-ui/src/views/stquery/leaseRecord.vue @@ -1,7 +1,7 @@