指标分年度和季度分类

ims-common/pom.xml

@@ -51,6 +51,13 @@
             <groupId>org.apache.poi</groupId>
             <artifactId>poi-ooxml</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>com.belerweb</groupId>
+            <artifactId>pinyin4j</artifactId>
+            <version>2.5.0</version>
+        </dependency>
+
     </dependencies>
 
     <build>

ims-common/src/main/java/com/ims/common/utils/StringUtils.java

@@ -2,6 +2,7 @@ package com.ims.common.utils;
 
 import cn.hutool.core.text.StrBuilder;
 import cn.hutool.core.text.StrFormatter;
+import net.sourceforge.pinyin4j.PinyinHelper;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
@@ -517,4 +518,22 @@ public class StringUtils{
 	}
 
 
+//	public static void main(String[] args) {
+//		String chineseCharacter = "-你好";
+//
+//		StringBuilder initials = new StringBuilder();
+//		for (char c : chineseCharacter.toCharArray()) {
+//			String[] pinyinArray = PinyinHelper.toHanyuPinyinStringArray(c);
+//			if (pinyinArray != null && pinyinArray.length > 0) {
+//				String pinyin = pinyinArray[0];
+//				initials.append(pinyin.charAt(0));
+//			} else {
+//				initials.append(c);
+//			}
+//		}
+//		System.out.println(initials.toString().toUpperCase());
+//
+//	}
+
+
 }

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

@@ -64,8 +64,9 @@ public class IndicatorController {
 				  @RequestParam(value = "binSection", required = false) String binSection,
 				  @RequestParam(value = "binStage", required = false) String binStage,
 				  @RequestParam(value = "dept", required = false) String dept,
-				  @RequestParam(value = "company", required = false) String company) {
-		IPage<Indicator> list = iIndicatorService.list2(pageNum, pageSize, id, indicatorName, indicatorCode, binSection, binStage, dept, company);
+				  @RequestParam(value = "company", required = false) String company,
+				  @RequestParam(value = "evaluationCycle", required = false) String evaluationCycle) {
+		IPage<Indicator> list = iIndicatorService.list2(pageNum, pageSize, id, indicatorName, indicatorCode, binSection, binStage, dept, company,evaluationCycle);
 		return R.ok().data(list);
 	}
 
@@ -91,8 +92,9 @@ public class IndicatorController {
 		@RequestParam(value = "binSection", required = false) String binSection,
 		@RequestParam(value = "binStage", required = false) String binStage,
 		@RequestParam(value = "dept", required = false) String dept,
-		@RequestParam(value = "company", required = false) String company) {
-		List<Indicator> list = iIndicatorService.listAll(id, indicatorName, indicatorCode, binSection, binStage, dept, company);
+		@RequestParam(value = "company", required = false) String company,
+		@RequestParam(value = "evaluationCycle", required = false) String evaluationCycle) {
+		List<Indicator> list = iIndicatorService.listAll(id, indicatorName, indicatorCode, binSection, binStage, dept, company,evaluationCycle);
 		return R.ok().data(list);
 	}
 

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

@@ -25,22 +25,24 @@ public interface IndicatorMapper extends BaseMapper<Indicator> {
     Indicator selectByCode(@Param("code") String code);
 
 
-	IPage<Indicator> seleclistPage( Page page,@Param("id") String id,
-							@Param("indicatorName") String indicatorName,
-							@Param("indicatorCode")  String indicatorCode,
-							@Param("binSection") String binSection,
-							@Param("binStage") String binStage,
-							@Param("dept") String dept,
-							@Param("company") String company);
+	IPage<Indicator> seleclistPage(Page page, @Param("id") String id,
+								   @Param("indicatorName") String indicatorName,
+								   @Param("indicatorCode") String indicatorCode,
+								   @Param("binSection") String binSection,
+								   @Param("binStage") String binStage,
+								   @Param("dept") String dept,
+								   @Param("company") String company,
+								   @Param("evaluationCycle") String evaluationCycle);
 
 
 	List<Indicator> seleclistAll(@Param("id") String id,
-									@Param("indicatorName") String indicatorName,
-									@Param("indicatorCode")  String indicatorCode,
-									@Param("binSection") String binSection,
-									@Param("binStage") String binStage,
-									@Param("dept") String dept,
-									@Param("company") String company);
+								 @Param("indicatorName") String indicatorName,
+								 @Param("indicatorCode") String indicatorCode,
+								 @Param("binSection") String binSection,
+								 @Param("binStage") String binStage,
+								 @Param("dept") String dept,
+								 @Param("company") String company,
+								 @Param("evaluationCycle") String evaluationCycle);
 
 
 

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

@@ -1,6 +1,8 @@
 package com.ims.eval.entity;
 
 import java.math.BigDecimal;
+
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -49,5 +51,18 @@ public class 	CiteCalculationIndicator extends Model {
 	 */
 	private String binSection;
 
+	/**
+	 * 板块明
+	 */
+	@TableField(exist = false)
+	private String binSectionName;
+
+
+	/**
+	 * 周期（年度。季度/月）
+	 */
+	private String  evaluationCycle;
+
+
 
 }

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

@@ -154,5 +154,10 @@ public class Indicator extends Model {
 	@TableField(exist = false)
 	private String indicatorTypeName;
 
+	/**
+	 * 周期 （年、月/季度）
+	 */
+	private String evaluationCycle;
+
 
 }

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

@@ -21,9 +21,9 @@ public interface IIndicatorService extends IService<Indicator> {
 
 	IPage<Indicator> list(Integer pageNum, Integer pageSize, String id, String indicatorName, String indicatorCode, String binSection, String binStage, String dept, String company);
 
-	IPage<Indicator> list2(Integer pageNum, Integer pageSize, String id, String indicatorName, String indicatorCode, String binSection, String binStage, String dept, String company);
+	IPage<Indicator> list2(Integer pageNum, Integer pageSize, String id, String indicatorName, String indicatorCode, String binSection, String binStage, String dept, String company,String evaluationCycle);
 
-	List<Indicator> listAll(String id, String indicatorName, String indicatorCode, String binSection, String binStage, String dept, String company);
+	List<Indicator> listAll(String id, String indicatorName, String indicatorCode, String binSection, String binStage, String dept, String company,String evaluationCycle);
 
 	Indicator selectByCode(String indicatorCode);
 

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

@@ -11,13 +11,11 @@ import com.ims.eval.dao.IndicatorMapper;
 import com.ims.eval.config.CustomException;
 import com.ims.eval.entity.Indicator;
 import com.ims.eval.entity.IndicatorDictionary;
-import com.ims.eval.entity.YearOperatingCoefficient;
 import com.ims.eval.entity.dto.request.IndicatorDTO;
 import com.ims.eval.entity.dto.request.IndicatorDictionaryDTO;
 import com.ims.eval.entity.dto.response.IndicatorResDTO;
 import com.ims.eval.service.IIndicatorDictionaryService;
 import com.ims.eval.service.IIndicatorService;
-import io.swagger.models.auth.In;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -95,9 +93,9 @@ public class IndicatorServiceImpl extends ServiceImpl<IndicatorMapper, Indicator
 	}
 
 	@Override
-	public IPage<Indicator> list2(Integer pageNum, Integer pageSize, String id, String indicatorName, String indicatorCode, String binSection, String binStage, String dept, String company) {
+	public IPage<Indicator> list2(Integer pageNum, Integer pageSize, String id, String indicatorName, String indicatorCode, String binSection, String binStage, String dept, String company,String evaluationCycle) {
 		Page<Indicator> page = new Page<>(pageNum, pageSize);
-		IPage<Indicator> list = baseMapper.seleclistPage(page, id, indicatorName, indicatorCode, binSection, binStage, dept, company);
+		IPage<Indicator> list = baseMapper.seleclistPage(page, id, indicatorName, indicatorCode, binSection, binStage, dept, company,evaluationCycle);
 		List<Indicator> records = list.getRecords();
 		records.stream().forEach(r ->{
 			r.setDeptName(CacheContext.ddNameMap.get(r.getDeptId()));
@@ -106,9 +104,9 @@ public class IndicatorServiceImpl extends ServiceImpl<IndicatorMapper, Indicator
 	}
 
 	@Override
-	public List<Indicator> listAll(String id, String indicatorName, String indicatorCode, String binSection, String binStage, String dept, String company) {
+	public List<Indicator> listAll(String id, String indicatorName, String indicatorCode, String binSection, String binStage, String dept, String company,String evaluationCycle) {
 		QueryWrapper<Indicator> qw = new QueryWrapper<>();
-		List<Indicator> list = baseMapper.seleclistAll(id, indicatorName, indicatorCode, binSection, binStage, dept, company);
+		List<Indicator> list = baseMapper.seleclistAll(id, indicatorName, indicatorCode, binSection, binStage, dept, company,evaluationCycle);
 		return list;
 	}
 

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

@@ -93,7 +93,7 @@ public class OrganizationStructureServiceImpl extends ServiceImpl<OrganizationSt
 		List<OrganizationStructure> list = arr.toJavaList(OrganizationStructure.class);
 		list.addAll(list2);
 		List<OrganizationStructure> filteredList = list.stream()
-			.filter(structure -> structure.getType().equals("100")||structure.getType().equals("160")||structure.getType().equals("130")||structure.getType().equals("3"))
+			.filter(structure -> null != structure.getType() && (structure.getType().equals("100")||structure.getType().equals("160")||structure.getType().equals("130")||structure.getType().equals("3")))
 			.collect(Collectors.toList());
 
 		return filteredList;

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

@@ -6,8 +6,9 @@
     <select id="selectCiteCalculationIndicatorList" resultType="com.ims.eval.entity.CiteCalculationIndicator">
 
         select
-            *
+            cci.*,bs.section_name binSectionName
         from  cite_calculation_indicator cci
+        left join bin_section bs on cci.bin_section = bs.id
 
         <where>
             <if test="citeCalculationName !=null and citeCalculationName !=''">
@@ -19,6 +20,7 @@
             </if>
 
         </where>
+        order by cci.order_num asc
     </select>
 
 

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

@@ -82,6 +82,11 @@
                 AND i.company = #{company}
             </if>
 
+            <if test="evaluationCycle !=null and evaluationCycle !=''">
+                AND i.evaluation_cycle = #{evaluationCycle}
+            </if>
+
+
         </where>
 
         order by  i.order_num asc
@@ -167,6 +172,10 @@
                 AND i.company = #{company}
             </if>
 
+            <if test="evaluationCycle !=null and evaluationCycle !=''">
+                AND i.evaluation_cycle = #{evaluationCycle}
+            </if>
+
         </where>
 
     </select>