LY 培训

master/src/main/java/com/ruoyi/common/utils/file/ExcelUtils.java

@@ -212,7 +212,6 @@ public class ExcelUtils {
                     xr = lastR;
                 }
             }
-
         }
         return xr;
 

master/src/main/java/com/ruoyi/project/training/controller/TTrainingController.java

@@ -204,6 +204,10 @@ public class TTrainingController extends BaseController
                 i = 1;
             }
         }
+        if (tTraining.getStartDate()!= null) {
+            logger.info("修改了时间");
+            i = 1;
+        }
         if (i == 1) {
             logger.info("修改了需参培人员名单");
             //如果存在条目

master/src/main/java/com/ruoyi/project/training/controller/TTrainingHisparticipantsController.java

@@ -169,11 +169,11 @@ public class TTrainingHisparticipantsController extends BaseController
 
                     }else if (j == 9){
                         if (cellValue!= ""){
-                            entity.setScore(Long.parseLong(cellValue.trim()));
+                            entity.setScore(Double.parseDouble(cellValue.trim()));
                         }
                     }else if (j == 10){
                         if (cellValue!= ""){
-                            entity.setOperationScore(Long.parseLong(cellValue.trim()));
+                            entity.setOperationScore(Double.parseDouble(cellValue.trim()));
                         }
                     }else if (j == 11){
                         entity.setTrainingPlace(cellValue);

master/src/main/java/com/ruoyi/project/training/controller/TTrainingRegularController.java

@@ -271,7 +271,6 @@ public class TTrainingRegularController extends BaseController
                         TTrainingDevice tTrainingDevice = new TTrainingDevice();
                         tTrainingDevice.setStaffId(s.getStaffid());
                         tTrainingDevice.setRegularId(training.getId());
-                        tTrainingDevice.setStartDate(tTrainingRegular.getPlanTrainingdate());
                         tTrainingDevice.setSupplementary("0");
                         tTrainingDeviceService.insertTTrainingDevice(tTrainingDevice);
                     }
@@ -284,7 +283,6 @@ public class TTrainingRegularController extends BaseController
                         TTrainingDevice tTrainingDevice = new TTrainingDevice();
                         tTrainingDevice.setStaffId(staffId);
                         tTrainingDevice.setRegularId(training.getId());
-                        tTrainingDevice.setStartDate(tTrainingRegular.getPlanTrainingdate());
                         tTrainingDevice.setSupplementary("0");
                         tTrainingDeviceService.insertTTrainingDevice(tTrainingDevice);
                     }
@@ -296,7 +294,6 @@ public class TTrainingRegularController extends BaseController
                         TTrainingDevice tTrainingDevice = new TTrainingDevice();
                         tTrainingDevice.setStaffId(s.getStaffid());
                         tTrainingDevice.setRegularId(training.getId());
-                        tTrainingDevice.setStartDate(tTrainingRegular.getPlanTrainingdate());
                         tTrainingDevice.setSupplementary("0");
                         tTrainingDeviceService.insertTTrainingDevice(tTrainingDevice);
                     }

master/src/main/java/com/ruoyi/project/training/domain/TTrainingHisparticipants.java

@@ -40,11 +40,11 @@ public class TTrainingHisparticipants extends BaseEntity
 
     /** 理论成绩 */
     @Excel(name = "理论成绩")
-    private Long score;
+    private Double score;
 
     /** 实际操作成绩 */
     @Excel(name = "实际操作成绩")
-    private Long operationScore;
+    private Double operationScore;
 
     /** 培训地点 */
     @Excel(name = "培训地点")
@@ -132,26 +132,24 @@ public class TTrainingHisparticipants extends BaseEntity
     {
         return endDate;
     }
-    public void setScore(Long score)
-    {
-        this.score = score;
-    }
 
-    public Long getScore()
-    {
+    public Double getScore() {
         return score;
     }
-    public void setOperationScore(Long operationScore)
-    {
-        this.operationScore = operationScore;
+
+    public void setScore(Double score) {
+        this.score = score;
     }
 
-    public Long getOperationScore()
-    {
+    public Double getOperationScore() {
         return operationScore;
     }
-    public void setTrainingPlace(String trainingPlace)
-    {
+
+    public void setOperationScore(Double operationScore) {
+        this.operationScore = operationScore;
+    }
+
+    public void setTrainingPlace(String trainingPlace) {
         this.trainingPlace = trainingPlace;
     }
 

master/src/main/java/com/ruoyi/project/training/domain/TTrainingParticipants.java

@@ -40,11 +40,11 @@ public class TTrainingParticipants extends BaseEntity
 
     /** 理论成绩 */
     @Excel(name = "理论成绩")
-    private Long score;
+    private Double score;
 
     /** 实际操作成绩 */
     @Excel(name = "实际操作成绩")
-    private Long operationScore;
+    private Double operationScore;
 
     /** 培训地点 */
     @Excel(name = "培训地点")
@@ -137,24 +137,23 @@ public class TTrainingParticipants extends BaseEntity
     {
         return endDate;
     }
-    public void setScore(Long score)
-    {
-        this.score = score;
-    }
 
-    public Long getScore()
-    {
+    public Double getScore() {
         return score;
     }
-    public void setOperationScore(Long operationScore)
-    {
-        this.operationScore = operationScore;
+
+    public void setScore(Double score) {
+        this.score = score;
     }
 
-    public Long getOperationScore()
-    {
+    public Double getOperationScore() {
         return operationScore;
     }
+
+    public void setOperationScore(Double operationScore) {
+        this.operationScore = operationScore;
+    }
+
     public void setTrainingPlace(String trainingPlace)
     {
         this.trainingPlace = trainingPlace;