From 91ab1a15515c4c213b2ac4f777a7f20c3d0d59ad Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 28 三月 2025 13:49:53 +0800
Subject: [PATCH] 一个订单在每个站点检验都需要扫码入库报检,在中间站点复核继续试验之后默认自动将样品出库,且在列表中也不需要再展示出来,到最后一步复核结束反而是需要手动去出库不能自动出库,且出库之后也不需要在页面展示
---
performance-server/src/main/resources/mapper/EvaluateMapper.xml | 36 +++++++++++++++++++++++++++++-------
1 files changed, 29 insertions(+), 7 deletions(-)
diff --git a/performance-server/src/main/resources/mapper/EvaluateMapper.xml b/performance-server/src/main/resources/mapper/EvaluateMapper.xml
index 126f445..92ad065 100644
--- a/performance-server/src/main/resources/mapper/EvaluateMapper.xml
+++ b/performance-server/src/main/resources/mapper/EvaluateMapper.xml
@@ -1,14 +1,36 @@
<?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.yuanchu.mom.mapper.EvaluateMapper">
-
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
<resultMap id="BaseResultMap" type="com.yuanchu.mom.pojo.Evaluate">
- <id column="id" property="id" />
- <result column="user_id" property="userId" />
- <result column="score" property="score" />
- <result column="grade" property="grade" />
- <result column="month" property="month" />
+ <id column="id" property="id"/>
+ <result column="user_id" property="userId"/>
+ <result column="account" property="account"/>
+ <result column="name" property="name"/>
+ <result column="depart_lims" property="departLims"/>
+ <result column="score" property="score"/>
+ <result column="grade" property="grade"/>
+ <result column="month" property="month"/>
+ <result column="competentTotal" property="competentTotal"/>
+ <result column="groupTotal" property="groupTotal"/>
+ <result column="leaderTotal" property="leaderTotal"/>
</resultMap>
-
+ <select id="getPage" resultType="com.yuanchu.mom.pojo.Evaluate">
+ select * from(select e.*,
+ account,
+ u.name name,
+ dl.name depart_lims,
+ ec.total*0.5 competentTotal,
+ eg.total*0.2 groupTotal,
+ el.total*0.3 leaderTotal
+ from evaluate e
+ left join evaluate_competent ec on e.id = ec.evaluate_id
+ left join evaluate_group eg on e.id = eg.evaluate_id
+ left join evaluate_leader el on e.id = el.evaluate_id
+ left join user u on e.user_id = u.id
+ left join department_lims dl on FIND_IN_SET(dl.id, depart_lims_id) ) A
+ <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
+ ${ew.customSqlSegment}
+ </if>
+ </select>
</mapper>
--
Gitblit v1.9.3