完善

platform-dao/src/main/java/com/platform/dao/dto/check/CheckStandardDTO.java

@@ -54,6 +54,10 @@ public class CheckStandardDTO extends BaseDTO implements Serializable {
      * 设备新号
      */
     private String sbNo;
+    /**
+     * 设备等级
+     */
+    private Integer level;
     /**
      * 被复制设备id
      */

platform-dao/src/main/resources/mapper/check/CheckStandardMapper.xml

@@ -148,7 +148,15 @@ checkstandard.last_date,
             <if test="sbNo != null and sbNo != ''">
                 and sbInfo.no like concat('%',#{sbNo},'%')
             </if>
+            <if test="level != null and level != ''">
+                and sbInfo.level = #{level}
+            </if>
         </where>
+        Order By
+        sbInfo.level asc,
+        sbInfo.no asc,
+        checkstandard.period_type asc,
+        checkstandard.period asc
     </select>
     <select id="selectProjectStandardList" resultType="com.platform.dao.vo.query.check.CheckStandardVO">
         select project.*, project.id as projectId

platform-rest/src/main/java/com/platform/rest/controller/mobile/IgnoreController.java

@@ -71,7 +71,7 @@ public class IgnoreController {
      * @return R
      */
     @SysLog("新增保修单")
-    @PostMapping("/repair")
+    @PostMapping("/repair/add")
     public R saveIgnore(@Validated({AddGroup.class}) @RequestBody RepairApplicationFormDTO repairApplicationFormDTO) {
         return new R<>(repairApplicationFormService.saveModelByDTO(repairApplicationFormDTO));
     }

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

@@ -191,7 +191,7 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
         Weekend<RepairApplicationForm> weekend = new Weekend<>(RepairApplicationForm.class);
         weekend.weekendCriteria().andIsNotNull(RepairApplicationForm::getId).andEqualTo(RepairApplicationForm::getType, model.getType());
         int count = mapper.selectCountByExample(weekend);
-        UserInfo userInfo = SecurityUtils.getUserInfo();
+       /* UserInfo userInfo = SecurityUtils.getUserInfo();
 
         // 未登录
         if(userInfo != null){
@@ -199,6 +199,21 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
             if(StringUtils.isBlank(model.getActualUser())){
                 model.setActualUser(userInfo.getRealName());
             }
+        }*/
+
+        if(StringUtils.isBlank(model.getActualUser())){
+            UserInfo userInfo = SecurityUtils.getUserInfo();
+            model.setUserId(userInfo.getUserId());
+            model.setActualUser(userInfo.getRealName());
+        }else{
+            SysUser sysUser = new SysUser();
+            sysUser.setRealName(model.getActualUser());
+            SysUser sysUser1 = sysUserService.getModelByModel(sysUser);
+            if(sysUser1 == null){
+                model.setUserId("1");
+            }else{
+                model.setUserId(sysUser1.getUserId());
+            }
         }
 
         if(model.getSource() == null){