From 8c92abab314c92f7dc9ab2344120587ea8320e9c Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Mon, 9 Aug 2021 17:52:01 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E8=BF=87=E6=BB=A4=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=EF=BC=81=EF=BC=81=EF=BC=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/SarLawsAttrDetailedListDao.java | 1 - .../SarLawsAttrDetailedListMapper.xml | 30 ++----------------- 2 files changed, 2 insertions(+), 29 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java index 2ff5fc7c..47444721 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java @@ -31,7 +31,6 @@ public interface SarLawsAttrDetailedListDao extends BaseMapper selectLawsByIdE(@Param("param1") List LawsIds); //根据标准id查出数据 List selectLawsByIdC(@Param("start")Integer start,@Param("end")Integer end,@Param("param1") List LawsIds, @Param("standName") String standName,@Param("standType")String standType,@Param("fileType")String fileType); - List selectLawsByIdCount(@Param("param1") List LawsIds, @Param("standName") String standName,@Param("standType")String standType,@Param("fileType")String fileType); //查询时间 List selectTimes(String standId); List selectLawsId2(String standId); diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml index 70378358..994ffcb3 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml @@ -110,34 +110,6 @@ group by a.ID limit #{start},#{end} - - - + + + @@ -374,10 +374,10 @@ - select from @@ -740,10 +740,10 @@ a.STAND_ID FROM sar_stand_items a - LEFT JOIN sar_standards_info b - on a.STAND_ID=b.ID + LEFT JOIN sar_standards_info b + on a.STAND_ID=b.ID WHERE b.VALID_FLAG = 0 - and a.FILE_TYPE ='FBGBJBD' + and a.FILE_TYPE ='FBGBJBD' GROUP BY a.STAND_ID limit #{page},#{size} From 86ca14988548f42d7b6fb0d52504cdbf2f246caa Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Thu, 12 Aug 2021 09:40:16 +0800 Subject: [PATCH 4/6] GIT --- .../SarStandPartCodeApplyController.java | 56 +++++++++++++ .../dao/SarStandPartCodeApplyDao.java | 15 ++++ .../entity/SarStandPartCodeApply.java | 84 +++++++++++++++++++ .../entity/SarStandPartCodeApplyPage.java | 51 +++++++++++ .../ISarStandPartCodeApplyService.java | 16 ++++ .../SarStandPartCodeApplyServiceImpl.java | 35 ++++++++ 6 files changed, 257 insertions(+) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/controller/SarStandPartCodeApplyController.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/dao/SarStandPartCodeApplyDao.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/entity/SarStandPartCodeApply.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/entity/SarStandPartCodeApplyPage.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/service/ISarStandPartCodeApplyService.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/service/impl/SarStandPartCodeApplyServiceImpl.java diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/controller/SarStandPartCodeApplyController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/controller/SarStandPartCodeApplyController.java new file mode 100644 index 00000000..bc26ef9c --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/controller/SarStandPartCodeApplyController.java @@ -0,0 +1,56 @@ +//package com.adc.da.slrs.sarStandPartCodeApply.controller; +// +//import com.adc.da.base.web.BaseController; +//import com.adc.da.http.ResponseMessage; +//import com.adc.da.http.Result; +//import com.adc.da.slrs.sarStandPartCodeApply.entity.SarStandPartCodeApply; +//import com.adc.da.slrs.sarStandPartCodeApply.entity.SarStandPartCodeApplyPage; +//import com.adc.da.slrs.sarStandPartCodeApply.service.ISarStandPartCodeApplyService; +//import com.adc.da.slrs.sarStandardsInfo.controller.SarStandardsInfoController; +//import com.baomidou.mybatisplus.core.metadata.IPage; +//import io.swagger.annotations.Api; +//import io.swagger.annotations.ApiOperation; +//import org.slf4j.Logger; +//import org.slf4j.LoggerFactory; +//import org.springframework.beans.factory.annotation.Autowired; +//import org.springframework.web.bind.annotation.PostMapping; +//import org.springframework.web.bind.annotation.RequestBody; +//import org.springframework.web.bind.annotation.RequestMapping; +//import org.springframework.web.bind.annotation.RestController; +// +//import java.util.Date; +//import java.util.List; +// +//@RestController +//@Api(tags = "零部件编号申请") +//@RequestMapping("/api/sarStandPartCodeApply")//前端和后端对的接口 +//public class SarStandPartCodeApplyController extends BaseController { +// +// //创建日志实例 +// private static final Logger logger = LoggerFactory.getLogger(SarStandardsInfoController.class); +// +// @Autowired +// private ISarStandPartCodeApplyService sarStandPartCodeApplyService; +// +// @ApiOperation("零部件编号申请新增") +// @PostMapping("/add") +// public ResponseMessage add(@RequestBody List sarStandPartCodeApply){ +// sarStandPartCodeApply.forEach(sarStandPartCodeApply1 -> sarStandPartCodeApply1.setCreateTime(new Date())); +// if (sarStandPartCodeApplyService.saveBatch(sarStandPartCodeApply)){ +// return Result.success("新增成功"); +// } +// else { +// return Result.error("新增失败"); +// } +// } +// +// /** +// * 分页查询零部件 +// * @param sarStandPartCodeApplyPage: 筛选、分页信息 +// * @return IPage +// */ +// public ResponseMessage> getSarStandPartCodeApplyPage(SarStandPartCodeApplyPage sarStandPartCodeApplyPage){ +// IPage sarStandPartCodeApplyIPage = sarStandPartCodeApplyService.getSarStandPartCodeApplyPage(sarStandPartCodeApplyPage); +// return Result.success(sarStandPartCodeApplyIPage); +// } +//} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/dao/SarStandPartCodeApplyDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/dao/SarStandPartCodeApplyDao.java new file mode 100644 index 00000000..76921954 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/dao/SarStandPartCodeApplyDao.java @@ -0,0 +1,15 @@ +//package com.adc.da.slrs.sarStandPartCodeApply.dao; +// +//import com.adc.da.slrs.sarStandPartCodeApply.entity.SarStandPartCodeApply; +//import com.adc.da.slrs.sarStandPartCodeApply.entity.SarStandPartCodeApplyPage; +//import com.baomidou.mybatisplus.core.mapper.BaseMapper; +//import com.baomidou.mybatisplus.core.metadata.IPage; +//import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +//import org.apache.ibatis.annotations.Mapper; +//import org.apache.ibatis.annotations.Param; +// +//@Mapper +//public interface SarStandPartCodeApplyDao extends BaseMapper { +// IPage getAllDatasByPage(Page page, @Param("sar")SarStandPartCodeApplyPage sarStandPartCodeApply); +// +//} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/entity/SarStandPartCodeApply.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/entity/SarStandPartCodeApply.java new file mode 100644 index 00000000..46a2cf72 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/entity/SarStandPartCodeApply.java @@ -0,0 +1,84 @@ +//package com.adc.da.slrs.sarStandPartCodeApply.entity; +// +//import com.adc.da.base.entity.BaseEntity; +//import com.alibaba.excel.annotation.ExcelIgnore; +//import com.alibaba.excel.annotation.ExcelProperty; +//import com.baomidou.mybatisplus.annotation.IdType; +//import com.baomidou.mybatisplus.annotation.TableField; +//import com.baomidou.mybatisplus.annotation.TableId; +//import com.fasterxml.jackson.annotation.JsonFormat; +//import io.swagger.annotations.ApiModel; +//import io.swagger.annotations.ApiModelProperty; +//import lombok.Data; +//import lombok.EqualsAndHashCode; +//import lombok.experimental.Accessors; +//import org.springframework.format.annotation.DateTimeFormat; +// +//import java.util.Date; +// +//@Data +//@EqualsAndHashCode(callSuper = true) +//@Accessors(chain = true) +//@ApiModel(value = "SarStandPartCodeApply对象",description = "SarStandPartCodeApply基础表里的所有属性") +//public class SarStandPartCodeApply extends BaseEntity { +// +// //版本号 +// private static final long serialVersionUID = 1L; +// +// @ExcelIgnore//这个字段在导出Excel的时候不显示在Excel表头里 +// @ApiModelProperty(value = "主键")//接口标志 +// @TableId(type = IdType.UUID)//数据库表里的主键 +// private String id; +// +// @ExcelProperty("子组号")//Excel里的表头显示的是什么 +// @ApiModelProperty(value = "子组号")//接口标志 +// @TableField("SUBGROUP_NUMBER")//数据库表里的字段 +// private String subgroupNumber; +// +// @ExcelProperty("子组结构号")//Excel里的表头显示的是什么 +// @ApiModelProperty(value = "子组结构号")//接口标志 +// @TableField("SUBGROUP_STRUCTURE_NUMBER")//数据库表里的字段 +// private String subgroupStructureNumber; +// +// @ExcelProperty("子组结构名称")//Excel里的表头显示的是什么 +// @ApiModelProperty(value = "子组结构名称")//接口标志 +// @TableField("SUBGROUP_STRUCTURE_NAME")//数据库表里的字段 +// private String subgroupStructureName; +// +// @ExcelProperty("分组代号")//Excel里的表头显示的是什么 +// @ApiModelProperty(value = "分组代号")//接口标志 +// @TableField("GROUP_CODE")//数据库表里的字段 +// private String groupCode; +// +// @ExcelProperty("零部件分类名称")//Excel里的表头显示的是什么 +// @ApiModelProperty(value = "零部件分类名称")//接口标志 +// @TableField("PART_CATEGORY_NAME")//数据库表里的字段 +// private String partCategoryName; +// +// @ExcelProperty("零部件分类代号")//Excel里的表头显示的是什么 +// @ApiModelProperty(value = "零部件分类代号")//接口标志 +// @TableField("PART_CATEGORY_CODE")//数据库表里的字段 +// private String partCategoryCode; +// +// @ExcelProperty("备注")//Excel里的表头显示的是什么 +// @ApiModelProperty(value = "备注")//接口标志 +// @TableField("REMARKS")//数据库表里的字段 +// private String remarks; +// +// @ExcelIgnore//这个字段在导出Excel的时候不显示在Excel表头里 +// @ApiModelProperty(value = "创建部门")//接口标志 +// @TableField("CREATE_DEPT_ID")//数据库表里的字段 +// private String createDeptId; +// +// @ExcelIgnore//这个字段在导出Excel的时候不显示在Excel表头里 +// @ApiModelProperty(value = "创建人")//接口标志 +// @TableField("CREATE_BY_ID")//数据库表里的字段 +// private String createById; +// +// @ExcelIgnore//这个字段在导出Excel的时候不显示在Excel表头里 +// @ApiModelProperty(value = "创建时间")//接口标志 +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")//时间格式化 +// @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")//时间格式化 +// @TableField("CREATE_TIME")//数据库表里的字段 +// private Date createTime; +//} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/entity/SarStandPartCodeApplyPage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/entity/SarStandPartCodeApplyPage.java new file mode 100644 index 00000000..c1f53510 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/entity/SarStandPartCodeApplyPage.java @@ -0,0 +1,51 @@ +//package com.adc.da.slrs.sarStandPartCodeApply.entity; +// +//import io.swagger.annotations.ApiModel; +//import io.swagger.annotations.ApiModelProperty; +//import lombok.Data; +// +//import java.sql.Timestamp; +// +//@Data +//@ApiModel(value = "SarStandPartCodeApply分页",description = "SarStandPartCodeApply对象分页信息") +//public class SarStandPartCodeApplyPage { +// +// @ApiModelProperty(value = "主键") +// private String id; +// +// @ApiModelProperty(value = "子组号") +// private String subgroupNumber; +// +// @ApiModelProperty(value = "子组结构号") +// private String subgroupStructureNumber; +// +// @ApiModelProperty(value = "子组结构名称") +// private String subgroupStructureName; +// +// @ApiModelProperty(value = "分组代号") +// private String groupCode; +// +// @ApiModelProperty(value = "零部件分类名称") +// private String partCategoryName; +// +// @ApiModelProperty(value = "零部件分类代号") +// private String partCategoryCode; +// +// @ApiModelProperty(value = "备注") +// private String remarks; +// +// @ApiModelProperty(value = "创建部门") +// private String createDeptId; +// +// @ApiModelProperty(value = "创建人") +// private String createById; +// +// @ApiModelProperty(value = "创建时间") +// private Timestamp createTime; +// +// @ApiModelProperty("当前页") +// private Integer current; +// +// @ApiModelProperty("每页条数") +// private Integer size; +//} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/service/ISarStandPartCodeApplyService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/service/ISarStandPartCodeApplyService.java new file mode 100644 index 00000000..b16a1563 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/service/ISarStandPartCodeApplyService.java @@ -0,0 +1,16 @@ +//package com.adc.da.slrs.sarStandPartCodeApply.service; +// +//import com.adc.da.slrs.sarStandPartCodeApply.entity.SarStandPartCodeApply; +//import com.adc.da.slrs.sarStandPartCodeApply.entity.SarStandPartCodeApplyPage; +//import com.baomidou.mybatisplus.core.metadata.IPage; +//import com.baomidou.mybatisplus.extension.service.IService; +// +//public interface ISarStandPartCodeApplyService extends IService { +// +// /** +// * 分页查询零部件 +// * @param sarStandPartCodeApplyPage: 筛选、分页信息 +// * @return: IPage +// */ +// IPage getSarStandPartCodeApplyPage(SarStandPartCodeApplyPage sarStandPartCodeApplyPage); +//} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/service/impl/SarStandPartCodeApplyServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/service/impl/SarStandPartCodeApplyServiceImpl.java new file mode 100644 index 00000000..d9c54026 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/service/impl/SarStandPartCodeApplyServiceImpl.java @@ -0,0 +1,35 @@ +//package com.adc.da.slrs.sarStandPartCodeApply.service.impl; +// +//import com.adc.da.slrs.sarStandPartCodeApply.dao.SarStandPartCodeApplyDao; +//import com.adc.da.slrs.sarStandPartCodeApply.entity.SarStandPartCodeApply; +//import com.adc.da.slrs.sarStandPartCodeApply.entity.SarStandPartCodeApplyPage; +//import com.adc.da.slrs.sarStandPartCodeApply.service.ISarStandPartCodeApplyService; +//import com.adc.da.slrs.sarStandUnqualified.entity.SarStandUnqualified; +//import com.adc.da.slrs.sarStandardsInfo.dao.SarStandardsInfoDao; +//import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo; +//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +//import com.baomidou.mybatisplus.core.metadata.IPage; +//import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +//import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +//import org.springframework.beans.factory.annotation.Autowired; +//import org.springframework.stereotype.Service; +// +//import javax.annotation.Resource; +//import java.util.List; +// +//@Service +//public class SarStandPartCodeApplyServiceImpl extends ServiceImpl implements ISarStandPartCodeApplyService { +// +// @Autowired +// private SarStandPartCodeApplyDao sarStandPartCodeApplyDao; +// +// @Resource +// private SarStandardsInfoDao sarStandardsInfoDao; +// +// public IPage getSarStandPartCodeApplyPage(SarStandPartCodeApplyPage sarStandPartCodeApplyPage){ +// QueryWrapper sarStandPartCodeApplyQueryWrapper = new QueryWrapper<>(); +// if (sarStandPartCodeApplyQueryWrapper.) +// } +// +// +//} From 249f6bd1eb37732d0d7d94a09104ec8cc0888c77 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Thu, 12 Aug 2021 17:57:33 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E9=9B=B6=E9=83=A8=E4=BB=B6=E7=BC=96?= =?UTF-8?q?=E5=8F=B7=E7=94=B3=E8=AF=B7=E6=A8=A1=E5=9D=97=E5=BC=80=E5=8F=91?= =?UTF-8?q?=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarStandPartCodeApplyController.java | 165 +++++++++++------ .../dao/SarStandPartCodeApplyDao.java | 30 ++-- .../entity/SarStandPartCodeApply.java | 168 +++++++++--------- .../entity/SarStandPartCodeApplyPage.java | 102 +++++------ .../entity/StandPartCodeExcelVO.java | 16 ++ .../ISarStandPartCodeApplyService.java | 49 +++-- .../SarStandPartCodeApplyServiceImpl.java | 126 +++++++++---- 7 files changed, 399 insertions(+), 257 deletions(-) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/entity/StandPartCodeExcelVO.java diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/controller/SarStandPartCodeApplyController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/controller/SarStandPartCodeApplyController.java index bc26ef9c..32fb0284 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/controller/SarStandPartCodeApplyController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/controller/SarStandPartCodeApplyController.java @@ -1,56 +1,109 @@ -//package com.adc.da.slrs.sarStandPartCodeApply.controller; -// -//import com.adc.da.base.web.BaseController; -//import com.adc.da.http.ResponseMessage; -//import com.adc.da.http.Result; -//import com.adc.da.slrs.sarStandPartCodeApply.entity.SarStandPartCodeApply; -//import com.adc.da.slrs.sarStandPartCodeApply.entity.SarStandPartCodeApplyPage; -//import com.adc.da.slrs.sarStandPartCodeApply.service.ISarStandPartCodeApplyService; -//import com.adc.da.slrs.sarStandardsInfo.controller.SarStandardsInfoController; -//import com.baomidou.mybatisplus.core.metadata.IPage; -//import io.swagger.annotations.Api; -//import io.swagger.annotations.ApiOperation; -//import org.slf4j.Logger; -//import org.slf4j.LoggerFactory; -//import org.springframework.beans.factory.annotation.Autowired; -//import org.springframework.web.bind.annotation.PostMapping; -//import org.springframework.web.bind.annotation.RequestBody; -//import org.springframework.web.bind.annotation.RequestMapping; -//import org.springframework.web.bind.annotation.RestController; -// -//import java.util.Date; -//import java.util.List; -// -//@RestController -//@Api(tags = "零部件编号申请") -//@RequestMapping("/api/sarStandPartCodeApply")//前端和后端对的接口 -//public class SarStandPartCodeApplyController extends BaseController { -// -// //创建日志实例 -// private static final Logger logger = LoggerFactory.getLogger(SarStandardsInfoController.class); -// -// @Autowired -// private ISarStandPartCodeApplyService sarStandPartCodeApplyService; -// -// @ApiOperation("零部件编号申请新增") -// @PostMapping("/add") -// public ResponseMessage add(@RequestBody List sarStandPartCodeApply){ -// sarStandPartCodeApply.forEach(sarStandPartCodeApply1 -> sarStandPartCodeApply1.setCreateTime(new Date())); -// if (sarStandPartCodeApplyService.saveBatch(sarStandPartCodeApply)){ -// return Result.success("新增成功"); -// } -// else { -// return Result.error("新增失败"); -// } -// } -// -// /** -// * 分页查询零部件 -// * @param sarStandPartCodeApplyPage: 筛选、分页信息 -// * @return IPage -// */ -// public ResponseMessage> getSarStandPartCodeApplyPage(SarStandPartCodeApplyPage sarStandPartCodeApplyPage){ -// IPage sarStandPartCodeApplyIPage = sarStandPartCodeApplyService.getSarStandPartCodeApplyPage(sarStandPartCodeApplyPage); -// return Result.success(sarStandPartCodeApplyIPage); -// } -//} +package com.adc.da.slrs.sarStandPartCodeApply.controller; + +import com.adc.da.base.web.BaseController; +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.slrs.sarStandPartCodeApply.entity.SarStandPartCodeApply; +import com.adc.da.slrs.sarStandPartCodeApply.entity.SarStandPartCodeApplyPage; +import com.adc.da.slrs.sarStandPartCodeApply.entity.StandPartCodeExcelVO; +import com.adc.da.slrs.sarStandPartCodeApply.service.ISarStandPartCodeApplyService; +import com.adc.da.slrs.sarStandardsInfo.controller.SarStandardsInfoController; +import com.alibaba.excel.EasyExcel; +import com.alibaba.fastjson.JSON; +import com.baomidou.mybatisplus.core.metadata.IPage; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.net.URLEncoder; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Date; +import java.util.List; + +@RestController +@Api(tags = "零部件编号申请", value = "SarStandPartCodeApplyController", description = "零部件编号申请控制类") +@RequestMapping("/api/sarStandPartCodeApply")//前端和后端对的接口 +public class SarStandPartCodeApplyController extends BaseController { + + //创建日志实例 + private static final Logger logger = LoggerFactory.getLogger(SarStandardsInfoController.class); + + @Autowired + private ISarStandPartCodeApplyService sarStandPartCodeApplyService; + + @ApiOperation("零部件编号申请新增") + @PostMapping("/add") + public ResponseMessage add(@RequestBody List sarStandPartCodeApply) { + sarStandPartCodeApply.forEach(sarStandPartCodeApply1 -> sarStandPartCodeApply1.setCreateTime(new Date())); + if (sarStandPartCodeApplyService.saveBatch(sarStandPartCodeApply)) { + return Result.success("新增成功"); + } else { + return Result.error("新增失败"); + } + } + + /** + * 分页查询零部件 + * + * @param sarStandPartCodeApplyPage: 筛选、分页信息 + * @return IPage + */ + @ApiOperation("分页查询零部件") + @GetMapping + public ResponseMessage> getSarStandPartCodeApplyPage(SarStandPartCodeApplyPage sarStandPartCodeApplyPage) { + IPage sarStandPartCodeApplyIPage = sarStandPartCodeApplyService.getSarStandPartCodeApplyPage(sarStandPartCodeApplyPage); + return Result.success(sarStandPartCodeApplyIPage); + } + + /** + * 批量删除零部件 + * + * @param idList + * @return + */ + @ApiOperation(value = "批量删除零部件") + @PostMapping("/deleteListAll") + public ResponseMessage deleteListAll(String[] idList) { + if (idList == null || idList.length == 0) { + return Result.success("200", "要删除的数据为空"); + } else { + List list = new ArrayList<>(Arrays.asList(idList)); + String src = sarStandPartCodeApplyService.del(list); + return Result.success("200", src); + } + } + + @ApiOperation("导出Excel表") + @GetMapping(value = "exportPartInfoExcel") + public void exportPartInfoExcel(StandPartCodeExcelVO standPartCodeExcelVO, HttpServletResponse response) throws Exception { + // 这里注意 有同学反应使用swagger 会导致各种问题，请直接用浏览器或者用postman + try { + response.setContentType("application/vnd.ms-excel"); + response.setCharacterEncoding("utf-8"); + // 这里URLEncoder.encode可以防止中文乱码 当然和easyexcel没有关系 + if (standPartCodeExcelVO.getExportName() == null) { + standPartCodeExcelVO.setExportName("零部件申请信息"); + } + String fileName = URLEncoder.encode(standPartCodeExcelVO.getExportName(), "UTF-8").replaceAll("\\+", "%20"); + response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx"); + List data = sarStandPartCodeApplyService.getPartInfoExcelData(standPartCodeExcelVO); + //这里需要设置不关闭流 + EasyExcel.write(response.getOutputStream(), SarStandPartCodeApply.class).autoCloseStream(Boolean.FALSE) + .sheet("sheet1").doWrite(data); + } catch (Exception e) { + System.out.println(e); + //重置response + response.reset(); + response.setContentType("application/json"); + response.setCharacterEncoding("utf-8"); + response.getWriter().println(JSON.toJSONString(Result.error())); + } + } + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/dao/SarStandPartCodeApplyDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/dao/SarStandPartCodeApplyDao.java index 76921954..a51ef362 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/dao/SarStandPartCodeApplyDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/dao/SarStandPartCodeApplyDao.java @@ -1,15 +1,15 @@ -//package com.adc.da.slrs.sarStandPartCodeApply.dao; -// -//import com.adc.da.slrs.sarStandPartCodeApply.entity.SarStandPartCodeApply; -//import com.adc.da.slrs.sarStandPartCodeApply.entity.SarStandPartCodeApplyPage; -//import com.baomidou.mybatisplus.core.mapper.BaseMapper; -//import com.baomidou.mybatisplus.core.metadata.IPage; -//import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -//import org.apache.ibatis.annotations.Mapper; -//import org.apache.ibatis.annotations.Param; -// -//@Mapper -//public interface SarStandPartCodeApplyDao extends BaseMapper { -// IPage getAllDatasByPage(Page page, @Param("sar")SarStandPartCodeApplyPage sarStandPartCodeApply); -// -//} +package com.adc.da.slrs.sarStandPartCodeApply.dao; + +import com.adc.da.slrs.sarStandPartCodeApply.entity.SarStandPartCodeApply; +import com.adc.da.slrs.sarStandPartCodeApply.entity.SarStandPartCodeApplyPage; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +@Mapper +public interface SarStandPartCodeApplyDao extends BaseMapper { + IPage getAllDatasByPage(Page page, @Param("sar")SarStandPartCodeApplyPage sarStandPartCodeApply); + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/entity/SarStandPartCodeApply.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/entity/SarStandPartCodeApply.java index 46a2cf72..a8b93259 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/entity/SarStandPartCodeApply.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/entity/SarStandPartCodeApply.java @@ -1,84 +1,84 @@ -//package com.adc.da.slrs.sarStandPartCodeApply.entity; -// -//import com.adc.da.base.entity.BaseEntity; -//import com.alibaba.excel.annotation.ExcelIgnore; -//import com.alibaba.excel.annotation.ExcelProperty; -//import com.baomidou.mybatisplus.annotation.IdType; -//import com.baomidou.mybatisplus.annotation.TableField; -//import com.baomidou.mybatisplus.annotation.TableId; -//import com.fasterxml.jackson.annotation.JsonFormat; -//import io.swagger.annotations.ApiModel; -//import io.swagger.annotations.ApiModelProperty; -//import lombok.Data; -//import lombok.EqualsAndHashCode; -//import lombok.experimental.Accessors; -//import org.springframework.format.annotation.DateTimeFormat; -// -//import java.util.Date; -// -//@Data -//@EqualsAndHashCode(callSuper = true) -//@Accessors(chain = true) -//@ApiModel(value = "SarStandPartCodeApply对象",description = "SarStandPartCodeApply基础表里的所有属性") -//public class SarStandPartCodeApply extends BaseEntity { -// -// //版本号 -// private static final long serialVersionUID = 1L; -// -// @ExcelIgnore//这个字段在导出Excel的时候不显示在Excel表头里 -// @ApiModelProperty(value = "主键")//接口标志 -// @TableId(type = IdType.UUID)//数据库表里的主键 -// private String id; -// -// @ExcelProperty("子组号")//Excel里的表头显示的是什么 -// @ApiModelProperty(value = "子组号")//接口标志 -// @TableField("SUBGROUP_NUMBER")//数据库表里的字段 -// private String subgroupNumber; -// -// @ExcelProperty("子组结构号")//Excel里的表头显示的是什么 -// @ApiModelProperty(value = "子组结构号")//接口标志 -// @TableField("SUBGROUP_STRUCTURE_NUMBER")//数据库表里的字段 -// private String subgroupStructureNumber; -// -// @ExcelProperty("子组结构名称")//Excel里的表头显示的是什么 -// @ApiModelProperty(value = "子组结构名称")//接口标志 -// @TableField("SUBGROUP_STRUCTURE_NAME")//数据库表里的字段 -// private String subgroupStructureName; -// -// @ExcelProperty("分组代号")//Excel里的表头显示的是什么 -// @ApiModelProperty(value = "分组代号")//接口标志 -// @TableField("GROUP_CODE")//数据库表里的字段 -// private String groupCode; -// -// @ExcelProperty("零部件分类名称")//Excel里的表头显示的是什么 -// @ApiModelProperty(value = "零部件分类名称")//接口标志 -// @TableField("PART_CATEGORY_NAME")//数据库表里的字段 -// private String partCategoryName; -// -// @ExcelProperty("零部件分类代号")//Excel里的表头显示的是什么 -// @ApiModelProperty(value = "零部件分类代号")//接口标志 -// @TableField("PART_CATEGORY_CODE")//数据库表里的字段 -// private String partCategoryCode; -// -// @ExcelProperty("备注")//Excel里的表头显示的是什么 -// @ApiModelProperty(value = "备注")//接口标志 -// @TableField("REMARKS")//数据库表里的字段 -// private String remarks; -// -// @ExcelIgnore//这个字段在导出Excel的时候不显示在Excel表头里 -// @ApiModelProperty(value = "创建部门")//接口标志 -// @TableField("CREATE_DEPT_ID")//数据库表里的字段 -// private String createDeptId; -// -// @ExcelIgnore//这个字段在导出Excel的时候不显示在Excel表头里 -// @ApiModelProperty(value = "创建人")//接口标志 -// @TableField("CREATE_BY_ID")//数据库表里的字段 -// private String createById; -// -// @ExcelIgnore//这个字段在导出Excel的时候不显示在Excel表头里 -// @ApiModelProperty(value = "创建时间")//接口标志 -// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")//时间格式化 -// @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")//时间格式化 -// @TableField("CREATE_TIME")//数据库表里的字段 -// private Date createTime; -//} +package com.adc.da.slrs.sarStandPartCodeApply.entity; + +import com.adc.da.base.entity.BaseEntity; +import com.alibaba.excel.annotation.ExcelIgnore; +import com.alibaba.excel.annotation.ExcelProperty; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + +@Data +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) +@ApiModel(value = "SarStandPartCodeApply对象",description = "SarStandPartCodeApply基础表里的所有属性") +public class SarStandPartCodeApply extends BaseEntity { + + //版本号 + private static final long serialVersionUID = 1L; + + @ExcelIgnore//这个字段在导出Excel的时候不显示在Excel表头里 + @ApiModelProperty(value = "主键")//接口标志 + @TableId(type = IdType.UUID)//数据库表里的主键 + private String id; + + @ExcelProperty("子组号")//Excel里的表头显示的是什么 + @ApiModelProperty(value = "子组号")//接口标志 + @TableField("SUBGROUP_NUMBER")//数据库表里的字段 + private String subgroupNumber; + + @ExcelProperty("子组结构号")//Excel里的表头显示的是什么 + @ApiModelProperty(value = "子组结构号")//接口标志 + @TableField("SUBGROUP_STRUCTURE_NUMBER")//数据库表里的字段 + private String subgroupStructureNumber; + + @ExcelProperty("子组结构名称")//Excel里的表头显示的是什么 + @ApiModelProperty(value = "子组结构名称")//接口标志 + @TableField("SUBGROUP_STRUCTURE_NAME")//数据库表里的字段 + private String subgroupStructureName; + + @ExcelProperty("分组代号")//Excel里的表头显示的是什么 + @ApiModelProperty(value = "分组代号")//接口标志 + @TableField("GROUP_CODE")//数据库表里的字段 + private String groupCode; + + @ExcelProperty("零部件分类名称")//Excel里的表头显示的是什么 + @ApiModelProperty(value = "零部件分类名称")//接口标志 + @TableField("PART_CATEGORY_NAME")//数据库表里的字段 + private String partCategoryName; + + @ExcelProperty("零部件分类代号")//Excel里的表头显示的是什么 + @ApiModelProperty(value = "零部件分类代号")//接口标志 + @TableField("PART_CATEGORY_CODE")//数据库表里的字段 + private String partCategoryCode; + + @ExcelProperty("备注")//Excel里的表头显示的是什么 + @ApiModelProperty(value = "备注")//接口标志 + @TableField("REMARKS")//数据库表里的字段 + private String remarks; + + @ExcelIgnore//这个字段在导出Excel的时候不显示在Excel表头里 + @ApiModelProperty(value = "创建部门")//接口标志 + @TableField("CREATE_DEPT_ID")//数据库表里的字段 + private String createDeptId; + + @ExcelIgnore//这个字段在导出Excel的时候不显示在Excel表头里 + @ApiModelProperty(value = "创建人")//接口标志 + @TableField("CREATE_BY_ID")//数据库表里的字段 + private String createById; + + @ExcelIgnore//这个字段在导出Excel的时候不显示在Excel表头里 + @ApiModelProperty(value = "创建时间")//接口标志 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")//时间格式化 + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")//时间格式化 + @TableField("CREATE_TIME")//数据库表里的字段 + private Date createTime; +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/entity/SarStandPartCodeApplyPage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/entity/SarStandPartCodeApplyPage.java index c1f53510..2c5d819f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/entity/SarStandPartCodeApplyPage.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/entity/SarStandPartCodeApplyPage.java @@ -1,51 +1,51 @@ -//package com.adc.da.slrs.sarStandPartCodeApply.entity; -// -//import io.swagger.annotations.ApiModel; -//import io.swagger.annotations.ApiModelProperty; -//import lombok.Data; -// -//import java.sql.Timestamp; -// -//@Data -//@ApiModel(value = "SarStandPartCodeApply分页",description = "SarStandPartCodeApply对象分页信息") -//public class SarStandPartCodeApplyPage { -// -// @ApiModelProperty(value = "主键") -// private String id; -// -// @ApiModelProperty(value = "子组号") -// private String subgroupNumber; -// -// @ApiModelProperty(value = "子组结构号") -// private String subgroupStructureNumber; -// -// @ApiModelProperty(value = "子组结构名称") -// private String subgroupStructureName; -// -// @ApiModelProperty(value = "分组代号") -// private String groupCode; -// -// @ApiModelProperty(value = "零部件分类名称") -// private String partCategoryName; -// -// @ApiModelProperty(value = "零部件分类代号") -// private String partCategoryCode; -// -// @ApiModelProperty(value = "备注") -// private String remarks; -// -// @ApiModelProperty(value = "创建部门") -// private String createDeptId; -// -// @ApiModelProperty(value = "创建人") -// private String createById; -// -// @ApiModelProperty(value = "创建时间") -// private Timestamp createTime; -// -// @ApiModelProperty("当前页") -// private Integer current; -// -// @ApiModelProperty("每页条数") -// private Integer size; -//} +package com.adc.da.slrs.sarStandPartCodeApply.entity; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.sql.Timestamp; + +@Data +@ApiModel(value = "SarStandPartCodeApply分页",description = "SarStandPartCodeApply对象分页信息") +public class SarStandPartCodeApplyPage { + + @ApiModelProperty(value = "主键") + private String id; + + @ApiModelProperty(value = "子组号") + private String subgroupNumber; + + @ApiModelProperty(value = "子组结构号") + private String subgroupStructureNumber; + + @ApiModelProperty(value = "子组结构名称") + private String subgroupStructureName; + + @ApiModelProperty(value = "分组代号") + private String groupCode; + + @ApiModelProperty(value = "零部件分类名称") + private String partCategoryName; + + @ApiModelProperty(value = "零部件分类代号") + private String partCategoryCode; + + @ApiModelProperty(value = "备注") + private String remarks; + + @ApiModelProperty(value = "创建部门") + private String createDeptId; + + @ApiModelProperty(value = "创建人") + private String createById; + + @ApiModelProperty(value = "创建时间") + private Timestamp createTime; + + @ApiModelProperty("当前页") + private Integer current; + + @ApiModelProperty("每页条数") + private Integer size; +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/entity/StandPartCodeExcelVO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/entity/StandPartCodeExcelVO.java new file mode 100644 index 00000000..03bb1163 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/entity/StandPartCodeExcelVO.java @@ -0,0 +1,16 @@ +package com.adc.da.slrs.sarStandPartCodeApply.entity; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@Data +@ApiModel(description = "零部件申请ExcelVO类") +public class StandPartCodeExcelVO { + @ApiModelProperty("文件名") + String exportName; + @ApiModelProperty("导出的零部件ID列表") + List ids; +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/service/ISarStandPartCodeApplyService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/service/ISarStandPartCodeApplyService.java index b16a1563..d2a1b4dc 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/service/ISarStandPartCodeApplyService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/service/ISarStandPartCodeApplyService.java @@ -1,16 +1,33 @@ -//package com.adc.da.slrs.sarStandPartCodeApply.service; -// -//import com.adc.da.slrs.sarStandPartCodeApply.entity.SarStandPartCodeApply; -//import com.adc.da.slrs.sarStandPartCodeApply.entity.SarStandPartCodeApplyPage; -//import com.baomidou.mybatisplus.core.metadata.IPage; -//import com.baomidou.mybatisplus.extension.service.IService; -// -//public interface ISarStandPartCodeApplyService extends IService { -// -// /** -// * 分页查询零部件 -// * @param sarStandPartCodeApplyPage: 筛选、分页信息 -// * @return: IPage -// */ -// IPage getSarStandPartCodeApplyPage(SarStandPartCodeApplyPage sarStandPartCodeApplyPage); -//} +package com.adc.da.slrs.sarStandPartCodeApply.service; + +import com.adc.da.slrs.sarStandPartCodeApply.entity.SarStandPartCodeApply; +import com.adc.da.slrs.sarStandPartCodeApply.entity.SarStandPartCodeApplyPage; +import com.adc.da.slrs.sarStandPartCodeApply.entity.StandPartCodeExcelVO; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +public interface ISarStandPartCodeApplyService extends IService { + + /** + * 分页查询零部件 + * @param sarStandPartCodeApplyPage: 筛选、分页信息 + * @return: IPage + */ + IPage getSarStandPartCodeApplyPage(SarStandPartCodeApplyPage sarStandPartCodeApplyPage); + + /** + * 批量删除零件申请信息 + * @param idList + * @return + */ + String del(List idList); + + /** + * 获取导出Excel的数据 + * @param standPartCodeExcelVO: ids + * @return List + */ + List getPartInfoExcelData(StandPartCodeExcelVO standPartCodeExcelVO); +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/service/impl/SarStandPartCodeApplyServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/service/impl/SarStandPartCodeApplyServiceImpl.java index d9c54026..e25edf6a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/service/impl/SarStandPartCodeApplyServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/service/impl/SarStandPartCodeApplyServiceImpl.java @@ -1,35 +1,91 @@ -//package com.adc.da.slrs.sarStandPartCodeApply.service.impl; -// -//import com.adc.da.slrs.sarStandPartCodeApply.dao.SarStandPartCodeApplyDao; -//import com.adc.da.slrs.sarStandPartCodeApply.entity.SarStandPartCodeApply; -//import com.adc.da.slrs.sarStandPartCodeApply.entity.SarStandPartCodeApplyPage; -//import com.adc.da.slrs.sarStandPartCodeApply.service.ISarStandPartCodeApplyService; -//import com.adc.da.slrs.sarStandUnqualified.entity.SarStandUnqualified; -//import com.adc.da.slrs.sarStandardsInfo.dao.SarStandardsInfoDao; -//import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo; -//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -//import com.baomidou.mybatisplus.core.metadata.IPage; -//import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -//import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -//import org.springframework.beans.factory.annotation.Autowired; -//import org.springframework.stereotype.Service; -// -//import javax.annotation.Resource; -//import java.util.List; -// -//@Service -//public class SarStandPartCodeApplyServiceImpl extends ServiceImpl implements ISarStandPartCodeApplyService { -// -// @Autowired -// private SarStandPartCodeApplyDao sarStandPartCodeApplyDao; -// -// @Resource -// private SarStandardsInfoDao sarStandardsInfoDao; -// -// public IPage getSarStandPartCodeApplyPage(SarStandPartCodeApplyPage sarStandPartCodeApplyPage){ -// QueryWrapper sarStandPartCodeApplyQueryWrapper = new QueryWrapper<>(); -// if (sarStandPartCodeApplyQueryWrapper.) -// } -// -// -//} +package com.adc.da.slrs.sarStandPartCodeApply.service.impl; + +import com.adc.da.slrs.sarStandPartCodeApply.dao.SarStandPartCodeApplyDao; +import com.adc.da.slrs.sarStandPartCodeApply.entity.SarStandPartCodeApply; +import com.adc.da.slrs.sarStandPartCodeApply.entity.SarStandPartCodeApplyPage; +import com.adc.da.slrs.sarStandPartCodeApply.entity.StandPartCodeExcelVO; +import com.adc.da.slrs.sarStandPartCodeApply.service.ISarStandPartCodeApplyService; +import com.adc.da.slrs.sarStandUnqualified.entity.SarStandUnqualified; +import com.adc.da.slrs.sarStandardsInfo.dao.SarStandardsInfoDao; +import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +@Service +public class SarStandPartCodeApplyServiceImpl extends ServiceImpl implements ISarStandPartCodeApplyService { + + @Autowired + private SarStandPartCodeApplyDao sarStandPartCodeApplyDao; + + @Resource + private SarStandardsInfoDao sarStandardsInfoDao; + + /** + * 分页查询零部件信息 + * @param sarStandPartCodeApplyPage: 筛选、分页信息 + * @return :IPage + */ + @Override + public IPage getSarStandPartCodeApplyPage(SarStandPartCodeApplyPage sarStandPartCodeApplyPage){ + QueryWrapper sarStandPartCodeApplyQueryWrapper = new QueryWrapper<>(); + //根据子组号查询 + if (sarStandPartCodeApplyPage.getSubgroupNumber() != null){ + sarStandPartCodeApplyQueryWrapper.like("SUBGROUP_NUMBER",sarStandPartCodeApplyPage.getSubgroupNumber()); + } + //根据分组代号查询 + if (sarStandPartCodeApplyPage.getGroupCode() != null){ + sarStandPartCodeApplyQueryWrapper.like("GROUP_CODE",sarStandPartCodeApplyPage.getGroupCode()); + } + //根据零件分类代号查询 + if (sarStandPartCodeApplyPage.getPartCategoryCode() != null){ + sarStandPartCodeApplyQueryWrapper.like("PART_CATEGORY_CODE",sarStandPartCodeApplyPage.getPartCategoryCode()); + } + Page standPartCodeApplyPage=new Page<>(); + //判断前端是否提供页码和每页条数 + if (sarStandPartCodeApplyPage.getCurrent()!=null && sarStandPartCodeApplyPage.getSize()!=null){ + standPartCodeApplyPage = new Page<>(sarStandPartCodeApplyPage.getCurrent(),sarStandPartCodeApplyPage.getSize()); + } + return sarStandPartCodeApplyDao.selectPage(standPartCodeApplyPage,sarStandPartCodeApplyQueryWrapper); + } + + /** + * 批量删除零部件信息 + * @param idList: 批量删除的id数组 + * @return + */ + @Override + public String del(List idList){ + QueryWrapper wrapper = new QueryWrapper<>(); + for (String id: idList) { + wrapper.eq("ID",id); + sarStandPartCodeApplyDao.delete(wrapper); + } + sarStandPartCodeApplyDao.deleteBatchIds(idList); + return "删除成功"; + } + + /** + * 获取导出excel的数据 + * @param standPartCodeExcelVO: ids + * @return List + */ + @Override + public List getPartInfoExcelData(StandPartCodeExcelVO standPartCodeExcelVO){ + QueryWrapper sarStandPartCodeApplyQueryWrapper = new QueryWrapper<>(); + if (standPartCodeExcelVO.getIds()!=null && standPartCodeExcelVO.getIds().size()>0){ + sarStandPartCodeApplyQueryWrapper.in("id",standPartCodeExcelVO.getIds()); + } + List stand = sarStandPartCodeApplyDao.selectList(sarStandPartCodeApplyQueryWrapper); + List a = stand; + return a; + } + + +} From 26ffa2d7afd555382a4f510d3d35a153580ce710 Mon Sep 17 00:00:00 2001 From: "Mr.Z" <709235321@qq.com> Date: Thu, 12 Aug 2021 18:02:28 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=90=88=E8=A7=84?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B=20=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/SarStandardComplianceProductAssess.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssess.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssess.java index 4601161e..0fff5ae4 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssess.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssess.java @@ -91,6 +91,10 @@ public class SarStandardComplianceProductAssess extends BaseEntity { @ApiModelProperty(value = "在产产品合规信息") private String productionCompliance; + @ApiModelProperty(value = "在产产品不合规信息") + @TableField("production_non_compliance") + private String productionNonCompliance; + @ApiModelProperty(value = "在产产品不合规应对措施") private String productionCountermeasures;