From e2dba648a958d3f9181b0556c941f14d07477a64 Mon Sep 17 00:00:00 2001
From: JYW <2013732181@qq.com>
Date: 星期五, 10 五月 2024 17:34:49 +0800
Subject: [PATCH] 辅助工时单位字段修改和不合格品bug修改
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsUnPassServiceImpl.java | 2 --
performance-server/src/main/resources/mapper/AuxiliaryWorkingHoursMapper.xml | 6 +++---
performance-server/src/main/java/com/yuanchu/mom/pojo/AuxiliaryWorkingHours.java | 5 +----
inspect-server/src/main/resources/mapper/InsUnPassMapper.xml | 8 --------
4 files changed, 4 insertions(+), 17 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsUnPassServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsUnPassServiceImpl.java
index 4350315..19bf21e 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsUnPassServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsUnPassServiceImpl.java
@@ -30,8 +30,6 @@
public Map<String, Object> pageInsUnPass(Page page, UnPassPageDto unPassPageDto) {
Map<String, Object> map = new HashMap<>();
map.put("head", PrintChina.printChina(UnPassPageDto.class));
- Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("pageInsUnPass");
- if (map1.get("look") == 1) unPassPageDto.setCreateUser(map1.get("userId"));
map.put("body", insUnPassMapper.pageInsUnPass(page, QueryWrappers.queryWrappers(unPassPageDto)));
return map;
}
diff --git a/inspect-server/src/main/resources/mapper/InsUnPassMapper.xml b/inspect-server/src/main/resources/mapper/InsUnPassMapper.xml
index 79658de..88c5d45 100644
--- a/inspect-server/src/main/resources/mapper/InsUnPassMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsUnPassMapper.xml
@@ -19,14 +19,6 @@
<result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
</resultMap>
<select id="pageInsUnPass" resultType="com.yuanchu.mom.dto.UnPassPageDto">
--- select *
--- from (
--- select
--- iu.*,io.entrust_code,u.name write_user_name
--- from ins_un_pass iu
--- left join ins_order io on io.id = iu.ins_order_id
--- left join user u on u.id = iu.create_user
--- ) a
select *
from ins_un_pass iu
</select>
diff --git a/performance-server/src/main/java/com/yuanchu/mom/pojo/AuxiliaryWorkingHours.java b/performance-server/src/main/java/com/yuanchu/mom/pojo/AuxiliaryWorkingHours.java
index 1d076c8..570c382 100644
--- a/performance-server/src/main/java/com/yuanchu/mom/pojo/AuxiliaryWorkingHours.java
+++ b/performance-server/src/main/java/com/yuanchu/mom/pojo/AuxiliaryWorkingHours.java
@@ -61,8 +61,6 @@
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
- @ApiModelProperty("澶栭敭锛氬瓧鍏竔d锛堝崟浣嶏級")
- private Integer eId;
@ValueTableShow(6)
@ApiModelProperty("閮ㄩ棬")
private String department;
@@ -70,7 +68,6 @@
@ApiModelProperty("瀹為獙瀹�")
private String laboratory;
@ValueTableShow(4)
- @TableField(exist = false)
@ApiModelProperty("鍗曚綅")
- private String label;
+ private String unit;
}
diff --git a/performance-server/src/main/resources/mapper/AuxiliaryWorkingHoursMapper.xml b/performance-server/src/main/resources/mapper/AuxiliaryWorkingHoursMapper.xml
index 133dc87..7977187 100644
--- a/performance-server/src/main/resources/mapper/AuxiliaryWorkingHoursMapper.xml
+++ b/performance-server/src/main/resources/mapper/AuxiliaryWorkingHoursMapper.xml
@@ -5,6 +5,7 @@
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
<resultMap id="BaseResultMap" type="com.yuanchu.mom.pojo.AuxiliaryWorkingHours">
<id column="id" property="id" />
+ <result column="number" property="number"/>
<result column="AuxiliaryProject" property="auxiliaryProject" />
<result column="approved_working_hour" property="approvedWorkingHour" />
<result column="remarks" property="remarks" />
@@ -12,9 +13,9 @@
<result column="update_user" property="updateUser" />
<result column="create_time" property="createTime" />
<result column="update_time" property="updateTime" />
- <result column="e_id" property="eId" />
<result column="department" property="department" />
<result column="laboratory" property="laboratory" />
+ <result column="unit" property="unit"/>
</resultMap>
<select id="selectAuxiliaryWorkingHours" resultType="com.yuanchu.mom.pojo.AuxiliaryWorkingHours">
select data.*
@@ -24,12 +25,11 @@
awh.number,
awh.auxiliary_project,
awh.laboratory,
- enu.label,
+ awh.unit,
awh.approved_working_hour,
awh.department,
awh.remarks
FROM auxiliary_working_hours awh
- left JOIN enums enu on enu.id = awh.e_id
) data
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment}
--
Gitblit v1.9.3