queryMaintenanceProject(int current, int pageSize);
}
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 87b321e4..c342eebd 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
@@ -1,15 +1,42 @@
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;
+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.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;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.*;
import com.adc.da.slrs.sarStandUnqualified.entity.SarStandUnqualified;
import io.swagger.annotations.Api;
-import org.springframework.web.bind.annotation.RestController;
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.util.ArrayList;
+import java.util.List;
+
/**
*
* 前端控制器
@@ -22,8 +49,79 @@ import com.adc.da.base.web.BaseController;
@Api(tags = "未符合项整改")
@RequestMapping("/sarStandUnqualified/sar-stand-unqualified")
public class SarStandUnqualifiedController extends BaseController {
+
+ private static final Logger logger = LoggerFactory.getLogger(SarStandardsInfoController.class);
+
@Autowired
private ISarStandUnqualifiedService sarStandUnqualifiedService;
+ /**
+ * 分页查询未符合项
+ * @param sarStandUnqualifiedPage：筛选、分页信息
+ * @return ResponseMessage>
+ */
+ @ApiOperation("分页查询未符合项")
+ @GetMapping
+ public ResponseMessage> getSarStandUnqualifiedPage(SarStandUnqualifiedPage sarStandUnqualifiedPage){
+ IPage sarStandUnqualifiedIPage=sarStandUnqualifiedService.getSarStandUnqualifiedPage(sarStandUnqualifiedPage);
+ return Result.success(sarStandUnqualifiedIPage);
+ }
+ /**
+ * 分页查询未符合项历史数据
+ * @param sarStandUnqualifiedPage：筛选、分页信息
+ * @return ResponseMessage>
+ */
+ @ApiOperation("分页查询未符合项历史数据")
+ @GetMapping("/history")
+ public ResponseMessage> getSarStandUnqualifiedHistoryPage(SarStandUnqualifiedPage sarStandUnqualifiedPage){
+ IPage sarStandUnqualifiedIPage=sarStandUnqualifiedService.getSarStandUnqualifiedHistoryPage(sarStandUnqualifiedPage);
+ return Result.success(sarStandUnqualifiedIPage);
+ }
+
+ /**
+ * 批量关闭未符合项
+ * @param standUnqualifiedListVO：未符合项ID列表
+ * @return ResponseMessage>：关闭失败的未符合项ID
+ */
+ @ApiOperation("批量关闭未符合项")
+ @PostMapping("/close")
+ public ResponseMessage> closeSarStandUnqualified(@RequestBody StandUnqualifiedListVO standUnqualifiedListVO){
+ if(standUnqualifiedListVO==null||standUnqualifiedListVO.getIds().size()==0){
+ return Result.error(ResponseMessageCodeEnum.ERROR.getCode(),"未传入未符合项ID",null);
+ }
+ List failIds=sarStandUnqualifiedService.closeSarStandUnqualifiedList(standUnqualifiedListVO);
+ if(failIds==null||failIds.size()==0){
+ return Result.success(null);
+ }else {
+ return Result.error(ResponseMessageCodeEnum.ERROR.getCode(),"部分未符合项关闭失败",null);
+ }
+ }
+
+ @ApiOperation("导出Excel表")
+ @GetMapping(value = "/exportStandUnqulifiedExcel")
+ public void exportStandardsInfoExcel(StandUnqualifiedExcelVO standUnqualifiedExcelVO, HttpServletResponse response) throws Exception {
+ // 这里注意 有同学反应使用swagger 会导致各种问题，请直接用浏览器或者用postman
+ try {
+ response.setContentType("application/vnd.ms-excel");
+ response.setCharacterEncoding("utf-8");
+ // 这里URLEncoder.encode可以防止中文乱码 当然和easyexcel没有关系
+ if(standUnqualifiedExcelVO.getExportName()==null){
+ standUnqualifiedExcelVO.setExportName("未符合项信息");
+ }
+ String fileName = URLEncoder.encode(standUnqualifiedExcelVO.getExportName(), "UTF-8").replaceAll("\\+", "%20");
+ response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
+ List data=sarStandUnqualifiedService.getStandUnqualifiedExcelData(standUnqualifiedExcelVO);
+ // 这里需要设置不关闭流
+ EasyExcel.write(response.getOutputStream(), SarStandUnqualified.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/sarStandUnqualified/entity/SarStandUnqualified.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java
index d0ea4bc6..69c8650f 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
@@ -1,7 +1,13 @@
package com.adc.da.slrs.sarStandUnqualified.entity;
import com.adc.da.base.entity.BaseEntity;
-import java.time.LocalDateTime;
+
+import java.sql.Timestamp;
+
+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.TableId;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel;
@@ -26,74 +32,92 @@ public class SarStandUnqualified extends BaseEntity {
private static final long serialVersionUID = 1L;
+ @ExcelProperty("创建部门")
@ApiModelProperty(value = "创建部门")
@TableField("CREATE_DEPT_ID")
private String createDeptId;
+ @ExcelProperty("创建人")
@ApiModelProperty(value = "创建人")
@TableField("CREATE_BY_ID")
private String createById;
+ @ExcelProperty(value = "创建时间",converter = TimestampConverter.class)
@ApiModelProperty(value = "创建时间")
@TableField("CREATE_TIME")
- private LocalDateTime createTime;
+ private Timestamp createTime;
+ @ExcelIgnore
@ApiModelProperty(value = "关闭状态（1为开启，2为关闭）")
@TableField("CLOSE_STATE")
private Integer closeState;
+ @ExcelIgnore
@ApiModelProperty(value = "实际关闭时间")
@TableField("ACTUAL_CLOSE_TIME")
- private LocalDateTime actualCloseTime;
+ private Timestamp actualCloseTime;
+ @ExcelProperty(value = "计划关闭时间",converter = TimestampConverter.class)
@ApiModelProperty(value = "计划关闭时间")
@TableField("PLAN_CLOSE_TIME")
- private LocalDateTime planCloseTime;
+ private Timestamp planCloseTime;
+ @ExcelProperty("质量工程师")
@ApiModelProperty(value = "质量工程师")
@TableField("QA_ENGINEER")
private String qaEngineer;
+ @ExcelProperty("认证工程师")
@ApiModelProperty(value = "认证工程师")
@TableField("AUTH_ENGINEER")
private String authEngineer;
+ @ExcelProperty("责任工程师")
@ApiModelProperty(value = "责任工程师")
@TableField("DUTY_ENGINEER")
private String dutyEngineer;
+ @ExcelProperty("责任部门")
@ApiModelProperty(value = "责任部门")
@TableField("RESPONSIBLE_UNIT")
private String responsibleUnit;
+ @ExcelProperty("项目名称")
@ApiModelProperty(value = "项目名称")
@TableField("PRODUCT_NAME")
private String productName;
+ @ExcelProperty("产品线")
@ApiModelProperty(value = "产品线")
@TableField("PRODUCT_LINE")
private String productLine;
+ @ExcelProperty(value = "产品类型",converter = ProductTypeConverter.class)
@ApiModelProperty(value = "产品类型（research为在研产品，product为在产产品）")
@TableField("PRODUCT_TYPE")
private String productType;
+ @ExcelProperty("条款名称")
@ApiModelProperty(value = "条款名称")
@TableField("ITEMS_NAME")
private String itemsName;
+ @ExcelProperty("条款号")
@ApiModelProperty(value = "条款号")
@TableField("ITEMS_NUM")
private String itemsNum;
+ @ExcelProperty("标准名称")
@ApiModelProperty(value = "标准名称")
@TableField("STAND_NAME")
private String standName;
+ @ExcelProperty("标准编号")
@ApiModelProperty(value = "标准ID")
@TableField("STAND_ID")
private String standId;
+ @ExcelIgnore
@ApiModelProperty(value = "主键")
@TableId("ID")
private String id;
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualifiedPage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualifiedPage.java
new file mode 100644
index 00000000..c2801a4c
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualifiedPage.java
@@ -0,0 +1,88 @@
+package com.adc.da.slrs.sarStandUnqualified.entity;
+
+import com.adc.da.base.entity.BaseEntity;
+
+import java.sql.Timestamp;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonBackReference;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ *
+ *
+ *
+ *
+ * @author super_liu
+ * @since 2021-06-15
+ */
+@Data
+@ApiModel(value="SarStandUnqualifiedPage对象", description="")
+public class SarStandUnqualifiedPage {
+
+ @ApiModelProperty(value = "创建部门")
+ private String createDeptId;
+
+ @ApiModelProperty(value = "创建人")
+ private String createById;
+
+ @ApiModelProperty(value = "创建时间")
+ private Timestamp createTime;
+
+ @ApiModelProperty(value = "关闭状态（1为开启，2为关闭）")
+ private Integer closeState;
+
+ @ApiModelProperty(value = "实际关闭时间")
+ private Timestamp actualCloseTime;
+
+ @ApiModelProperty(value = "计划关闭时间")
+ private Timestamp planCloseTime;
+
+ @ApiModelProperty(value = "质量工程师")
+ private String qaEngineer;
+
+ @ApiModelProperty(value = "认证工程师")
+ private String authEngineer;
+
+ @ApiModelProperty(value = "责任工程师")
+ private String dutyEngineer;
+
+ @ApiModelProperty(value = "责任部门")
+ private String responsibleUnit;
+
+ @ApiModelProperty(value = "项目名称")
+ private String productName;
+
+ @ApiModelProperty(value = "产品线")
+ private String productLine;
+
+ @ApiModelProperty(value = "产品类型（research为在研产品，product为在产产品）")
+ private String productType;
+
+ @ApiModelProperty(value = "条款名称")
+ private String itemsName;
+
+ @ApiModelProperty(value = "条款号")
+ private String itemsNum;
+
+ @ApiModelProperty(value = "标准名称")
+ private String standName;
+
+ @ApiModelProperty(value = "标准ID")
+ private String standId;
+
+ @ApiModelProperty(value = "主键")
+ private String id;
+
+ @ApiModelProperty("当前页")
+ private Integer current;
+
+ @ApiModelProperty("每页条数")
+ private Integer size;
+
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/StandUnqualifiedExcelVO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/StandUnqualifiedExcelVO.java
new file mode 100644
index 00000000..830e23c1
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/StandUnqualifiedExcelVO.java
@@ -0,0 +1,16 @@
+package com.adc.da.slrs.sarStandUnqualified.entity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@ApiModel(description = "未符合项ExcelVO类")
+public class StandUnqualifiedExcelVO {
+ @ApiModelProperty("文件名")
+ String exportName;
+ @ApiModelProperty("导出的未符合项ID列表")
+ List ids;
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/StandUnqualifiedListVO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/StandUnqualifiedListVO.java
new file mode 100644
index 00000000..eb045402
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/StandUnqualifiedListVO.java
@@ -0,0 +1,12 @@
+package com.adc.da.slrs.sarStandUnqualified.entity;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class StandUnqualifiedListVO {
+ @ApiModelProperty("未符合项ID列表")
+ private List Ids;
+}
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 765bc8bc..4d7873ca 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
@@ -1,8 +1,14 @@
package com.adc.da.slrs.sarStandUnqualified.service;
import com.adc.da.slrs.sarStandUnqualified.entity.SarStandUnqualified;
+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.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
+
/**
*
* 服务类
@@ -13,4 +19,31 @@ import com.baomidou.mybatisplus.extension.service.IService;
*/
public interface ISarStandUnqualifiedService extends IService {
+ /**
+ * 分页查询未符合项
+ * @param sarStandUnqualifiedPage：筛选、分页信息
+ * @return：IPage
+ */
+ IPage getSarStandUnqualifiedPage(SarStandUnqualifiedPage sarStandUnqualifiedPage);
+
+ /**
+ * 分页查询未符合项历史数据
+ * @param sarStandUnqualifiedPage：筛选、分页信息
+ * @return：IPage
+ */
+ IPage getSarStandUnqualifiedHistoryPage(SarStandUnqualifiedPage sarStandUnqualifiedPage);
+
+ /**
+ * 批量关闭未符合项
+ * @param standUnqualifiedListVO ：要关闭的未符合项目列表
+ * @return
+ */
+ List closeSarStandUnqualifiedList(StandUnqualifiedListVO standUnqualifiedListVO);
+
+ /**
+ * 获取导出excel的数据
+ * @param standUnqualifiedExcelVO：ids
+ * @return List
+ */
+ 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 66d459c9..eefa6161 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
@@ -2,9 +2,23 @@ package com.adc.da.slrs.sarStandUnqualified.service.impl;
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.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 org.springframework.transaction.annotation.Transactional;
+
+import java.sql.Timestamp;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
/**
*
@@ -17,4 +31,109 @@ import org.springframework.stereotype.Service;
@Service
public class SarStandUnqualifiedServiceImpl extends ServiceImpl implements ISarStandUnqualifiedService {
+ @Autowired
+ private SarStandUnqualifiedDao sarStandUnqualifiedDao;
+ /**
+ * 分页查询未符合项
+ * @param sarStandUnqualifiedPage：筛选、分页信息
+ * @return：IPage
+ */
+ @Override
+ public IPage getSarStandUnqualifiedPage(SarStandUnqualifiedPage sarStandUnqualifiedPage) {
+ QueryWrapper sarStandUnqualifiedQueryWrapper=new QueryWrapper<>();
+ //仅查询未关闭的
+ sarStandUnqualifiedQueryWrapper.eq("close_state",1);
+ if(sarStandUnqualifiedPage.getStandId()!=null){
+ sarStandUnqualifiedQueryWrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId()).or().like("stand_name","%"+sarStandUnqualifiedPage.getStandName()+"%");
+ }
+ 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);
+ }
+
+ /**
+ * 分页查询未符合项历史数据
+ * @param sarStandUnqualifiedPage：筛选、分页信息
+ * @return：IPage
+ */
+ @Override
+ public IPage getSarStandUnqualifiedHistoryPage(SarStandUnqualifiedPage sarStandUnqualifiedPage) {
+ QueryWrapper sarStandUnqualifiedQueryWrapper=new QueryWrapper<>();
+ //仅查询关闭的
+ sarStandUnqualifiedQueryWrapper.eq("close_state",2);
+ if(sarStandUnqualifiedPage.getStandId()!=null){
+ sarStandUnqualifiedQueryWrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId()).or().like("stand_name","%"+sarStandUnqualifiedPage.getStandName()+"%");
+ }
+ 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);
+
+ }
+
+ /**
+ * 批量关闭未符合项
+ * @param standUnqualifiedListVO ：要关闭的未符合项目列表
+ * @return List：失败的ID列表
+ */
+ @Transactional
+ @Override
+ public List closeSarStandUnqualifiedList(StandUnqualifiedListVO standUnqualifiedListVO) {
+ List failIds=new ArrayList<>();
+ for(String id:standUnqualifiedListVO.getIds()){
+ boolean success=closeSarStandUnqualified(id);
+ if(!success){
+ failIds.add(id);
+ }
+ }
+ return failIds;
+ }
+
+ /**
+ * 获取导出excel的数据
+ * @param standUnqualifiedExcelVO：ids
+ * @return List
+ */
+ @Override
+ public List getStandUnqualifiedExcelData(StandUnqualifiedExcelVO standUnqualifiedExcelVO) {
+ QueryWrapper sarStandUnqualifiedQueryWrapper=new QueryWrapper<>();
+ sarStandUnqualifiedQueryWrapper.eq("close_state",1);
+ if(standUnqualifiedExcelVO.getIds()!=null&&standUnqualifiedExcelVO.getIds().size()>0){
+ sarStandUnqualifiedQueryWrapper.in("id",standUnqualifiedExcelVO.getIds());
+ }
+ return sarStandUnqualifiedDao.selectList(sarStandUnqualifiedQueryWrapper);
+ }
+
+ private boolean closeSarStandUnqualified(String standUnqualifiedId){
+ SarStandUnqualified sarStandUnqualified=sarStandUnqualifiedDao.selectById(standUnqualifiedId);
+ //判断是否存在
+ if(sarStandUnqualified==null){
+ return false;
+ }
+ //判断是否已关闭
+ if(sarStandUnqualified.getCloseState()==2){
+ return false;
+ }
+ sarStandUnqualified.setCloseState(2);
+ sarStandUnqualified.setActualCloseTime(new Timestamp(new Date().getTime()));
+ sarStandUnqualifiedDao.updateById(sarStandUnqualified);
+ return true;
+ }
}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/utils/ProductTypeConverter.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/utils/ProductTypeConverter.java
new file mode 100644
index 00000000..168354ed
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/utils/ProductTypeConverter.java
@@ -0,0 +1,47 @@
+package com.adc.da.slrs.sarStandUnqualified.utils;
+
+import com.alibaba.excel.converters.Converter;
+import com.alibaba.excel.enums.CellDataTypeEnum;
+import com.alibaba.excel.metadata.CellData;
+import com.alibaba.excel.metadata.GlobalConfiguration;
+import com.alibaba.excel.metadata.property.ExcelContentProperty;
+
+/**
+ * excel产品类型转换
+ */
+public class ProductTypeConverter implements Converter {
+ //在java中性别是用 0 1 来标识的 所以是int
+ @Override
+ public Class supportJavaTypeKey() {return String.class;}
+ // 在excel中是男女 所以是string
+ @Override
+ public CellDataTypeEnum supportExcelTypeKey() {return CellDataTypeEnum.STRING;}
+ //将excel的数据类型转为java数据类型
+ @Override
+ public String convertToJavaData(CellData cellData, ExcelContentProperty excelContentProperty, GlobalConfiguration globalConfiguration) throws Exception {
+ String stringValue = cellData.getStringValue();
+ if (stringValue != null) {
+ if(stringValue.equals("在研产品")){
+ return "research";
+ }
+ if(stringValue.equals("在产产品")){
+ return "product";
+ }
+ }
+ return null;
+ }
+
+ @Override
+ public CellData convertToExcelData(String s, ExcelContentProperty excelContentProperty, GlobalConfiguration globalConfiguration) throws Exception {
+ if(s!=null){
+ if(s.equals("research")){
+ return new CellData<>("在研产品");
+ }
+ if(s.equals("product")){
+ return new CellData<>("在产产品");
+ }
+ }
+ return null;
+ }
+
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/utils/TimestampConverter.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/utils/TimestampConverter.java
new file mode 100644
index 00000000..feafea8c
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/utils/TimestampConverter.java
@@ -0,0 +1,42 @@
+package com.adc.da.slrs.sarStandUnqualified.utils;
+
+import com.adc.da.utils.util.DateUtil;
+import com.alibaba.excel.converters.Converter;
+import com.alibaba.excel.enums.CellDataTypeEnum;
+import com.alibaba.excel.metadata.CellData;
+import com.alibaba.excel.metadata.GlobalConfiguration;
+import com.alibaba.excel.metadata.property.ExcelContentProperty;
+
+import java.sql.Timestamp;
+import java.text.ParseException;
+import java.time.format.DateTimeFormatter;
+import java.util.Date;
+
+/**
+ * excel输出时Timestamp和String的转换
+ */
+public class TimestampConverter implements Converter {
+
+ @Override
+ public Class supportJavaTypeKey() {
+ return Timestamp.class;
+ }
+
+ @Override
+ public CellDataTypeEnum supportExcelTypeKey() {
+ return CellDataTypeEnum.STRING;
+ }
+
+ @Override
+ public Timestamp convertToJavaData(CellData cellData, ExcelContentProperty contentProperty,
+ GlobalConfiguration globalConfiguration) throws ParseException {
+ return new Timestamp(DateUtil.stingToDate(cellData.getDataFormatString(),"yyyy-MM-dd HH:mm:ss").getTime());
+ }
+
+ @Override
+ public CellData convertToExcelData(Timestamp value, ExcelContentProperty contentProperty,
+ GlobalConfiguration globalConfiguration) {
+ return new CellData<>(DateUtil.dateToString(new Date(value.getTime()),"yyyy-MM-dd HH:mm:ss"));
+ }
+
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/utils/util/DateUtil.java b/adc-da-slrs/src/main/java/com/adc/da/utils/util/DateUtil.java
index 7ef009f3..cd892c2c 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/utils/util/DateUtil.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/utils/util/DateUtil.java
@@ -55,6 +55,36 @@ public class DateUtil {
return dateTime;
}
+ /**
+ * 将日期对象转换为指定的日期字符串
+ *
+ * @param date 传入的日期对象
+ * @param format 格式
+ * @return 日期字符串
+ * @author 赵肖云
+ */
+ public static String dateToString(Date date, String format) {
+ String string = "";
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat(format);
+ if (date != null) {
+ string = simpleDateFormat.format(date);
+ }
+ return string;
+ }
+
+ /**
+ * 将日期字符串转换为一个日期对象
+ *
+ * @param datestr 日期字符串
+ * @param format 格式
+ * @return Date
+ * @author 赵肖云
+ */
+ public static Date stingToDate(String datestr, String format) throws ParseException {
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat(format);
+ return simpleDateFormat.parse(datestr);
+ }
+
public static void main(String[] args) {
String utcTime = "2021-04-15T01:43:54.296Z";
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIssueControlCause/SarStandIssueControlCauseMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIssueControlCause/SarStandIssueControlCauseMapper.xml
new file mode 100644
index 00000000..cf0cfb84
--- /dev/null
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIssueControlCause/SarStandIssueControlCauseMapper.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIssueControlProduct/SarStandIssueControlProductMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIssueControlProduct/SarStandIssueControlProductMapper.xml
new file mode 100644
index 00000000..d436e6ae
--- /dev/null
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIssueControlProduct/SarStandIssueControlProductMapper.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/pom.xml b/pom.xml
index a44dee79..4bff73b3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -279,6 +279,12 @@
spring-rabbit-test
test
+
+
+ com.alibaba
+ easyexcel
+ 2.2.6
+
From f5e2d04d3010f6e1f7de23177b5dd3d8d9bc6197 Mon Sep 17 00:00:00 2001
From: yinglong zhang <1679309912@qq.com>
Date: Fri, 18 Jun 2021 15:32:47 +0800
Subject: [PATCH 2/3] =?UTF-8?q?feat=20=E4=BF=AE=E6=94=B9=E6=A0=87=E5=87=86?=
=?UTF-8?q?=E5=90=88=E8=A7=84=E8=AF=84=E4=BC=B0=E7=BB=93=E6=9E=9C=E6=8E=A5?=
=?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../SarInterpretationForeignStandard.java | 41 ------
.../SarInterpretationNationalStandard.java | 41 ------
...erpretationForeignStandardServiceImpl.java | 20 ---
...rpretationNationalStandardServiceImpl.java | 20 ---
...terpretationForeignStandardController.java | 8 +-
...erpretationNationalStandardController.java | 8 +-
...ndardComplianceAssessResultController.java | 133 +++++++++---------
...dardComplianceProductAssessController.java | 8 +-
.../SarInterpretationForeignStandardDao.java | 6 +-
.../SarInterpretationNationalStandardDao.java | 6 +-
.../SarStandardComplianceAssessResultDao.java | 12 --
...SarStandardComplianceProductAssessDao.java | 6 +-
.../entity/InterpretationEO.java | 39 +++++
.../entity/SarBaseStandardInfo.java | 16 +++
.../SarInterpretationForeignStandard.java | 102 ++++++++++++++
.../SarInterpretationForeignStandardEO.java | 20 ---
.../SarInterpretationNationalStandard.java | 90 ++++++++++++
.../SarInterpretationNationalStandardEO.java | 20 ---
.../SarStandardComplianceProductAssess.java | 112 +++++++++++++++
.../SarStandardComplianceProductAssessEO.java | 18 ++-
.../entity/SarStandardsInfoEO.java | 6 +
...rInterpretationForeignStandardService.java | 6 +-
...InterpretationNationalStandardService.java | 6 +-
.../ISarStandardComplianceAssessResult.java | 11 --
...tandardComplianceProductAssessService.java | 6 +-
...erpretationForeignStandardServiceImpl.java | 20 +++
...rpretationNationalStandardServiceImpl.java | 20 +++
...ardComplianceProductAssessServiceImpl.java | 20 +++
.../SarStandardComplianceProductAssess.java | 63 ---------
...ardComplianceProductAssessServiceImpl.java | 20 ---
.../SarInterpretationStandardMapper.xml | 5 +
...SarInterpretationForeignStandardMapper.xml | 5 +
...arInterpretationNationalStandardMapper.xml | 9 ++
...rStandardComplianceProductAssessMapper.xml | 7 +
34 files changed, 566 insertions(+), 364 deletions(-)
delete mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarInterpretationStandard/entity/SarInterpretationForeignStandard.java
delete mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarInterpretationStandard/entity/SarInterpretationNationalStandard.java
delete mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarInterpretationStandard/service/impl/SarInterpretationForeignStandardServiceImpl.java
delete mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarInterpretationStandard/service/impl/SarInterpretationNationalStandardServiceImpl.java
rename adc-da-slrs/src/main/java/com/adc/da/slrs/{sarInterpretationStandard => sarStandardComplianceAssessResult}/controller/SarInterpretationForeignStandardController.java (62%)
rename adc-da-slrs/src/main/java/com/adc/da/slrs/{sarInterpretationStandard => sarStandardComplianceAssessResult}/controller/SarInterpretationNationalStandardController.java (62%)
rename adc-da-slrs/src/main/java/com/adc/da/slrs/{sarStandardComplianceProductAssess => sarStandardComplianceAssessResult}/controller/SarStandardComplianceProductAssessController.java (62%)
rename adc-da-slrs/src/main/java/com/adc/da/slrs/{sarInterpretationStandard => sarStandardComplianceAssessResult}/dao/SarInterpretationForeignStandardDao.java (55%)
rename adc-da-slrs/src/main/java/com/adc/da/slrs/{sarInterpretationStandard => sarStandardComplianceAssessResult}/dao/SarInterpretationNationalStandardDao.java (55%)
delete mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/dao/SarStandardComplianceAssessResultDao.java
rename adc-da-slrs/src/main/java/com/adc/da/slrs/{sarStandardComplianceProductAssess => sarStandardComplianceAssessResult}/dao/SarStandardComplianceProductAssessDao.java (55%)
create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/InterpretationEO.java
create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarBaseStandardInfo.java
create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarInterpretationForeignStandard.java
delete mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarInterpretationForeignStandardEO.java
create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarInterpretationNationalStandard.java
delete mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarInterpretationNationalStandardEO.java
create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssess.java
rename adc-da-slrs/src/main/java/com/adc/da/slrs/{sarInterpretationStandard => sarStandardComplianceAssessResult}/service/ISarInterpretationForeignStandardService.java (55%)
rename adc-da-slrs/src/main/java/com/adc/da/slrs/{sarInterpretationStandard => sarStandardComplianceAssessResult}/service/ISarInterpretationNationalStandardService.java (55%)
delete mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/ISarStandardComplianceAssessResult.java
rename adc-da-slrs/src/main/java/com/adc/da/slrs/{sarStandardComplianceProductAssess => sarStandardComplianceAssessResult}/service/ISarStandardComplianceProductAssessService.java (55%)
create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/impl/SarInterpretationForeignStandardServiceImpl.java
create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/impl/SarInterpretationNationalStandardServiceImpl.java
create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/impl/SarStandardComplianceProductAssessServiceImpl.java
delete mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceProductAssess/entity/SarStandardComplianceProductAssess.java
delete mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceProductAssess/service/impl/SarStandardComplianceProductAssessServiceImpl.java
create mode 100644 adc-da-slrs/src/main/resources/mybatis/mapper/sarInterpretationStandard/SarInterpretationStandardMapper.xml
create mode 100644 adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarInterpretationForeignStandardMapper.xml
create mode 100644 adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarInterpretationNationalStandardMapper.xml
create mode 100644 adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarStandardComplianceProductAssessMapper.xml
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInterpretationStandard/entity/SarInterpretationForeignStandard.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInterpretationStandard/entity/SarInterpretationForeignStandard.java
deleted file mode 100644
index b3e186a6..00000000
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInterpretationStandard/entity/SarInterpretationForeignStandard.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.adc.da.slrs.sarInterpretationStandard.entity;
-
-import com.adc.da.base.entity.BaseEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- *
- *
- *
- *
- * @author zyl
- * @since 2021-06-16
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
-@ApiModel(value="SarInterpretationForeignStandard对象", description="")
-public class SarInterpretationForeignStandard extends BaseEntity {
-
- private static final long serialVersionUID = 1L;
-
- private String standardNum;
-
- private String standardName;
-
- private String correspondDomesticStandard;
-
- private String specificItem;
-
- private String coreTechnicalRequirement;
-
- private String comparedDomesticStandard;
-
- private String complianceState;
-
-
-}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInterpretationStandard/entity/SarInterpretationNationalStandard.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInterpretationStandard/entity/SarInterpretationNationalStandard.java
deleted file mode 100644
index e2b4cd3e..00000000
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInterpretationStandard/entity/SarInterpretationNationalStandard.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.adc.da.slrs.sarInterpretationStandard.entity;
-
-import com.adc.da.base.entity.BaseEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- *
- *
- *
- *
- * @author zyl
- * @since 2021-06-16
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
-@ApiModel(value="SarInterpretationNationalStandard对象", description="")
-public class SarInterpretationNationalStandard extends BaseEntity {
-
- private static final long serialVersionUID = 1L;
-
- private String standardNum;
-
- private String standardName;
-
- private Integer lastVersionNum;
-
- private String specificItem;
-
- private String coreTechnicalRequirement;
-
- private String comparedWithPrevious;
-
- private String complianceState;
-
-
-}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInterpretationStandard/service/impl/SarInterpretationForeignStandardServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInterpretationStandard/service/impl/SarInterpretationForeignStandardServiceImpl.java
deleted file mode 100644
index f809c650..00000000
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInterpretationStandard/service/impl/SarInterpretationForeignStandardServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.adc.da.slrs.sarInterpretationStandard.service.impl;
-
-import com.adc.da.slrs.sarInterpretationStandard.entity.SarInterpretationForeignStandard;
-import com.adc.da.slrs.sarInterpretationStandard.dao.SarInterpretationForeignStandardDao;
-import com.adc.da.slrs.sarInterpretationStandard.service.ISarInterpretationForeignStandardService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- *
- * 服务实现类
- *
- *
- * @author zyl
- * @since 2021-06-16
- */
-@Service
-public class SarInterpretationForeignStandardServiceImpl extends ServiceImpl implements ISarInterpretationForeignStandardService {
-
-}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInterpretationStandard/service/impl/SarInterpretationNationalStandardServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInterpretationStandard/service/impl/SarInterpretationNationalStandardServiceImpl.java
deleted file mode 100644
index 0fa0a2bf..00000000
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInterpretationStandard/service/impl/SarInterpretationNationalStandardServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.adc.da.slrs.sarInterpretationStandard.service.impl;
-
-import com.adc.da.slrs.sarInterpretationStandard.entity.SarInterpretationNationalStandard;
-import com.adc.da.slrs.sarInterpretationStandard.dao.SarInterpretationNationalStandardDao;
-import com.adc.da.slrs.sarInterpretationStandard.service.ISarInterpretationNationalStandardService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- *
- * 服务实现类
- *
- *
- * @author zyl
- * @since 2021-06-16
- */
-@Service
-public class SarInterpretationNationalStandardServiceImpl extends ServiceImpl implements ISarInterpretationNationalStandardService {
-
-}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInterpretationStandard/controller/SarInterpretationForeignStandardController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarInterpretationForeignStandardController.java
similarity index 62%
rename from adc-da-slrs/src/main/java/com/adc/da/slrs/sarInterpretationStandard/controller/SarInterpretationForeignStandardController.java
rename to adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarInterpretationForeignStandardController.java
index e09d97fe..2df7a33d 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInterpretationStandard/controller/SarInterpretationForeignStandardController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarInterpretationForeignStandardController.java
@@ -1,8 +1,8 @@
-package com.adc.da.slrs.sarInterpretationStandard.controller;
+package com.adc.da.slrs.sarStandardComplianceAssessResult.controller;
import org.springframework.web.bind.annotation.RequestMapping;
-import com.adc.da.slrs.sarInterpretationStandard.entity.SarInterpretationForeignStandard;
+import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarInterpretationForeignStandard;
import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RestController;
import com.adc.da.base.web.BaseController;
@@ -13,11 +13,11 @@ import com.adc.da.base.web.BaseController;
*
*
* @author zyl
-* @since 2021-06-16
+* @since 2021-06-18
*/
@RestController
@Api(description = "|SarInterpretationForeignStandard|")
-@RequestMapping("/sarInterpretationStandard/sar-interpretation-foreign-standard")
+@RequestMapping("/sarStandardComplianceAssessResult/sar-interpretation-foreign-standard")
public class SarInterpretationForeignStandardController extends BaseController {
}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInterpretationStandard/controller/SarInterpretationNationalStandardController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarInterpretationNationalStandardController.java
similarity index 62%
rename from adc-da-slrs/src/main/java/com/adc/da/slrs/sarInterpretationStandard/controller/SarInterpretationNationalStandardController.java
rename to adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarInterpretationNationalStandardController.java
index 50cbd956..c0d1a370 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInterpretationStandard/controller/SarInterpretationNationalStandardController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarInterpretationNationalStandardController.java
@@ -1,8 +1,8 @@
-package com.adc.da.slrs.sarInterpretationStandard.controller;
+package com.adc.da.slrs.sarStandardComplianceAssessResult.controller;
import org.springframework.web.bind.annotation.RequestMapping;
-import com.adc.da.slrs.sarInterpretationStandard.entity.SarInterpretationNationalStandard;
+import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarInterpretationNationalStandard;
import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RestController;
import com.adc.da.base.web.BaseController;
@@ -13,11 +13,11 @@ import com.adc.da.base.web.BaseController;
*
*
* @author zyl
-* @since 2021-06-16
+* @since 2021-06-18
*/
@RestController
@Api(description = "|SarInterpretationNationalStandard|")
-@RequestMapping("/sarInterpretationStandard/sar-interpretation-national-standard")
+@RequestMapping("/sarStandardComplianceAssessResult/sar-interpretation-national-standard")
public class SarInterpretationNationalStandardController extends BaseController {
}
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 de342746..43ba106f 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
@@ -4,22 +4,12 @@ package com.adc.da.slrs.sarStandardComplianceAssessResult.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.sarInterpretationStandard.entity.SarInterpretationForeignStandard;
-import com.adc.da.slrs.sarInterpretationStandard.entity.SarInterpretationNationalStandard;
-import com.adc.da.slrs.sarInterpretationStandard.service.ISarInterpretationForeignStandardService;
-import com.adc.da.slrs.sarInterpretationStandard.service.ISarInterpretationNationalStandardService;
-import com.adc.da.slrs.sarProductStand.entity.SarProductStand;
-import com.adc.da.slrs.sarProductStand.service.ISarProductStandService;
import com.adc.da.slrs.sarSarAccessInfo.entity.SarSarAccessInfo;
-import com.adc.da.slrs.sarSarAccessInfo.service.ISarSarAccessInfoService;
-import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarInterpretationForeignStandardEO;
-import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarInterpretationNationalStandardEO;
-import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarStandardComplianceProductAssessEO;
-import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarStandardsInfoEO;
-import com.adc.da.slrs.sarStandardComplianceProductAssess.entity.SarStandardComplianceProductAssess;
-import com.adc.da.slrs.sarStandardComplianceProductAssess.service.ISarStandardComplianceProductAssessService;
+import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.*;
+import com.adc.da.slrs.sarStandardComplianceAssessResult.service.ISarInterpretationForeignStandardService;
+import com.adc.da.slrs.sarStandardComplianceAssessResult.service.ISarInterpretationNationalStandardService;
+import com.adc.da.slrs.sarStandardComplianceAssessResult.service.ISarStandardComplianceProductAssessService;
import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo;
-import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfoEOPage;
import com.adc.da.slrs.sarStandardsInfo.service.ISarStandardsInfoService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -33,27 +23,21 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
/**
-*
- * 标准法规准入清单详情表 前端控制器
- *
-*
-* @author super_liu
-* @since 2021-06-02
-*/
+ *
+ * 标准法规准入清单详情表 前端控制器
+ *
+ *
+ * @author super_liu
+ * @since 2021-06-02
+ */
@RestController
@Api(tags = "福田标准法规--标准法规库--标准合规评估结果")
@RequestMapping("/${restPath}/sarStandardComplianceAssessResult")
-public class SarStandardComplianceAssessResultController extends BaseController {
+public class SarStandardComplianceAssessResultController {
private static final Logger logger = LoggerFactory.getLogger(SarStandardComplianceAssessResultController.class);
- @Autowired
- private ISarStandardsInfoService iSarStandardsInfoService;
@Autowired
private ISarStandardComplianceProductAssessService iSarStandardComplianceProductAssessService;
@@ -65,48 +49,71 @@ public class SarStandardComplianceAssessResultController extends BaseController<
@ApiOperation(value = "条件查询标准清单")
@GetMapping("/standard")
- public ResponseMessage> selectStandard(SarStandardsInfoEO eo) throws Exception {
- QueryWrapper sarStandardsInfoQueryWrapper=new QueryWrapper<>();
+ public ResponseMessage
*
* @author zyl
-* @since 2021-06-16
+* @since 2021-06-18
*/
@RestController
@Api(description = "|SarStandardComplianceProductAssess|")
-@RequestMapping("/sarStandardComplianceProductAssess/sar-standard-compliance-product-assess")
+@RequestMapping("/sarStandardComplianceAssessResult/sar-standard-compliance-product-assess")
public class SarStandardComplianceProductAssessController extends BaseController {
}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInterpretationStandard/dao/SarInterpretationForeignStandardDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/dao/SarInterpretationForeignStandardDao.java
similarity index 55%
rename from adc-da-slrs/src/main/java/com/adc/da/slrs/sarInterpretationStandard/dao/SarInterpretationForeignStandardDao.java
rename to adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/dao/SarInterpretationForeignStandardDao.java
index bcc60031..698cfcaa 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInterpretationStandard/dao/SarInterpretationForeignStandardDao.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/dao/SarInterpretationForeignStandardDao.java
@@ -1,6 +1,6 @@
-package com.adc.da.slrs.sarInterpretationStandard.dao;
+package com.adc.da.slrs.sarStandardComplianceAssessResult.dao;
-import com.adc.da.slrs.sarInterpretationStandard.entity.SarInterpretationForeignStandard;
+import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarInterpretationForeignStandard;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
*
*
* @author zyl
- * @since 2021-06-16
+ * @since 2021-06-18
*/
public interface SarInterpretationForeignStandardDao extends BaseMapper {
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInterpretationStandard/dao/SarInterpretationNationalStandardDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/dao/SarInterpretationNationalStandardDao.java
similarity index 55%
rename from adc-da-slrs/src/main/java/com/adc/da/slrs/sarInterpretationStandard/dao/SarInterpretationNationalStandardDao.java
rename to adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/dao/SarInterpretationNationalStandardDao.java
index 796a4e63..b01295a6 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInterpretationStandard/dao/SarInterpretationNationalStandardDao.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/dao/SarInterpretationNationalStandardDao.java
@@ -1,6 +1,6 @@
-package com.adc.da.slrs.sarInterpretationStandard.dao;
+package com.adc.da.slrs.sarStandardComplianceAssessResult.dao;
-import com.adc.da.slrs.sarInterpretationStandard.entity.SarInterpretationNationalStandard;
+import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarInterpretationNationalStandard;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
*
*
* @author zyl
- * @since 2021-06-16
+ * @since 2021-06-18
*/
public interface SarInterpretationNationalStandardDao extends BaseMapper {
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/dao/SarStandardComplianceAssessResultDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/dao/SarStandardComplianceAssessResultDao.java
deleted file mode 100644
index 8028b6be..00000000
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/dao/SarStandardComplianceAssessResultDao.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.adc.da.slrs.sarStandardComplianceAssessResult.dao;
-
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
-
-@Repository
-@Mapper
-public interface SarStandardComplianceAssessResultDao {
-
-
-
-}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceProductAssess/dao/SarStandardComplianceProductAssessDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/dao/SarStandardComplianceProductAssessDao.java
similarity index 55%
rename from adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceProductAssess/dao/SarStandardComplianceProductAssessDao.java
rename to adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/dao/SarStandardComplianceProductAssessDao.java
index d1781c87..93e7b580 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceProductAssess/dao/SarStandardComplianceProductAssessDao.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/dao/SarStandardComplianceProductAssessDao.java
@@ -1,6 +1,6 @@
-package com.adc.da.slrs.sarStandardComplianceProductAssess.dao;
+package com.adc.da.slrs.sarStandardComplianceAssessResult.dao;
-import com.adc.da.slrs.sarStandardComplianceProductAssess.entity.SarStandardComplianceProductAssess;
+import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarStandardComplianceProductAssess;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
*
*
* @author zyl
- * @since 2021-06-16
+ * @since 2021-06-18
*/
public interface SarStandardComplianceProductAssessDao extends BaseMapper {
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/InterpretationEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/InterpretationEO.java
new file mode 100644
index 00000000..2b92fb9a
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/InterpretationEO.java
@@ -0,0 +1,39 @@
+package com.adc.da.slrs.sarStandardComplianceAssessResult.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+@Data
+@ApiModel("条件查询")
+public class InterpretationEO {
+
+// @ApiModelProperty(value = "'审核编号'")
+// private String interpretation_id;
+
+
+ @ApiModelProperty(value = "标准ID")
+ @TableField("STAND_ID")
+ private String standId;
+
+ @ApiModelProperty(value = "评估时间")
+ @TableField("INTERPRETATION_TIME")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date interpretationTime;
+
+ @ApiModelProperty(value = "国内(1)/外(2)")
+ private Integer position=1;
+
+ @ApiModelProperty("页数")
+ private Integer current=1;
+
+ @ApiModelProperty("页内数量")
+ private Integer size=20;
+
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarBaseStandardInfo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarBaseStandardInfo.java
new file mode 100644
index 00000000..90cc88c3
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarBaseStandardInfo.java
@@ -0,0 +1,16 @@
+package com.adc.da.slrs.sarStandardComplianceAssessResult.entity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+public class SarBaseStandardInfo {
+ private String standard_id;
+ private String standard_number;
+ private String standard_name;
+ private String standard_type;
+ private LocalDateTime INTERPRETATION_TIME;
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarInterpretationForeignStandard.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarInterpretationForeignStandard.java
new file mode 100644
index 00000000..87930898
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarInterpretationForeignStandard.java
@@ -0,0 +1,102 @@
+package com.adc.da.slrs.sarStandardComplianceAssessResult.entity;
+
+import com.adc.da.base.entity.BaseEntity;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+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;
+
+/**
+ *
+ *
+ *
+ *
+ * @author zyl
+ * @since 2021-06-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@ApiModel(value="SarInterpretationForeignStandard对象", description="")
+public class SarInterpretationForeignStandard extends BaseEntity {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "具体章条")
+ private String specificItem;
+
+ @ApiModelProperty(value = "核心技术要求")
+ private String coreTechnicalRequirement;
+
+ @ApiModelProperty(value = "相对于国行标差异点")
+ private String comparedDomesticStandard;
+
+ @ApiModelProperty(value = "对应国行版（仅国外有）")
+ private String correspondDomesticStandard;
+
+ private String complianceState;
+
+ @ApiModelProperty(value = "上一版本号")
+ @TableField("LAST_VERSION_NUMBER")
+ private String lastVersionNumber;
+
+ @ApiModelProperty(value = "创建时间")
+ @TableField("CREATION_TIME")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date creationTime;
+
+ @ApiModelProperty(value = "修改时间")
+ @TableField("MODIFY_TIME")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date modifyTime;
+
+ @ApiModelProperty(value = "标准ID")
+ @TableField("STAND_ID")
+ private String standId;
+
+ @ApiModelProperty(value = "标准分类")
+ @TableField("STAND_TYPE")
+ private String standType;
+
+ @ApiModelProperty(value = "标准类别")
+ @TableField("STAND_SORT")
+ private String standSort;
+
+ @ApiModelProperty(value = "标准编号")
+ @TableField("STAND_NUMBER")
+ private String standNumber;
+
+ @ApiModelProperty(value = "标准名称")
+ @TableField("STAND_NAME")
+ private String standName;
+
+
+
+ @TableField("CREATION_USER")
+ private String creationUser;
+
+ @ApiModelProperty(value = "是否有效")
+ @TableField("VALID_FLAG")
+ private String validFlag;
+
+ @ApiModelProperty(value = "评估状态")
+ @TableField("INTERPRETATION_STATE")
+ private String interpretationState;
+
+ @ApiModelProperty(value = "评估时间")
+ @TableField("INTERPRETATION_TIME")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date interpretationTime;
+
+
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarInterpretationForeignStandardEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarInterpretationForeignStandardEO.java
deleted file mode 100644
index b94c124d..00000000
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarInterpretationForeignStandardEO.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.adc.da.slrs.sarStandardComplianceAssessResult.entity;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@Data
-@ApiModel("条件查询")
-public class SarInterpretationForeignStandardEO {
-
- @ApiModelProperty(value = "'标准编号'")
- private String standardId;
-
- @ApiModelProperty("页数")
- private Integer current=1;
-
- @ApiModelProperty("页内数量")
- private Integer size=20;
-
-}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarInterpretationNationalStandard.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarInterpretationNationalStandard.java
new file mode 100644
index 00000000..cf78fea2
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarInterpretationNationalStandard.java
@@ -0,0 +1,90 @@
+package com.adc.da.slrs.sarStandardComplianceAssessResult.entity;
+
+import com.adc.da.base.entity.BaseEntity;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ *
+ *
+ *
+ *
+ * @author zyl
+ * @since 2021-06-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@ApiModel(value="SarInterpretationNationalStandard对象", description="")
+public class SarInterpretationNationalStandard extends BaseEntity {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "具体章条")
+ private String specificItem;
+
+ @ApiModelProperty(value = "核心技术要求")
+ private String coreTechnicalRequirement;
+
+ @ApiModelProperty(value = "相对于上一版本变化点")
+ private String comparedWithPrevious;
+
+ @ApiModelProperty(value = "合规性分析")
+ private String complianceState;
+
+ @ApiModelProperty(value = "上一版本号")
+ @TableField("LAST_VERSION_NUMBER")
+ private String lastVersionNumber;
+
+ @ApiModelProperty(value = "创建时间")
+ @TableField("CREATION_TIME")
+ private Date creationTime;
+
+ @ApiModelProperty(value = "修改时间")
+ @TableField("MODIFY_TIME")
+ private Date modifyTime;
+
+ @ApiModelProperty(value = "标准ID")
+ @TableField("STAND_ID")
+ private String standId;
+
+ @ApiModelProperty(value = "标准分类")
+ @TableField("STAND_TYPE")
+ private String standType;
+
+ @ApiModelProperty(value = "标准类别")
+ @TableField("STAND_SORT")
+ private String standSort;
+
+ @ApiModelProperty(value = "标准编号")
+ @TableField("STAND_NUMBER")
+ private String standNumber;
+
+ @ApiModelProperty(value = "标准名称")
+ @TableField("STAND_NAME")
+ private String standName;
+
+ @TableField("CREATION_USER")
+ private String creationUser;
+
+ @ApiModelProperty(value = "是否有效")
+ @TableField("VALID_FLAG")
+ private String validFlag;
+
+ @ApiModelProperty(value = "评估状态")
+ @TableField("INTERPRETATION_STATE")
+ private String interpretationState;
+
+ @ApiModelProperty(value = "评估时间")
+ @TableField("INTERPRETATION_TIME")
+ private Date interpretationTime;
+
+
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarInterpretationNationalStandardEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarInterpretationNationalStandardEO.java
deleted file mode 100644
index f50ca55c..00000000
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarInterpretationNationalStandardEO.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.adc.da.slrs.sarStandardComplianceAssessResult.entity;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@Data
-@ApiModel("条件查询")
-public class SarInterpretationNationalStandardEO {
-
- @ApiModelProperty(value = "'标准编号'")
- private String standardId;
-
- @ApiModelProperty("页数")
- private Integer current=1;
-
- @ApiModelProperty("页内数量")
- private Integer size=20;
-
-}
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
new file mode 100644
index 00000000..bfaa990b
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssess.java
@@ -0,0 +1,112 @@
+package com.adc.da.slrs.sarStandardComplianceAssessResult.entity;
+
+import com.adc.da.base.entity.BaseEntity;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+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;
+
+/**
+ *
+ *
+ *
+ *
+ * @author zyl
+ * @since 2021-06-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@ApiModel(value="SarStandardComplianceProductAssess对象", description="")
+public class SarStandardComplianceProductAssess extends BaseEntity {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "'产品线'")
+ private String productLineId;
+
+ @ApiModelProperty(value = "'项目id'")
+ private String productId;
+
+ @ApiModelProperty(value = "'项目名称'")
+ private String productName;
+
+ @ApiModelProperty(value = "标准ID")
+ @TableField("STAND_ID")
+ private String standId;
+
+ @ApiModelProperty(value = "标准编号")
+ @TableField("STAND_NUMBER")
+ private String standNumber;
+
+ @ApiModelProperty(value = "'标准名称'")
+ @TableField("STAND_NAME")
+ private String standName;
+
+ @ApiModelProperty(value = "'标准章条'")
+ private String standardItem;
+
+ @ApiModelProperty(value = "标准类型")
+ @TableField("STAND_TYPE")
+ private String standType;
+
+ @ApiModelProperty(value = "标准主要内容")
+ private String standardInfo;
+
+ @ApiModelProperty(value = "1是在产，0是在研")
+ private Integer productType;
+
+ @ApiModelProperty(value = "在研产品实施时间")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date researchImplementationTime;
+
+ @ApiModelProperty(value = "在研产品合规信息")
+ private String researchCompliance;
+
+ @ApiModelProperty(value = "在研产品不合规项目")
+ private String researchNonCompliance;
+
+ @ApiModelProperty(value = "在研产品不合规应对措施")
+ private String researchCountermeasures;
+
+ @ApiModelProperty(value = "在研产品不合规完成时间")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date researchCompletionTime;
+
+ @ApiModelProperty(value = "在产产品实施时间")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date productionImplementationTime;
+
+ @ApiModelProperty(value = "在产产品合规信息")
+ private String productionCompliance;
+
+ @ApiModelProperty(value = "在产产品不合规应对措施")
+ private String productionCountermeasures;
+
+ @ApiModelProperty(value = "在产产品不合规完成时间")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date productionCompletionTime;
+
+ @ApiModelProperty(value = "审查状态")
+ @TableField("INTERPRETATION_STATE")
+ private String interpretationState;
+
+ @ApiModelProperty(value = "审查时间")
+ @TableField("INTERPRETATION_TIME")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date interpretationTime;
+
+
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssessEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssessEO.java
index d6cfa4f6..53b782b2 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssessEO.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssessEO.java
@@ -1,19 +1,31 @@
package com.adc.da.slrs.sarStandardComplianceAssessResult.entity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
@Data
@ApiModel("条件查询")
-public class SarStandardComplianceProductAssessEO {
+public class SarStandardComplianceProductAssessEO{
+
+ @ApiModelProperty(value = "标准ID")
+ @TableField("STAND_ID")
+ private String standId;
@ApiModelProperty(value = "'项目名称'")
private String productName;
- @ApiModelProperty(value = "'标准编号'")
- private String standardId;
+ @ApiModelProperty(value = "评估时间")
+ @TableField("INTERPRETATION_TIME")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date interpretationTime;
@ApiModelProperty("页数")
private Integer current=1;
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardsInfoEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardsInfoEO.java
index 5231cca0..f4fee6c3 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardsInfoEO.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardsInfoEO.java
@@ -17,6 +17,12 @@ public class SarStandardsInfoEO {
@ApiModelProperty(value = "标准名称")
private String standName;
+ @ApiModelProperty(value = "应用类型")
+ private Integer standApplicationType=1;
+
+ @ApiModelProperty(value = "国内1，国外2")
+ private Integer position=1;
+
@ApiModelProperty("页数")
private Integer current=1;
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInterpretationStandard/service/ISarInterpretationForeignStandardService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/ISarInterpretationForeignStandardService.java
similarity index 55%
rename from adc-da-slrs/src/main/java/com/adc/da/slrs/sarInterpretationStandard/service/ISarInterpretationForeignStandardService.java
rename to adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/ISarInterpretationForeignStandardService.java
index d6013d4e..9ba49575 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInterpretationStandard/service/ISarInterpretationForeignStandardService.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/ISarInterpretationForeignStandardService.java
@@ -1,6 +1,6 @@
-package com.adc.da.slrs.sarInterpretationStandard.service;
+package com.adc.da.slrs.sarStandardComplianceAssessResult.service;
-import com.adc.da.slrs.sarInterpretationStandard.entity.SarInterpretationForeignStandard;
+import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarInterpretationForeignStandard;
import com.baomidou.mybatisplus.extension.service.IService;
/**
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
*
*
* @author zyl
- * @since 2021-06-16
+ * @since 2021-06-18
*/
public interface ISarInterpretationForeignStandardService extends IService {
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInterpretationStandard/service/ISarInterpretationNationalStandardService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/ISarInterpretationNationalStandardService.java
similarity index 55%
rename from adc-da-slrs/src/main/java/com/adc/da/slrs/sarInterpretationStandard/service/ISarInterpretationNationalStandardService.java
rename to adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/ISarInterpretationNationalStandardService.java
index d508a1a4..e51c76f4 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInterpretationStandard/service/ISarInterpretationNationalStandardService.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/ISarInterpretationNationalStandardService.java
@@ -1,6 +1,6 @@
-package com.adc.da.slrs.sarInterpretationStandard.service;
+package com.adc.da.slrs.sarStandardComplianceAssessResult.service;
-import com.adc.da.slrs.sarInterpretationStandard.entity.SarInterpretationNationalStandard;
+import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarInterpretationNationalStandard;
import com.baomidou.mybatisplus.extension.service.IService;
/**
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
*
*
* @author zyl
- * @since 2021-06-16
+ * @since 2021-06-18
*/
public interface ISarInterpretationNationalStandardService extends IService {
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/ISarStandardComplianceAssessResult.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/ISarStandardComplianceAssessResult.java
deleted file mode 100644
index e8ff1cc7..00000000
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/ISarStandardComplianceAssessResult.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.adc.da.slrs.sarStandardComplianceAssessResult.service;
-
-import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo;
-import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfoEOPage;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-
-public interface ISarStandardComplianceAssessResult {
-
- IPage getSarStandardsInfo();
-
-}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceProductAssess/service/ISarStandardComplianceProductAssessService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/ISarStandardComplianceProductAssessService.java
similarity index 55%
rename from adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceProductAssess/service/ISarStandardComplianceProductAssessService.java
rename to adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/ISarStandardComplianceProductAssessService.java
index 431fddce..f813e993 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceProductAssess/service/ISarStandardComplianceProductAssessService.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/ISarStandardComplianceProductAssessService.java
@@ -1,6 +1,6 @@
-package com.adc.da.slrs.sarStandardComplianceProductAssess.service;
+package com.adc.da.slrs.sarStandardComplianceAssessResult.service;
-import com.adc.da.slrs.sarStandardComplianceProductAssess.entity.SarStandardComplianceProductAssess;
+import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarStandardComplianceProductAssess;
import com.baomidou.mybatisplus.extension.service.IService;
/**
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
*
*
* @author zyl
- * @since 2021-06-16
+ * @since 2021-06-18
*/
public interface ISarStandardComplianceProductAssessService extends IService {
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/impl/SarInterpretationForeignStandardServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/impl/SarInterpretationForeignStandardServiceImpl.java
new file mode 100644
index 00000000..f78c54e0
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/impl/SarInterpretationForeignStandardServiceImpl.java
@@ -0,0 +1,20 @@
+package com.adc.da.slrs.sarStandardComplianceAssessResult.service.impl;
+
+import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarInterpretationForeignStandard;
+import com.adc.da.slrs.sarStandardComplianceAssessResult.dao.SarInterpretationForeignStandardDao;
+import com.adc.da.slrs.sarStandardComplianceAssessResult.service.ISarInterpretationForeignStandardService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ * 服务实现类
+ *
+ *
+ * @author zyl
+ * @since 2021-06-18
+ */
+@Service
+public class SarInterpretationForeignStandardServiceImpl extends ServiceImpl implements ISarInterpretationForeignStandardService {
+
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/impl/SarInterpretationNationalStandardServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/impl/SarInterpretationNationalStandardServiceImpl.java
new file mode 100644
index 00000000..9713ea5b
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/impl/SarInterpretationNationalStandardServiceImpl.java
@@ -0,0 +1,20 @@
+package com.adc.da.slrs.sarStandardComplianceAssessResult.service.impl;
+
+import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarInterpretationNationalStandard;
+import com.adc.da.slrs.sarStandardComplianceAssessResult.dao.SarInterpretationNationalStandardDao;
+import com.adc.da.slrs.sarStandardComplianceAssessResult.service.ISarInterpretationNationalStandardService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ * 服务实现类
+ *
+ *
+ * @author zyl
+ * @since 2021-06-18
+ */
+@Service
+public class SarInterpretationNationalStandardServiceImpl extends ServiceImpl implements ISarInterpretationNationalStandardService {
+
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/impl/SarStandardComplianceProductAssessServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/impl/SarStandardComplianceProductAssessServiceImpl.java
new file mode 100644
index 00000000..ea8c9f44
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/impl/SarStandardComplianceProductAssessServiceImpl.java
@@ -0,0 +1,20 @@
+package com.adc.da.slrs.sarStandardComplianceAssessResult.service.impl;
+
+import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarStandardComplianceProductAssess;
+import com.adc.da.slrs.sarStandardComplianceAssessResult.dao.SarStandardComplianceProductAssessDao;
+import com.adc.da.slrs.sarStandardComplianceAssessResult.service.ISarStandardComplianceProductAssessService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ * 服务实现类
+ *
+ *
+ * @author zyl
+ * @since 2021-06-18
+ */
+@Service
+public class SarStandardComplianceProductAssessServiceImpl extends ServiceImpl implements ISarStandardComplianceProductAssessService {
+
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceProductAssess/entity/SarStandardComplianceProductAssess.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceProductAssess/entity/SarStandardComplianceProductAssess.java
deleted file mode 100644
index 453376f2..00000000
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceProductAssess/entity/SarStandardComplianceProductAssess.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.adc.da.slrs.sarStandardComplianceProductAssess.entity;
-
-import com.adc.da.base.entity.BaseEntity;
-import java.time.LocalDateTime;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- *
- *
- *
- *
- * @author zyl
- * @since 2021-06-16
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
-@ApiModel(value="SarStandardComplianceProductAssess对象", description="")
-public class SarStandardComplianceProductAssess extends BaseEntity {
-
- private static final long serialVersionUID = 1L;
-
- @ApiModelProperty(value = "'产品线'")
- private String productLineId;
-
- @ApiModelProperty(value = "'项目id'")
- private String productId;
-
- @ApiModelProperty(value = "'项目名称'")
- private String productName;
-
- @ApiModelProperty(value = "'标准编号'")
- private String standardId;
-
- @ApiModelProperty(value = "'标准章条'")
- private String itemsId;
-
- @ApiModelProperty(value = "'标准名称'")
- private String standardName;
-
- @ApiModelProperty(value = "1是在产，0是在研")
- private Integer state;
-
- @ApiModelProperty(value = "实施时间")
- private LocalDateTime implementation_time;
-
- @ApiModelProperty(value = "0是合规，1是不合规")
- private Integer complianceState;
-
- private String compliance;
-
- private String nonCompliance;
-
- private String countermeasures;
-
- private LocalDateTime completionTime;
-
-
-}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceProductAssess/service/impl/SarStandardComplianceProductAssessServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceProductAssess/service/impl/SarStandardComplianceProductAssessServiceImpl.java
deleted file mode 100644
index 27ea4bc1..00000000
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceProductAssess/service/impl/SarStandardComplianceProductAssessServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.adc.da.slrs.sarStandardComplianceProductAssess.service.impl;
-
-import com.adc.da.slrs.sarStandardComplianceProductAssess.entity.SarStandardComplianceProductAssess;
-import com.adc.da.slrs.sarStandardComplianceProductAssess.dao.SarStandardComplianceProductAssessDao;
-import com.adc.da.slrs.sarStandardComplianceProductAssess.service.ISarStandardComplianceProductAssessService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- *
- * 服务实现类
- *
- *
- * @author zyl
- * @since 2021-06-16
- */
-@Service
-public class SarStandardComplianceProductAssessServiceImpl extends ServiceImpl implements ISarStandardComplianceProductAssessService {
-
-}
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarInterpretationStandard/SarInterpretationStandardMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarInterpretationStandard/SarInterpretationStandardMapper.xml
new file mode 100644
index 00000000..62001a87
--- /dev/null
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarInterpretationStandard/SarInterpretationStandardMapper.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarInterpretationForeignStandardMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarInterpretationForeignStandardMapper.xml
new file mode 100644
index 00000000..9a345a83
--- /dev/null
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarInterpretationForeignStandardMapper.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarInterpretationNationalStandardMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarInterpretationNationalStandardMapper.xml
new file mode 100644
index 00000000..41097a19
--- /dev/null
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarInterpretationNationalStandardMapper.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarStandardComplianceProductAssessMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarStandardComplianceProductAssessMapper.xml
new file mode 100644
index 00000000..b82994ed
--- /dev/null
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarStandardComplianceProductAssessMapper.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
From b85c133749f81e3a9248d7b59d2feb9ca3b1bac8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E8=82=96=E4=BA=91?= <2816048001@qq.com>
Date: Fri, 18 Jun 2021 15:46:31 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fetch:=20=E4=BF=AE=E6=94=B9=E5=85=B3?=
=?UTF-8?q?=E9=97=AD=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9=E6=8E=A5=E5=8F=A3?=
=?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/adc/da/login/rest/LoginRestController.java | 2 +-
.../src/main/resources/application-dev.properties | 2 +-
.../SarStandIssueControlCauseController.java | 2 +-
.../entity/SarStandIssueControlCause.java | 10 +++++++++-
.../impl/SarStandIssueControlCauseServiceImpl.java | 4 ++--
.../SarStandIssueControlProductController.java | 2 +-
.../entity/SarStandIssueControlProduct.java | 10 ++++++++++
.../impl/SarStandIssueControlProductServiceImpl.java | 4 ++--
.../controller/SarStandUnqualifiedController.java | 4 ++--
.../entity/SarStandUnqualified.java | 8 ++++++++
.../service/impl/SarStandUnqualifiedServiceImpl.java | 4 ++--
11 files changed, 39 insertions(+), 13 deletions(-)
diff --git a/adc-da-jwtLogin/src/main/java/com/adc/da/login/rest/LoginRestController.java b/adc-da-jwtLogin/src/main/java/com/adc/da/login/rest/LoginRestController.java
index 48890445..589c05a9 100644
--- a/adc-da-jwtLogin/src/main/java/com/adc/da/login/rest/LoginRestController.java
+++ b/adc-da-jwtLogin/src/main/java/com/adc/da/login/rest/LoginRestController.java
@@ -37,7 +37,7 @@ import java.util.Map;
@Validated
@Controller
@RequestMapping(value = "/api")
-@Api(description = "登录接口")
+@Api(tags = "登录接口")
@Slf4j
public class LoginRestController {
diff --git a/adc-da-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties
index 0280f9bd..d89ffe27 100644
--- a/adc-da-main/src/main/resources/application-dev.properties
+++ b/adc-da-main/src/main/resources/application-dev.properties
@@ -3,7 +3,7 @@
# 数据库配置
#=============================================
spring.datasource.driverClassName = com.mysql.cj.jdbc.Driver
-spring.datasource.url = jdbc:mysql://39.100.23.127:3306/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false
+spring.datasource.url = jdbc:mysql://192.168.10.47:3306/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false
spring.datasource.username = root
spring.datasource.password = root
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIssueControlCause/controller/SarStandIssueControlCauseController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIssueControlCause/controller/SarStandIssueControlCauseController.java
index 3ad6a625..83ed19c1 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIssueControlCause/controller/SarStandIssueControlCauseController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIssueControlCause/controller/SarStandIssueControlCauseController.java
@@ -40,7 +40,7 @@ import java.util.List;
*/
@RestController
@Api(tags = "|重点问题项管控模块-事业部|")
-@RequestMapping("/sarStandIssueControlCause/sar-stand-issue-control-cause")
+@RequestMapping("/api/sarStandIssueControlCause/sar-stand-issue-control-cause")
public class SarStandIssueControlCauseController extends BaseController {
private static final Logger logger = LoggerFactory.getLogger(SarStandardsInfoController.class);
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIssueControlCause/entity/SarStandIssueControlCause.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIssueControlCause/entity/SarStandIssueControlCause.java
index 4e10aa51..a0b2ad88 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIssueControlCause/entity/SarStandIssueControlCause.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIssueControlCause/entity/SarStandIssueControlCause.java
@@ -10,11 +10,13 @@ import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableField;
+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;
/**
*
@@ -44,21 +46,27 @@ public class SarStandIssueControlCause extends BaseEntity {
@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("CREATE_TIME")
private Timestamp createTime;
- @ExcelProperty("关闭状态")
+ @ExcelIgnore
@ApiModelProperty(value = "关闭状态（1为开启，2为关闭）")
@TableField("CLOSE_STATE")
private Integer closeState;
@ExcelIgnore
@ApiModelProperty(value = "实际关闭时间")
+ @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;
@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("REQUIRE_CLOSE_TIME")
private Timestamp requireCloseTime;
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIssueControlCause/service/impl/SarStandIssueControlCauseServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIssueControlCause/service/impl/SarStandIssueControlCauseServiceImpl.java
index 3f2b3fe6..26c30a92 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIssueControlCause/service/impl/SarStandIssueControlCauseServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIssueControlCause/service/impl/SarStandIssueControlCauseServiceImpl.java
@@ -44,7 +44,7 @@ public class SarStandIssueControlCauseServiceImpl extends ServiceImpl {
private static final Logger logger = LoggerFactory.getLogger(SarStandardsInfoController.class);
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIssueControlProduct/entity/SarStandIssueControlProduct.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIssueControlProduct/entity/SarStandIssueControlProduct.java
index f5591fd3..ca929c35 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIssueControlProduct/entity/SarStandIssueControlProduct.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIssueControlProduct/entity/SarStandIssueControlProduct.java
@@ -10,11 +10,13 @@ import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableField;
+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;
/**
*
@@ -44,6 +46,8 @@ public class SarStandIssueControlProduct extends BaseEntity {
@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("CREATE_TIME")
private Timestamp createTime;
@@ -54,11 +58,15 @@ public class SarStandIssueControlProduct extends BaseEntity {
@ExcelIgnore
@ApiModelProperty(value = "实际关闭时间")
+ @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;
@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("REQUIRE_CLOSE_TIME")
private Timestamp requireCloseTime;
@@ -94,6 +102,8 @@ public class SarStandIssueControlProduct extends BaseEntity {
@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("IMPLEMENT_TIME")
private Timestamp implementTime;
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIssueControlProduct/service/impl/SarStandIssueControlProductServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIssueControlProduct/service/impl/SarStandIssueControlProductServiceImpl.java
index 840c6fed..55701ecc 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIssueControlProduct/service/impl/SarStandIssueControlProductServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIssueControlProduct/service/impl/SarStandIssueControlProductServiceImpl.java
@@ -42,7 +42,7 @@ public class SarStandIssueControlProductServiceImpl extends ServiceImpl {
private static final Logger logger = LoggerFactory.getLogger(SarStandardsInfoController.class);
@@ -86,7 +86,7 @@ public class SarStandUnqualifiedController extends BaseController> closeSarStandUnqualified(@RequestBody StandUnqualifiedListVO standUnqualifiedListVO){
+ public ResponseMessage> closeSarStandUnqualified(StandUnqualifiedListVO standUnqualifiedListVO){
if(standUnqualifiedListVO==null||standUnqualifiedListVO.getIds().size()==0){
return Result.error(ResponseMessageCodeEnum.ERROR.getCode(),"未传入未符合项ID",null);
}
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 69c8650f..17781e2e 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
@@ -10,11 +10,13 @@ import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableField;
+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;
/**
*
@@ -44,6 +46,8 @@ public class SarStandUnqualified extends BaseEntity {
@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("CREATE_TIME")
private Timestamp createTime;
@@ -54,11 +58,15 @@ public class SarStandUnqualified extends BaseEntity {
@ExcelIgnore
@ApiModelProperty(value = "实际关闭时间")
+ @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;
@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;
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 eefa6161..e457319a 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
@@ -44,7 +44,7 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl