hfxc226 3 years ago
parent
commit
ce16d54067

+ 1 - 1
platform-dao/src/main/resources/mapper/check/CheckJobMapper.xml

@@ -275,7 +275,7 @@
             update t_check_job
             <set>
                 <if test="item.receiveOvertime != null and item.receiveOvertime != ''">
-                    receive_overtime = #{receiveOvertime}
+                    receive_overtime = #{item.receiveOvertime}
                 </if>
             </set>
             where id = #{item.id}

+ 1 - 1
platform-service/src/main/java/com/platform/service/check/impl/CheckJobServiceImpl.java

@@ -644,7 +644,7 @@ public class CheckJobServiceImpl extends BaseServiceImpl<CheckJobMapper, CheckJo
             }
         });
 
-        if(CollectionUtil.isNotEmpty(updateJobs)){
+        if(CollectionUtil.isNotEmpty(updateJobs) && updateJobs.size()>0){
             mapper.updateBatch(updateJobs);
         }
     }

+ 5 - 5
platform-service/src/main/java/com/platform/service/repair/impl/RepairApplicationFormServiceImpl.java

@@ -115,15 +115,15 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
                         vo.setProblemDesc(reason.getProblemDesc());
                         vo.setCheckProcess(reason.getCheckProcess());
                         vo.setReasonAnalysis(reason.getReasonAnalysis());
-                        vo.setChangeRepairPlan(reason.getChangeRepairPlan()?"是":"否");
+                        vo.setChangeRepairPlan(reason.getChangeRepairPlan());
                         vo.setChangeRepairPlanContent(reason.getChangeRepairPlanContent());
-                        vo.setChangeSparePlan(reason.getChangeSparePlan()?"是":"否");
+                        vo.setChangeSparePlan(reason.getChangeSparePlan());
                         vo.setChangeSparePlanContent(reason.getChangeSparePlanContent());
-                        vo.setUserTeach(reason.getUserTeach()?"是":"否");
+                        vo.setUserTeach(reason.getUserTeach());
                         vo.setUserTeachContent(reason.getUserTeachContent());
-                        vo.setSbChange(reason.getSbChange()?"是":"否");
+                        vo.setSbChange(reason.getSbChange());
                         vo.setSbChangeContent(reason.getSbChangeContent());
-                        vo.setOtherChange(reason.getOtherChange()?"是":"否");
+                        vo.setOtherChange(reason.getOtherChange());
                         vo.setOtherChangeContent(reason.getOtherChangeContent());
                     }
                 }