项目库标准详情
This commit is contained in:
caozhen
+52
-8
@@ -66,6 +66,11 @@ public class LawsAssessController extends JeroController<LawsAssess, ILawsAssess
|
||||
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
||||
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
String projectId = lawsAssess.getProjectId();
|
||||
if (StringUtils.isBlank(projectId)){
|
||||
return Result.error("请在项目内查询!");
|
||||
}
|
||||
lawsAssess.setDelFlag("0");
|
||||
IPage<LawsAssess> pageList = lawsAssessService.queryPage(lawsAssess, pageNo, pageSize, req);
|
||||
this.assignment(pageList.getRecords());
|
||||
return Result.OK(pageList);
|
||||
@@ -112,14 +117,29 @@ public class LawsAssessController extends JeroController<LawsAssess, ILawsAssess
|
||||
return Result.error("请至少选择一个标准进行调取!");
|
||||
}
|
||||
//查询当前项目已绑定的标准，为了不造成重复绑定
|
||||
List<LawsAssess> assessArrayList = lawsAssessService.getAllByProjectId(lawsAssessAddVo.getProjectId());
|
||||
List<String> collect = assessArrayList.stream().map(LawsAssess::getStandardId).distinct().collect(Collectors.toList());
|
||||
//查询该项目下所有未删除的标准
|
||||
List<LawsAssess> allByProjectIdNotDeleted = lawsAssessService.getAllByProjectIdNotDeleted(lawsAssessAddVo.getProjectId());
|
||||
List<String> allByProjectIdNotDeletedIdList = allByProjectIdNotDeleted.stream().map(LawsAssess::getStandardId).distinct().collect(Collectors.toList());
|
||||
//查询该项目下所有删除的标准
|
||||
List<LawsAssess> allByProjectIdDeleted = lawsAssessService.getAllByProjectIdDeleted(lawsAssessAddVo.getProjectId());
|
||||
List<String> allByProjectIdDeletedIdList = allByProjectIdDeleted.stream().map(LawsAssess::getStandardId).distinct().collect(Collectors.toList());
|
||||
|
||||
Date now = new Date();
|
||||
List<LawsAssess> lawsAssesses = new ArrayList<>();
|
||||
if (StringUtils.isNotBlank(domesticStandardId)){
|
||||
List<String> asList = Arrays.asList(domesticStandardId.split(","));
|
||||
for (String id : asList) {
|
||||
if (collect.contains(id)){
|
||||
if (allByProjectIdNotDeletedIdList.contains(id)){
|
||||
//如果已存在跳过新增
|
||||
continue;
|
||||
}
|
||||
if (allByProjectIdDeletedIdList.contains(id)){
|
||||
//如果已删除则恢复未删除状态
|
||||
LawsAssess lawsAssess = lawsAssessService.getById(id);
|
||||
lawsAssess.setDelFlag("0");
|
||||
lawsAssess.setCreateTime(now);
|
||||
lawsAssess.setUpdateTime(now);
|
||||
lawsAssessService.updateById(lawsAssess);
|
||||
continue;
|
||||
}
|
||||
LawsAssess lawsAssess = new LawsAssess();
|
||||
@@ -138,7 +158,17 @@ public class LawsAssessController extends JeroController<LawsAssess, ILawsAssess
|
||||
if (StringUtils.isNotBlank(overseasStandardId)){
|
||||
List<String> asList = Arrays.asList(overseasStandardId.split(","));
|
||||
for (String id : asList) {
|
||||
if (collect.contains(id)){
|
||||
if (allByProjectIdNotDeletedIdList.contains(id)){
|
||||
//如果已存在跳过新增
|
||||
continue;
|
||||
}
|
||||
if (allByProjectIdDeletedIdList.contains(id)){
|
||||
//如果已删除则恢复未删除状态
|
||||
LawsAssess lawsAssess = lawsAssessService.getById(id);
|
||||
lawsAssess.setDelFlag("0");
|
||||
lawsAssess.setCreateTime(now);
|
||||
lawsAssess.setUpdateTime(now);
|
||||
lawsAssessService.updateById(lawsAssess);
|
||||
continue;
|
||||
}
|
||||
LawsAssess lawsAssess = new LawsAssess();
|
||||
@@ -174,12 +204,25 @@ public class LawsAssessController extends JeroController<LawsAssess, ILawsAssess
|
||||
}
|
||||
Date now = new Date();
|
||||
List<LawsAssess> lawsAssesses = new ArrayList<>();
|
||||
List<LawsAssess> assessArrayList = lawsAssessService.getAllByProjectId(lawsAssessAddVo.getProjectId());
|
||||
List<String> collect = assessArrayList.stream().map(LawsAssess::getStandardId).distinct().collect(Collectors.toList());
|
||||
List<LawsAssess> copyAssessArrayList = lawsAssessService.getAllByProjectId(copyProjectId);
|
||||
List<LawsAssess> allByProjectIdNotDeleted = lawsAssessService.getAllByProjectIdNotDeleted(lawsAssessAddVo.getProjectId());
|
||||
List<LawsAssess> allByProjectIdDeleted = lawsAssessService.getAllByProjectIdDeleted(lawsAssessAddVo.getProjectId());
|
||||
List<String> allByProjectIdNotDeletedIdList = allByProjectIdNotDeleted.stream().map(LawsAssess::getStandardId).distinct().collect(Collectors.toList());
|
||||
List<String> allByProjectIdDeletedIdList = allByProjectIdDeleted.stream().map(LawsAssess::getStandardId).distinct().collect(Collectors.toList());
|
||||
//获取要拷贝项目的未删除标准
|
||||
List<LawsAssess> copyAssessArrayList = lawsAssessService.getAllByProjectIdNotDeleted(copyProjectId);
|
||||
for (LawsAssess lawsAssess : copyAssessArrayList) {
|
||||
String standardId = lawsAssess.getStandardId();
|
||||
if (collect.contains(standardId)){
|
||||
if (allByProjectIdNotDeletedIdList.contains(standardId)){
|
||||
//如果已存在跳过新增
|
||||
continue;
|
||||
}
|
||||
if (allByProjectIdDeletedIdList.contains(standardId)){
|
||||
//如果已删除则恢复未删除状态
|
||||
LawsAssess assess = lawsAssessService.getById(standardId);
|
||||
assess.setDelFlag("0");
|
||||
assess.setCreateTime(now);
|
||||
assess.setUpdateTime(now);
|
||||
lawsAssessService.updateById(assess);
|
||||
continue;
|
||||
}
|
||||
LawsAssess assess = new LawsAssess();
|
||||
@@ -203,6 +246,7 @@ public class LawsAssessController extends JeroController<LawsAssess, ILawsAssess
|
||||
|
||||
/**
|
||||
* 通过id删除
|
||||
* 同步删除未符合项、专项项目库；
|
||||
*/
|
||||
@AutoLog(value = "项目-标准评估-通过id删除")
|
||||
@ApiOperation(value="项目-标准评估-通过id删除", notes="项目-标准评估-通过id删除")
|
||||
|
||||
-133
@@ -1,26 +1,17 @@
|
||||
package com.jero.modules.projectLibrary.controller;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import com.jero.common.api.vo.Result;
|
||||
import com.jero.modules.projectLibrary.entity.LawsAssessResults;
|
||||
import com.jero.modules.projectLibrary.service.ILawsAssessResultsService;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import com.jero.common.system.base.controller.JeroController;
|
||||
import org.apache.ibatis.annotations.Results;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import com.jero.common.aspect.annotation.AutoLog;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.apache.poi.ss.formula.functions.T;
|
||||
|
||||
|
||||
/**
|
||||
@@ -39,12 +30,6 @@ public class LawsAssessResultsController extends JeroController<LawsAssessResult
|
||||
|
||||
/**
|
||||
* 分页列表查询
|
||||
*
|
||||
* @param lawsAssessResults
|
||||
* @param pageNo
|
||||
* @param pageSize
|
||||
* @param req
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "标准评估结果-分页列表查询")
|
||||
@ApiOperation(value="标准评估结果-分页列表查询", notes="标准评估结果-分页列表查询")
|
||||
@@ -56,122 +41,4 @@ public class LawsAssessResultsController extends JeroController<LawsAssessResult
|
||||
IPage<LawsAssessResults> pageList = lawsAssessResultsService.queryPage(lawsAssessResults, pageNo, pageSize, req);
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
||||
/**
|
||||
* 列表查询
|
||||
*
|
||||
* @param lawsAssessResults
|
||||
* @param req
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "标准评估结果-列表查询")
|
||||
@ApiOperation(value="标准评估结果-列表查询", notes="标准评估结果-列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<List<LawsAssessResults>> queryList(LawsAssessResults lawsAssessResults, HttpServletRequest req) {
|
||||
List<LawsAssessResults> list = lawsAssessResultsService.queryList(lawsAssessResults, req);
|
||||
return Result.OK(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 添加
|
||||
*
|
||||
* @param lawsAssessResults
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "标准评估结果-添加")
|
||||
@ApiOperation(value="标准评估结果-添加", notes="标准评估结果-添加")
|
||||
@PostMapping(value = "/add")
|
||||
public Result<T> add(@Validated @RequestBody LawsAssessResults lawsAssessResults) {
|
||||
lawsAssessResultsService.add(lawsAssessResults);
|
||||
return Result.OK("操作成功!");
|
||||
}
|
||||
|
||||
/**
|
||||
* 编辑
|
||||
*
|
||||
* @param lawsAssessResults
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "标准评估结果-编辑")
|
||||
@ApiOperation(value="标准评估结果-编辑", notes="标准评估结果-编辑")
|
||||
@PostMapping(value = "/edit")
|
||||
public Result<T> edit(@Validated @RequestBody LawsAssessResults lawsAssessResults) {
|
||||
lawsAssessResultsService.editById(lawsAssessResults);
|
||||
return Result.OK("操作成功!");
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过id删除
|
||||
*
|
||||
* @param map
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "标准评估结果-通过id删除")
|
||||
@ApiOperation(value="标准评估结果-通过id删除", notes="标准评估结果-通过id删除")
|
||||
@PostMapping(value = "/delete")
|
||||
public Result<T> delete(@RequestBody Map<String, String> map) {
|
||||
if(!map.containsKey("id") || StringUtils.isEmpty(map.get("id"))){
|
||||
return Result.error("请选择数据!");
|
||||
}
|
||||
lawsAssessResultsService.deleteById(map.get("id"));
|
||||
return Result.OK("删除成功!");
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除
|
||||
*
|
||||
* @param map
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "标准评估结果-批量删除")
|
||||
@ApiOperation(value="标准评估结果-批量删除", notes="标准评估结果-批量删除")
|
||||
@PostMapping(value = "/deleteBatch")
|
||||
public Result<T> deleteBatch(@RequestBody Map<String, String> map) {
|
||||
if(!map.containsKey("ids") || StringUtils.isEmpty(map.get("ids"))){
|
||||
return Result.error("请选择数据!");
|
||||
}
|
||||
this.lawsAssessResultsService.deleteByIds(Arrays.asList(map.get("ids").split(",")));
|
||||
return Result.OK("批量删除成功!");
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过id查询
|
||||
*
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "标准评估结果-通过id查询")
|
||||
@ApiOperation(value="标准评估结果-通过id查询", notes="标准评估结果-通过id查询")
|
||||
@GetMapping(value = "/queryById")
|
||||
public Result<LawsAssessResults> queryById(@RequestParam(name="id",required=true) String id) {
|
||||
LawsAssessResults lawsAssessResults = lawsAssessResultsService.queryById(id);
|
||||
if(lawsAssessResults==null) {
|
||||
return Result.error("未找到对应数据");
|
||||
}
|
||||
return Result.OK(lawsAssessResults);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出excel
|
||||
*
|
||||
* @param request
|
||||
* @param lawsAssessResults
|
||||
*/
|
||||
@RequestMapping(value = "/exportXls")
|
||||
public ModelAndView exportXls(HttpServletRequest request, LawsAssessResults lawsAssessResults) {
|
||||
return super.exportXls(request, lawsAssessResults, LawsAssessResults.class, "标准评估结果");
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过excel导入数据
|
||||
*
|
||||
* @param request
|
||||
* @param response
|
||||
* @return
|
||||
*/
|
||||
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
|
||||
public Result<LawsAssessResults> importExcel(HttpServletRequest request, HttpServletResponse response) {
|
||||
return super.importExcel(request, response, LawsAssessResults.class);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user