From ba682942eba9618f17b1af2665c97390320abdd4 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 18 八月 2023 22:11:55 +0800
Subject: [PATCH] 修复bug
---
server/src/main/java/doumeemes/service/business/impl/SalaryParamServiceImpl.java | 2 +-
server/src/main/resources/mappers/WorkorderRecordExtMapper.xml | 33 +--------------------------------
2 files changed, 2 insertions(+), 33 deletions(-)
diff --git a/server/src/main/java/doumeemes/service/business/impl/SalaryParamServiceImpl.java b/server/src/main/java/doumeemes/service/business/impl/SalaryParamServiceImpl.java
index 2c66aea..2c339cd 100644
--- a/server/src/main/java/doumeemes/service/business/impl/SalaryParamServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/business/impl/SalaryParamServiceImpl.java
@@ -265,7 +265,7 @@
salaryParam.setRootDepartId(department.getRootId());
salaryParam.setDepartId(department.getId());
salaryParam.setProcedureId(procedures.getId());
- salaryParam.setMaterialId(materialDistribute1.getId());
+ salaryParam.setMaterialId(materialDistribute.getId());
salaryParam.setSalary(salaryParamImportDTO.getSalary());
salaryParam.setNum(new BigDecimal(salaryParamImportDTO.getNum()));
salaryParam.setTimes(getIntegerTimes(salaryParamImportDTO.getTimesName()));
diff --git a/server/src/main/resources/mappers/WorkorderRecordExtMapper.xml b/server/src/main/resources/mappers/WorkorderRecordExtMapper.xml
index d1476ae..7ba6f80 100644
--- a/server/src/main/resources/mappers/WorkorderRecordExtMapper.xml
+++ b/server/src/main/resources/mappers/WorkorderRecordExtMapper.xml
@@ -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