Merge remote-tracking branch 'origin/master'

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

@@ -166,4 +166,15 @@ public class DeptResponsibilityController {
 		}
 	}
 
+
+
+
+	@GetMapping(value = "targetValueeport")
+	public R targetValueeport(
+		@RequestParam(value = "id", required = false) String id,
+		@RequestParam(value = "dept", required = false) String dept) {
+		List<Map> list = deptResponsibilityService.targetValueeport(id, dept,request);
+		return R.ok().data(list);
+	}
+
 }

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

@@ -0,0 +1,82 @@
+package com.ims.eval.controller;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.ims.eval.entity.EvaluateReport;
+import com.ims.eval.entity.EvaluateRule;
+import com.ims.eval.entity.Indicator;
+import com.ims.eval.entity.dto.result.R;
+import com.ims.eval.service.IEvaluateReportService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 前端控制器
+ * </p>
+ *
+ * @author wang
+ * @since 2023-03-25
+ */
+@RestController
+@RequestMapping("//evaluate-report")
+public class EvaluateReportController {
+
+
+	@Autowired
+	private IEvaluateReportService evaluateReportService;
+
+
+	/**
+	 * 生成考评报告
+	 *
+	 * @param organizationEvaluationId 组织考评主键
+	 * @return
+	 */
+	//@ImsPreAuth("eval:dataDictionary:view")
+	@GetMapping(value = "generateEvaluateReport")
+	public R generateEvaluateReport(@RequestParam(value = "organizationEvaluationId", required = false) String organizationEvaluationId) {
+		boolean b = evaluateReportService.generateEvaluateReport(organizationEvaluationId);
+		return R.ok().data(b);
+	}
+
+
+	/**
+	 * 查询分页数据
+	 *
+	 * @param pageNum
+	 * @param pageSize
+	 * @param id                       主键
+	 * @param evaluateReportName       报告名称
+	 * @param binSection			   业务版块
+	 * @param organizationEvaluationId 考评记录id
+	 * @param organizationType         考评类别(单位、部门)
+	 * @param checkCycle               周期
+	 * @param year                     年
+	 * @param month                    月
+	 * @return
+	 */
+	//@ImsPreAuth("eval:dataDictionary: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 = "evaluateReportName", required = false) String evaluateReportName,
+				  @RequestParam(value = "binSection", required = false) String binSection,
+				  @RequestParam(value = "organizationEvaluationId", required = false) String organizationEvaluationId,
+				  @RequestParam(value = "organizationType", required = false) String organizationType,
+				  @RequestParam(value = "checkCycle", required = false) String checkCycle,
+				  @RequestParam(value = "year", required = false) String year,
+				  @RequestParam(value = "month", required = false) String month) {
+		IPage<EvaluateReport> list = evaluateReportService.list(pageNum, pageSize, id, evaluateReportName, binSection,  organizationEvaluationId, organizationType, checkCycle, year, month);
+		return R.ok().data(list);
+	}
+
+
+}

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

@@ -0,0 +1,50 @@
+package com.ims.eval.controller;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.ims.eval.entity.EvaluateReport;
+import com.ims.eval.entity.EvaluateReportInfo;
+import com.ims.eval.entity.dto.result.R;
+import com.ims.eval.service.IEvaluateReportInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 考评报告明细
+
+ 前端控制器
+ * </p>
+ *
+ * @author wang
+ * @since 2023-03-25
+ */
+@RestController
+@RequestMapping("//evaluate-report-info")
+public class EvaluateReportInfoController {
+
+
+	@Autowired
+	private IEvaluateReportInfoService evaluateReportInfoService;
+
+	/**
+	 * 根据汇总id 获取数据
+	 * @param evaluateReportId                       考评报告id
+	 * @return
+	 */
+	//@ImsPreAuth("eval:dataDictionary:view")
+	@GetMapping(value = "list")
+	public R list(@RequestParam(value = "evaluateReportId", required = true) String evaluateReportId) {
+		Map<String,List<Map>> list = evaluateReportInfoService.listByReportId(evaluateReportId);
+		return R.ok().data(list);
+	}
+
+
+}

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

@@ -0,0 +1,22 @@
+package com.ims.eval.dao;
+
+import com.ims.eval.entity.EvaluateReportInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 考评报告明细
+
+ Mapper 接口
+ * </p>
+ *
+ * @author wang
+ * @since 2023-03-25
+ */
+public interface EvaluateReportInfoMapper extends BaseMapper<EvaluateReportInfo> {
+
+	List<EvaluateReportInfo> selectListByReportId(String evaluateReportId);
+
+}

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

@@ -0,0 +1,29 @@
+package com.ims.eval.dao;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ims.eval.entity.EvaluateReport;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ims.eval.entity.Indicator;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author wang
+ * @since 2023-03-25
+ */
+public interface EvaluateReportMapper extends BaseMapper<EvaluateReport> {
+
+	IPage<EvaluateReport>  selectListPage(Page page, @Param("id") String id,
+		 @Param("evaluateReportName")String evaluateReportName,
+		 @Param("binSection")String binSection,
+		 @Param("organizationEvaluationId") String organizationEvaluationId,
+		 @Param("organizationType")String organizationType,
+		 @Param("checkCycle")String checkCycle,
+		 @Param("year")String year,
+		 @Param("month")String month);
+
+}

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

@@ -21,4 +21,9 @@ public interface ResponsibilityIndicatorInfoMapper extends BaseMapper<Responsibi
 	List<ResponsibilityIndicatorInfoResDTO> listByresponsibilityId(@Param("deptResponsibilityIds") List<String> deptResponsibilityIds,
 																   @Param("dept") String dept,
 																   @Param("optionCode") String optionCode);
+
+
+
+
+
 }

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

@@ -0,0 +1,108 @@
+package com.ims.eval.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 考评报告
+ * </p>
+ *
+ * @author wang
+ * @since 2023-03-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class EvaluateReport extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    private String id;
+
+    /**
+     * 报告名称
+     */
+    private String evaluateReportName;
+
+    /**
+     * 考评记录id
+     */
+    private String organizationEvaluationId;
+
+	/**
+	 * 业务版块name
+	 */
+	@TableField(exist = false)
+	private String organizationEvaluationDes;
+
+    /**
+     * 业务版块
+     */
+    private String binSection;
+
+	/**
+	 * 业务版块name
+	 */
+	@TableField(exist = false)
+	private String binSectionName;
+
+    /**
+     * 考评类别(单位、部门)
+     */
+    private String organizationType;
+
+    /**
+     * 周期
+     */
+    private String checkCycle;
+
+    /**
+     * 年
+     */
+    private String year;
+
+    /**
+     * 月
+     */
+    private String month;
+
+    /**
+     * 描述
+     */
+    private String des;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 创建者
+     */
+    private String createBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 更新者
+     */
+    private String updateBy;
+
+    /**
+     * 是否启用
+     */
+    private Boolean enable;
+
+
+}

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

@@ -0,0 +1,96 @@
+package com.ims.eval.entity;
+
+import java.math.BigDecimal;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 考评报告明细
+
+
+ * </p>
+ *
+ * @author wang
+ * @since 2023-03-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class EvaluateReportInfo extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    private String id;
+
+    /**
+     * 考评报告id
+     */
+    private String evaluateReportId;
+
+    /**
+     * 考评组织ID
+     */
+    private String organizationId;
+
+    /**
+     * 考评组织名称
+     */
+    private String organizationName;
+
+    /**
+     * 业务阶段
+     */
+    private String binStage;
+
+	/**
+	 * 业务阶段
+	 */
+	@TableField(exist = false)
+	private String binStageName;
+
+    /**
+     * 分数
+     */
+    private double score;
+
+    /**
+     * 折算分数
+     */
+    private double discountScore;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 创建者
+     */
+    private String createBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 更新者
+     */
+    private String updateBy;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

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

@@ -6,7 +6,9 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.ims.eval.entity.dto.response.DeptResponsibilityResDTO;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -27,4 +29,7 @@ public interface IDeptResponsibilityService extends IService<DeptResponsibility>
 	DeptResponsibilityResDTO getByidAndInfo(String id, String dept);
 
 
+	List<Map> targetValueeport(String id, String dept, HttpServletRequest request);
+
+
 }

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

@@ -0,0 +1,24 @@
+package com.ims.eval.service;
+
+import com.ims.eval.entity.EvaluateReportInfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.apache.poi.ss.formula.functions.T;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 考评报告明细
+
+ 服务类
+ * </p>
+ *
+ * @author wang
+ * @since 2023-03-25
+ */
+public interface IEvaluateReportInfoService extends IService<EvaluateReportInfo> {
+
+	Map<String,List<Map>> listByReportId(String evaluateReportId);
+
+}

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

@@ -0,0 +1,21 @@
+package com.ims.eval.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.ims.eval.entity.EvaluateReport;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author wang
+ * @since 2023-03-25
+ */
+public interface IEvaluateReportService extends IService<EvaluateReport> {
+
+	boolean generateEvaluateReport(String organizationEvaluationId);
+
+	IPage<EvaluateReport> list(Integer pageNum,Integer pageSize, String id,String evaluateReportName,String  binSection, String organizationEvaluationId, String organizationType,String  checkCycle, String year,String  month);
+
+}

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

@@ -33,4 +33,9 @@ public interface IResponsibilityIndicatorInfoService extends IService<Responsibi
 	Map<String ,Object> getResponsibilityIdMap(String deptResponsibilityId);
 
 
+
+
+
+
+
 }

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

@@ -42,7 +42,7 @@ public interface IUserService extends IService<Myuser> {
 	 * @param code
 	 * @return
 	 */
-	Object getSysUser(String code);
+	Myuser getSysUser(String code);
 
 	/**
 	 * 通过token获取code

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

@@ -18,6 +18,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import java.io.Serializable;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -72,6 +73,10 @@ public class DeptResponsibilityServiceImpl extends ServiceImpl<DeptResponsibilit
 	@Resource
 	private IResponsibilityIndicatorInfoService responsibilityIndicatorInfoService;
 
+
+	@Autowired
+	private IUserService userService;
+
 	@Override
 	public IPage<DeptResponsibility> list(Integer pageNum, Integer pageSize, String id, String responsibilityCode,String cycleUnit,  List<String> checkCycle, String beginDate, String endDate, String stage, String createBy, String year, String month,String des) {
 
@@ -236,6 +241,15 @@ public class DeptResponsibilityServiceImpl extends ServiceImpl<DeptResponsibilit
 		return resDTO;
 	}
 
+	@Override
+	public List<Map> targetValueeport(String id, String dept, HttpServletRequest request) {
+		DeptResponsibilityResDTO resDTO = baseMapper.selectById(id);
+		Myuser myuser = userService.getSysUser(request.getHeader("code"));
+//		responsibilityIndicatorInfoMapper.listByresponsibilityId()
+
+		return null;
+	}
+
 	@Transactional
 	@Override
 	public boolean saveOrUpdate(DeptResponsibility entity) {
@@ -345,4 +359,6 @@ public class DeptResponsibilityServiceImpl extends ServiceImpl<DeptResponsibilit
 		}
 		return true;
 	}
+
+
 }

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

@@ -0,0 +1,81 @@
+package com.ims.eval.service.impl;
+
+import com.ims.eval.entity.EvaluateReportInfo;
+import com.ims.eval.dao.EvaluateReportInfoMapper;
+import com.ims.eval.entity.IndicatorDictionary;
+import com.ims.eval.entity.dto.request.IndicatorDictionaryDTO;
+import com.ims.eval.entity.dto.response.ResponsibilityIndicatorInfoResDTO;
+import com.ims.eval.service.IEvaluateReportInfoService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.xmlbeans.impl.jam.mutable.MPackage;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ * 考评报告明细
+ * <p>
+ * 服务实现类
+ * </p>
+ *
+ * @author wang
+ * @since 2023-03-25
+ */
+@Service
+public class EvaluateReportInfoServiceImpl extends ServiceImpl<EvaluateReportInfoMapper, EvaluateReportInfo> implements IEvaluateReportInfoService {
+
+	@Override
+	public Map<String,List<Map>> listByReportId(String evaluateReportId) {
+
+
+		Map<String,List<Map>> datemap = new LinkedHashMap<>();
+		List<EvaluateReportInfo> list = baseMapper.selectListByReportId(evaluateReportId);
+		List<Map> listmap = new ArrayList<>();
+
+		List<Map> listtitle = new ArrayList<>();
+		list.stream().collect(Collectors.groupingBy(EvaluateReportInfo::getOrganizationId));
+
+		Map<String, List<EvaluateReportInfo>> map = list.stream().collect(Collectors.groupingBy(ord -> ord.getOrganizationId() + "," + ord.getOrganizationName()));
+
+
+
+
+
+		map.forEach((k, v) -> {
+			String[] zb = k.split(",");
+			if(listtitle.size()<=0){
+				Map title = new LinkedHashMap();
+				title.put("nameZh","单位");
+				title.put("nameEh","organizationId");
+				listtitle.add(title);
+
+				for (EvaluateReportInfo info : v) {
+					Map title2 = new LinkedHashMap();
+					title2.put("nameZh",info.getBinStageName());
+					title2.put("nameEh",info.getBinStage());
+					listtitle.add(title2);
+				}
+				Map title2 = new LinkedHashMap();
+				title2.put("nameZh","备注");
+				title2.put("nameEh","remark");
+				datemap.put("title",listtitle);
+			}
+
+			Map m = new LinkedHashMap();
+			m.put("organizationId", zb[1]);
+			for (EvaluateReportInfo info : v) {
+				double c = info.getScore() * info.getDiscountScore();
+				m.put(info.getBinStage(), c);
+			}
+			listmap.add(m);
+		});
+
+		datemap.put("body",listmap);
+		return datemap;
+	}
+}

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

@@ -0,0 +1,73 @@
+package com.ims.eval.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ims.eval.config.CustomException;
+import com.ims.eval.entity.EvaluateReport;
+import com.ims.eval.dao.EvaluateReportMapper;
+import com.ims.eval.entity.Indicator;
+import com.ims.eval.entity.OrganizationEvaluation;
+import com.ims.eval.service.IEvaluateReportService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ims.eval.service.IOrganizationEvaluationRuleService;
+import com.ims.eval.service.IOrganizationEvaluationService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 服务实现类
+ * </p>
+ *
+ * @author wang
+ * @since 2023-03-25
+ */
+@Service
+public class EvaluateReportServiceImpl extends ServiceImpl<EvaluateReportMapper, EvaluateReport> implements IEvaluateReportService {
+
+
+	@Autowired
+	private IOrganizationEvaluationService organizationEvaluationService;
+
+
+	@Autowired
+	private IOrganizationEvaluationRuleService organizationEvaluationRuleService;
+	//考评结果报告
+	//按照业务类型生成
+	//业务阶综合展示
+
+	@Override
+	public boolean generateEvaluateReport(String organizationEvaluationId) {
+		OrganizationEvaluation evaluation = organizationEvaluationService.getById(organizationEvaluationId);
+		if (null == evaluation) {
+			throw new CustomException("没有此靠考评");
+		}
+
+		//获取到对应组织考评规则
+		String evaluationRuleIds = evaluation.getOrganizationEvaluationRuleId();
+		if (null == evaluationRuleIds || evaluationRuleIds.length() <= 0) {
+			throw new CustomException("组织考评id为空");
+		}
+
+		//
+//		organizationEvaluationRuleService.listByIds();
+
+		return false;
+	}
+
+	@Override
+	public IPage<EvaluateReport> list(Integer pageNum, Integer pageSize, String id, String evaluateReportName, String binSection, String organizationEvaluationId, String organizationType, String checkCycle, String year, String month) {
+		Page<Indicator> page = new Page<>(pageNum, pageSize);
+		if (null == pageNum || null == pageSize) {
+			throw new CustomException("分页参数为空");
+		}
+		IPage<EvaluateReport> list = null;
+		try {
+			list = baseMapper.selectListPage(page, id, evaluateReportName, binSection, organizationEvaluationId, organizationType, checkCycle, year, month);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+
+		return list;
+	}
+}

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

@@ -82,9 +82,10 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, Myuser> implements
 	}
 
 	@Override
-	public Object getSysUser(String code) {
+	public Myuser getSysUser(String code) {
 		Object json = remoteServiceBuilder.getGatewayUrl().getSysUser(code);
-		return json;
+		Myuser user = JSON.parseObject(json.toString(), Myuser.class);
+		return user;
 	}
 
 	@Override

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

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ims.eval.dao.EvaluateReportInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.ims.eval.entity.EvaluateReportInfo">
+        <id column="id" property="id" />
+        <result column="evaluate_report_id" property="evaluateReportId" />
+        <result column="organization_id" property="organizationId" />
+        <result column="organization_name" property="organizationName" />
+        <result column="bin_stage" property="binStage" />
+        <result column="create_time" property="createTime" />
+        <result column="create_by" property="createBy" />
+        <result column="update_time" property="updateTime" />
+        <result column="update_by" property="updateBy" />
+        <result column="remark" property="remark" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, evaluate_report_id, organization_id, organization_name, bin_stage, create_time, create_by, update_time, update_by, remark
+    </sql>
+    <select id="selectListByReportId" resultType="com.ims.eval.entity.EvaluateReportInfo">
+
+     select
+     ri.*,
+     b.stage_name binStageName
+     from  evaluate_report_info ri
+     LEFT JOIN bin_stage b on b.id = ri.bin_stage
+     <where>
+         <if test="evaluateReportId !=null and evaluateReportId !=''">
+             AND ri.evaluate_report_id = #{evaluateReportId}
+         </if>
+     </where>
+    </select>
+
+</mapper>

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

@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ims.eval.dao.EvaluateReportMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.ims.eval.entity.EvaluateReport">
+        <id column="id" property="id" />
+        <result column="evaluate_report_name" property="evaluateReportName" />
+        <result column="organization_evaluation_id" property="organizationEvaluationId" />
+        <result column="bin_section" property="binSection" />
+        <result column="des" property="des" />
+        <result column="create_time" property="createTime" />
+        <result column="create_by" property="createBy" />
+        <result column="update_time" property="updateTime" />
+        <result column="update_by" property="updateBy" />
+        <result column="enable" property="enable" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, evaluate_report_name, organization_evaluation_id, bin_section, des, create_time, create_by, update_time, update_by, enable
+    </sql>
+
+    <select id="selectListPage" resultType="com.ims.eval.entity.EvaluateReport">
+
+        select r.*
+        ,o.des organizationEvaluationDes,
+        b.section_name binSectionName
+        from  evaluate_report r
+        LEFT JOIN organization_evaluation o on r.organization_evaluation_id = o.id
+        INNER JOIN bin_section b on r.bin_section = b.id
+        <where>
+
+
+            <if test="id !=null and id !=''">
+                AND r.id = #{id}
+            </if>
+            <if test="evaluateReportName !=null and evaluateReportName !=''">
+                AND r.evaluatereport_name like   CONCAT('%',#{evaluateReportName},'%')
+            </if>
+
+            <if test="binSection !=null and binSection !=''">
+                AND r.bin_section = #{binSection}
+            </if>
+
+            <if test="organizationEvaluationId !=null and organizationEvaluationId !=''">
+                AND r.organization_evaluation_id = #{organizationEvaluationId}
+            </if>
+
+            <if test="organizationType !=null and organizationType !=''">
+                AND r.organization_type = #{organizationType}
+            </if>
+
+            <if test="checkCycle !=null and checkCycle !=''">
+                AND r.checkCycle = #{checkCycle}
+            </if>
+
+            <if test="year !=null and year !=''">
+                AND r.year = #{year}
+            </if>
+            <if test="month !=null and month !=''">
+                AND r.month = #{month}
+            </if>
+
+        </where>
+    </select>
+
+</mapper>

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

@@ -114,4 +114,5 @@
     </select>
 
 
+
 </mapper>