完善

platform-dao/src/main/java/com/platform/dao/vo/query/sb/SbMeasureLogVO.java

@@ -44,6 +44,10 @@ public class SbMeasureLogVO extends BaseVO implements Serializable{
      * 设备型号
      */
     private String sbModel;
+    /**
+     * 出厂编号
+     */
+    private String sbZzh;
     /**
      * 测量设备编号
      */

platform-dao/src/main/resources/mapper/sb/SbMeasureLogMapper.xml

@@ -134,9 +134,9 @@
     <select id="selectList" parameterType="com.platform.dao.dto.sb.SbMeasureLogDTO"
             resultType="com.platform.dao.vo.query.sb.SbMeasureLogVO">
         select checkstandard.*,
-               sb.name sbName, sb.model sbModel, sb.no sbNo, sb.card_no cardNo
+               sb.name sbName, sb.model sbModel, sb.no sbNo, sb.zzh sbZzh, sb.card_no cardNo
         from t_sb_measure_log as checkstandard
-        LEFT JOIN t_sb_info sb on checkstandard.sb_id = sb.id
+        LEFT JOIN t_sb_info_measure sb on checkstandard.sb_id = sb.id
         <where>
             <include refid="List_Condition"/>
         </where>

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

@@ -885,9 +885,19 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
     public void change(RepairApplicationFormDTO dto) {
 
         RepairApplicationForm applicationForm = mapper.selectById(dto.getId());
-        applicationForm.setReceiveMinutes(DateUtils.getDurationHours(dto.getApplyTime(), dto.getRepairStartTime()));
+        // 判断时间是否先后顺序
+        if(applicationForm.getApplyTime().isAfter(dto.getRepairStartTime())){
+            throw new BusinessException("报修时间不可晚于接收时间，请重新设置时间.");
+        }
+        if(applicationForm.getApplyTime().isAfter(dto.getRepairEndTime())){
+            throw new BusinessException("报修时间不可晚于完成时间，请重新设置时间.");
+        }
+        if(dto.getRepairStartTime().isAfter(dto.getRepairEndTime())){
+            throw new BusinessException("接收时间不可晚于完成时间，请重新设置时间.");
+        }
+        applicationForm.setReceiveMinutes(DateUtils.getDurationHours(applicationForm.getApplyTime(), dto.getRepairStartTime()));
         applicationForm.setRepairMinutes(DateUtils.getDurationHours(dto.getRepairStartTime(), dto.getRepairEndTime()));
-        applicationForm.setDealMinutes(DateUtils.getDurationHours(dto.getApplyTime(), dto.getRepairEndTime()));
+        applicationForm.setDealMinutes(DateUtils.getDurationHours(applicationForm.getApplyTime(), dto.getRepairEndTime()));
         applicationForm.setCategory(dto.getCategory());
         super.modModelByPrimaryKey(applicationForm);