代码优化

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

@@ -64,6 +64,22 @@ public class OrganizationEvaluationRuleController {
 	}
 
 
+	@GetMapping(value = "list2")
+	public R list2(@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 = "organizationType", required = false) String organizationType,
+				  @RequestParam(value = "binSection", required = false) String binSection,
+				  @RequestParam(value = "binStage", required = false) String binStage,
+				  @RequestParam(value = "evaluationCycle", required = false) String evaluationCycle,
+				  @RequestParam(value = "year", required = false) String year,
+				  @RequestParam(value = "month", required = false) String month) {
+		IPage<OrganizationEvaluationRule> list = organizationEvaluationRuleService.list2(pageNum, pageSize, id, organizationName, organizationId, organizationType, binSection, binStage, evaluationCycle, year, month);
+		return R.ok().data(list);
+	}
+
 	/**
 	 * 查询所有数据
 	 *

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

@@ -1,7 +1,10 @@
 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.OrganizationEvaluationRule;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -13,4 +16,14 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface OrganizationEvaluationRuleMapper extends BaseMapper<OrganizationEvaluationRule> {
 
+	IPage<OrganizationEvaluationRule> list(Page page, @Param("id") String id,
+										   @Param("organizationName") String organizationName,
+										   @Param("organizationId") String organizationId,
+										   @Param("organizationType") String organizationType,
+										   @Param("binSection") String binSection,
+										   @Param("binStage") String binStage,
+										   @Param("evaluationCycle") String evaluationCycle,
+										   @Param("year") String year,
+										   @Param("month") String month);
+
 }

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

@@ -74,6 +74,12 @@ public class OrganizationEvaluationRule extends Model {
      */
     private String evaluateRuleId;
 
+	/**
+	 * 考评规则Name
+	 */
+	@TableField(exist = false)
+	private String ruleName;
+
     /**
      * 创建时间
      */
@@ -119,5 +125,4 @@ public class OrganizationEvaluationRule extends Model {
 	 */
 	private String month;
 
-
 }

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

@@ -20,4 +20,7 @@ public interface IOrganizationEvaluationRuleService extends IService<Organizatio
 
 	List<OrganizationEvaluationRule> listAll( String id, String organizationName, String organizationId, String organizationType, String binSection, String binStage, String evaluationCycle,String year,String month);
 
+
+	IPage<OrganizationEvaluationRule> list2( Integer pageNum, Integer pageSize, String id, String organizationName, String organizationId, String organizationType, String binSection, String binStage, String evaluationCycle,String year,String month);
+
 }

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

@@ -108,7 +108,8 @@ public class EvaluateRuleServiceImpl extends ServiceImpl<EvaluateRuleMapper, Eva
 				throw new CustomException("当前模块规则已存在,如若新增规则，请禁用已存在规则");
 			}
 
-			entity.setCreateTime(new Date());
+			entity.setCreateTime(new Date());//创建时间
+			entity.setEnable(true);//默认启用
 		} else {
 			entity.setUpdateTime(new Date());
 		}

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

@@ -6,12 +6,14 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ims.common.utils.StringUtils;
 import com.ims.eval.cache.CacheContext;
 import com.ims.eval.dao.result.CustomException;
+import com.ims.eval.entity.IndicatorDictionary;
 import com.ims.eval.entity.OrganizationEvaluationRule;
 import com.ims.eval.dao.OrganizationEvaluationRuleMapper;
 import com.ims.eval.service.IOrganizationEvaluationRuleService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -131,7 +133,28 @@ public class OrganizationEvaluationRuleServiceImpl extends ServiceImpl<Organizat
 	}
 
 	@Override
+	public IPage<OrganizationEvaluationRule> list2(Integer pageNum, Integer pageSize, String id, String organizationName, String organizationId, String organizationType, String binSection, String binStage, String evaluationCycle, String year, String month) {
+		Page<OrganizationEvaluationRule> page = new Page<>(pageNum, pageSize);
+		IPage<OrganizationEvaluationRule>  list = baseMapper.list(page, id, organizationName, organizationId, organizationType, binSection, binStage, evaluationCycle, year, month);
+		return list;
+	}
+
+	@Override
 	public boolean saveOrUpdate(OrganizationEvaluationRule entity) {
+		if (null != entity && (null == entity.getId() || "".equals(entity.getId().trim()))) {
+			QueryWrapper<OrganizationEvaluationRule> qw = new QueryWrapper<>();
+			qw.lambda().eq(OrganizationEvaluationRule::getYear, entity.getYear());
+			qw.lambda().eq(OrganizationEvaluationRule::getOrganizationId, entity.getOrganizationId());
+			qw.lambda().eq(OrganizationEvaluationRule::getEvaluationCycle, entity.getEvaluationCycle());
+			List<OrganizationEvaluationRule> list = baseMapper.selectList(qw);
+			if (null != list && list.size() > 0) {
+				throw new CustomException("已存在同期考评配置");
+			}
+			entity.setCreateTime(new Date());
+		} else {
+			entity.setUpdateTime(new Date());
+		}
+
 		return super.saveOrUpdate(entity);
 	}
 }

ims-service/ims-eval/src/main/resources/application.yml

@@ -1,6 +1,6 @@
 #mybatis-plus配置
 mybatis-plus:
-  mapper-locations: classpath:mappings/**/**/*.xml
+  mapper-locations: classpath:mappers/*.xml
   #实体扫描，多个package用逗号或者分号分隔
   typeAliasesPackage: com.ims.eval.entity,com.ims.**.entity
 

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

@@ -0,0 +1,42 @@
+<?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.OrganizationEvaluationRuleMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.ims.eval.entity.OrganizationEvaluationRule">
+        <id column="id" property="id" />
+        <result column="organization_name" property="organizationName" />
+        <result column="organization_id" property="organizationId" />
+        <result column="organization_type" property="organizationType" />
+        <result column="bin_section" property="binSection" />
+        <result column="bin_stage" property="binStage" />
+        <result column="evaluation_cycle" property="evaluationCycle" />
+        <result column="evaluate_rule_id" property="evaluateRuleId" />
+        <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="del_flag" property="delFlag" />
+        <result column="is_check" property="isCheck" />
+        <result column="order_num" property="orderNum" />
+        <result column="year" property="year" />
+        <result column="month" property="month" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, organization_name, organization_id, organization_type, bin_section, bin_stage, evaluation_cycle, evaluate_rule_id, create_time, create_by, update_time, update_by, del_flag, is_check, order_num, year, month
+    </sql>
+
+
+    <select id="list" resultType="com.ims.eval.entity.OrganizationEvaluationRule">
+        SELECT
+            *
+        FROM
+            organization_evaluation_rule r
+            LEFT JOIN evaluate_rule i ON r.evaluate_rule_id = i.ID
+
+    </select>
+
+
+</mapper>

ims-service/ims-eval/src/main/resources/mappings/ims/eval/DeptResponsibilityDao.xml

@@ -1,267 +0,0 @@
-<?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.DeptResponsibilityDao">
-
-	<sql id="deptResponsibilityColumns">
-		a.id AS "id",
-		a.dept_id AS "deptId",
-		a.cycle_unit AS "cycleUnit",
-		a.check_cycle AS "checkCycle",
-		a.begin_date AS "beginDate",
-		a.end_date AS "endDate",
-		a.stage AS "stage",
-		a.des AS "des",
-		a.create_time AS "createTime",
-		a.create_by AS "createBy",
-		a.update_time AS "updateTime",
-		a.update_by AS "updateBy",
-		a.review_people AS "reviewPeople",
-		a.review_people_time AS "reviewPeopleTime",
-		a.review_opinion AS "reviewOpinion",
-		a.final_review_people AS "finalReviewPeople",
-		a.final_review_people_time AS "finalReviewPeopleTime",
-		a.final_review_opinion AS "finalReviewOpinion",
-		a.remark AS "remark"
-	</sql>
-
-
-    <sql id="whereStr">
-			1=1
-		    <!-- 快速定位 -->
-			<if test="sqlMap.key != null and  sqlMap.key  != ''">
-			  AND (
-			  )
-			</if>
-		    <!-- 高级查询dataFilter -->
-			<if test="sqlMap.df != null and  sqlMap.df  != ''">
-			   AND ( ${sqlMap.df} )
-			</if>
-		    <!-- 默认查询baseFilter -->
-			<if test="sqlMap.bf != null and  sqlMap.bf  != ''">
-			   AND ( ${sqlMap.bf} )
-			</if>
-		    <!-- 基本Query查询 -->
-			<if test="sqlMap.baseQuery != null and  sqlMap.baseQuery  != ''">
-			   AND ( ${sqlMap.baseQuery} )
-			</if>
-		    <!-- 特定Query查询 -->
-			<if test="sqlMap.specQuery != null and  sqlMap.specQuery  != ''">
-			   AND ( ${sqlMap.specQuery} )
-			</if>
-			<if test="sqlMap.dsf != null and  sqlMap.dsf  != ''">
-				AND (${sqlMap.dsf})
-			</if>
-    </sql>
-
-	<select id="get" resultType="DeptResponsibility">
-		SELECT
-			<include refid="deptResponsibilityColumns"/>
-		FROM public.{table.name} a
-
-		WHERE a.id = #{id}
-	</select>
-
-	<select id="findList" resultType="DeptResponsibility">
-		SELECT
-			<include refid="deptResponsibilityColumns"/>
-		FROM public.dept_responsibility a
-
-		<where>
-              <include refid="whereStr"/>
-		</where>
-		<choose>
-			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
-				ORDER BY ${page.orderBy}
-			</when>
-			<otherwise>
-			</otherwise>
-		</choose>
-	</select>
-
-	<select id="findAllList" resultType="DeptResponsibility">
-		SELECT
-			<include refid="deptResponsibilityColumns"/>
-		FROM public.dept_responsibility a
-
-		<where>
-			 <include refid="whereStr"/>
-		</where>
-		<choose>
-			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
-				ORDER BY ${page.orderBy}
-			</when>
-			<otherwise>
-			</otherwise>
-		</choose>
-	</select>
-
-    <sql id="insertColumns">
-	        id,
-	        dept_id,
-	        cycle_unit,
-	        check_cycle,
-	        begin_date,
-	        end_date,
-	        stage,
-	        des,
-	        create_time,
-	        update_time,
-	        review_people,
-	        review_people_time,
-	        review_opinion,
-	        final_review_people,
-	        final_review_people_time,
-	        final_review_opinion,
-	        remark
-    </sql>
-
-	<insert id="insert">
-        <selectKey keyProperty="id" resultType="String" order="BEFORE">
-          <choose>
-			<when test="id == null or  id  == ''">
-              select get_next_id('dept_responsibility','') from dual
-			</when>
-			<otherwise>
-			  select #{id} from dual
-			</otherwise>
-	      </choose>
-        </selectKey>
-		INSERT INTO dept_responsibility(
-            <include refid="insertColumns"/>
-		) VALUES (
-			#{id
-, jdbcType=VARCHAR
-
-},
-			#{deptId
-, jdbcType=VARCHAR
-
-},
-			#{cycleUnit
-, jdbcType=VARCHAR
-
-},
-			#{checkCycle
-, jdbcType=VARCHAR
-
-},
-			#{beginDate
-
-
-},
-			#{endDate
-
-
-},
-			#{stage
-, jdbcType=VARCHAR
-
-},
-			#{des
-, jdbcType=VARCHAR
-
-},
-			#{createTime
-
-
-},
-			#{updateTime
-
-
-},
-			#{reviewPeople
-, jdbcType=VARCHAR
-
-},
-			#{reviewPeopleTime
-
-
-},
-			#{reviewOpinion
-, jdbcType=VARCHAR
-
-},
-			#{finalReviewPeople
-, jdbcType=VARCHAR
-
-},
-			#{finalReviewPeopleTime
-
-
-},
-			#{finalReviewOpinion
-, jdbcType=VARCHAR
-
-},
-			#{remark
-, jdbcType=VARCHAR
-
-}
-		)
-	</insert>
-
-	<insert id="insertList">
-		INSERT INTO dept_responsibility(
-		    <include refid="insertColumns"/>
-		) select FFF.* from (
-            <foreach collection="list" item="item" index="index" separator="UNION ALL" >
-                select
-                    #{item.id, jdbcType=VARCHAR} as "id",
-                    #{item.deptId, jdbcType=VARCHAR} as "deptId",
-                    #{item.cycleUnit, jdbcType=VARCHAR} as "cycleUnit",
-                    #{item.checkCycle, jdbcType=VARCHAR} as "checkCycle",
-                    #{item.beginDate} as "beginDate",
-                    #{item.endDate} as "endDate",
-                    #{item.stage, jdbcType=VARCHAR} as "stage",
-                    #{item.des, jdbcType=VARCHAR} as "des",
-                    #{item.createTime} as "createTime",
-                    #{item.updateTime} as "updateTime",
-                    #{item.reviewPeople, jdbcType=VARCHAR} as "reviewPeople",
-                    #{item.reviewPeopleTime} as "reviewPeopleTime",
-                    #{item.reviewOpinion, jdbcType=VARCHAR} as "reviewOpinion",
-                    #{item.finalReviewPeople, jdbcType=VARCHAR} as "finalReviewPeople",
-                    #{item.finalReviewPeopleTime} as "finalReviewPeopleTime",
-                    #{item.finalReviewOpinion, jdbcType=VARCHAR} as "finalReviewOpinion",
-                    #{item.remark, jdbcType=VARCHAR} as "remark"
-                from dual
-            </foreach>
-		) FFF
-
-	</insert>
-
-	<update id="update">
-		UPDATE dept_responsibility SET
-			id = #{id},
-			dept_id = #{deptId},
-			cycle_unit = #{cycleUnit},
-			check_cycle = #{checkCycle},
-			begin_date = #{beginDate},
-			end_date = #{endDate},
-			stage = #{stage},
-			des = #{des},
-			create_time = #{createTime},
-			update_time = #{updateTime},
-			update_by = #{updateBy},
-			review_people = #{reviewPeople},
-			review_people_time = #{reviewPeopleTime},
-			review_opinion = #{reviewOpinion},
-			final_review_people = #{finalReviewPeople},
-			final_review_people_time = #{finalReviewPeopleTime},
-			final_review_opinion = #{finalReviewOpinion},
-			remark = #{remark}
-		WHERE id = #{id, jdbcType=VARCHAR}
-	</update>
-
-	<update id="delete">
-		DELETE FROM public.dept_responsibility
-	    WHERE
-		<choose>
-			<when test="id != null and  id  != ''">
-					 id = #{id, jdbcType=VARCHAR}
-			</when>
-			<otherwise>
-			</otherwise>
-		</choose>
-	</update>
-
-</mapper>

ims-service/ims-eval/src/main/resources/mappings/ims/eval/DeptResponsibilityTargetDao.xml

@@ -1,424 +0,0 @@
-<?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.DeptResponsibilityTargetDao">
-
-	<sql id="deptResponsibilityTargetColumns">
-		a.id AS "id",
-		a.responsibility_id AS "responsibilityId",
-		a.indicator_id AS "indicatorId",
-		a.quantization_target AS "quantizationTarget",
-		a.quantization_target_actual AS "quantizationTargetActual",
-		a.evaluation_target AS "evaluationTarget",
-		a.evaluation_target_actual AS "evaluationTargetActual",
-		a.month_threshold AS "monthThreshold",
-		a.season_threshold AS "seasonThreshold",
-		a.year_threshold AS "yearThreshold",
-		a.direction AS "direction",
-		a.order_num AS "orderNum",
-		a.remark AS "remark",
-		a.target_1 AS "target1",
-		a.actual_1 AS "actual1",
-		a.target_2 AS "target2",
-		a.actual_2 AS "actual2",
-		a.target_3 AS "target3",
-		a.actual_3 AS "actual3",
-		a.target_4 AS "target4",
-		a.actual_4 AS "actual4",
-		a.target_5 AS "target5",
-		a.actual_5 AS "actual5",
-		a.target_6 AS "target6",
-		a.actual_6 AS "actual6",
-		a.target_7 AS "target7",
-		a.actual_7 AS "actual7",
-		a.target_8 AS "target8",
-		a.actual_8 AS "actual8",
-		a.target_9 AS "target9",
-		a.actual_9 AS "actual9",
-		a.target_10 AS "target10",
-		a.actual_10 AS "actual10",
-		a.target_11 AS "target11",
-		a.actual_11 AS "actual11",
-		a.target_12 AS "target12",
-		a.actual_12 AS "actual12"
-	</sql>
-
-
-    <sql id="whereStr">
-			1=1
-		    <!-- 快速定位 -->
-			<if test="sqlMap.key != null and  sqlMap.key  != ''">
-			  AND (
-			  )
-			</if>
-		    <!-- 高级查询dataFilter -->
-			<if test="sqlMap.df != null and  sqlMap.df  != ''">
-			   AND ( ${sqlMap.df} )
-			</if>
-		    <!-- 默认查询baseFilter -->
-			<if test="sqlMap.bf != null and  sqlMap.bf  != ''">
-			   AND ( ${sqlMap.bf} )
-			</if>
-		    <!-- 基本Query查询 -->
-			<if test="sqlMap.baseQuery != null and  sqlMap.baseQuery  != ''">
-			   AND ( ${sqlMap.baseQuery} )
-			</if>
-		    <!-- 特定Query查询 -->
-			<if test="sqlMap.specQuery != null and  sqlMap.specQuery  != ''">
-			   AND ( ${sqlMap.specQuery} )
-			</if>
-			<if test="sqlMap.dsf != null and  sqlMap.dsf  != ''">
-				AND (${sqlMap.dsf})
-			</if>
-    </sql>
-
-	<select id="get" resultType="DeptResponsibilityTarget">
-		SELECT
-			<include refid="deptResponsibilityTargetColumns"/>
-		FROM public.{table.name} a
-
-		WHERE a.id = #{id}
-	</select>
-
-	<select id="findList" resultType="DeptResponsibilityTarget">
-		SELECT
-			<include refid="deptResponsibilityTargetColumns"/>
-		FROM public.dept_responsibility_target a
-
-		<where>
-              <include refid="whereStr"/>
-		</where>
-		<choose>
-			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
-				ORDER BY ${page.orderBy}
-			</when>
-			<otherwise>
-			</otherwise>
-		</choose>
-	</select>
-
-	<select id="findAllList" resultType="DeptResponsibilityTarget">
-		SELECT
-			<include refid="deptResponsibilityTargetColumns"/>
-		FROM public.dept_responsibility_target a
-
-		<where>
-			 <include refid="whereStr"/>
-		</where>
-		<choose>
-			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
-				ORDER BY ${page.orderBy}
-			</when>
-			<otherwise>
-			</otherwise>
-		</choose>
-	</select>
-
-    <sql id="insertColumns">
-	        id,
-	        responsibility_id,
-	        indicator_id,
-	        quantization_target,
-	        quantization_target_actual,
-	        evaluation_target,
-	        evaluation_target_actual,
-	        month_threshold,
-	        season_threshold,
-	        year_threshold,
-	        direction,
-	        order_num,
-	        remark,
-	        target_1,
-	        actual_1,
-	        target_2,
-	        actual_2,
-	        target_3,
-	        actual_3,
-	        target_4,
-	        actual_4,
-	        target_5,
-	        actual_5,
-	        target_6,
-	        actual_6,
-	        target_7,
-	        actual_7,
-	        target_8,
-	        actual_8,
-	        target_9,
-	        actual_9,
-	        target_10,
-	        actual_10,
-	        target_11,
-	        actual_11,
-	        target_12,
-	        actual_12
-    </sql>
-
-	<insert id="insert">
-        <selectKey keyProperty="id" resultType="String" order="BEFORE">
-          <choose>
-			<when test="id == null or  id  == ''">
-              select get_next_id('dept_responsibility_target','') from dual
-			</when>
-			<otherwise>
-			  select #{id} from dual
-			</otherwise>
-	      </choose>
-        </selectKey>
-		INSERT INTO dept_responsibility_target(
-            <include refid="insertColumns"/>
-		) VALUES (
-			#{id
-, jdbcType=VARCHAR
-
-},
-			#{responsibilityId
-, jdbcType=VARCHAR
-
-},
-			#{indicatorId
-, jdbcType=VARCHAR
-
-},
-			#{quantizationTarget
-
-
-},
-			#{quantizationTargetActual
-
-
-},
-			#{evaluationTarget
-, jdbcType=VARCHAR
-
-},
-			#{evaluationTargetActual
-
-
-},
-			#{monthThreshold
-
-
-},
-			#{seasonThreshold
-
-
-},
-			#{yearThreshold
-
-
-},
-			#{direction
-
-
-},
-			#{orderNum
-
-
-},
-			#{remark
-, jdbcType=VARCHAR
-
-},
-			#{target1
-
-
-},
-			#{actual1
-
-
-},
-			#{target2
-
-
-},
-			#{actual2
-
-
-},
-			#{target3
-
-
-},
-			#{actual3
-
-
-},
-			#{target4
-
-
-},
-			#{actual4
-
-
-},
-			#{target5
-
-
-},
-			#{actual5
-
-
-},
-			#{target6
-
-
-},
-			#{actual6
-
-
-},
-			#{target7
-
-
-},
-			#{actual7
-
-
-},
-			#{target8
-
-
-},
-			#{actual8
-
-
-},
-			#{target9
-
-
-},
-			#{actual9
-
-
-},
-			#{target10
-
-
-},
-			#{actual10
-
-
-},
-			#{target11
-
-
-},
-			#{actual11
-
-
-},
-			#{target12
-
-
-},
-			#{actual12
-
-
-}
-		)
-	</insert>
-
-	<insert id="insertList">
-		INSERT INTO dept_responsibility_target(
-		    <include refid="insertColumns"/>
-		) select FFF.* from (
-            <foreach collection="list" item="item" index="index" separator="UNION ALL" >
-                select
-                    #{item.id, jdbcType=VARCHAR} as "id",
-                    #{item.responsibilityId, jdbcType=VARCHAR} as "responsibilityId",
-                    #{item.indicatorId, jdbcType=VARCHAR} as "indicatorId",
-                    #{item.quantizationTarget} as "quantizationTarget",
-                    #{item.quantizationTargetActual} as "quantizationTargetActual",
-                    #{item.evaluationTarget, jdbcType=VARCHAR} as "evaluationTarget",
-                    #{item.evaluationTargetActual} as "evaluationTargetActual",
-                    #{item.monthThreshold} as "monthThreshold",
-                    #{item.seasonThreshold} as "seasonThreshold",
-                    #{item.yearThreshold} as "yearThreshold",
-                    #{item.direction} as "direction",
-                    #{item.orderNum} as "orderNum",
-                    #{item.remark, jdbcType=VARCHAR} as "remark",
-                    #{item.target1} as "target1",
-                    #{item.actual1} as "actual1",
-                    #{item.target2} as "target2",
-                    #{item.actual2} as "actual2",
-                    #{item.target3} as "target3",
-                    #{item.actual3} as "actual3",
-                    #{item.target4} as "target4",
-                    #{item.actual4} as "actual4",
-                    #{item.target5} as "target5",
-                    #{item.actual5} as "actual5",
-                    #{item.target6} as "target6",
-                    #{item.actual6} as "actual6",
-                    #{item.target7} as "target7",
-                    #{item.actual7} as "actual7",
-                    #{item.target8} as "target8",
-                    #{item.actual8} as "actual8",
-                    #{item.target9} as "target9",
-                    #{item.actual9} as "actual9",
-                    #{item.target10} as "target10",
-                    #{item.actual10} as "actual10",
-                    #{item.target11} as "target11",
-                    #{item.actual11} as "actual11",
-                    #{item.target12} as "target12",
-                    #{item.actual12} as "actual12"
-                from dual
-            </foreach>
-		) FFF
-
-	</insert>
-
-	<update id="update">
-		UPDATE dept_responsibility_target SET
-			id = #{id},
-			responsibility_id = #{responsibilityId},
-			indicator_id = #{indicatorId},
-			quantization_target = #{quantizationTarget},
-			quantization_target_actual = #{quantizationTargetActual},
-			evaluation_target = #{evaluationTarget},
-			evaluation_target_actual = #{evaluationTargetActual},
-			month_threshold = #{monthThreshold},
-			season_threshold = #{seasonThreshold},
-			year_threshold = #{yearThreshold},
-			direction = #{direction},
-			order_num = #{orderNum},
-			remark = #{remark},
-			target_1 = #{target1},
-			actual_1 = #{actual1},
-			target_2 = #{target2},
-			actual_2 = #{actual2},
-			target_3 = #{target3},
-			actual_3 = #{actual3},
-			target_4 = #{target4},
-			actual_4 = #{actual4},
-			target_5 = #{target5},
-			actual_5 = #{actual5},
-			target_6 = #{target6},
-			actual_6 = #{actual6},
-			target_7 = #{target7},
-			actual_7 = #{actual7},
-			target_8 = #{target8},
-			actual_8 = #{actual8},
-			target_9 = #{target9},
-			actual_9 = #{actual9},
-			target_10 = #{target10},
-			actual_10 = #{actual10},
-			target_11 = #{target11},
-			actual_11 = #{actual11},
-			target_12 = #{target12},
-			actual_12 = #{actual12}
-		WHERE id = #{id, jdbcType=VARCHAR}
-	</update>
-
-	<update id="delete">
-		DELETE FROM public.dept_responsibility_target
-	    WHERE
-		<choose>
-			<when test="id != null and  id  != ''">
-					 id = #{id, jdbcType=VARCHAR}
-			</when>
-			<otherwise>
-			</otherwise>
-		</choose>
-	</update>
-
-</mapper>

ims-service/ims-eval/src/main/resources/mappings/ims/eval/EvaluateRuleDao.xml

@@ -1,203 +0,0 @@
-<?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.EvaluateRuleDao">
-
-	<sql id="evaluateRuleColumns">
-		a.id AS "id",
-		a.des AS "des",
-		a.indicator_id AS "indicatorId",
-		a.total_score AS "totalScore",
-		a.evaluate_method AS "evaluateMethod",
-		a.evaluate_formula AS "evaluateFormula",
-		a.mapping_function AS "mappingFunction",
-		a.create_time AS "createTime",
-		a.create_by AS "createBy",
-		a.update_time AS "updateTime",
-		a.update_by AS "updateBy"
-	</sql>
-
-
-    <sql id="whereStr">
-			1=1
-		    <!-- 快速定位 -->
-			<if test="sqlMap.key != null and  sqlMap.key  != ''">
-			  AND (
-			  )
-			</if>
-		    <!-- 高级查询dataFilter -->
-			<if test="sqlMap.df != null and  sqlMap.df  != ''">
-			   AND ( ${sqlMap.df} )
-			</if>
-		    <!-- 默认查询baseFilter -->
-			<if test="sqlMap.bf != null and  sqlMap.bf  != ''">
-			   AND ( ${sqlMap.bf} )
-			</if>
-		    <!-- 基本Query查询 -->
-			<if test="sqlMap.baseQuery != null and  sqlMap.baseQuery  != ''">
-			   AND ( ${sqlMap.baseQuery} )
-			</if>
-		    <!-- 特定Query查询 -->
-			<if test="sqlMap.specQuery != null and  sqlMap.specQuery  != ''">
-			   AND ( ${sqlMap.specQuery} )
-			</if>
-			<if test="sqlMap.dsf != null and  sqlMap.dsf  != ''">
-				AND (${sqlMap.dsf})
-			</if>
-    </sql>
-
-	<select id="get" resultType="EvaluateRule">
-		SELECT
-			<include refid="evaluateRuleColumns"/>
-		FROM public.{table.name} a
-
-		WHERE a.id = #{id}
-	</select>
-
-	<select id="findList" resultType="EvaluateRule">
-		SELECT
-			<include refid="evaluateRuleColumns"/>
-		FROM public.evaluate_rule a
-
-		<where>
-              <include refid="whereStr"/>
-		</where>
-		<choose>
-			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
-				ORDER BY ${page.orderBy}
-			</when>
-			<otherwise>
-			</otherwise>
-		</choose>
-	</select>
-
-	<select id="findAllList" resultType="EvaluateRule">
-		SELECT
-			<include refid="evaluateRuleColumns"/>
-		FROM public.evaluate_rule a
-
-		<where>
-			 <include refid="whereStr"/>
-		</where>
-		<choose>
-			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
-				ORDER BY ${page.orderBy}
-			</when>
-			<otherwise>
-			</otherwise>
-		</choose>
-	</select>
-
-    <sql id="insertColumns">
-	        id,
-	        des,
-	        indicator_id,
-	        total_score,
-	        evaluate_method,
-	        evaluate_formula,
-	        mapping_function,
-	        create_time,
-	        update_time
-    </sql>
-
-	<insert id="insert">
-        <selectKey keyProperty="id" resultType="String" order="BEFORE">
-          <choose>
-			<when test="id == null or  id  == ''">
-              select get_next_id('evaluate_rule','') from dual
-			</when>
-			<otherwise>
-			  select #{id} from dual
-			</otherwise>
-	      </choose>
-        </selectKey>
-		INSERT INTO evaluate_rule(
-            <include refid="insertColumns"/>
-		) VALUES (
-			#{id
-, jdbcType=VARCHAR
-
-},
-			#{des
-, jdbcType=VARCHAR
-
-},
-			#{indicatorId
-, jdbcType=VARCHAR
-
-},
-			#{totalScore
-
-
-},
-			#{evaluateMethod
-, jdbcType=VARCHAR
-
-},
-			#{evaluateFormula
-, jdbcType=VARCHAR
-
-},
-			#{mappingFunction
-, jdbcType=VARCHAR
-
-},
-			#{createTime
-
-
-},
-			#{updateTime
-
-
-}
-		)
-	</insert>
-
-	<insert id="insertList">
-		INSERT INTO evaluate_rule(
-		    <include refid="insertColumns"/>
-		) select FFF.* from (
-            <foreach collection="list" item="item" index="index" separator="UNION ALL" >
-                select
-                    #{item.id, jdbcType=VARCHAR} as "id",
-                    #{item.des, jdbcType=VARCHAR} as "des",
-                    #{item.indicatorId, jdbcType=VARCHAR} as "indicatorId",
-                    #{item.totalScore} as "totalScore",
-                    #{item.evaluateMethod, jdbcType=VARCHAR} as "evaluateMethod",
-                    #{item.evaluateFormula, jdbcType=VARCHAR} as "evaluateFormula",
-                    #{item.mappingFunction, jdbcType=VARCHAR} as "mappingFunction",
-                    #{item.createTime} as "createTime",
-                    #{item.updateTime} as "updateTime"
-                from dual
-            </foreach>
-		) FFF
-
-	</insert>
-
-	<update id="update">
-		UPDATE evaluate_rule SET
-			id = #{id},
-			des = #{des},
-			indicator_id = #{indicatorId},
-			total_score = #{totalScore},
-			evaluate_method = #{evaluateMethod},
-			evaluate_formula = #{evaluateFormula},
-			mapping_function = #{mappingFunction},
-			create_time = #{createTime},
-			update_time = #{updateTime},
-			update_by = #{updateBy}
-		WHERE id = #{id, jdbcType=VARCHAR}
-	</update>
-
-	<update id="delete">
-		DELETE FROM public.evaluate_rule
-	    WHERE
-		<choose>
-			<when test="id != null and  id  != ''">
-					 id = #{id, jdbcType=VARCHAR}
-			</when>
-			<otherwise>
-			</otherwise>
-		</choose>
-	</update>
-
-</mapper>

ims-service/ims-eval/src/main/resources/mappings/ims/eval/EvaluateScoreDao.xml

@@ -1,235 +0,0 @@
-<?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.EvaluateScoreDao">
-
-	<sql id="evaluateScoreColumns">
-		a.id AS "id",
-		a.des AS "des",
-		a.create_time AS "createTime",
-		a.create_by AS "createBy",
-		a.update_time AS "updateTime",
-		a.update_by AS "updateBy",
-		a.evaluate_cycle AS "evaluateCycle",
-		a.evaluate_type AS "evaluateType",
-		a.dept_id AS "deptId",
-		a.responsibility_id AS "responsibilityId",
-		a.sys_score AS "sysScore",
-		a.review_score AS "reviewScore",
-		a.review_people AS "reviewPeople",
-		a.review_people_time AS "reviewPeopleTime",
-		a.review_opinion AS "reviewOpinion"
-	</sql>
-
-
-    <sql id="whereStr">
-			1=1
-		    <!-- 快速定位 -->
-			<if test="sqlMap.key != null and  sqlMap.key  != ''">
-			  AND (
-			  )
-			</if>
-		    <!-- 高级查询dataFilter -->
-			<if test="sqlMap.df != null and  sqlMap.df  != ''">
-			   AND ( ${sqlMap.df} )
-			</if>
-		    <!-- 默认查询baseFilter -->
-			<if test="sqlMap.bf != null and  sqlMap.bf  != ''">
-			   AND ( ${sqlMap.bf} )
-			</if>
-		    <!-- 基本Query查询 -->
-			<if test="sqlMap.baseQuery != null and  sqlMap.baseQuery  != ''">
-			   AND ( ${sqlMap.baseQuery} )
-			</if>
-		    <!-- 特定Query查询 -->
-			<if test="sqlMap.specQuery != null and  sqlMap.specQuery  != ''">
-			   AND ( ${sqlMap.specQuery} )
-			</if>
-			<if test="sqlMap.dsf != null and  sqlMap.dsf  != ''">
-				AND (${sqlMap.dsf})
-			</if>
-    </sql>
-
-	<select id="get" resultType="EvaluateScore">
-		SELECT
-			<include refid="evaluateScoreColumns"/>
-		FROM public.{table.name} a
-
-		WHERE a.id = #{id}
-	</select>
-
-	<select id="findList" resultType="EvaluateScore">
-		SELECT
-			<include refid="evaluateScoreColumns"/>
-		FROM public.evaluate_score a
-
-		<where>
-              <include refid="whereStr"/>
-		</where>
-		<choose>
-			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
-				ORDER BY ${page.orderBy}
-			</when>
-			<otherwise>
-			</otherwise>
-		</choose>
-	</select>
-
-	<select id="findAllList" resultType="EvaluateScore">
-		SELECT
-			<include refid="evaluateScoreColumns"/>
-		FROM public.evaluate_score a
-
-		<where>
-			 <include refid="whereStr"/>
-		</where>
-		<choose>
-			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
-				ORDER BY ${page.orderBy}
-			</when>
-			<otherwise>
-			</otherwise>
-		</choose>
-	</select>
-
-    <sql id="insertColumns">
-	        id,
-	        des,
-	        create_time,
-	        update_time,
-	        evaluate_cycle,
-	        evaluate_type,
-	        dept_id,
-	        responsibility_id,
-	        sys_score,
-	        review_score,
-	        review_people,
-	        review_people_time,
-	        review_opinion
-    </sql>
-
-	<insert id="insert">
-        <selectKey keyProperty="id" resultType="String" order="BEFORE">
-          <choose>
-			<when test="id == null or  id  == ''">
-              select get_next_id('evaluate_score','') from dual
-			</when>
-			<otherwise>
-			  select #{id} from dual
-			</otherwise>
-	      </choose>
-        </selectKey>
-		INSERT INTO evaluate_score(
-            <include refid="insertColumns"/>
-		) VALUES (
-			#{id
-, jdbcType=VARCHAR
-
-},
-			#{des
-, jdbcType=VARCHAR
-
-},
-			#{createTime
-
-
-},
-			#{updateTime
-
-
-},
-			#{evaluateCycle
-, jdbcType=VARCHAR
-
-},
-			#{evaluateType
-, jdbcType=VARCHAR
-
-},
-			#{deptId
-, jdbcType=VARCHAR
-
-},
-			#{responsibilityId
-, jdbcType=VARCHAR
-
-},
-			#{sysScore
-
-
-},
-			#{reviewScore
-
-
-},
-			#{reviewPeople
-, jdbcType=VARCHAR
-
-},
-			#{reviewPeopleTime
-
-
-},
-			#{reviewOpinion
-, jdbcType=VARCHAR
-
-}
-		)
-	</insert>
-
-	<insert id="insertList">
-		INSERT INTO evaluate_score(
-		    <include refid="insertColumns"/>
-		) select FFF.* from (
-            <foreach collection="list" item="item" index="index" separator="UNION ALL" >
-                select
-                    #{item.id, jdbcType=VARCHAR} as "id",
-                    #{item.des, jdbcType=VARCHAR} as "des",
-                    #{item.createTime} as "createTime",
-                    #{item.updateTime} as "updateTime",
-                    #{item.evaluateCycle, jdbcType=VARCHAR} as "evaluateCycle",
-                    #{item.evaluateType, jdbcType=VARCHAR} as "evaluateType",
-                    #{item.deptId, jdbcType=VARCHAR} as "deptId",
-                    #{item.responsibilityId, jdbcType=VARCHAR} as "responsibilityId",
-                    #{item.sysScore} as "sysScore",
-                    #{item.reviewScore} as "reviewScore",
-                    #{item.reviewPeople, jdbcType=VARCHAR} as "reviewPeople",
-                    #{item.reviewPeopleTime} as "reviewPeopleTime",
-                    #{item.reviewOpinion, jdbcType=VARCHAR} as "reviewOpinion"
-                from dual
-            </foreach>
-		) FFF
-
-	</insert>
-
-	<update id="update">
-		UPDATE evaluate_score SET
-			id = #{id},
-			des = #{des},
-			create_time = #{createTime},
-			update_time = #{updateTime},
-			update_by = #{updateBy},
-			evaluate_cycle = #{evaluateCycle},
-			evaluate_type = #{evaluateType},
-			dept_id = #{deptId},
-			responsibility_id = #{responsibilityId},
-			sys_score = #{sysScore},
-			review_score = #{reviewScore},
-			review_people = #{reviewPeople},
-			review_people_time = #{reviewPeopleTime},
-			review_opinion = #{reviewOpinion}
-		WHERE id = #{id, jdbcType=VARCHAR}
-	</update>
-
-	<update id="delete">
-		DELETE FROM public.evaluate_score
-	    WHERE
-		<choose>
-			<when test="id != null and  id  != ''">
-					 id = #{id, jdbcType=VARCHAR}
-			</when>
-			<otherwise>
-			</otherwise>
-		</choose>
-	</update>
-
-</mapper>

ims-service/ims-eval/src/main/resources/mappings/ims/eval/EvaluationScoringRuleDao.xml

@@ -1,45 +0,0 @@
-<?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.EvaluationScoringRuleMapper">
-
-    <sql id="EvaluationScoringRuleColumns">
-        a.id AS "id",
-		a.indicator_id AS "indicatorId",
-		a.type AS "type",
-		a.departid AS "departid",
-		a.describe AS "describe",
-		a.parttition_interval AS "parttitionInterval"
-    </sql>
-
-    <!--
-
-    b.id As "id",
-        b.rule_id As "ruleId",
-        b.range As "range",
-        b.rule_description As "ruleDescription",
-        b.regular_expression As "regularExpression",
-        b.enabled As "enabled",
-        b.create_time As "createTime",
-        b.create_by As "createBy",
-        b.update_time As "updateTime",
-        b.update_by As "updateBy",
-    -->
-    <select id="list" resultType="EvaluationScoringRule">
-        SELECT
-        <include refid="EvaluationScoringRuleColumns"/>
-        FROM evaluation_scoring_rule a left join  interval_scoring_table b on a.id = b.rule_id
-        <where>
-            <if test="id != null and  id  != ''">
-                AND a.id = #{id}
-            </if>
-            <if test="type != null and  type  != ''">
-                AND a.type = #{type}
-            </if>
-            <if test="indicatorId != null and  indicatorId  != ''">
-                AND a.indicator_id = #{indicatorId}
-            </if>
-        </where>
-    </select>
-
-
-</mapper>

ims-service/ims-eval/src/main/resources/mappings/ims/eval/IndicatorDao.xml

@@ -1,259 +0,0 @@
-<?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.IndicatorDao">
-
-	<sql id="indicatorColumns">
-		a.id AS "id",
-		a.indicator_name AS "indicatorName",
-		a.indicator_cede AS "indicatorCede",
-		a.unit AS "unit",
-		a.is_quantified AS "isQuantified",
-		a.is_additional AS "isAdditional",
-		a.des AS "des",
-		a.bin_section AS "binSection",
-		a.bin_stage AS "binStage",
-		a.dept AS "dept",
-		a.company AS "company",
-		a.enable AS "enable",
-		a.create_time AS "createTime",
-		a.update_time AS "updateTime",
-		a.create_by AS "createBy",
-		a.update_by AS "updateBy",
-		a.remark AS "remark",
-		a.order_num AS "orderNum"
-	</sql>
-
-
-    <sql id="whereStr">
-			1=1
-		    <!-- 快速定位 -->
-			<if test="sqlMap.key != null and  sqlMap.key  != ''">
-			  AND (
-			  )
-			</if>
-		    <!-- 高级查询dataFilter -->
-			<if test="sqlMap.df != null and  sqlMap.df  != ''">
-			   AND ( ${sqlMap.df} )
-			</if>
-		    <!-- 默认查询baseFilter -->
-			<if test="sqlMap.bf != null and  sqlMap.bf  != ''">
-			   AND ( ${sqlMap.bf} )
-			</if>
-		    <!-- 基本Query查询 -->
-			<if test="sqlMap.baseQuery != null and  sqlMap.baseQuery  != ''">
-			   AND ( ${sqlMap.baseQuery} )
-			</if>
-		    <!-- 特定Query查询 -->
-			<if test="sqlMap.specQuery != null and  sqlMap.specQuery  != ''">
-			   AND ( ${sqlMap.specQuery} )
-			</if>
-			<if test="sqlMap.dsf != null and  sqlMap.dsf  != ''">
-				AND (${sqlMap.dsf})
-			</if>
-    </sql>
-
-	<select id="get" resultType="Indicator">
-		SELECT
-			<include refid="indicatorColumns"/>
-		FROM public.{table.name} a
-
-		WHERE a.id = #{id}
-	</select>
-
-	<select id="findList" resultType="Indicator">
-		SELECT
-			<include refid="indicatorColumns"/>
-		FROM public.indicator a
-
-		<where>
-              <include refid="whereStr"/>
-		</where>
-		<choose>
-			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
-				ORDER BY ${page.orderBy}
-			</when>
-			<otherwise>
-			</otherwise>
-		</choose>
-	</select>
-
-	<select id="findAllList" resultType="Indicator">
-		SELECT
-			<include refid="indicatorColumns"/>
-		FROM public.indicator a
-
-		<where>
-			 <include refid="whereStr"/>
-		</where>
-		<choose>
-			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
-				ORDER BY ${page.orderBy}
-			</when>
-			<otherwise>
-			</otherwise>
-		</choose>
-	</select>
-
-    <sql id="insertColumns">
-	        id,
-	        indicator_name,
-	        indicator_cede,
-	        unit,
-	        is_quantified,
-	        is_additional,
-	        des,
-	        bin_section,
-	        bin_stage,
-	        dept,
-	        company,
-	        enable,
-	        create_time,
-	        update_time,
-	        remark,
-	        order_num
-    </sql>
-
-	<insert id="insert">
-        <selectKey keyProperty="id" resultType="String" order="BEFORE">
-          <choose>
-			<when test="id == null or  id  == ''">
-              select get_next_id('indicator','') from dual
-			</when>
-			<otherwise>
-			  select #{id} from dual
-			</otherwise>
-	      </choose>
-        </selectKey>
-		INSERT INTO indicator(
-            <include refid="insertColumns"/>
-		) VALUES (
-			#{id
-, jdbcType=VARCHAR
-
-},
-			#{indicatorName
-, jdbcType=VARCHAR
-
-},
-			#{indicatorCede
-, jdbcType=VARCHAR
-
-},
-			#{unit
-, jdbcType=VARCHAR
-
-},
-			#{isQuantified
-, jdbcType=VARCHAR
-
-},
-			#{isAdditional
-, jdbcType=VARCHAR
-
-},
-			#{des
-, jdbcType=VARCHAR
-
-},
-			#{binSection
-, jdbcType=VARCHAR
-
-},
-			#{binStage
-, jdbcType=VARCHAR
-
-},
-			#{dept
-, jdbcType=VARCHAR
-
-},
-			#{company
-, jdbcType=VARCHAR
-
-},
-			#{enable
-
-
-},
-			#{createTime
-
-
-},
-			#{updateTime
-
-
-},
-			#{remark
-, jdbcType=VARCHAR
-
-},
-			#{orderNum
-
-
-}
-		)
-	</insert>
-
-	<insert id="insertList">
-		INSERT INTO indicator(
-		    <include refid="insertColumns"/>
-		) select FFF.* from (
-            <foreach collection="list" item="item" index="index" separator="UNION ALL" >
-                select
-                    #{item.id, jdbcType=VARCHAR} as "id",
-                    #{item.indicatorName, jdbcType=VARCHAR} as "indicatorName",
-                    #{item.indicatorCede, jdbcType=VARCHAR} as "indicatorCede",
-                    #{item.unit, jdbcType=VARCHAR} as "unit",
-                    #{item.isQuantified, jdbcType=VARCHAR} as "isQuantified",
-                    #{item.isAdditional, jdbcType=VARCHAR} as "isAdditional",
-                    #{item.des, jdbcType=VARCHAR} as "des",
-                    #{item.binSection, jdbcType=VARCHAR} as "binSection",
-                    #{item.binStage, jdbcType=VARCHAR} as "binStage",
-                    #{item.dept, jdbcType=VARCHAR} as "dept",
-                    #{item.company, jdbcType=VARCHAR} as "company",
-                    #{item.enable} as "enable",
-                    #{item.createTime} as "createTime",
-                    #{item.updateTime} as "updateTime",
-                    #{item.remark, jdbcType=VARCHAR} as "remark",
-                    #{item.orderNum} as "orderNum"
-                from dual
-            </foreach>
-		) FFF
-
-	</insert>
-
-	<update id="update">
-		UPDATE indicator SET
-			id = #{id},
-			indicator_name = #{indicatorName},
-			indicator_cede = #{indicatorCede},
-			unit = #{unit},
-			is_quantified = #{isQuantified},
-			is_additional = #{isAdditional},
-			des = #{des},
-			bin_section = #{binSection},
-			bin_stage = #{binStage},
-			dept = #{dept},
-			company = #{company},
-			enable = #{enable},
-			create_time = #{createTime},
-			update_time = #{updateTime},
-			update_by = #{updateBy},
-			remark = #{remark},
-			order_num = #{orderNum}
-		WHERE id = #{id, jdbcType=VARCHAR}
-	</update>
-
-	<update id="delete">
-		DELETE FROM public.indicator
-	    WHERE
-		<choose>
-			<when test="id != null and  id  != ''">
-					 id = #{id, jdbcType=VARCHAR}
-			</when>
-			<otherwise>
-			</otherwise>
-		</choose>
-	</update>
-
-</mapper>

ims-service/ims-eval/src/main/resources/mappings/ims/eval/IndicatorDictionaryDao.xml

@@ -1,195 +0,0 @@
-<?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.IndicatorDictionaryDao">
-
-	<sql id="indicatorDictionaryColumns">
-		a.id AS "id",
-		a.indicator_id AS "indicatorId",
-		a.option_code AS "optionCode",
-		a.option_name AS "optionName",
-		a.option_order AS "optionOrder",
-		a.des AS "des",
-		a.create_by AS "createBy",
-		a.create_time AS "createTime",
-		a.update_by AS "updateBy",
-		a.update_time AS "updateTime"
-	</sql>
-
-
-    <sql id="whereStr">
-			1=1
-		    <!-- 快速定位 -->
-			<if test="sqlMap.key != null and  sqlMap.key  != ''">
-			  AND (
-			  )
-			</if>
-		    <!-- 高级查询dataFilter -->
-			<if test="sqlMap.df != null and  sqlMap.df  != ''">
-			   AND ( ${sqlMap.df} )
-			</if>
-		    <!-- 默认查询baseFilter -->
-			<if test="sqlMap.bf != null and  sqlMap.bf  != ''">
-			   AND ( ${sqlMap.bf} )
-			</if>
-		    <!-- 基本Query查询 -->
-			<if test="sqlMap.baseQuery != null and  sqlMap.baseQuery  != ''">
-			   AND ( ${sqlMap.baseQuery} )
-			</if>
-		    <!-- 特定Query查询 -->
-			<if test="sqlMap.specQuery != null and  sqlMap.specQuery  != ''">
-			   AND ( ${sqlMap.specQuery} )
-			</if>
-			<if test="sqlMap.dsf != null and  sqlMap.dsf  != ''">
-				AND (${sqlMap.dsf})
-			</if>
-    </sql>
-
-	<select id="get" resultType="IndicatorDictionary">
-		SELECT
-			<include refid="indicatorDictionaryColumns"/>
-		FROM indicator_dictionary a
-
-		WHERE a.id = #{id}
-	</select>
-
-	<select id="findList" resultType="IndicatorDictionary">
-		SELECT
-			<include refid="indicatorDictionaryColumns"/>
-		FROM public.indicator_dictionary a
-
-		<where>
-              <include refid="whereStr"/>
-		</where>
-		<choose>
-			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
-				ORDER BY ${page.orderBy}
-			</when>
-			<otherwise>
-			</otherwise>
-		</choose>
-	</select>
-
-	<select id="findAllList" resultType="IndicatorDictionary">
-		SELECT
-			<include refid="indicatorDictionaryColumns"/>
-		FROM public.indicator_dictionary a
-
-		<where>
-			 <include refid="whereStr"/>
-		</where>
-		<choose>
-			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
-				ORDER BY ${page.orderBy}
-			</when>
-			<otherwise>
-			</otherwise>
-		</choose>
-	</select>
-
-    <sql id="insertColumns">
-	        id,
-	        indicator_id,
-	        option_code,
-	        option_name,
-	        option_order,
-	        des,
-	        create_time,
-	        update_time
-    </sql>
-
-	<insert id="insert">
-        <selectKey keyProperty="id" resultType="String" order="BEFORE">
-          <choose>
-			<when test="id == null or  id  == ''">
-              select get_next_id('indicator_dictionary','') from dual
-			</when>
-			<otherwise>
-			  select #{id} from dual
-			</otherwise>
-	      </choose>
-        </selectKey>
-		INSERT INTO indicator_dictionary(
-            <include refid="insertColumns"/>
-		) VALUES (
-			#{id
-, jdbcType=VARCHAR
-
-},
-			#{indicatorId
-, jdbcType=VARCHAR
-
-},
-			#{optionCode
-, jdbcType=VARCHAR
-
-},
-			#{optionName
-, jdbcType=VARCHAR
-
-},
-			#{optionOrder
-
-
-},
-			#{des
-, jdbcType=VARCHAR
-
-},
-			#{createTime
-
-
-},
-			#{updateTime
-
-
-}
-		)
-	</insert>
-
-	<insert id="insertList">
-		INSERT INTO indicator_dictionary(
-		    <include refid="insertColumns"/>
-		) select FFF.* from (
-            <foreach collection="list" item="item" index="index" separator="UNION ALL" >
-                select
-                    #{item.id, jdbcType=VARCHAR} as "id",
-                    #{item.indicatorId, jdbcType=VARCHAR} as "indicatorId",
-                    #{item.optionCode, jdbcType=VARCHAR} as "optionCode",
-                    #{item.optionName, jdbcType=VARCHAR} as "optionName",
-                    #{item.optionOrder} as "optionOrder",
-                    #{item.des, jdbcType=VARCHAR} as "des",
-                    #{item.createTime} as "createTime",
-                    #{item.updateTime} as "updateTime"
-                from dual
-            </foreach>
-		) FFF
-
-	</insert>
-
-	<update id="update">
-		UPDATE indicator_dictionary SET
-			id = #{id},
-			indicator_id = #{indicatorId},
-			option_code = #{optionCode},
-			option_name = #{optionName},
-			option_order = #{optionOrder},
-			des = #{des},
-			create_time = #{createTime},
-			update_by = #{updateBy},
-			update_time = #{updateTime}
-		WHERE id = #{id, jdbcType=VARCHAR}
-	</update>
-
-	<update id="delete">
-		DELETE FROM public.indicator_dictionary
-	    WHERE
-		<choose>
-			<when test="id != null and  id  != ''">
-					 id = #{id, jdbcType=VARCHAR}
-			</when>
-			<otherwise>
-			</otherwise>
-		</choose>
-	</update>
-
-</mapper>

ims-service/ims-eval/src/main/resources/mappings/ims/eval/ReportDao.xml

@@ -1,195 +0,0 @@
-<?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.ReportDao">
-
-	<sql id="reportColumns">
-		a.id AS "id",
-		a.report_title AS "reportTitle",
-		a.des AS "des",
-		a.publish_time AS "publishTime",
-		a.report_path AS "reportPath",
-		a.dept_id AS "deptId",
-		a.create_time AS "createTime",
-		a.create_by AS "createBy",
-		a.update_time AS "updateTime",
-		a.update_by AS "updateBy"
-	</sql>
-
-
-    <sql id="whereStr">
-			1=1
-		    <!-- 快速定位 -->
-			<if test="sqlMap.key != null and  sqlMap.key  != ''">
-			  AND (
-			  )
-			</if>
-		    <!-- 高级查询dataFilter -->
-			<if test="sqlMap.df != null and  sqlMap.df  != ''">
-			   AND ( ${sqlMap.df} )
-			</if>
-		    <!-- 默认查询baseFilter -->
-			<if test="sqlMap.bf != null and  sqlMap.bf  != ''">
-			   AND ( ${sqlMap.bf} )
-			</if>
-		    <!-- 基本Query查询 -->
-			<if test="sqlMap.baseQuery != null and  sqlMap.baseQuery  != ''">
-			   AND ( ${sqlMap.baseQuery} )
-			</if>
-		    <!-- 特定Query查询 -->
-			<if test="sqlMap.specQuery != null and  sqlMap.specQuery  != ''">
-			   AND ( ${sqlMap.specQuery} )
-			</if>
-			<if test="sqlMap.dsf != null and  sqlMap.dsf  != ''">
-				AND (${sqlMap.dsf})
-			</if>
-    </sql>
-
-	<select id="get" resultType="Report">
-		SELECT
-			<include refid="reportColumns"/>
-		FROM public.{table.name} a
-
-		WHERE a.id = #{id}
-	</select>
-
-	<select id="findList" resultType="Report">
-		SELECT
-			<include refid="reportColumns"/>
-		FROM public.report a
-
-		<where>
-              <include refid="whereStr"/>
-		</where>
-		<choose>
-			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
-				ORDER BY ${page.orderBy}
-			</when>
-			<otherwise>
-			</otherwise>
-		</choose>
-	</select>
-
-	<select id="findAllList" resultType="Report">
-		SELECT
-			<include refid="reportColumns"/>
-		FROM public.report a
-
-		<where>
-			 <include refid="whereStr"/>
-		</where>
-		<choose>
-			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
-				ORDER BY ${page.orderBy}
-			</when>
-			<otherwise>
-			</otherwise>
-		</choose>
-	</select>
-
-    <sql id="insertColumns">
-	        id,
-	        report_title,
-	        des,
-	        publish_time,
-	        report_path,
-	        dept_id,
-	        create_time,
-	        update_time
-    </sql>
-
-	<insert id="insert">
-        <selectKey keyProperty="id" resultType="String" order="BEFORE">
-          <choose>
-			<when test="id == null or  id  == ''">
-              select get_next_id('report','') from dual
-			</when>
-			<otherwise>
-			  select #{id} from dual
-			</otherwise>
-	      </choose>
-        </selectKey>
-		INSERT INTO report(
-            <include refid="insertColumns"/>
-		) VALUES (
-			#{id
-, jdbcType=VARCHAR
-
-},
-			#{reportTitle
-, jdbcType=VARCHAR
-
-},
-			#{des
-, jdbcType=VARCHAR
-
-},
-			#{publishTime
-
-
-},
-			#{reportPath
-, jdbcType=VARCHAR
-
-},
-			#{deptId
-, jdbcType=VARCHAR
-
-},
-			#{createTime
-
-
-},
-			#{updateTime
-
-
-}
-		)
-	</insert>
-
-	<insert id="insertList">
-		INSERT INTO report(
-		    <include refid="insertColumns"/>
-		) select FFF.* from (
-            <foreach collection="list" item="item" index="index" separator="UNION ALL" >
-                select
-                    #{item.id, jdbcType=VARCHAR} as "id",
-                    #{item.reportTitle, jdbcType=VARCHAR} as "reportTitle",
-                    #{item.des, jdbcType=VARCHAR} as "des",
-                    #{item.publishTime} as "publishTime",
-                    #{item.reportPath, jdbcType=VARCHAR} as "reportPath",
-                    #{item.deptId, jdbcType=VARCHAR} as "deptId",
-                    #{item.createTime} as "createTime",
-                    #{item.updateTime} as "updateTime"
-                from dual
-            </foreach>
-		) FFF
-
-	</insert>
-
-	<update id="update">
-		UPDATE report SET
-			id = #{id},
-			report_title = #{reportTitle},
-			des = #{des},
-			publish_time = #{publishTime},
-			report_path = #{reportPath},
-			dept_id = #{deptId},
-			create_time = #{createTime},
-			update_time = #{updateTime},
-			update_by = #{updateBy}
-		WHERE id = #{id, jdbcType=VARCHAR}
-	</update>
-
-	<update id="delete">
-		DELETE FROM public.report
-	    WHERE
-		<choose>
-			<when test="id != null and  id  != ''">
-					 id = #{id, jdbcType=VARCHAR}
-			</when>
-			<otherwise>
-			</otherwise>
-		</choose>
-	</update>
-
-</mapper>