diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/controller/SarLawsAttrDetailedListController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/controller/SarLawsAttrDetailedListController.java index 254106fd..47156302 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/controller/SarLawsAttrDetailedListController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/controller/SarLawsAttrDetailedListController.java @@ -11,6 +11,7 @@ import com.adc.da.slrs.sarLawsAttrDetailedList.service.ISarLawsAttrDetailedListS import com.adc.da.sys.service.IDicTypeEOService; 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.springframework.beans.factory.annotation.Autowired; @@ -60,7 +61,7 @@ public class SarLawsAttrDetailedListController extends BaseController laws = iSarLawsAttrDetailedList.selectLaws(sarFindDto); + IPage laws = iSarLawsAttrDetailedList.selectLaws(sarFindDto); return Result.success("200",laws); } 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 baffd3c1..6dba1030 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 @@ -25,6 +25,8 @@ public interface SarLawsAttrDetailedListDao extends BaseMapper selectLawsId(@Param("standId") String standId,@Param("param3") Integer page,@Param("param2") Integer size); //根据标准id查出数据 List selectLawsById(@Param("param1") List LawsIds, @Param("sarFindDto") SarFindDto sarFindDto); + //根据标准id查出数据用于清单查询 + List selectLawsByIdList(@Param("param1") List LawsIds, @Param("sarFindDto") SarFindDto sarFindDto); //用于导出 List selectLawsByIdE(@Param("param1") List LawsIds); //根据标准id查出数据 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java index 5fd67bcf..007690bf 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java @@ -112,4 +112,7 @@ public class LawsDto { @ApiModelProperty(value = "1") private String standType; + + @ApiModelProperty(value = "文本状态") + private String textStatus; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/ISarLawsAttrDetailedListService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/ISarLawsAttrDetailedListService.java index 0474c233..6c113eff 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/ISarLawsAttrDetailedListService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/ISarLawsAttrDetailedListService.java @@ -2,6 +2,7 @@ package com.adc.da.slrs.sarLawsAttrDetailedList.service; import com.adc.da.slrs.sarLawsAttrDetailedList.entity.*; import com.adc.da.slrs.sarLawsDetailedList.entity.TimeDto; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import javax.servlet.http.HttpServletResponse; @@ -18,7 +19,7 @@ import java.util.Map; */ public interface ISarLawsAttrDetailedListService extends IService { - List selectLaws(SarFindDto sarFindDto); + IPage selectLaws(SarFindDto sarFindDto); Boolean insertDetailedList(String id,List timeDto); Boolean updateDetailedLaws(String id,List timeDtos); void exportExcel(HttpServletResponse response, StandExcelVo standExcelVo); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java index 9918bc69..92c664b7 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java @@ -3,11 +3,12 @@ package com.adc.da.slrs.sarLawsAttrDetailedList.service.impl; import com.adc.da.slrs.sarLawsAttrDetailedList.dao.SarLawsAttrDetailedListDao; import com.adc.da.slrs.sarLawsAttrDetailedList.entity.*; import com.adc.da.slrs.sarLawsAttrDetailedList.service.ISarLawsAttrDetailedListService; -import com.adc.da.slrs.sarLawsDetailedList.entity.SarLawsDetailedList; import com.adc.da.slrs.sarLawsDetailedList.entity.TimeDto; import com.adc.da.sys.service.IDicTypeEOService; import com.adc.da.util.UUIDUtils; 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.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -37,7 +38,13 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl selectLaws(SarFindDto sarFindDto) { + public IPage selectLaws(SarFindDto sarFindDto) { + //获取封装信息 + IPage pageRes = new Page<>(sarFindDto.getPage(), sarFindDto.getSize()); + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("detailed_list_id", sarFindDto.getId()); + IPage selectPage = sarLawsAttrDetailedListDao.selectPage(pageRes,wrapper); + //查询标准id List lawsIds = sarLawsAttrDetailedListDao.selectLawsId(sarFindDto.getId(),(sarFindDto.getPage())-1,sarFindDto.getSize()); if (CollectionUtils.isEmpty(lawsIds)){ return null; @@ -169,7 +176,14 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl list1 = new Page<>(); + list1.setRecords(list); + list1.setCurrent(selectPage.getCurrent()); + list1.setTotal(selectPage.getTotal()); + list1.setSize(selectPage.getSize()); + list1.setPages(selectPage.getPages()); + return list1; } //向清单表和主表中的关联表插入信息 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/ExcelDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/ExcelDto.java new file mode 100644 index 00000000..1a37c435 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/ExcelDto.java @@ -0,0 +1,21 @@ +package com.adc.da.slrs.sarLawsDetailedList.entity; + +import com.adc.da.slrs.sarStandUnqualified.entity.SarStandUnqualified; +import com.alibaba.excel.annotation.ExcelProperty; +import lombok.Data; + +/** + * //TODO 添加类、接口描述 + * + * @author ZhangZhiYuan + * @date 2021-07-29 + */ +@Data +public class ExcelDto extends SarStandUnqualified { + + @ExcelProperty("创建时间") + private String createTime1; + @ExcelProperty("计划关闭时间") + private String planCloseTime1; + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java index 01697f77..c22780bd 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java @@ -60,10 +60,6 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl timeDto = new ArrayList<>(); - if ("1".equals(detailedUpDto.getSortKey()) && detailedUpDto.getInforlist().contains(",")) { + if ( detailedUpDto.getInforlist().contains(",")) { String[] id = detailedUpDto.getInforlist().split(","); String[] putTime = detailedUpDto.getInforlist1().split(","); String[] zcc = detailedUpDto.getInforlist2().split(","); String[] xcx = detailedUpDto.getInforlist3().split(","); - for (int a = 0; a < id.length; a++) { - TimeDto dto = new TimeDto(); - dto.setStandId(id[a]); - if (putTime[a]==null) { - dto.setPutTime(null); - } else { - dto.setPutTime(putTime[a]); + for (int a = 0; a < id.length; a++) { + TimeDto dto = new TimeDto(); + dto.setStandId(id[a]); + if (putTime.length<=a) { + dto.setPutTime(null); + } else { + dto.setPutTime(putTime[a]); + } + if (putTime.length<=a) { + dto.setXcxssrqgj(null); + } else { + dto.setXcxssrqgj(xcx[a]); + } + if (putTime.length<=a) { + dto.setZccssrqgj(null); + } else { + dto.setZccssrqgj(zcc[a]); + } + timeDto.add(dto); } - if (putTime[a]==null) { - dto.setXcxssrqgj(null); - } else { - dto.setXcxssrqgj(xcx[a]); - } - if (putTime[a]==null) { - dto.setZccssrqgj(null); - } else { - dto.setZccssrqgj(zcc[a]); - } - timeDto.add(dto); - } } else { TimeDto dto = new TimeDto(); dto.setStandId(detailedUpDto.getInforlist()); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/GetExcelDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/GetExcelDto.java index 86c3cdb7..37b2a020 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/GetExcelDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/GetExcelDto.java @@ -25,7 +25,7 @@ public class GetExcelDto { @ExcelProperty("章节编号") private String partCode; - @ExcelProperty("内容") + @ExcelProperty("修改意见内容(包括理由或依据)") private String content; @ExcelProperty("提出人") private String userName; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java index 347f77df..7158dc30 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java @@ -81,7 +81,7 @@ public class SarStandUnqualified extends BaseEntity { @TableField("CREATE_BY_ID") private String createById; - @ExcelProperty(value = "创建时间",converter = TimestampConverter.class) + @ExcelIgnore @ApiModelProperty(value = "创建时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @@ -100,7 +100,7 @@ public class SarStandUnqualified extends BaseEntity { @TableField("ACTUAL_CLOSE_TIME") private Date actualCloseTime; - @ExcelProperty(value = "计划关闭时间",converter = TimestampConverter.class) + @ExcelIgnore @ApiModelProperty(value = "计划关闭时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @@ -126,8 +126,6 @@ public class SarStandUnqualified extends BaseEntity { @TableField("DUTY_ENGINEER") private String dutyEngineer; - - @ExcelProperty(value = "产品类型",converter = ProductTypeConverter.class) @ApiModelProperty(value = "产品类型（research为在研产品，product为在产产品）") @TableField("PRODUCT_TYPE") @@ -138,7 +136,6 @@ public class SarStandUnqualified extends BaseEntity { @TableId(type = IdType.UUID) private String id; - @ApiModelProperty(value = "质量工程师") @TableField(exist=false) private String qaEngineerName; 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 1270bef4..71be68e1 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 @@ -1,6 +1,7 @@ package com.adc.da.slrs.sarStandUnqualified.service.impl; -import com.adc.da.att.entity.AttFileEO; +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; @@ -11,13 +12,12 @@ 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.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.stereotype.Service; import java.sql.Timestamp; -import java.time.LocalDateTime; +import java.text.ParseException; +import java.text.SimpleDateFormat; import java.util.*; /** @@ -128,9 +128,35 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl0){ sarStandUnqualifiedQueryWrapper.in("id",standUnqualifiedExcelVO.getIds()); } - List stand = sarStandUnqualifiedDao.selectList(sarStandUnqualifiedQueryWrapper); - List a = stand; - return a; + List stand = sarStandUnqualifiedDao.selectList(sarStandUnqualifiedQueryWrapper); + List list = new ArrayList<>(); + list = BeanConverUtil.converList(stand,ExcelDto.class); + for (int a=0;a and STAND_ID in 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 eedd123f..745bb3e1 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 @@ -5,7 +5,7 @@ +