From 23772b4982d80c9f3da3aa2cda1ade06e44e9288 Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Mon, 5 Jun 2023 08:47:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=89=B9=E6=B5=81=E7=A8=8B=E8=AE=B0?= =?UTF-8?q?=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/approvalrecord/ApprovalRecord.java | 27 +++++ .../ApprovalRecordDetailsVo.java | 25 +++++ .../api/approvalrecord/ApprovalRecordDto.java | 24 +++++ .../approvalrecord/ApprovalRecordQuery.java | 25 +++++ .../api/approvalrecord/ApprovalRecordVo.java | 25 +++++ .../approvalrecord/ApprovalRecordMapper.java | 29 +++++ .../approvalrecord/ApprovalRecordMapper.xml | 22 ++++ .../approvalrecord/ApprovalRecordRest.java | 42 ++++++++ .../approvalrecord/ApprovalRecordService.java | 102 ++++++++++++++++++ 9 files changed, 321 insertions(+) create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/approvalrecord/ApprovalRecord.java create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/approvalrecord/ApprovalRecordDetailsVo.java create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/approvalrecord/ApprovalRecordDto.java create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/approvalrecord/ApprovalRecordQuery.java create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/approvalrecord/ApprovalRecordVo.java create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/approvalrecord/ApprovalRecordMapper.java create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/approvalrecord/ApprovalRecordMapper.xml create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/approvalrecord/ApprovalRecordRest.java create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/approvalrecord/ApprovalRecordService.java diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/approvalrecord/ApprovalRecord.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/approvalrecord/ApprovalRecord.java new file mode 100644 index 00000000..4d2eac06 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/approvalrecord/ApprovalRecord.java @@ -0,0 +1,27 @@ +package com.yxt.supervise.cyf.api.approvalrecord; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/5/4 14:26 + */ +@Data +@ApiModel(value = "审批记录信息", description = "审批记录信息") +@TableName("approval_record") +public class ApprovalRecord extends BaseEntity { + + //订单sid + private double proSid; + //审批人 + private String approver; + //审批日期 + private String approvalDate; + //审批意见 + private double approvalOpinions; + + +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/approvalrecord/ApprovalRecordDetailsVo.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/approvalrecord/ApprovalRecordDetailsVo.java new file mode 100644 index 00000000..93728f68 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/approvalrecord/ApprovalRecordDetailsVo.java @@ -0,0 +1,25 @@ +package com.yxt.supervise.cyf.api.approvalrecord; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/5/4 14:28 + */ +@Data +@ApiModel(value = "原油库存记录信息 视图数据详情", description = "原油库存记录信息 视图数据详情") +public class ApprovalRecordDetailsVo implements Vo { + private String id; + private String sid; + + //订单sid + private double proSid; + //审批人 + private String approver; + //审批日期 + private String approvalDate; + //审批意见 + private double approvalOpinions; +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/approvalrecord/ApprovalRecordDto.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/approvalrecord/ApprovalRecordDto.java new file mode 100644 index 00000000..4eca4f88 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/approvalrecord/ApprovalRecordDto.java @@ -0,0 +1,24 @@ +package com.yxt.supervise.cyf.api.approvalrecord; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/5/4 14:28 + */ +@Data +@ApiModel(value = "原油库存记录信息 数据传输对象", description = "原油库存记录信息 数据传输对象") +public class ApprovalRecordDto implements Dto { + private String id; + private String sid; + //订单sid + private String proSid; + //审批人 + private String approver; + //审批日期 + private String approvalDate; + //审批意见 + private String approvalOpinions; +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/approvalrecord/ApprovalRecordQuery.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/approvalrecord/ApprovalRecordQuery.java new file mode 100644 index 00000000..bb596dc0 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/approvalrecord/ApprovalRecordQuery.java @@ -0,0 +1,25 @@ +package com.yxt.supervise.cyf.api.approvalrecord; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/5/4 14:29 + */ +@Data +@ApiModel(value = "原油库存记录信息 查询条件", description = "原油库存记录信息 查询条件") +public class ApprovalRecordQuery implements Query { + private String id; + private String sid; + + //订单sid + private double proSid; + //审批人 + private String approver; + //审批日期 + private String approvalDate; + //审批意见 + private double approvalOpinions; +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/approvalrecord/ApprovalRecordVo.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/approvalrecord/ApprovalRecordVo.java new file mode 100644 index 00000000..c6a0e1f6 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/approvalrecord/ApprovalRecordVo.java @@ -0,0 +1,25 @@ +package com.yxt.supervise.cyf.api.approvalrecord; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/5/4 14:29 + */ +@Data +@ApiModel(value = "原油库存记录信息 视图数据对象", description = "原油库存记录信息 视图数据对象") +public class ApprovalRecordVo implements Vo { + private String id; + private String sid; + + //订单sid + private double proSid; + //审批人 + private String approver; + //审批日期 + private String approvalDate; + //审批意见 + private double approvalOpinions; +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/approvalrecord/ApprovalRecordMapper.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/approvalrecord/ApprovalRecordMapper.java new file mode 100644 index 00000000..c3de7324 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/approvalrecord/ApprovalRecordMapper.java @@ -0,0 +1,29 @@ +package com.yxt.supervise.cyf.biz.approvalrecord; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.supervise.cyf.api.approvalrecord.ApprovalRecord; +import com.yxt.supervise.cyf.api.approvalrecord.ApprovalRecordVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; +import java.util.Map; + +/** + * @author wangpengfei + * @date 2023/5/4 14:37 + */ +@Mapper +public interface ApprovalRecordMapper extends BaseMapper { + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + @Select("select *,t.number as tankNumber from crude_oil_inventory_record left join tank_information t on t.sid =c.tankSid where sid=#{sid}") + ApprovalRecord getCrudeBySid(@Param("sid")String sid); + void insertCrudeOilFiles(List> maps); + + List selectRecordBySid(@Param("sid") String sid); +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/approvalrecord/ApprovalRecordMapper.xml b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/approvalrecord/ApprovalRecordMapper.xml new file mode 100644 index 00000000..c3573641 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/approvalrecord/ApprovalRecordMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + \ No newline at end of file diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/approvalrecord/ApprovalRecordRest.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/approvalrecord/ApprovalRecordRest.java new file mode 100644 index 00000000..8f5b8610 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/approvalrecord/ApprovalRecordRest.java @@ -0,0 +1,42 @@ +package com.yxt.supervise.cyf.biz.approvalrecord; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.supervise.cyf.api.approvalrecord.ApprovalRecordDto; +import com.yxt.supervise.cyf.api.approvalrecord.ApprovalRecordQuery; +import com.yxt.supervise.cyf.api.approvalrecord.ApprovalRecordVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +/** + * @author wangpengfei + * @date 2023/5/4 14:38 + */ +@Api(tags = "审批记录信息") +@RestController +@RequestMapping("cyf/approval") +public class ApprovalRecordRest { + @Autowired + ApprovalRecordService ApprovalRecordService; + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = ApprovalRecordService.listPageVo(pq); + return rb.success().setData(pv); + } + @ApiOperation("新增") + @PostMapping("/save") + public ResultBean save (@RequestBody ApprovalRecordDto dto){ + return ApprovalRecordService.save(dto); + } + + @ApiOperation("查询订单审批详细信息") + @GetMapping("/getRecordBySid/{sid}") + public ResultBean selectRecordBySid(@PathVariable String sid){ + return ApprovalRecordService.selectRecordBySid(sid); + } +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/approvalrecord/ApprovalRecordService.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/approvalrecord/ApprovalRecordService.java new file mode 100644 index 00000000..0abecf80 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/approvalrecord/ApprovalRecordService.java @@ -0,0 +1,102 @@ +package com.yxt.supervise.cyf.biz.approvalrecord; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.supervise.cyf.api.approvalrecord.ApprovalRecord; +import com.yxt.supervise.cyf.api.approvalrecord.ApprovalRecordDto; +import com.yxt.supervise.cyf.api.approvalrecord.ApprovalRecordQuery; +import com.yxt.supervise.cyf.api.approvalrecord.ApprovalRecordVo; +import com.yxt.supervise.cyf.api.tankinformation.TankInformation; +import com.yxt.supervise.cyf.biz.tankinformation.TankInformationMapper; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.*; + +/** + * @author wangpengfei + * @date 2023/5/4 14:37 + */ +@Service +public class ApprovalRecordService extends MybatisBaseService { + @Autowired + TankInformationMapper tankInformationMapper; + + public PagerVo listPageVo(PagerQuery pq) { + ApprovalRecordQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); +// if (StringUtils.isNotBlank(query.getDate())) { +// qw.eq("STR_TO_DATE(c.recordDate,'%Y-%m-%d')", query.getDate()); +// } +// if (StringUtils.isNotBlank(query.getNumber())) { +// qw.like("t.number", query.getNumber()); +// } + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + @Transactional + public ResultBean save(ApprovalRecordDto dto){ + ResultBean rb=new ResultBean(); + ApprovalRecord entity=new ApprovalRecord(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + Date curDate = new Date(); + String dfmt = DateUtil.format(curDate, "yyyy-MM-dd"); + TankInformation tank=tankInformationMapper.getTankBySid(dto.getTankSid()); + entity.setRecordDate(dfmt); + entity.setExistingInventory(dto.getHeight()*tank.getBottomArea()*tank.getDensity()); + String [] file=dto.getCrudeOilRecordFile(); + if(file!=null){ + List> maps=new ArrayList<>(); + for(String s:file){ + Mapm=new HashMap<>(); + m.put("mainSid",entity.getSid()); + m.put("url",s); + m.put("sid", UUID.randomUUID().toString()); + maps.add(m); + } + if(maps.size()>0){ + baseMapper.insertCrudeOilFiles(maps); + } + } + baseMapper.insert(entity); + //油罐每日填写信息修改 + tank.setExistingInventory(dto.getHeight()*tank.getBottomArea()*tank.getDensity()); + tankInformationMapper.updateById(tank); + return rb.success().setMsg("新增成功"); + } + public ResultBean update (ApprovalRecordDto dto){ + ResultBean rb=new ResultBean(); + String dtoSid = dto.getSid(); + ApprovalRecord entity=fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + return rb.success().setMsg("修改成功"); + } + public ResultBean getCrudeBySid(String sid){ + ResultBean rb=new ResultBean(); + ApprovalRecord ApprovalRecord=baseMapper.getCrudeBySid(sid); + return rb.success().setData(ApprovalRecord); + } + public ResultBean del(String sid){ + ResultBean rb=new ResultBean(); + baseMapper.delete(new QueryWrapper().eq("sid",sid)); + return rb.success().setMsg("删除成功"); + } + + public ResultBean selectRecordBySid(String sid){ + ResultBean rb = ResultBean.fireFail(); + List ApprovalRecord = baseMapper.selectRecordBySid(sid); + return rb.success().setData(ApprovalRecord); + } +}