From 7c74df6030b0c8d9dab2e650a01ed074ab509983 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Tue, 10 Aug 2021 16:00:57 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9B=B6=E9=83=A8=E4=BB=B6=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sarStandIdea/entity/DetAllStandDto.java | 2 +- .../Impl/SarPublicIdeaAllServiceImpl.java | 6 +- .../SarStandPartCodeApplyController.java | 56 +++++++++++++ .../dao/SarStandPartCodeApplyDao.java | 15 ++++ .../entity/SarStandPartCodeApply.java | 84 +++++++++++++++++++ .../entity/SarStandPartCodeApplyPage.java | 51 +++++++++++ .../ISarStandPartCodeApplyService.java | 16 ++++ .../SarStandPartCodeApplyServiceImpl.java | 35 ++++++++ .../SarStandProjectLibraryServiceImpl.java | 4 +- .../impl/SarStandUnqualifiedServiceImpl.java | 3 + 10 files changed, 266 insertions(+), 6 deletions(-) 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/sarStandIdea/entity/DetAllStandDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/DetAllStandDto.java index e0da9d35..a1e195cf 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/DetAllStandDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/DetAllStandDto.java @@ -8,6 +8,6 @@ public class DetAllStandDto { Integer size; String cid; String userId; - String endTime; + String startTime; String Account; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaAllServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaAllServiceImpl.java index 7f34cc6c..6d17d6f7 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaAllServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaAllServiceImpl.java @@ -40,11 +40,11 @@ public class SarPublicIdeaAllServiceImpl extends ServiceImpl selectAll(DetAllStandDto detAllStandDto) { - if (detAllStandDto.getEndTime() != null) { + if (detAllStandDto.getStartTime() != null) { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); Date Time = null; try { - Time = sdf.parse(detAllStandDto.getEndTime()); + Time = sdf.parse(detAllStandDto.getStartTime()); } catch (ParseException e) { e.printStackTrace(); } @@ -110,7 +110,7 @@ public class SarPublicIdeaAllServiceImpl extends ServiceImpl { +// +// //创建日志实例 +// 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.) +// } +// +// +//} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java index 510130bc..beee32f3 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java @@ -132,8 +132,8 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl queryProjectManager(int current, int pageSize) { QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.select("distinct product_line","project_manager as projectManager","uName"); - wrapper.last("inner join ts_user t on sar_stand_project_library.project_manager=t.usid"); + wrapper.select("distinct product_line","sar_stand_project_library.project_manager as projectManager","ts_user.uName"); + wrapper.last("inner join sar_stand_project_library s on ts_user.USID = s.project_manager"); Page page = new Page<>(current, pageSize); IPage userIPage = sarStandProjectLibraryDao.selectPage(page, wrapper); System.out.println("总条数"+userIPage.getTotal()); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java index 3bbc3938..599e5517 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java @@ -72,12 +72,15 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl