流程修改

ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsDeclarationRecordsController.java

@@ -11,22 +11,17 @@ import com.ruoyi.jjh.declaration.entity.dto.ApprovalDeclarationRecordsQueryDto;
 import com.ruoyi.jjh.declaration.entity.dto.BmsApprovalInfoUpdateDto;
 import com.ruoyi.jjh.declaration.entity.dto.BmsDeclarationRecordsAddDto;
 import com.ruoyi.jjh.declaration.entity.dto.BmsDeclarationRecordsDto;
-import com.ruoyi.jjh.declaration.entity.dto.MunicipalReviewDto;
 import com.ruoyi.jjh.declaration.entity.vo.ApprovalDeclarationRecordsQueryVo;
 import com.ruoyi.jjh.declaration.entity.vo.BmsDeclarationRecordsQueryVo;
 import com.ruoyi.jjh.declaration.entity.vo.BmsMunicipalBureauReviewQueryVo;
 import com.ruoyi.jjh.declaration.service.IBmsDeclarationRecordsService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
 import java.util.List;
 
 /**
@@ -37,6 +32,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/system/declarationRecords")
+@Api("在线申报记录")
 public class BmsDeclarationRecordsController extends BaseController {
     @Autowired
     private IBmsDeclarationRecordsService bmsDeclarationRecordsService;
@@ -74,6 +70,16 @@ public class BmsDeclarationRecordsController extends BaseController {
         return getDataTable(list);
     }
 
+    /**
+     * 根据id集合压缩所有文件
+     */
+//    @RequiresPermissions("system:declarationRecords:list")
+    @GetMapping("/fileList")
+    @ApiOperation("根据列表id集合压缩所有文件")
+    public AjaxResult fileList(@RequestParam(name = "list") List<Long> list) {
+        return AjaxResult.success(bmsDeclarationRecordsService.fileList(list));
+    }
+
     /**
      * 查询在线申报记录列表-政务
      */
@@ -134,18 +140,18 @@ public class BmsDeclarationRecordsController extends BaseController {
         return toAjax(bmsDeclarationRecordsService.updateBmsDeclarationRecords(bmsDeclarationRecords));
     }
 
-    @Log(title = "市级评定结果确认-old", businessType = BusinessType.UPDATE)
+//    @Log(title = "市级评定结果确认-old", businessType = BusinessType.UPDATE)
-    @PutMapping("/municipalReview")
+//    @PutMapping("/municipalReview")
-    @Deprecated
+//    @Deprecated
-    public AjaxResult municipalReview(@RequestBody MunicipalReviewDto municipalReviewDto) {
+//    public AjaxResult municipalReview(@RequestBody MunicipalReviewDto municipalReviewDto) {
-        return success("市级评定结果确认成功" + bmsDeclarationRecordsService.municipalReview(municipalReviewDto) + "条数据");
+//        return success("市级评定结果确认成功" + bmsDeclarationRecordsService.municipalReview(municipalReviewDto) + "条数据");
-    }
+//    }
-
+
-    @Log(title = "市级评定结果确认-new", businessType = BusinessType.UPDATE)
+//    @Log(title = "市级评定结果确认-new", businessType = BusinessType.UPDATE)
-    @PutMapping("/municipalReviewNew")
+//    @PutMapping("/municipalReviewNew")
-    public AjaxResult municipalReviewNew(@RequestBody MunicipalReviewDto municipalReviewDto) {
+//    public AjaxResult municipalReviewNew(@RequestBody MunicipalReviewDto municipalReviewDto) {
-        return success("市级评定结果确认成功" + bmsDeclarationRecordsService.municipalReviewNew(municipalReviewDto) + "条数据");
+//        return success("市级评定结果确认成功" + bmsDeclarationRecordsService.municipalReviewNew(municipalReviewDto) + "条数据");
-    }
+//    }
 
 
     /**

ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsIndustrialInternetAwardController.java

@@ -10,6 +10,8 @@ import com.ruoyi.jjh.declaration.entity.BmsIndustrialInternetAward;
 import com.ruoyi.jjh.declaration.entity.dto.BmsIndustrialInternetAwardAddDto;
 import com.ruoyi.jjh.declaration.entity.dto.BmsIndustrialInternetAwardUpdateDto;
 import com.ruoyi.jjh.declaration.service.IBmsIndustrialInternetAwardService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -29,6 +31,7 @@ import java.util.List;
  * @author farben
  * @date 2023-08-25
  */
+@Api(tags = "5G+工业互联网奖补")
 @RestController
 @RequestMapping("/system/industrialInternetAward")
 public class BmsIndustrialInternetAwardController extends BaseController {
@@ -87,6 +90,17 @@ public class BmsIndustrialInternetAwardController extends BaseController {
         return toAjax(bmsIndustrialInternetAwardService.updateBmsIndustrialInternetAward(bmsIndustrialInternetAwardUpdateDto));
     }
 
+    /**
+     * 修改5G+工业互联网奖补（只做修改，不做逻辑）
+     */
+    @ApiOperation(value = "修改5G+工业互联网奖补（只做修改，不做逻辑）")
+//    @RequiresPermissions("system:industrialInternetAward:edit")
+    @Log(title = "修改5G+工业互联网奖补（只做修改，不做逻辑）", businessType = BusinessType.UPDATE)
+    @PutMapping("/update")
+    public AjaxResult update(@RequestBody BmsIndustrialInternetAward bmsIndustrialInternetAward) {
+        return toAjax(bmsIndustrialInternetAwardService.updateById(bmsIndustrialInternetAward));
+    }
+
     /**
      * 删除5G+工业互联网奖补
      */

ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsIndustrialInternetAward.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.jjh.common.entity.BaseInfoEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -14,12 +16,14 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * @author farben
  * @date 2023-08-25
  */
+@ApiModel("5G+工业互联网奖补对象")
 public class BmsIndustrialInternetAward extends BaseInfoEntity {
     private static final long serialVersionUID = 1L;
 
     /**
      * 主键id
      */
+    @ApiModelProperty("id")
     @JSONField(serialize = false)
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
@@ -27,6 +31,7 @@ public class BmsIndustrialInternetAward extends BaseInfoEntity {
     /**
      * 企业id
      */
+    @ApiModelProperty("企业id")
     @JSONField(serialize = false)
     @Excel(name = "企业id")
     private Long enterpriseId;
@@ -34,6 +39,7 @@ public class BmsIndustrialInternetAward extends BaseInfoEntity {
     /**
      * 荣誉名称
      */
+    @ApiModelProperty("荣誉名称")
     @JSONField(name = "荣誉名称")
     @Excel(name = "荣誉名称")
     private String honoraryName;
@@ -41,6 +47,7 @@ public class BmsIndustrialInternetAward extends BaseInfoEntity {
     /**
      * 证明材料
      */
+    @ApiModelProperty("证明材料")
     @JSONField(serialize = false)
     @Excel(name = "证明材料")
     private String material;
@@ -48,6 +55,7 @@ public class BmsIndustrialInternetAward extends BaseInfoEntity {
     /**
      * 是否删除：0，未删除；1，已删除
      */
+    @ApiModelProperty("是否删除：0，未删除；1，已删除")
     @JSONField(serialize = false)
     @Excel(name = "是否删除：0，未删除；1，已删除")
     private Long isDeleted;

ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsDeclarationRecordsService.java

@@ -104,4 +104,6 @@ public interface IBmsDeclarationRecordsService extends IService<BmsDeclarationRe
     public int updateProjectNameById(Long id, String projectName, Long projectId);
 
     public int updateDeclarationRecords(Long declarationId, Long projectId, String projectName, Long status);
+
+    String fileList(List<Long> list);
 }

ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsDeclarationRecordsServiceImpl.java

@@ -2,6 +2,8 @@ package com.ruoyi.jjh.declaration.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.context.SecurityContextHolder;
@@ -17,6 +19,7 @@ import com.ruoyi.jjh.declaration.mapper.BmsDeclarationRecordsMapper;
 import com.ruoyi.jjh.declaration.service.*;
 import com.ruoyi.jjh.ent.entity.JProject;
 import com.ruoyi.jjh.ent.service.JProjectService;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -58,7 +61,7 @@ public class BmsDeclarationRecordsServiceImpl extends ServiceImpl<BmsDeclaration
     private IBmsEnterpriseBasicInfoService iBmsEnterpriseBasicInfoService;
 
     @Resource
-    private JProjectService  jProjectService;
+    private JProjectService jProjectService;
 
     /**
      * 查询在线申报记录
@@ -238,14 +241,13 @@ public class BmsDeclarationRecordsServiceImpl extends ServiceImpl<BmsDeclaration
                 bmsDeclarationRecords.setStatus(7L);
             }
         } else if (bmsProcessInfo.getApprovalLevel().equals(2)) {
-            if (bmsApprovalInfoUpdateDto.getApprovalStatus() == 1) {
+//            if (bmsApprovalInfoUpdateDto.getApprovalStatus() == 1) {
-                jp.setStatus(4);
+//                jp.setStatus(4);
-                bmsDeclarationRecords.setStatus(4L);
+//                bmsDeclarationRecords.setStatus(4L);
-            } else {
+//            } else {
-                jp.setStatus(6);
+//                jp.setStatus(6);
-                bmsDeclarationRecords.setStatus(6L);
+//                bmsDeclarationRecords.setStatus(6L);
-            }
+//            }
-        } else if (bmsProcessInfo.getApprovalLevel().equals(3)) {
             if (bmsApprovalInfoUpdateDto.getApprovalStatus() == 1) {
                 jp.setStatus(5);
                 bmsDeclarationRecords.setStatus(5L);
@@ -254,6 +256,15 @@ public class BmsDeclarationRecordsServiceImpl extends ServiceImpl<BmsDeclaration
                 bmsDeclarationRecords.setStatus(9L);
             }
         }
+//        else if (bmsProcessInfo.getApprovalLevel().equals(3)) {
+//            if (bmsApprovalInfoUpdateDto.getApprovalStatus() == 1) {
+//                jp.setStatus(5);
+//                bmsDeclarationRecords.setStatus(5L);
+//            } else {
+//                jp.setStatus(9);
+//                bmsDeclarationRecords.setStatus(9L);
+//            }
+//        }
         jProjectService.updateById(jp);
         return baseMapper.updateById(bmsDeclarationRecords);
     }
@@ -571,4 +582,11 @@ public class BmsDeclarationRecordsServiceImpl extends ServiceImpl<BmsDeclaration
         bmsDeclarationRecords.setStatus(status);
         return baseMapper.updateById(bmsDeclarationRecords);
     }
+
+    @Override
+    public String fileList(List<Long> list) {
+        List<BmsDeclarationRecords> rd = baseMapper.selectBatchIds(list);
+        System.out.println(rd);
+        return null;
+    }
 }