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

# Conflicts:
#	adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java
#	adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/SarStandUnqualifiedDao.java
#	adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java
#	adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/SarStandUnqualifiedController.java

@@ -34,7 +34,9 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.net.URLEncoder;
+import java.sql.Timestamp;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -55,6 +57,18 @@ public class SarStandUnqualifiedController extends BaseController<SarStandUnqual
     @Autowired
     private ISarStandUnqualifiedService sarStandUnqualifiedService;
 
+    @ApiOperation("未符合项整改新增")
+    @PostMapping("/add")
+    public ResponseMessage<Object> add(@RequestBody List<SarStandUnqualified> sarStandUnqualified){
+        sarStandUnqualified.forEach(sarStandUnqualified1 -> sarStandUnqualified1.setCreateTime(new Date()));
+        if (sarStandUnqualifiedService.saveBatch(sarStandUnqualified)) {
+            return Result.success("新增成功");
+        }
+        else{
+            return Result.error("新增失败");
+        }
+    }
+
     /**
      * 分页查询未符合项
      * @param sarStandUnqualifiedPage：筛选、分页信息

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/SarStandUnqualifiedDao.java

@@ -1,7 +1,11 @@
 package com.adc.da.slrs.sarStandUnqualified.dao;
 
 import com.adc.da.slrs.sarStandUnqualified.entity.SarStandUnqualified;
+import com.adc.da.slrs.sarStandUnqualified.entity.SarStandUnqualifiedPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -14,6 +18,7 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface SarStandUnqualifiedDao extends BaseMapper<SarStandUnqualified> {
+    IPage<SarStandUnqualified> getAllDatasByPage(Page page,@Param("sar") SarStandUnqualifiedPage sarStandUnqualified);
 
 
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java

@@ -3,11 +3,13 @@ package com.adc.da.slrs.sarStandUnqualified.entity;
 import com.adc.da.base.entity.BaseEntity;
 
 import java.sql.Timestamp;
+import java.util.Date;
 
 import com.adc.da.slrs.sarStandUnqualified.utils.ProductTypeConverter;
 import com.adc.da.slrs.sarStandUnqualified.utils.TimestampConverter;
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -84,7 +86,7 @@ public class SarStandUnqualified extends BaseEntity {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField("CREATE_TIME")
-    private Timestamp createTime;
+    private Date createTime;
 
     @ExcelIgnore
     @ApiModelProperty(value = "关闭状态（1为开启，2为关闭）")
@@ -96,14 +98,14 @@ public class SarStandUnqualified extends BaseEntity {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField("ACTUAL_CLOSE_TIME")
-    private Timestamp actualCloseTime;
+    private Date actualCloseTime;
 
     @ExcelProperty(value = "计划关闭时间",converter = TimestampConverter.class)
     @ApiModelProperty(value = "计划关闭时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField("PLAN_CLOSE_TIME")
-    private Timestamp planCloseTime;
+    private Date planCloseTime;
 
     @ApiModelProperty(value = "未符合原因")
     @TableField("REASON")
@@ -133,8 +135,18 @@ public class SarStandUnqualified extends BaseEntity {
 
     @ExcelIgnore
     @ApiModelProperty(value = "主键")
-    @TableId("ID")
+    @TableId(type = IdType.UUID)
     private String id;
 
 
+    @ApiModelProperty(value = "质量工程师")
+    private String qaEngineerName;
+
+    @ApiModelProperty(value = "认证工程师")
+    private String authEngineerName;
+
+    @ApiModelProperty(value = "责任工程师")
+    private String dutyEngineerName;
+
+
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/ISarStandUnqualifiedService.java

@@ -46,4 +46,5 @@ public interface ISarStandUnqualifiedService extends IService<SarStandUnqualifie
      * @return List<SarStandUnqualified>
      */
     List<SarStandUnqualified> getStandUnqualifiedExcelData(StandUnqualifiedExcelVO standUnqualifiedExcelVO);
+
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java

@@ -144,4 +144,3 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl<SarStandUnqualif
         return true;
     }
 }
-