diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java index 8d9ef5de..670dde45 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java @@ -141,7 +141,7 @@ public class ActSarItemsEOService { // String resId = standMap.get("standId").toString(); // //此处说明是带入的形式 // sarStandardsInfoEO.setId(resId); -// SarCompResAssess assessInfoByResId = sarCompResAssessEOService.getAssessInfoByResId(resId); +// SarCompResAssess assessInfoByResId = sarCompResAssessEOService.ssessInfoByResId(resId); // if (assessInfoByResId != null) { // assessInfoByResId.setProcessState("2"); // sarCompResAssessEOService.updateByPrimaryKeySelective(assessInfoByResId); 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 f5cd3c3f..4697d6ff 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 @@ -2,6 +2,7 @@ package com.adc.da.slrs.sarLawsAttrDetailedList.entity; import io.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -49,4 +50,6 @@ public class LawsDto { private String KCCVPPSBM; @ApiModelProperty(value = "卡车vpps中文名称") private String KCCVPPSCN; + @ApiModelProperty(value = "责任工程师") + private String responsibleEngineer; } 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 f6223f44..1f010567 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 @@ -99,7 +99,7 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl AllSelectD(Integer pages, Integer size, String sortKey, + public IPage AllSelectD(Integer page, Integer pageSize, String sortKey, String countryArea,String projectName, String detailedList,String detailedListName) { QueryWrapper wrapper = new QueryWrapper<>(); @@ -115,8 +115,8 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl page = new Page<>(pages, size); - IPage userIPage = sarLawsDetailedListDao.selectPage(page, wrapper); + Page pageRes = new Page<>(page, pageSize); + IPage userIPage = sarLawsDetailedListDao.selectPage(pageRes, wrapper); if ("1".equals(sortKey)){ Map map= iDicTypeEOService.getDicTypeListCode(); List list= userIPage.getRecords(); @@ -196,9 +196,11 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl pageres=new Page(); + pageres.setRecords(listTemp); + pageres.setPages(list1.getPages()); + pageres.setTotal(list1.getTotal()); + pageres.setCurrent(list1.getCurrent()); + pageres.setSize(list1.getSize()); + return Result.success("200",pageres); } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/SarStandUnqualifiedController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/SarStandUnqualifiedController.java index 61b9e5c7..91ead351 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/SarStandUnqualifiedController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/SarStandUnqualifiedController.java @@ -34,7 +34,9 @@ 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; /** @@ -55,6 +57,18 @@ public class SarStandUnqualifiedController extends BaseController add(@RequestBody List sarStandUnqualified){ + sarStandUnqualified.forEach(sarStandUnqualified1 -> sarStandUnqualified1.setCreateTime(new Date())); + if (sarStandUnqualifiedService.saveBatch(sarStandUnqualified)) { + return Result.success("新增成功"); + } + else{ + return Result.error("新增失败"); + } + } + /** * 分页查询未符合项 * @param sarStandUnqualifiedPage：筛选、分页信息 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/SarStandUnqualifiedDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/SarStandUnqualifiedDao.java index d91792c6..9ed080b6 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/SarStandUnqualifiedDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/SarStandUnqualifiedDao.java @@ -1,7 +1,14 @@ package com.adc.da.slrs.sarStandUnqualified.dao; import com.adc.da.slrs.sarStandUnqualified.entity.SarStandUnqualified; +import com.adc.da.slrs.sarStandUnqualified.entity.SarStandUnqualifiedPage; 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.Param; +import org.springframework.web.bind.annotation.RequestParam; + +import java.util.List; /** *

@@ -12,5 +19,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @since 2021-06-15 */ public interface SarStandUnqualifiedDao extends BaseMapper { - + IPage getAllDatasByPage(Page page,@Param("sar") SarStandUnqualifiedPage sarStandUnqualified); } 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 2dd65a21..f45817e6 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 @@ -3,11 +3,13 @@ package com.adc.da.slrs.sarStandUnqualified.entity; import com.adc.da.base.entity.BaseEntity; import java.sql.Timestamp; +import java.util.Date; import com.adc.da.slrs.sarStandUnqualified.utils.ProductTypeConverter; import com.adc.da.slrs.sarStandUnqualified.utils.TimestampConverter; import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; @@ -84,7 +86,7 @@ public class SarStandUnqualified extends BaseEntity { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @TableField("CREATE_TIME") - private Timestamp createTime; + private Date createTime; @ExcelIgnore @ApiModelProperty(value = "关闭状态（1为开启，2为关闭）") @@ -96,14 +98,14 @@ public class SarStandUnqualified extends BaseEntity { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @TableField("ACTUAL_CLOSE_TIME") - private Timestamp actualCloseTime; + private Date actualCloseTime; @ExcelProperty(value = "计划关闭时间",converter = TimestampConverter.class) @ApiModelProperty(value = "计划关闭时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @TableField("PLAN_CLOSE_TIME") - private Timestamp planCloseTime; + private Date planCloseTime; @ApiModelProperty(value = "未符合原因") @TableField("REASON") @@ -133,8 +135,18 @@ public class SarStandUnqualified extends BaseEntity { @ExcelIgnore @ApiModelProperty(value = "主键") - @TableId("ID") + @TableId(type = IdType.UUID) private String id; + @ApiModelProperty(value = "质量工程师") + private String qaEngineerName; + + @ApiModelProperty(value = "认证工程师") + private String authEngineerName; + + @ApiModelProperty(value = "责任工程师") + private String dutyEngineerName; + + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/ISarStandUnqualifiedService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/ISarStandUnqualifiedService.java index 4d7873ca..df5fa169 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/ISarStandUnqualifiedService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/ISarStandUnqualifiedService.java @@ -46,4 +46,5 @@ public interface ISarStandUnqualifiedService extends IService */ List getStandUnqualifiedExcelData(StandUnqualifiedExcelVO standUnqualifiedExcelVO); + } 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 bfa7a494..11e9a2dd 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 @@ -40,25 +40,28 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl getSarStandUnqualifiedPage(SarStandUnqualifiedPage sarStandUnqualifiedPage) { - QueryWrapper sarStandUnqualifiedQueryWrapper=new QueryWrapper<>(); - if(sarStandUnqualifiedPage.getStandId()!=null){ - sarStandUnqualifiedQueryWrapper.and(wrapper->wrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId()).or().like("stand_name","%"+sarStandUnqualifiedPage.getStandId()+"%")); -// sarStandUnqualifiedQueryWrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId()).or().like("stand_name","%"+sarStandUnqualifiedPage.getStandId()+"%"); - } - //仅查询未关闭的 - sarStandUnqualifiedQueryWrapper.eq("close_state",1); - if(sarStandUnqualifiedPage.getProductName()!=null){ - sarStandUnqualifiedQueryWrapper.like("product_name","%"+sarStandUnqualifiedPage.getProductName()+"%"); - } - if(sarStandUnqualifiedPage.getResponsibleUnit()!=null){ - sarStandUnqualifiedQueryWrapper.eq("responsible_unit",sarStandUnqualifiedPage.getResponsibleUnit()); - } - Page standUnqualifiedPage=new Page<>(); - //判断前端是否提供页码和每页条数 - if(sarStandUnqualifiedPage.getCurrent()!=null&&sarStandUnqualifiedPage.getSize()!=null){ - standUnqualifiedPage=new Page<>(sarStandUnqualifiedPage.getCurrent(),sarStandUnqualifiedPage.getSize()); - } - return sarStandUnqualifiedDao.selectPage(standUnqualifiedPage,sarStandUnqualifiedQueryWrapper); +// QueryWrapper sarStandUnqualifiedQueryWrapper=new QueryWrapper<>(); +// if(sarStandUnqualifiedPage.getStandId()!=null){ +// sarStandUnqualifiedQueryWrapper.and(wrapper->wrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId()).or().like("stand_name","%"+sarStandUnqualifiedPage.getStandId()+"%")); +//// sarStandUnqualifiedQueryWrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId()).or().like("stand_name","%"+sarStandUnqualifiedPage.getStandId()+"%"); +// } +// //仅查询未关闭的 +// sarStandUnqualifiedQueryWrapper.eq("close_state",1); +// if(sarStandUnqualifiedPage.getProductName()!=null){ +// sarStandUnqualifiedQueryWrapper.like("product_name","%"+sarStandUnqualifiedPage.getProductName()+"%"); +// } +// if(sarStandUnqualifiedPage.getResponsibleUnit()!=null){ +// sarStandUnqualifiedQueryWrapper.eq("responsible_unit",sarStandUnqualifiedPage.getResponsibleUnit()); +// } +// Page standUnqualifiedPage=new Page<>(); +// //判断前端是否提供页码和每页条数 +// if(sarStandUnqualifiedPage.getCurrent()!=null&&sarStandUnqualifiedPage.getSize()!=null){ +// standUnqualifiedPage=new Page<>(sarStandUnqualifiedPage.getCurrent(),sarStandUnqualifiedPage.getSize()); +// } + Page pag = new Page(); + pag.setCurrent(sarStandUnqualifiedPage.getCurrent()).setSize(sarStandUnqualifiedPage.getSize()); + + return sarStandUnqualifiedDao.getAllDatasByPage(pag,sarStandUnqualifiedPage); } /** diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java index d3a8822d..8ec23ad6 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java @@ -12,6 +12,7 @@ import com.adc.da.slrs.sarStandardComplianceAssessResult.service.ISarInterpretat import com.adc.da.slrs.sarStandardComplianceAssessResult.service.ISarStandardComplianceProductAssessService; import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo; import com.adc.da.slrs.sarStandardsInfo.service.ISarStandardsInfoService; +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; @@ -25,9 +26,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.lang.reflect.InvocationTargetException; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; +import java.util.*; /** *

@@ -170,10 +169,14 @@ public class SarStandardComplianceAssessResultController { } @ApiOperation(value = "插入标准涉及项目符合性清单") - @PostMapping("/product") - public ResponseMessage insertProduct(List eo) throws Exception { + @PostMapping("/add") + public ResponseMessage insertProduct(@RequestBody List eo) throws Exception { - iSarStandardComplianceProductAssessService.saveOrUpdateBatch(eo); + eo.forEach(sarStandardComplianceProductAssess -> { + sarStandardComplianceProductAssess.setId(UUIDUtils.randomUUID(32)); + sarStandardComplianceProductAssess.setInterpretationTime(new Date()); + }); + iSarStandardComplianceProductAssessService.saveBatch(eo); return Result.success(); 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 bfaa990b..706bde15 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 @@ -109,4 +109,6 @@ public class SarStandardComplianceProductAssess extends BaseEntity { private Date interpretationTime; + private String id; + } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml index f42fb7ba..a77962cc 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml @@ -643,7 +643,7 @@ @@ -47,7 +47,7 @@ WHERE ID =#{param1,jdbcType=VARCHAR} + select s.product_line,t.UNAME as uName ,s.project_manager as projectManager + from sar_stand_project_library s + INNER JOIN ts_user t + ON s.project_manager=t.USID + GROUP BY s.product_line + limit #{current},#{pageSize} + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml index b90da545..da1eb9a9 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml @@ -2,4 +2,31 @@ + +