年度k值系数

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

@@ -3,19 +3,14 @@ package com.ims.eval.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.ims.eval.config.CustomException;
-import com.ims.eval.entity.Indicator;
 import com.ims.eval.entity.YearGroupCoefficient;
-import com.ims.eval.entity.dto.request.IndicatorDictionaryDTO;
 import com.ims.eval.entity.dto.request.YearGroupCoefficientDTO;
 import com.ims.eval.entity.dto.result.R;
-import com.ims.eval.service.IIndicatorDictionaryService;
-import com.ims.eval.service.IIndicatorService;
 import com.ims.eval.service.IYearGroupCoefficientService;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
@@ -154,4 +149,18 @@ public class YearGroupCoefficientController {
 		}
 	}
 
+
+
+	/**
+	 * 查询byid
+	 * @param id
+	 * @return
+	 */
+	//@ImsPreAuth("eval:dataDictionary:view")
+	@GetMapping(value = "listById")
+	public R listById(@RequestParam(value = "id", required = true) String id) {
+		YearGroupCoefficientDTO dto = yearGroupCoefficientService.getById( id);
+		return R.ok().data(dto);
+	}
+
 }

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

@@ -4,10 +4,15 @@ package com.ims.eval.controller;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.ims.eval.config.CustomException;
 import com.ims.eval.entity.Indicator;
+import com.ims.eval.entity.YearGroupCoefficient;
+import com.ims.eval.entity.YearOperatingCoefficient;
 import com.ims.eval.entity.dto.request.IndicatorDictionaryDTO;
+import com.ims.eval.entity.dto.request.YearGroupCoefficientDTO;
 import com.ims.eval.entity.dto.result.R;
 import com.ims.eval.service.IIndicatorDictionaryService;
 import com.ims.eval.service.IIndicatorService;
+import com.ims.eval.service.IYearGroupCoefficientService;
+import com.ims.eval.service.IYearOperatingCoefficientService;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -18,7 +23,7 @@ import java.util.List;
 
 /**
  * <p>
- * 年度经营业绩系数 前端控制器
+ * 年度经营业绩系数明细 前端控制器
  * </p>
  *
  * @author wang
@@ -29,6 +34,108 @@ import java.util.List;
 public class YearOperatingCoefficientController {
 
 
+	@Autowired
+	private IYearOperatingCoefficientService yearOperatingCoefficientService;
 
 
+	/**
+	 * year
+	 * @param pageNum
+	 * @param pageSize
+	 * @param id
+	 * @param organizationName
+	 * @param organizationId
+	 * @param yearGroupCoefficientId
+	 * @param binSection
+	 * @param year
+	 * @return
+	 */
+	//@ImsPreAuth("eval:yearOperatingCoefficient:view")
+	@GetMapping(value = "list")
+	public R list(@RequestParam(value = "pageNum") Integer pageNum,
+				  @RequestParam(value = "pageSize") Integer pageSize,
+				  @RequestParam(value = "id", required = false) String id,
+				  @RequestParam(value = "organizationName", required = false) String organizationName,
+				  @RequestParam(value = "organizationId", required = false) String organizationId,
+				  @RequestParam(value = "yearGroupCoefficientId", required = false) String yearGroupCoefficientId,
+				  @RequestParam(value = "binSection", required = false) String binSection,
+				  @RequestParam(value = "year", required = false) String year) {
+		IPage<YearOperatingCoefficient> list = yearOperatingCoefficientService.list(pageNum, pageSize, id, organizationName, organizationId, yearGroupCoefficientId, binSection,year);
+		return R.ok().data(list);
+	}
+
+	/**
+	 * 查询所有数据
+	 * @param id
+	 * @param organizationName
+	 * @param organizationId
+	 * @param yearGroupCoefficientId
+	 * @param binSection
+	 * @param year
+	 * @return
+	 */
+	//@ImsPreAuth("eval:yearOperatingCoefficient:view")
+	@GetMapping(value = "listAll")
+	public R listAll(
+		@RequestParam(value = "id", required = false) String id,
+		@RequestParam(value = "organizationName", required = false) String organizationName,
+		@RequestParam(value = "organizationId", required = false) String organizationId,
+		@RequestParam(value = "yearGroupCoefficientId", required = false) String yearGroupCoefficientId,
+		@RequestParam(value = "binSection", required = false) String binSection,
+		@RequestParam(value = "year", required = false) String year) {
+		List<YearOperatingCoefficient> list = yearOperatingCoefficientService.listAll(id, organizationName, organizationId, yearGroupCoefficientId, binSection,year);
+		return R.ok().data(list);
+	}
+
+
+
+
+	/**
+	 * 添加
+	 *
+	 * @param yearOperatingCoefficient
+	 * @return
+	 */
+
+	//@ImsPreAuth("eval:yearOperatingCoefficient:edit")
+	@PostMapping(value = "/save")
+	@ApiOperation(value = "新增(修改)", notes = "新增（修改）")
+	public R addAll(@RequestBody YearOperatingCoefficient yearOperatingCoefficient) {
+
+		try {
+			boolean b = yearOperatingCoefficientService.saveOrUpdate(yearOperatingCoefficient);
+			if (b) {
+				return R.ok().data(b);
+			} else {
+				return R.error().data("保存失败！");
+			}
+		} catch (CustomException e){
+			return R.customError(e.getMessage()).data("失败！");
+		}
+	}
+
+
+
+
+
+
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	//@ImsPreAuth("eval:yearOperatingCoefficient:remove")
+	@PostMapping(value = "/remove/{ids}")
+	@ApiOperation(value = "删除", notes = "删除")
+	public R deleteAll(@PathVariable("ids") String ids) {
+		String[] strings = ids.split(",");
+		boolean b = yearOperatingCoefficientService.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/YearGroupCoefficientMapper.java

@@ -2,6 +2,10 @@ package com.ims.eval.dao;
 
 import com.ims.eval.entity.YearGroupCoefficient;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ims.eval.entity.dto.request.YearGroupCoefficientDTO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +17,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface YearGroupCoefficientMapper extends BaseMapper<YearGroupCoefficient> {
 
+	YearGroupCoefficientDTO selectById(@Param("id") String id);
+
 }

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

@@ -23,4 +23,7 @@ public interface IYearGroupCoefficientService extends IService<YearGroupCoeffici
 
 	boolean saveGroup(YearGroupCoefficientDTO coefficientDTO);
 
+	YearGroupCoefficientDTO getById(String id);
+
+
 }

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

@@ -1,8 +1,11 @@
 package com.ims.eval.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.ims.eval.entity.YearOperatingCoefficient;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 年度经营业绩系数 服务类
@@ -13,4 +16,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IYearOperatingCoefficientService extends IService<YearOperatingCoefficient> {
 
+	IPage<YearOperatingCoefficient> list(Integer pageNum, Integer pageSize, String id, String organizationName,String organizationId,String yearGroupCoefficientId,String binSection,String year);
+
+	List<YearOperatingCoefficient> listAll(String id, String organizationName, String organizationId, String yearGroupCoefficientId, String binSection, String year);
+
 }

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ims.common.utils.StringUtils;
 import com.ims.eval.cache.CacheContext;
 import com.ims.eval.config.CustomException;
+import com.ims.eval.dao.YearOperatingCoefficientMapper;
 import com.ims.eval.entity.Indicator;
 import com.ims.eval.entity.YearGroupCoefficient;
 import com.ims.eval.dao.YearGroupCoefficientMapper;
@@ -18,6 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
 import java.io.Serializable;
 import java.util.Collection;
 import java.util.Date;
@@ -39,6 +41,11 @@ public class YearGroupCoefficientServiceImpl extends ServiceImpl<YearGroupCoeffi
 	@Autowired
 	private IYearOperatingCoefficientService yearOperatingCoefficientService;
 
+
+
+	@Resource
+	private YearOperatingCoefficientMapper yearOperatingCoefficientMapper;
+
 	@Override
 	public IPage<YearGroupCoefficient> list(Integer pageNum, Integer pageSize, String id, String coefficientCode, String year, String createOrgName, String createBy) {
 
@@ -136,6 +143,17 @@ public class YearGroupCoefficientServiceImpl extends ServiceImpl<YearGroupCoeffi
 	}
 
 
+	@Override
+	public YearGroupCoefficientDTO getById(String id) {
+		YearGroupCoefficientDTO byid = baseMapper.selectById(id);
+		QueryWrapper<YearOperatingCoefficient> qw = new QueryWrapper<>();
+		qw.lambda().eq(YearOperatingCoefficient::getYearGroupCoefficientId, id);
+		List<YearOperatingCoefficient> coefficientList = yearOperatingCoefficientMapper.selectList(qw);
+		byid.setCoefficientList(coefficientList);
+		return byid;
+	}
+
+
 	@Transactional
 	@Override
 	public boolean saveOrUpdate(YearGroupCoefficient entity) {

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

@@ -1,11 +1,19 @@
 package com.ims.eval.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ims.common.utils.StringUtils;
+import com.ims.eval.config.CustomException;
+import com.ims.eval.entity.YearGroupCoefficient;
 import com.ims.eval.entity.YearOperatingCoefficient;
 import com.ims.eval.dao.YearOperatingCoefficientMapper;
 import com.ims.eval.service.IYearOperatingCoefficientService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 年度经营业绩系数 服务实现类
@@ -17,4 +25,68 @@ import org.springframework.stereotype.Service;
 @Service
 public class YearOperatingCoefficientServiceImpl extends ServiceImpl<YearOperatingCoefficientMapper, YearOperatingCoefficient> implements IYearOperatingCoefficientService {
 
+	@Override
+	public IPage<YearOperatingCoefficient> list(Integer pageNum, Integer pageSize, String id, String organizationName, String organizationId, String yearGroupCoefficientId, String binSection, String year) {
+		QueryWrapper<YearOperatingCoefficient> qw = new QueryWrapper<>();
+		if (null == pageNum || null == pageSize) {
+			throw new CustomException("分页参数为空");
+		}
+		//构造分页构造器
+		Page<YearOperatingCoefficient> page = new Page<>(pageNum, pageSize);
+
+		if (StringUtils.isNotEmpty(id)) {
+			qw.lambda().eq(YearOperatingCoefficient::getId, id);
+		}
+
+		if (StringUtils.isNotEmpty(organizationName)) {
+			qw.lambda().like(YearOperatingCoefficient::getOrganizationName, organizationName);
+		}
+		if (StringUtils.isNotEmpty(organizationId)) {
+			qw.lambda().eq(YearOperatingCoefficient::getOrganizationId, organizationId);
+		}
+		if (StringUtils.isNotEmpty(yearGroupCoefficientId)) {
+			qw.lambda().eq(YearOperatingCoefficient::getYearGroupCoefficientId, yearGroupCoefficientId);
+		}
+		if (StringUtils.isNotEmpty(binSection)) {
+			qw.lambda().eq(YearOperatingCoefficient::getBinSection, binSection);
+		}
+
+		if (StringUtils.isNotEmpty(year)) {
+			qw.lambda().eq(YearOperatingCoefficient::getYear, year);
+		}
+
+		IPage<YearOperatingCoefficient> list = baseMapper.selectPage(page, qw);
+
+		return list;
+	}
+
+	@Override
+	public List<YearOperatingCoefficient> listAll(String id, String organizationName, String organizationId, String yearGroupCoefficientId, String binSection, String year) {
+
+		QueryWrapper<YearOperatingCoefficient> qw = new QueryWrapper<>();
+
+		if (StringUtils.isNotEmpty(id)) {
+			qw.lambda().eq(YearOperatingCoefficient::getId, id);
+		}
+
+		if (StringUtils.isNotEmpty(organizationName)) {
+			qw.lambda().like(YearOperatingCoefficient::getOrganizationName, organizationName);
+		}
+		if (StringUtils.isNotEmpty(organizationId)) {
+			qw.lambda().eq(YearOperatingCoefficient::getOrganizationId, organizationId);
+		}
+		if (StringUtils.isNotEmpty(yearGroupCoefficientId)) {
+			qw.lambda().eq(YearOperatingCoefficient::getYearGroupCoefficientId, yearGroupCoefficientId);
+		}
+		if (StringUtils.isNotEmpty(binSection)) {
+			qw.lambda().eq(YearOperatingCoefficient::getBinSection, binSection);
+		}
+
+		if (StringUtils.isNotEmpty(year)) {
+			qw.lambda().eq(YearOperatingCoefficient::getYear, year);
+		}
+		List<YearOperatingCoefficient> list = baseMapper.selectList( qw);
+
+		return list;
+	}
 }

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

@@ -25,4 +25,14 @@
         id, coefficient_code, create_org_name, create_org_id, year, month, state, create_time, update_time, create_by, update_by, remark, des, order_num
     </sql>
 
+    <select id="selectById" resultType="com.ims.eval.entity.dto.request.YearGroupCoefficientDTO">
+        SELECT
+            *
+        FROM
+            year_group_coefficient
+        where id = #{id}
+
+
+    </select>
+
 </mapper>