update

mec-biz/src/main/java/com/ym/mec/biz/service/StudentRepairService.java

@@ -8,6 +8,7 @@ import com.ym.mec.common.service.BaseService;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.Map;
 
 public interface StudentRepairService extends BaseService<Integer, StudentRepair> {
@@ -30,5 +31,5 @@ public interface StudentRepairService extends BaseService<Integer, StudentRepair
      * @param id
      * @param description
      */
-    void repairSuccess(Integer id, String description);
+    void repairSuccess(Integer id, String description,Integer repairStatus);
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentRepairServiceImpl.java

@@ -164,7 +164,7 @@ public class StudentRepairServiceImpl extends BaseServiceImpl<Integer, StudentRe
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void repairSuccess(Integer id, String description) {
+    public void repairSuccess(Integer id, String description,Integer repairStatus) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             throw new BizException("用户信息获取失败");
@@ -173,10 +173,12 @@ public class StudentRepairServiceImpl extends BaseServiceImpl<Integer, StudentRe
         if (studentRepair == null) {
             throw new BizException("维修信息不存在");
         }
-        studentRepair.setRepairStatus(1);
+        if(repairStatus != null){
+            studentRepair.setRepairStatus(1);
+            studentRepair.setFinishTime(new Date());
+        }
         studentRepair.setUpdateTime(new Date());
         studentRepair.setDescription(description);
-        studentRepair.setFinishTime(new Date());
         studentRepairDao.update(studentRepair);
         log.info("操作人 :" + sysUser.getId());
     }

mec-web/src/main/java/com/ym/mec/web/controller/StudentRepairController.java

@@ -69,8 +69,8 @@ public class StudentRepairController extends BaseController {
     @ApiOperation("维修完成")
     @GetMapping(value = "/repairSuccess")
     @PreAuthorize("@pcs.hasPermissions('studentRepair/repairSuccess')")
-    public HttpResponseResult repairSuccess(Integer id,String description) {
-        studentRepairService.repairSuccess(id,description);
+    public HttpResponseResult repairSuccess(Integer id,String description,Integer repairStatus) {
+        studentRepairService.repairSuccess(id,description,repairStatus);
         return succeed();
     }
 }