完善

platform-dao/src/main/java/com/platform/dao/dto/repair/RepairFeeDTO.java

@@ -36,7 +36,10 @@ public class RepairFeeDTO extends BaseDTO implements Serializable {
      */
     @NotNull(groups = {UpdateGroup.class}, message = "ID不能为空")
     private String id;
-
+    /**
+     * 设备id
+     */
+    private String sbId;
     /**
      * 维修单id
      */

platform-dao/src/main/java/com/platform/dao/entity/repair/RepairFee.java

@@ -23,7 +23,10 @@ import javax.persistence.Transient;
 @Table(name = "t_repair_fee")
 @Data
 public class RepairFee implements Serializable {
-
+    /**
+     * 设备id
+     */
+    private String sbId;
     /**
      * 主键
      */

platform-dao/src/main/resources/mapper/repair/RepairFeeMapper.xml

@@ -3,6 +3,7 @@
 <mapper namespace="com.platform.dao.mapper.repair.RepairFeeMapper">
     <resultMap id="BaseResultMap" type="com.platform.dao.entity.repair.RepairFee">
         <id column="id" jdbcType="VARCHAR" property="id"/>
+        <result column="sb_id" jdbcType="VARCHAR" property="sbId"/>
         <result column="repair_id" jdbcType="VARCHAR" property="repairId"/>
         <result column="fee" jdbcType="DOUBLE" property="fee"/>
         <result column="type" jdbcType="SMALLINT" property="type"/>
@@ -23,7 +24,7 @@
                      select="com.platform.dao.mapper.repair.RepairFormMapper.selectNoById"/>
     </resultMap>
     <sql id="Base_Column_List">
-        id, repair_id, fee, type, reason,
+        id, sb_id, repair_id, fee, type, reason,
 fee_date,money_type,
 descripition, remark, created_time, update_time,
         created_user_id, update_user_id
@@ -34,10 +35,13 @@ descripition, remark, created_time, update_time,
         from t_repair_fee
         <where>
             <if test="keyword != null and keyword != ''">
-                reason like concat('%',#{keyword},'%')
+                and reason like concat('%',#{keyword},'%')
             </if>
             <if test="repairId != null and repairId != ''">
-                repair_id = #{repairId}
+                and repair_id = #{repairId}
+            </if>
+            <if test="sbId != null and sbId != ''">
+                and sb_id = #{sbId}
             </if>
         </where>
     </select>

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

@@ -684,7 +684,7 @@ public class CheckJobServiceImpl extends BaseServiceImpl<CheckJobMapper, CheckJo
         checkJob.setUpdateTime(now);
         checkJob.setUpdateUserId(userInfo.getUserId());
         checkJob.setUpdateUserName(userInfo.getUsername());
-        checkJob.setSbStatus(dto.getSbStatus());
+        // checkJob.setSbStatus(dto.getSbStatus());
         checkJob.setFeedback(dto.getFeedback());
         mapper.updateByPrimaryKeySelective(checkJob);
 

platform-service/src/main/java/com/platform/service/check/impl/CheckStandardServiceImpl.java

@@ -287,6 +287,11 @@ public class CheckStandardServiceImpl extends BaseServiceImpl<CheckStandardMappe
     }
 
 
+    /**
+     * 设置时间直接生成任务
+     *
+     * @param checkJobDTO
+     */
     @Override
     public void generate(CheckJobDTO checkJobDTO) {
         LocalDateTime now = LocalDateTime.now();

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

@@ -90,18 +90,17 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
     @Override
     public int batchDelete(List<String> ids) {
         // 判断是否允许删除
-        Weekend<RepairApplicationForm> weekendSelect = new Weekend<>(RepairApplicationForm.class);
+  /*      Weekend<RepairApplicationForm> weekendSelect = new Weekend<>(RepairApplicationForm.class);
         WeekendCriteria<RepairApplicationForm, Object> weekendCriteriaSelect = weekendSelect.weekendCriteria();
         weekendCriteriaSelect.andIn(RepairApplicationForm::getId, ids);
         weekendCriteriaSelect.andNotEqualTo(RepairApplicationForm::getStatus, RepairApplicationFormStatusEnum.NOT_ALLOCATED);
         List<RepairApplicationForm> repairApplicationForms = mapper.selectByExample(weekendSelect);
         if (CollectionUtil.isNotEmpty(repairApplicationForms)) {
             throw new BusinessException("部分状态不允许删除");
-        }
+        }*/
         Weekend<RepairApplicationForm> weekend = new Weekend<>(RepairApplicationForm.class);
         WeekendCriteria<RepairApplicationForm, Object> weekendCriteria = weekend.weekendCriteria();
         weekendCriteria.andIn(RepairApplicationForm::getId, ids);
-
         mapper.deleteByExample(weekend);
         return 1;
     }