FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop_1' into develop_1

Browse Source
This commit is contained in:
zzy
2021-07-29 16:58:46 +08:00
parent 9d3d8e1198 f9d39e5e2d
commit 7d5fc79555
5 changed files with 97 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/SarStandUnqualifiedController.java
+3 -16
View File
@@ -1,8 +1,6 @@
package com.adc.da.slrs.sarStandUnqualified.controller;
import com.adc.da.common.ReadExcel;
import com.adc.da.exception.AdcDaBaseException;
import com.adc.da.http.ResponseMessage;
import com.adc.da.http.ResponseMessageCodeEnum;
import com.adc.da.http.Result;
@@ -11,16 +9,10 @@ import com.adc.da.slrs.sarStandUnqualified.entity.StandUnqualifiedExcelVO;
import com.adc.da.slrs.sarStandUnqualified.entity.StandUnqualifiedListVO;
import com.adc.da.slrs.sarStandUnqualified.service.ISarStandUnqualifiedService;
import com.adc.da.slrs.sarStandardsInfo.controller.SarStandardsInfoController;
import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo;
import com.adc.da.slrs.sarStandardsInfo.entity.StandardsInfoExcelVO;
import com.adc.da.utils.util.StandExportUtil;
import com.alibaba.excel.EasyExcel;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.util.IOUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -29,13 +21,8 @@ import com.adc.da.slrs.sarStandUnqualified.entity.SarStandUnqualified;
import io.swagger.annotations.Api;
import com.adc.da.base.web.BaseController;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.OutputStream;
import java.net.URLEncoder;
import java.sql.Timestamp;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -71,13 +58,13 @@ public class SarStandUnqualifiedController extends BaseController<SarStandUnqual
/**
* 分页查询未符合项
* @param sarStandUnqualifiedPage：筛选、分页信息
* @param sarStandUnqualifiedPage ：筛选、分页信息
* @return ResponseMessage<IPage<SarStandUnqualified>>
*/
@ApiOperation("分页查询未符合项")
@GetMapping
public ResponseMessage<IPage<SarStandUnqualified>> getSarStandUnqualifiedPage(SarStandUnqualifiedPage sarStandUnqualifiedPage){
IPage<SarStandUnqualified> sarStandUnqualifiedIPage=sarStandUnqualifiedService.getSarStandUnqualifiedPage(sarStandUnqualifiedPage);
public ResponseMessage<IPage<SarStandUnqualifiedPage>> getSarStandUnqualifiedPage(SarStandUnqualifiedPage sarStandUnqualifiedPage){
IPage<SarStandUnqualifiedPage> sarStandUnqualifiedIPage=sarStandUnqualifiedService.getSarStandUnqualifiedPage(sarStandUnqualifiedPage);
return Result.success(sarStandUnqualifiedIPage);
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java
+18 -1
View File
@@ -22,7 +22,7 @@ import org.springframework.format.annotation.DateTimeFormat;
/**
* <p>
*
*
* </p>
*
* @author super_liu
@@ -46,6 +46,18 @@ public class SarStandUnqualified extends BaseEntity {
@TableField("STAND_NAME")
private String standName;
@ApiModelProperty(value = "标准编号")
@TableField("STAND_NUMBER")
private String standNumber;
@ApiModelProperty(value = "标准类别")
@TableField("STAND_SORT")
private String standSort;
@ApiModelProperty(value = "标准年份")
@TableField("STAND_YEAR")
private String standYear;
@ExcelProperty("条款号")
@ApiModelProperty(value = "条款号")
@TableField("ITEMS_NUM")
@@ -126,6 +138,11 @@ public class SarStandUnqualified extends BaseEntity {
@TableField("DUTY_ENGINEER")
private String dutyEngineer;
@ExcelProperty("标准编号组合")
@ApiModelProperty(value = "标准编号组合")
@TableField("STAND_SERIAL_ NUMBER")
private String standSerialNumber;
@ExcelProperty(value = "产品类型",converter = ProductTypeConverter.class)
@ApiModelProperty(value = "产品类型（research为在研产品，product为在产产品）")
@TableField("PRODUCT_TYPE")
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualifiedPage.java
+14
View File
@@ -4,6 +4,8 @@ import com.adc.da.base.entity.BaseEntity;
import java.sql.Timestamp;
import java.time.LocalDateTime;
import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonBackReference;
@@ -43,6 +45,9 @@ public class SarStandUnqualifiedPage {
@ApiModelProperty(value = "计划关闭时间")
private Timestamp planCloseTime;
@ApiModelProperty(value = "标准编号组合")
private String standSerialNumber;
@ApiModelProperty(value = "质量工程师")
private String qaEngineer;
@@ -85,4 +90,13 @@ public class SarStandUnqualifiedPage {
@ApiModelProperty("每页条数")
private Integer size;
@ApiModelProperty(value = "标准编号")
private String standNumber;
@ApiModelProperty(value = "标准类别")
private String standSort;
@ApiModelProperty(value = "标准年份")
private String standYear;
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/ISarStandUnqualifiedService.java
+2 -2
View File
@@ -21,10 +21,10 @@ public interface ISarStandUnqualifiedService extends IService<SarStandUnqualifie
/**
* 分页查询未符合项
* @param sarStandUnqualifiedPage：筛选、分页信息
* @param sarStandUnqualifiedPage ：筛选、分页信息
* @return：IPage<SarStandUnqualified>
*/
IPage<SarStandUnqualified> getSarStandUnqualifiedPage(SarStandUnqualifiedPage sarStandUnqualifiedPage);
IPage<SarStandUnqualifiedPage> getSarStandUnqualifiedPage(SarStandUnqualifiedPage sarStandUnqualifiedPage);
/**
* 分页查询未符合项历史数据
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java
+60 -37
View File
@@ -1,13 +1,13 @@
package com.adc.da.slrs.sarStandUnqualified.service.impl;
import com.adc.da.slrs.sarLawsDetailedList.Util.BeanConverUtil;
import com.adc.da.slrs.sarLawsDetailedList.entity.ExcelDto;
import com.adc.da.slrs.sarStandUnqualified.entity.SarStandUnqualified;
import com.adc.da.slrs.sarStandUnqualified.dao.SarStandUnqualifiedDao;
import com.adc.da.slrs.sarStandUnqualified.entity.SarStandUnqualifiedPage;
import com.adc.da.slrs.sarStandUnqualified.entity.StandUnqualifiedExcelVO;
import com.adc.da.slrs.sarStandUnqualified.entity.StandUnqualifiedListVO;
import com.adc.da.slrs.sarStandUnqualified.service.ISarStandUnqualifiedService;
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;
@@ -15,9 +15,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.sql.Timestamp;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
/**
@@ -33,18 +33,35 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl<SarStandUnqualif
@Autowired
private SarStandUnqualifiedDao sarStandUnqualifiedDao;
@Resource
private SarStandardsInfoDao SarStandardsInfoDao;
/**
* 分页查询未符合项
* @param sarStandUnqualifiedPage：筛选、分页信息
* @param sarStandUnqualifiedPage ：筛选、分页信息
* @return：IPage<SarStandUnqualified>
*/
@Override
public IPage<SarStandUnqualified> getSarStandUnqualifiedPage(SarStandUnqualifiedPage sarStandUnqualifiedPage) {
public IPage<SarStandUnqualifiedPage> getSarStandUnqualifiedPage(SarStandUnqualifiedPage sarStandUnqualifiedPage) {
QueryWrapper<SarStandardsInfo> wrapper = new QueryWrapper<>();
wrapper.select("ID","STAND_NUMBER","STAND_SORT","STAND_YEAR");
wrapper.last("INNER JOIN sar_stand_unqualified r ON r.STAND_ID = sar_standards_info.ID WHERE r.STAND_ID ='"+ sarStandUnqualifiedPage.getStandId()+"'");
Page<SarStandardsInfo> page = new Page<>(sarStandUnqualifiedPage.getCurrent(),sarStandUnqualifiedPage.getSize());
IPage<SarStandardsInfo> userIPage = SarStandardsInfoDao.selectPage(page, wrapper);
List<SarStandUnqualifiedPage> list = new ArrayList<>();
List<SarStandardsInfo> list1 = userIPage.getRecords();
for(SarStandardsInfo s : list1){
SarStandUnqualifiedPage p = new SarStandUnqualifiedPage();
p.setStandSerialNumber(s.getStandSort()+s.getStandNumber()+s.getStandYear());
}
QueryWrapper<SarStandUnqualified> sarStandUnqualifiedQueryWrapper=new QueryWrapper<>();
if(sarStandUnqualifiedPage.getStandId()!=null){
sarStandUnqualifiedQueryWrapper.like("stand_id",sarStandUnqualifiedPage.getStandId());
sarStandUnqualifiedQueryWrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId());//查询详情页所需的标准ID
// sarStandUnqualifiedQueryWrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId()).or().like("stand_name","%"+sarStandUnqualifiedPage.getStandId()+"%");
}
if (sarStandUnqualifiedPage.getStandSerialNumber()!=null){
sarStandUnqualifiedQueryWrapper.like("STAND_SERIAL_ NUMBER",sarStandUnqualifiedPage.getStandSerialNumber());
}
if (sarStandUnqualifiedPage.getStandName()!=null){
sarStandUnqualifiedQueryWrapper.like("stand_name",sarStandUnqualifiedPage.getStandName());
}
@@ -62,7 +79,39 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl<SarStandUnqualif
&& sarStandUnqualifiedPage.getSize()!=null){
standUnqualifiedPage=new Page<>(sarStandUnqualifiedPage.getCurrent(),sarStandUnqualifiedPage.getSize());
}
return sarStandUnqualifiedDao.selectPage(standUnqualifiedPage,sarStandUnqualifiedQueryWrapper);
List<SarStandUnqualified> list2 = sarStandUnqualifiedDao.selectPage(standUnqualifiedPage,sarStandUnqualifiedQueryWrapper).getRecords();
for (SarStandardsInfo s : list1){
SarStandUnqualifiedPage p = new SarStandUnqualifiedPage();
p.setStandNumber(s.getStandNumber());
p.setStandSort(s.getStandSort());
p.setStandYear(s.getStandYear());
for (SarStandUnqualified a : list2){
if (s.getId().equals(a.getStandId())){
p.setCreateDeptId(a.getCreateDeptId());
p.setCreateById(a.getCreateById());
p.setCreateTime((Timestamp)a.getCreateTime());
p.setCloseState(a.getCloseState());
p.setActualCloseTime((Timestamp)a.getActualCloseTime());
p.setPlanCloseTime((Timestamp)a.getPlanCloseTime());
p.setQaEngineer(a.getQaEngineer());
p.setDutyEngineer(a.getDutyEngineer());
p.setResponsibleUnit(a.getResponsibleUnit());
p.setProductName(a.getProductName());
p.setProductLine(a.getProductLine());
p.setProductType(a.getProductType());
p.setItemsName(a.getItemsName());
p.setItemsNum(a.getItemsNum());
p.setStandName(a.getStandName());
p.setStandId(a.getStandId());
p.setId(a.getId());
p.setStandSerialNumber(a.getStandSerialNumber());
}
}
list.add(p);
}
IPage<SarStandUnqualifiedPage> userIPage1 = new Page<>();
userIPage1.setRecords(list);
return userIPage1;
}
/**
@@ -128,35 +177,9 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl<SarStandUnqualif
if(standUnqualifiedExcelVO.getIds()!=null && standUnqualifiedExcelVO.getIds().size()>0){
sarStandUnqualifiedQueryWrapper.in("id",standUnqualifiedExcelVO.getIds());
}
List<SarStandUnqualified> stand = sarStandUnqualifiedDao.selectList(sarStandUnqualifiedQueryWrapper);
List<ExcelDto> list = new ArrayList<>();
list = BeanConverUtil.converList(stand,ExcelDto.class);
for (int a=0;a<stand.size();a++){
Date date = null;
String str;
try {
if (stand.get(a).getCreateTime() != null) {
String dateStr = stand.get(a).getCreateTime().toString();
SimpleDateFormat sdf = new SimpleDateFormat("EEE MMM dd HH:mm:ss zzz yyyy", Locale.US);
date = sdf.parse(dateStr);
SimpleDateFormat sdf1=new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
String sDate=sdf1.format(date);
list.get(a).setCreateTime1(sDate);
}
if (stand.get(a).getActualCloseTime() != null) {
String dateStr = stand.get(a).getActualCloseTime().toString();
SimpleDateFormat sdf = new SimpleDateFormat("EEE MMM dd HH:mm:ss zzz yyyy", Locale.US);
date = sdf.parse(dateStr);
SimpleDateFormat sdf1=new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
String sDate=sdf1.format(date);
date=sdf1.parse(sDate);
list.get(a).setActualCloseTime(date);
}
} catch(ParseException e){
e.printStackTrace();
}
}
return stand;
List<SarStandUnqualified> stand = sarStandUnqualifiedDao.selectList(sarStandUnqualifiedQueryWrapper);
List<SarStandUnqualified> a = stand;
return a;
}
private boolean closeSarStandUnqualified(String standUnqualifiedId){