字段修改

pom.xml

@@ -301,6 +301,11 @@
             <artifactId>lombok</artifactId>
             <version>${lombok.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-autoconfigure</artifactId>
+            <version>2.2.4.RELEASE</version>
+        </dependency>
     </dependencies>
 
     <build>

src/main/java/com/gaotao/modules/schedule/data/SfdcRollOpsData.java

@@ -14,10 +14,10 @@ import java.util.Date;
  */
 @Alias("SfdcRollOpsData")
 public class SfdcRollOpsData extends BaseRollData {
-    private String scanBy;
+    private String scanedBy;
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date scanDate;
+    private Date scanedDate;
     private String startProdFlag;
     private String firstSetupBy;
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -60,9 +60,9 @@ public class SfdcRollOpsData extends BaseRollData {
     }
 
     //单纯插入数据
-    public SfdcRollOpsData(String scanBy, Date scanDate, String startProdFlag, String pauseFlag, Float qtyReported, Float qtyDefected, String reportedFlag) {
-        this.scanBy = scanBy;
-        this.scanDate = scanDate;
+    public SfdcRollOpsData(String scanedBy, Date scanedDate, String startProdFlag, String pauseFlag, Float qtyReported, Float qtyDefected, String reportedFlag) {
+        this.scanedBy = scanedBy;
+        this.scanedDate = scanedDate;
         this.startProdFlag = startProdFlag;
         this.pauseFlag = pauseFlag;
         this.qtyReported = qtyReported;
@@ -70,20 +70,20 @@ public class SfdcRollOpsData extends BaseRollData {
         this.reportedFlag = reportedFlag;
     }
 
-    public String getScanBy() {
-        return scanBy;
+    public String getScanedBy() {
+        return scanedBy;
     }
 
-    public void setScanBy(String scanBy) {
-        this.scanBy = scanBy;
+    public void setScanedBy(String scanedBy) {
+        this.scanedBy = scanedBy;
     }
 
-    public Date getScanDate() {
-        return scanDate;
+    public Date getScanedDate() {
+        return scanedDate;
     }
 
-    public void setScanDate(Date scanDate) {
-        this.scanDate = scanDate;
+    public void setScanedDate(Date scanedDate) {
+        this.scanedDate = scanedDate;
     }
 
     public String getStartProdFlag() {

src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java

@@ -660,8 +660,8 @@ public class ScheduleServiceImpl implements ScheduleService {
         sfdcRollOpsData.setOrderNo(orderNo);
         sfdcRollOpsData.setItemNo(itemNo);
         sfdcRollOpsData.setRollNo(currentRollNo);
-        sfdcRollOpsData.setScanBy(username);
-        sfdcRollOpsData.setScanDate(new Date());
+        sfdcRollOpsData.setScanedBy(username);
+        sfdcRollOpsData.setScanedDate(new Date());
         sfdcRollOpsData.setSeqNo(seqNo);
         sfdcRollOpsData.setFinishedFlag("N");
         sfdcRollOpsData.setRemark("");

src/main/resources/mapper/schedule/ScheduleMapper.xml

@@ -233,7 +233,7 @@
 
     <!--获取当前的上机卷信息-->
     <select id="getCurrentRollOpsBySeqNo" parameterType="BaseRollData" resultType="SfdcRollOpsData">
-        SELECT sro.Site site, sro.OrderNo orderNo, sro.RollNo rollNo, sro.ItemNo itemNo, sro.SeqNo seqNo, sro.ScanedBy scanBy, sro.ScanedDate scanDate,
+        SELECT sro.Site site, sro.OrderNo orderNo, sro.RollNo rollNo, sro.ItemNo itemNo, sro.SeqNo seqNo, sro.ScanedBy scanedBy, sro.ScanedDate scanedDate,
         sro.StartProdFlag startProdFlag, sro.FirstSetupBy firstSetupBy, sro.FirstSetupDate firstSetupDate, sro.LatestSetupBy latestSetupBy,
         sro.LatestSetupDate latestSetupDate, sro.FirstEndSetupBy firstEndSetupBy, sro.FirstEndSetupDate firstEndSetupDate, sro.LatestEndSetupBy latestEndSetupBy,
         sro.LatestEndSetupDate latestEndSetupDate, sro.FirstProdBy firstProdBy, sro.FirstProdDate firstProdDate, sro.LatestProdBy latestProdBy,
@@ -402,7 +402,7 @@
 
     <!--按照条件查询上机卷记录-->
     <select id="getSfdcRollOpsByCon" parameterType="SearchScheduleData" resultType="SfdcRollOpsData">
-        SELECT sro.Site site, sro.OrderNo orderNo, sro.RollNo rollNo, sro.ItemNo itemNo, sro.SeqNo seqNo, sro.ScanedBy scanBy, sro.ScanedDate scanDate,
+        SELECT sro.Site site, sro.OrderNo orderNo, sro.RollNo rollNo, sro.ItemNo itemNo, sro.SeqNo seqNo, sro.ScanedBy scanedBy, sro.ScanedDate scanedDate,
         sro.StartProdFlag startProdFlag, sro.FirstSetupBy firstSetupBy, sro.FirstSetupDate firstSetupDate, sro.LatestSetupBy latestSetupBy,
         sro.LatestSetupDate latestSetupDate, sro.FirstEndSetupBy firstEndSetupBy, sro.FirstEndSetupDate firstEndSetupDate, sro.LatestEndSetupBy latestEndSetupBy,
         sro.LatestEndSetupDate latestEndSetupDate, sro.FirstProdBy firstProdBy, sro.FirstProdDate firstProdDate, sro.LatestProdBy latestProdBy,