代码提交

ims-service/ims-eval/src/main/java/com/ims/eval/controller/BinStageController.java

@@ -48,7 +48,7 @@ public class BinStageController {
 				  @RequestParam(value = "type", required = false) String type) {
 		List<BinStage> list =null;
 		if(null != type&&type.length()>0){
-			 list =CacheContext.bseList.stream().filter(t->t.getType().equals(type)).collect(Collectors.toList());;
+			 list =CacheContext.bseList.stream().filter(t->t.getType().equals(type)).collect(Collectors.toList());
 		}else {
 			list =CacheContext.bseList;
 		}

ims-service/ims-eval/src/main/java/com/ims/eval/controller/CiteCalculationIndicatorController.java

@@ -1,9 +1,16 @@
 package com.ims.eval.controller;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.ims.eval.config.CustomException;
+import com.ims.eval.entity.CiteCalculationIndicator;
+import com.ims.eval.entity.dto.result.R;
+import com.ims.eval.service.ICiteCalculationIndicatorService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 
-import org.springframework.web.bind.annotation.RestController;
+import java.util.Arrays;
+import java.util.List;
 
 /**
  * <p>
@@ -17,4 +24,79 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("//cite-calculation-indicator")
 public class CiteCalculationIndicatorController {
 
+	@Autowired
+	private ICiteCalculationIndicatorService citeCalculationIndicatorService;
+
+
+	/**
+	 * 查询
+	 *
+	 * @param citeCalculationName 组合名称
+	 * @param binSection          板块id
+	 * @return
+	 */
+	//@ImsPreAuth("eval:binStage:view")
+	@GetMapping(value = "list")
+	public R list(
+		@RequestParam(value = "pageNum") Integer pageNum,
+		@RequestParam(value = "pageSize") Integer pageSize,
+		@RequestParam(value = "citeCalculationName", required = false) String citeCalculationName,
+		@RequestParam(value = "binSection", required = false) String binSection) {
+		List<CiteCalculationIndicator> list = null;
+
+		try {
+
+			list = citeCalculationIndicatorService.getCiteCalculationIndicatorList(pageNum,pageSize,citeCalculationName, binSection);
+
+			return R.ok().data(list);
+		} catch (Exception e) {
+			e.printStackTrace();
+			return R.error().data("失败！");
+		}
+	}
+
+
+	/**
+	 * 添加
+	 *
+	 * @param citeCalculationIndicator
+	 * @return
+	 */
+
+	@PostMapping(value = "/save")
+	@ApiOperation(value = "新增(修改)", notes = "新增（修改）")
+	public R addAll(@RequestBody CiteCalculationIndicator citeCalculationIndicator) {
+
+		try {
+			boolean b = citeCalculationIndicatorService.saveOrUpdate(citeCalculationIndicator);
+			if (b) {
+				return R.ok().data(b);
+			} else {
+				return R.error().data("保存失败！");
+			}
+		} catch (CustomException e) {
+			return R.customError(e.getMessage()).data("失败！");
+		}
+	}
+
+
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@PostMapping(value = "/remove/{ids}")
+	@ApiOperation(value = "删除", notes = "删除")
+	public R deleteAll(@PathVariable("ids") String ids) {
+		String[] strings = ids.split(",");
+		boolean b = citeCalculationIndicatorService.removeByIds(Arrays.asList(strings));
+		if (b) {
+			return R.ok().data(b);
+		} else {
+			return R.error().data("删除失败！");
+		}
+	}
+
+
 }

ims-service/ims-eval/src/main/java/com/ims/eval/dao/CiteCalculationIndicatorMapper.java

@@ -1,7 +1,12 @@
 package com.ims.eval.dao;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ims.eval.entity.CiteCalculationIndicator;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -13,4 +18,13 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface CiteCalculationIndicatorMapper extends BaseMapper<CiteCalculationIndicator> {
 
+
+	List<CiteCalculationIndicator> selectCiteCalculationIndicatorList(Page page,
+																	  @Param("citeCalculationName") String citeCalculationName,
+																	  @Param("binSection") String binSection);
+
+
+	List<Map> selectListLikeIndicatorIds(@Param("indicatorIds") String indicatorIds);
+
+
 }

ims-service/ims-eval/src/main/java/com/ims/eval/entity/CiteCalculationIndicator.java

@@ -15,7 +15,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class CiteCalculationIndicator extends Model {
+public class 	CiteCalculationIndicator extends Model {
 
     private static final long serialVersionUID = 1L;
 
@@ -35,14 +35,19 @@ public class CiteCalculationIndicator extends Model {
     private String indicatorNames;
 
     /**
-     * 描述
+     * 组合名称描述
      */
-    private String des;
+    private String citeCalculationName;
 
     /**
      * 排序
      */
     private BigDecimal orderNum;
 
+	/**
+	 * 板块
+	 */
+	private String binSection;
+
 
 }

ims-service/ims-eval/src/main/java/com/ims/eval/service/ICiteCalculationIndicatorService.java

@@ -2,6 +2,9 @@ package com.ims.eval.service;
 
 import com.ims.eval.entity.CiteCalculationIndicator;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.ims.eval.entity.DataDictionary;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +16,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ICiteCalculationIndicatorService extends IService<CiteCalculationIndicator> {
 
+
+	List<CiteCalculationIndicator> getCiteCalculationIndicatorList(Integer pageNum, Integer pageSize,String citeCalculationName, String binSection);
+
 }

ims-service/ims-eval/src/main/java/com/ims/eval/service/impl/CiteCalculationIndicatorServiceImpl.java

@@ -1,11 +1,17 @@
 package com.ims.eval.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ims.eval.config.CustomException;
 import com.ims.eval.entity.CiteCalculationIndicator;
 import com.ims.eval.dao.CiteCalculationIndicatorMapper;
+import com.ims.eval.entity.Indicator;
 import com.ims.eval.service.ICiteCalculationIndicatorService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 板块组合指标计算 服务实现类
@@ -17,4 +23,21 @@ import org.springframework.stereotype.Service;
 @Service
 public class CiteCalculationIndicatorServiceImpl extends ServiceImpl<CiteCalculationIndicatorMapper, CiteCalculationIndicator> implements ICiteCalculationIndicatorService {
 
+	@Override
+	public List<CiteCalculationIndicator> getCiteCalculationIndicatorList(Integer pageNum, Integer pageSize,String citeCalculationName, String binSection) {
+		QueryWrapper<Indicator> qw = new QueryWrapper<>();
+		if (null == pageNum || null == pageSize) {
+			throw new CustomException("分页参数为空");
+		}
+		//构造分页构造器
+		Page<Indicator> page = new Page<>(pageNum, pageSize);
+
+		List<CiteCalculationIndicator> list  = baseMapper.selectCiteCalculationIndicatorList(page,citeCalculationName,binSection);
+		return list;
+	}
+
+	@Override
+	public boolean saveOrUpdate(CiteCalculationIndicator entity) {
+		return super.saveOrUpdate(entity);
+	}
 }

ims-service/ims-eval/src/main/resources/mappers/CiteCalculationIndicatorMapper.xml

@@ -3,6 +3,35 @@
 <mapper namespace="com.ims.eval.dao.CiteCalculationIndicatorMapper">
 
 
+    <select id="selectCiteCalculationIndicatorList" resultType="com.ims.eval.entity.CiteCalculationIndicator">
 
+        select
+            *
+        from  cite_calculation_indicator cci
 
+        <where>
+            <if test="citeCalculationName !=null and citeCalculationName !=''">
+                cci.cite_calculation_name like   CONCAT('%',#{citeCalculationName},'%')
+            </if>
+
+            <if test="binSection !=null and binSection !=''">
+                and cci.bin_section  = #{binSection}
+            </if>
+
+        </where>
+    </select>
+
+    <select id="selectListLikeIndicatorIds" resultType="java.util.Map">
+
+        SELECT concat(bs.section_name, ',', '') as indicator_names,
+        i.id indicator_id,cci.section_name,cci.cite_calculation_name
+        FROM cite_calculation_indicator cci
+        JOIN LATERAL unnest(string_to_array(cci.indicator_ids, ',')) AS indicator_id ON TRUE
+        JOIN indicator i ON i.id = indicator_id
+        LEFT JOIN bin_section bs on bs.id = i.bin_section
+        <where>
+            and cci.indicator_ids like   CONCAT('%',#{indicatorIds},'%')
+        </where>
+
+    </select>
 </mapper>