[培训 模版] 代码提交

dev-file/src/main/java/com/tykj/dev/device/file/util/JavaToPdfHtmlFreeMarker.java

@@ -910,10 +910,10 @@ public class JavaToPdfHtmlFreeMarker {
             int len=workHandoverDevice.getSeqs().length();
             String deviceSerialNumber=workHandoverDevice.getSeqs();
 
-            if (len > 1568){
+            if (len > 784){
                 int page=0;
-                int remainder = len % 1568;
-                int pageCount = (remainder > 0) ? len/1568 + 1 :  len/1568;
+                int remainder = len % 784;
+                int pageCount = (remainder > 0) ? len/784 + 1 :  len/784;
                 while (page<pageCount-1) {
                     if (page==0) {
                         workHandoverDevice.setSeqs(workHandoverDevice.getSeqs().substring(page * 1568, (page + 1) * 1568));
@@ -929,21 +929,21 @@ public class JavaToPdfHtmlFreeMarker {
                     page++;
                 }
                 WorkHandoverDevice workHandoverDevice1=new WorkHandoverDevice();
-                workHandoverDevice1.setSeqs(deviceSerialNumber.substring((pageCount-1)*1568, len));
+                workHandoverDevice1.setSeqs(deviceSerialNumber.substring((pageCount-1)*784, len));
                 list.add(workHandoverDevice1);
-                count.set(len-(pageCount-1)*1568);
-            } else if (len==1568){
+                count.set(len-(pageCount-1)*784);
+            } else if (len==784){
                 workHandoverDevice.setSeqs(toString(workHandoverDevice.getSeqs()));
                 list.add(workHandoverDevice);
                 lists.add(list);
                 list=new ArrayList<>();
             }else {
                 int totle=count.get()+len;
-                 if (totle>1568){
-                    if (1568-count.get()>56) {
+                 if (totle>784){
+                    if (784-count.get()>56) {
                         WorkHandoverDevice workHandoverDevice1 = new WorkHandoverDevice();
-                        workHandoverDevice1.setSeqs(toString(workHandoverDevice1.getSeqs().substring(3510 - count.get(), len)));
-                        workHandoverDevice.setSeqs(toString(workHandoverDevice1.getSeqs().substring(0, 3510 - count.get())));
+                        workHandoverDevice1.setSeqs(toString(workHandoverDevice1.getSeqs().substring(784 - count.get(), len)));
+                        workHandoverDevice.setSeqs(toString(workHandoverDevice1.getSeqs().substring(0, 784 - count.get())));
                         list.add(workHandoverDevice);
                         lists.add(list);
                         list = new ArrayList<>();

dev-train/src/main/java/com/tykj/dev/device/train/controller/TrainJobController.java

@@ -352,7 +352,7 @@ public class TrainJobController {
         }));
         waitExaminesVo.setGenerateTestPaper(JacksonUtil.readValue(trainTheme.getGenerateTestPaperString(), GenerateTestPaper.class));
         List<TrainUser> userList= trainUserDao.findAllByTrainId(trainId).stream().filter(trainUser -> trainUser.getIsSignUp()==1).collect(Collectors.toList());
-        if (userList.stream().allMatch(trainUser -> trainUser.getOnlineStatus()==2)) {
+        if (userList.stream().allMatch(trainUser -> trainUser.getOnlineStatus()==2 ||trainUser.getOnlineStatus()==3)) {
             waitExaminesVo.setIsNot(1);
             taskService.moveToSpecial(taskBto, StatusEnum.TRAIN1015);
             trainTheme.setIsNotExamines(1);
@@ -394,7 +394,7 @@ public class TrainJobController {
         if (falg){
             onlineTainUserTime.setIsNotCanExam(1);
             TaskBto taskBto = taskService.get(onlineTainUserTime.getTaskId());
-            taskService.moveToSpecial(taskBto,StatusEnum.TRAIN1014);
+            taskService.moveToSpecial(taskBto,StatusEnum.TRAIN1014,onlineTainUserTime.getUserId());
         }
         onlineTainUserTime = onlineTainUserTimeDao.save(onlineTainUserTime);
         return ResponseEntity.ok(onlineTainUserTime);

dev-train/src/main/java/com/tykj/dev/device/train/service/impl/TrainThemeServiceImpl.java

@@ -168,7 +168,8 @@ public class TrainThemeServiceImpl implements TrainThemeService {
                         List<TrainUser> trainUsersNotSignUp = trainUsers.stream().filter(trainUser -> trainUser.getUnitsId().equals(taskBto1.getOwnUnit()) && trainUser.getIsSignUp() == 2).collect(Collectors.toList());
                         if (taskBto1.getBillStatus().equals(StatusEnum.TRAIN1002.id)){
                            flag.set(false);
-                           notSignUpTrainUserToUnitVo.add(new TrainUserToUnitVo(taskBto1.getOwnUnit(), unitsCache.findById(taskBto1.getOwnUnit()).getName(), trainUsersNotSignUp, taskBto1.getId(),trainUnit.getSubmitStatus()));
+                           List<TrainUser> trainUserList = trainUsers.stream().filter(trainUser -> trainUser.getUnitsId().equals(taskBto1.getOwnUnit())).collect(Collectors.toList());
+                           notSignUpTrainUserToUnitVo.add(new TrainUserToUnitVo(taskBto1.getOwnUnit(), unitsCache.findById(taskBto1.getOwnUnit()).getName(), trainUserList, taskBto1.getId(),trainUnit.getSubmitStatus()));
                        }else {
                            List<TrainUser> trainUsersSignUp = trainUsers.stream().filter(trainUser -> trainUser.getUnitsId().equals(taskBto1.getOwnUnit()) && trainUser.getIsSignUp() == 1).collect(Collectors.toList());
                            if (trainUsersSignUp.size() != 0) {

dev-union/src/main/resources/bill.html

@@ -733,7 +733,7 @@ border:1px solid #bebebe;
                                                         style="color: #fff;">0232</span>日</span>
                                                 <!--<div class="rightImg">-->
                                                     <!--<div id="pos1">-->
-                                                        <img id="imgB" style="position: fixed;bottom: 66px;right: 164px;width:80px;height:80px" src=${srcB} />
+                                                        <img id="imgB" style="position: fixed;bottom: 95px;right: 164px;width:80px;height:80px" src=${srcB} />
 
                                                     <!--</div>-->
                                                 <!--</div>-->