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

@@ -2,17 +2,22 @@ package com.ims.eval.controller;
 
 
 import com.ims.eval.config.CustomException;
+import com.ims.eval.entity.OrganizationEvaluationInfo;
 import com.ims.eval.entity.ResponsibilityIndicatorInfo;
 import com.ims.eval.entity.dto.request.ResponsibilityIndicatorInfoUpdateDTO;
 import com.ims.eval.entity.dto.result.R;
 import com.ims.eval.service.IResponsibilityIndicatorInfoService;
+import com.ims.eval.util.ExcelUtil;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.log4j.Log4j2;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
+import java.io.InputStream;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -149,4 +154,42 @@ public class ResponsibilityIndicatorInfoController {
 		}
 	}
 
+
+	@PostMapping(value = "/import")
+	@ResponseBody
+	public R importAlertrule(@RequestParam("file") MultipartFile file, HttpServletRequest request) {
+
+		if (!file.isEmpty()) {
+			try {
+				//获取原始的文件名
+				String originalFilename = file.getOriginalFilename();
+				//获取文件类型
+				String fileType = originalFilename.substring(originalFilename.lastIndexOf(".") + 1, originalFilename.length());
+				//默认从第一行开始读取
+				Integer startRows = 1;
+				//获取输入流
+				InputStream is = file.getInputStream();
+				List<ResponsibilityIndicatorInfoUpdateDTO> bindingList = new ArrayList<>();
+				//Excel导入导出的单元类
+				List<String[]> strings = ExcelUtil.readData(fileType, startRows, true, is);
+				//遍历Excel表每一行的数据
+				for (String[] str : strings) {
+					ResponsibilityIndicatorInfoUpdateDTO responsibilityIndicatorInfoUpdateDTO = new ResponsibilityIndicatorInfoUpdateDTO();
+					responsibilityIndicatorInfoUpdateDTO.setId(str[0]);
+					responsibilityIndicatorInfoUpdateDTO.setQuantifiedValue(Double.parseDouble(str[8]));
+					bindingList.add(responsibilityIndicatorInfoUpdateDTO);
+				}
+				boolean b = responsibilityIndicatorInfoService.saveBatchDto(bindingList);
+				if (b) {
+					return R.ok().data(b);
+				} else {
+					return R.error().data("保存失败！");
+				}
+			} catch (Exception e) {
+				log.error("错误", e);
+				return R.customError(e.getMessage()).data("失败！");
+			}
+		}
+		return R.customError("上传文件为空！");
+	}
 }

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

@@ -111,6 +111,11 @@ public class DeptResponsibility extends Model {
      */
     private String updateBy;
 
+	/**
+	 * 创建者名称
+	 */
+	private String createName;
+
     /**
      * 复审人
      */

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

@@ -70,6 +70,11 @@ public class EvaluateRule extends Model {
      */
     private String createBy;
 
+	/**
+	 * 创建者名称
+	 */
+	private String createName;
+
     /**
      * 更新时间
      */

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

@@ -64,6 +64,11 @@ public class EvaluateRuleInfo extends Model {
      */
     private String createBy;
 
+	/**
+	 * 创建者名称
+	 */
+	private String createName;
+
     /**
      * 更新时间
      */

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

@@ -97,6 +97,11 @@ public class OrganizationEvaluation extends Model {
      */
     private String createBy;
 
+	/**
+	 * 创建者名称
+	 */
+	private String createName;
+
     /**
      * 更新时间
      */

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

@@ -85,11 +85,16 @@ public class OrganizationEvaluationRule extends Model {
 	private Date createTime;
 
 	/**
-	 * 创建者
+	 * 创建者id
 	 */
 	private String createBy;
 
 	/**
+	 * 创建者名称
+	 */
+	private String createName;
+
+	/**
 	 * 更新时间
 	 */
 	private Date updateTime;

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

@@ -97,6 +97,10 @@ public class IndicatorServiceImpl extends ServiceImpl<IndicatorMapper, Indicator
 	public IPage<Indicator> list2(Integer pageNum, Integer pageSize, String id, String indicatorName, String indicatorCode, String binSection, String binStage, String dept, String company) {
 		Page<Indicator> page = new Page<>(pageNum, pageSize);
 		IPage<Indicator> list = baseMapper.seleclistPage(page, id, indicatorName, indicatorCode, binSection, binStage, dept, company);
+		List<Indicator> records = list.getRecords();
+		records.stream().forEach(r ->{
+			r.setDeptName(CacheContext.ddNameMap.get(r.getDept()));
+		});
 		return list;
 	}
 

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

@@ -17,6 +17,7 @@
         <result column="stage" property="stage" />
         <result column="des" property="des" />
         <result column="create_time" property="createTime" />
+        <result column="create_name" property="createName" />
         <result column="create_by" property="createBy" />
         <result column="update_time" property="updateTime" />
         <result column="update_by" property="updateBy" />
@@ -33,7 +34,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, organization_name, organization_id, cycle_unit, check_cycle, year, month, organization_evaluation_rule_id, begin_date, end_date, stage, des, create_time, create_by, update_time, update_by, review_people, review_people_time, review_opinion, final_review_people, final_review_people_time, final_review_opinion, remark, responsibility_code, organization_type
+        id, organization_name, organization_id, cycle_unit, check_cycle, year, month, organization_evaluation_rule_id, begin_date, end_date, stage, des, create_time, create_by, update_time, update_by, review_people, review_people_time, review_opinion, final_review_people, final_review_people_time, final_review_opinion, remark, responsibility_code, organization_type,create_name
     </sql>
     <select id="selectById" resultType="com.ims.eval.entity.dto.response.DeptResponsibilityResDTO">
         SELECT