Browse Source

'移动端-消防整改-待办事项上传整改资料接口'

james 2 years ago
parent
commit
a2ea6acb81

+ 13 - 0
service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/DemFireReformController.java

@@ -3,6 +3,7 @@ package com.usky.fire.controller.web;
 
 import com.usky.common.log.annotation.Log;
 import com.usky.common.log.enums.BusinessType;
+import com.usky.fire.domain.DemReformReview;
 import com.usky.fire.service.vo.DemFireReformVO;
 import com.usky.fire.service.vo.MobileScheduleVO;
 import com.usky.fire.service.vo.UpdateReformReviewVO;
@@ -105,5 +106,17 @@ public class DemFireReformController {
         demFireReformService.updateMobileReformStatus(reformId);
         return ApiResult.success();
     }
+
+    /**
+     * 移动端-消防整改-待办事项上传整改资料
+     *
+     * @param
+     * @return
+     */
+    @PostMapping("addReformMaterial")
+    public ApiResult<Void> addReformMaterial(@RequestBody DemReformReview demReformReview){
+        demFireReformService.addReformMaterial(demReformReview);
+        return ApiResult.success();
+    }
 }
 

+ 3 - 3
service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/DemReformReviewController.java

@@ -1,9 +1,10 @@
 package com.usky.fire.controller.web;
 
 
+
 import org.springframework.web.bind.annotation.RequestMapping;
 
-import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
@@ -13,9 +14,8 @@ import org.springframework.stereotype.Controller;
  * @author ZYJ
  * @since 2023-02-27
  */
-@Controller
+@RestController
 @RequestMapping("/demReformReview")
 public class DemReformReviewController {
-
 }
 

+ 3 - 0
service-fire/service-fire-biz/src/main/java/com/usky/fire/service/DemFireReformService.java

@@ -3,6 +3,7 @@ package com.usky.fire.service;
 import com.usky.common.core.bean.CommonPage;
 import com.usky.fire.domain.DemFireReform;
 import com.usky.common.mybatis.core.CrudService;
+import com.usky.fire.domain.DemReformReview;
 import com.usky.fire.service.vo.DemFireReformVO;
 import com.usky.fire.service.vo.MobileScheduleVO;
 import com.usky.fire.service.vo.UpdateReformReviewVO;
@@ -29,4 +30,6 @@ public interface DemFireReformService extends CrudService<DemFireReform> {
     void updateReformReview(UpdateReformReviewVO updateReformReviewVO);
 
     void updateMobileReformStatus(String reformId);
+
+    void addReformMaterial(DemReformReview demReformReview);
 }

+ 0 - 1
service-fire/service-fire-biz/src/main/java/com/usky/fire/service/DemReformReviewService.java

@@ -12,5 +12,4 @@ import com.usky.common.mybatis.core.CrudService;
  * @since 2023-02-27
  */
 public interface DemReformReviewService extends CrudService<DemReformReview> {
-
 }

+ 23 - 0
service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/DemFireReformServiceImpl.java

@@ -140,6 +140,29 @@ public class DemFireReformServiceImpl extends AbstractCrudService<DemFireReformM
         demReformReview.setReformId(Integer.parseInt(reformId));
         demReformReview.setReformTime(LocalDateTime.now());
         demReformReviewService.save(demReformReview);
+    }@Override
+
+    public void addReformMaterial(DemReformReview demReformReview){
+        LambdaQueryWrapper<DemFireReform> queryWrapper1 = Wrappers.lambdaQuery();
+        queryWrapper1.eq(DemFireReform::getId,demReformReview.getReformId());
+        List<DemFireReform> list1 = this.list(queryWrapper1);
+        DemFireReform demFireReform = new DemFireReform();
+        demFireReform.setId(list1.get(0).getId());
+        demFireReform.setCompanyId(list1.get(0).getCompanyId());
+        demFireReform.setCompanyCode(list1.get(0).getCompanyCode());
+        demFireReform.setReformPart(list1.get(0).getReformPart());
+        demFireReform.setSendTime(list1.get(0).getSendTime());
+        demFireReform.setReformStatus(3);
+        demFireReform.setLimitTime(list1.get(0).getLimitTime());
+        this.updateById(demFireReform);
+
+        LambdaQueryWrapper<DemReformReview> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.select(DemReformReview::getId)
+                .eq(DemReformReview::getReformId, demReformReview.getReformId());
+        List<DemReformReview> list = demReformReviewService.list(queryWrapper);
+        demReformReview.setId(list.get(0).getId());
+        demReformReview.setReformTime(LocalDateTime.now());
+        demReformReviewService.updateById(demReformReview);
     }
 
 }

+ 9 - 1
service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/DemReformReviewServiceImpl.java

@@ -1,11 +1,20 @@
 package com.usky.fire.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.usky.common.security.utils.SecurityUtils;
+import com.usky.fire.domain.DemFireReform;
 import com.usky.fire.domain.DemReformReview;
 import com.usky.fire.mapper.DemReformReviewMapper;
+import com.usky.fire.service.DemFireReformService;
 import com.usky.fire.service.DemReformReviewService;
 import com.usky.common.mybatis.core.AbstractCrudService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
+import java.util.List;
+
 /**
  * <p>
  * 整改审核数据表 服务实现类
@@ -16,5 +25,4 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class DemReformReviewServiceImpl extends AbstractCrudService<DemReformReviewMapper, DemReformReview> implements DemReformReviewService {
-
 }