From 513485caca0c56c713797bfd208c6f22c7ce7727 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 17 八月 2023 17:06:54 +0800
Subject: [PATCH] 初始化1.0.1
---
server/src/main/resources/mappers/WorkorderRecordExtMapper.xml | 74 +------------------------------------
1 files changed, 2 insertions(+), 72 deletions(-)
diff --git a/server/src/main/resources/mappers/WorkorderRecordExtMapper.xml b/server/src/main/resources/mappers/WorkorderRecordExtMapper.xml
index f4c1edd..346e661 100644
--- a/server/src/main/resources/mappers/WorkorderRecordExtMapper.xml
+++ b/server/src/main/resources/mappers/WorkorderRecordExtMapper.xml
@@ -431,62 +431,6 @@
</where>
limit 1
</select>
- <select id="userSalaryPage" parameterType="doumeemes.dao.ext.dto.QueryUserSalaryListDTO" resultType="doumeemes.dao.ext.vo.UserSalaryListVO">
- select a.WORKORDER_ID,b.`CODE` as workorderCode,c.`NAME` as materialName,c.code as materialCode
- ,d.name as unitName,a.PROCEDURE_ID,f.`NAME` as procedureName,a.CREATE_USER as userId
- ,sum(a.QUALIFIED_NUM) as qualifiedNum
- ,sum(a.UNQUALIFIED_NUM) as unQualifiedNum
- ,sum(a.num) as NUM
- from `workorder_record` a
- left join workorder b on a.WORKORDER_ID=b.id
- left join material_distribute m on b.MATERIAL_ID = m.ID
- left join material c on m.MATERIAL_ID = c.ID
- left join unit d on a.UNIT_ID = d.ID
- left join procedures f on a.PROCEDURE_ID =f.ID
- where a.DELETED = 0
- <if test="rootDepartId != null">
- AND a.`ROOT_DEPART_ID` = #{rootDepartId}
- </if>
- <if test="procedureId != null">
- AND a.`PROCEDURE_ID` = #{procedureId}
- </if>
- <if test="materialName != null and materialName !=''">
- AND (c.`name` like concat('%', #{materialName},'%') or c.`code` like concat('%', #{materialName},'%'))
- </if>
- <if test="startDate != null">
- AND a.`CREATE_TIME` >= #{startDate}
- </if>
- <if test="endDate != null">
- AND #{endDate} >= a.`CREATE_TIME`
- </if>
- <if test="userId != null">
- AND a.`CREATE_USER` = #{userId}
- </if>
- group by a.`WORKORDER_ID`
- order by a.CREATE_TIME desc
- </select>
- <select id="salaryStatistic" parameterType="doumeemes.dao.ext.dto.QuerySalaryStatisticDTO" resultType="doumeemes.dao.ext.vo.SalaryStatisticsListVO">
- select `CREATE_USER` as userId ,sum(CASE WHEN salary_type=0 THEN salary ELSE 0 END ) as jijianSalary
- ,sum(CASE WHEN salary_type=0 THEN 0 ELSE salary END ) as jishiSalary
- ,count(id) as num
- ,sum(salary) as totalSalary
- from `workorder_record`
- where `DELETED` =0 and `SALARY` >0
- <if test="rootDepartId != null">
- AND `ROOT_DEPART_ID` = #{rootDepartId}
- </if>
- <if test="userId != null">
- AND `CREATE_USER` = #{userId}
- </if>
- <if test="startDate != null">
- AND `CREATE_TIME` >= #{startDate}
- </if>
- <if test="endDate != null">
- AND #{endDate} >= `CREATE_TIME`
- </if>
- group by `CREATE_USER`
- <!-- order by `CREATE_TIME` desc-->
- </select>
<select id="selectListNew" parameterType="doumeemes.dao.ext.dto.QueryWorkorderRecordExtDTO" resultMap="WorkorderRecordExtListVO">
SELECT
`a`.`ID`,
@@ -1480,14 +1424,7 @@
MATERIAL_DONETYPE,
MATERIAL_PROCEDURE_ID,
RELOBJ_ID,
- RELOBJ_TYPE,
- `DURATION`,
- `SALARY`,
- `SALARY_PRICE`,
- `SALARY_NUM`,
- `SALARY_TIMES`,
- `SALARY_UNQUALIFIED`,
- `SALARY_TYPE`
+ RELOBJ_TYPE
)
values <foreach collection="list" separator="," item="item">
(
@@ -1525,14 +1462,7 @@
#{item.materialDonetype},
#{item.materialProcedureId},
#{item.relobjId},
- #{item.relobjType},
- #{item.duration},
- #{item.salary},
- #{item.salaryPrice},
- #{item.salaryNum},
- #{item.salaryTimes},
- #{item.salaryUnqualified},
- #{item.salaryType}
+ #{item.relobjType}
)
</foreach>
</insert>
--
Gitblit v1.9.3