From ca27f46e204ee9772040b5b1170b0e2c1addc738 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 18 八月 2023 23:26:01 +0800
Subject: [PATCH] 111
---
server/src/main/resources/mappers/WorkorderRecordExtMapper.xml | 35 ++---------------------------------
1 files changed, 2 insertions(+), 33 deletions(-)
diff --git a/server/src/main/resources/mappers/WorkorderRecordExtMapper.xml b/server/src/main/resources/mappers/WorkorderRecordExtMapper.xml
index 1af2515..7ba6f80 100644
--- a/server/src/main/resources/mappers/WorkorderRecordExtMapper.xml
+++ b/server/src/main/resources/mappers/WorkorderRecordExtMapper.xml
@@ -469,7 +469,7 @@
<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(distinct(a.workorder_id)) as num
+ ,count(distinct(workorder_id)) as num
,sum(salary) as totalSalary
from `workorder_record`
where `DELETED` =0 and `SALARY` >0
@@ -548,38 +548,7 @@
</select>
<select id="selectListNew" parameterType="doumeemes.dao.ext.dto.QueryWorkorderRecordExtDTO" resultMap="WorkorderRecordExtListVO">
SELECT
- `a`.`ID`,
- `a`.`DELETED`,
- `a`.`CREATE_USER`,
- `a`.`CREATE_TIME`,
- `a`.`UPDATE_USER`,
- `a`.`UPDATE_TIME`,
- `a`.`REMARK`,
- `a`.`ROOT_DEPART_ID`,
- `a`.`DEPART_ID`,
- `a`.`PLAN_ID`,
- `a`.`WORKORDER_ID`,
- `a`.`BATCH`,
- `a`.`FACTORY_ID`,
- `a`.`PROCEDURE_ID`,
- `a`.`PRO_DEVICE_ID`,
- `a`.`APPLIANCES_ID`,
- `a`.`PRO_DATE`,
- `a`.`TYPE`,
- `a`.`NUM`,
- `a`.`DONE_TYPE`,
- `a`.`MATERIAL_ID`,
- `a`.`UNIT_ID`,
- `a`.`MATERIAL_BATCH`,
- `a`.`CHECK_WAY`,
- `a`.`CHECK_USER_ID`,
- `a`.`QUALIFIED_NUM`,
- `a`.`UNQUALIFIED_NUM`,
- `a`.`CHECK_DATE`,
- `a`.`CHECK_INFO`,
- `a`.`QUALIFIED_APPLIANCE_ID`,
- `a`.`PRO_USERIDS`,
- `a`.MATERIAL_DONETYPE,`a`.MATERIAL_PROCEDURE_ID,`a`.RELOBJ_ID,`a`.RELOBJ_TYPE,
+ `a`.*,
`dmodel`.`ID` AS DMODEL_ID,
`dmodel`.`DELETED` AS DMODEL_DELETED,
`dmodel`.`CREATE_USER` AS DMODEL_CREATE_USER,
--
Gitblit v1.9.3