Browse Source

2023-08-08,设备和质量修改

java8
杨奉源 2 years ago
parent
commit
b3224cb2f3
  1. 13
      src/main/java/com/xujie/sys/modules/pms/controller/EamController.java
  2. 9
      src/main/java/com/xujie/sys/modules/pms/data/EamAdminData.java
  3. 2
      src/main/java/com/xujie/sys/modules/pms/mapper/EamMapper.java
  4. 2
      src/main/java/com/xujie/sys/modules/pms/service/EamService.java
  5. 13
      src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java
  6. 21
      src/main/resources/mapper/pms/EamMapper.xml

13
src/main/java/com/xujie/sys/modules/pms/controller/EamController.java

@ -1136,6 +1136,19 @@ public class EamController {
return R.ok().put("rows", list);
}
/**
* @description: 获取审核人员列表
* @author: fengyuan_yang
* @date: 2023/5/24 13:10
* @param: [inData]
* @return: com.xujie.sys.common.utils.R
**/
@PostMapping("/getCheckerList")
public R getCheckerList(@RequestBody EamAdminData data){
List<EamAdminData> list = eamService.getCheckerList(data);
return R.ok().put("rows", list);
}
//---------------点检工单-------------------

9
src/main/java/com/xujie/sys/modules/pms/data/EamAdminData.java

@ -9,6 +9,7 @@ import java.util.Date;
public class EamAdminData extends QueryPage {
private String site;
private Integer userId;
private String adminID;
private String adminName;
private String phone;
@ -31,6 +32,14 @@ public class EamAdminData extends QueryPage {
// 更新人
private String updateBy;
public Integer getUserId() {
return userId;
}
public void setUserId(Integer userId) {
this.userId = userId;
}
public String getDepartmentName() {
return departmentName;
}

2
src/main/java/com/xujie/sys/modules/pms/mapper/EamMapper.java

@ -1114,4 +1114,6 @@ public interface EamMapper {
void saveWorkPlanItemAvailable(EamWorkOrderItemInData data);
void cancelOrderAll(EamWorkOrderInData inData);
List<EamAdminData> getCheckerList(EamAdminData data);
}

2
src/main/java/com/xujie/sys/modules/pms/service/EamService.java

@ -1086,4 +1086,6 @@ public interface EamService {
void imageDelete(SysOssEntity data);
void refreshItem(EamWorkOrderItemInData data);
List<EamAdminData> getCheckerList(EamAdminData data);
}

13
src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java

@ -1904,6 +1904,19 @@ public class EamServiceImpl implements EamService {
return list;
}
/**
* @description: 获取审核人员列表
* @author: fengyuan_yang
* @date: 2023/5/24 13:12
* @param: [data]
* @return: java.util.List<com.xujie.sys.modules.pms.data.EamAdminData>
**/
@Override
public List<EamAdminData> getCheckerList(EamAdminData data) {
List<EamAdminData> list = eamMapper.getCheckerList(data);
return list;
}
/**
* @description: 点检工单审核
* @author: fengyuan_yang

21
src/main/resources/mapper/pms/EamMapper.xml

@ -1293,6 +1293,27 @@ b.MinValue,b.ItemRemark,b.ItemType
</where>
</select>
<!-- 获取审核人员列表 -->
<select id="getCheckerList" resultType="EamAdminData" parameterType="EamAdminData">
SELECT
site,
user_id,
username as adminID,
email,
mobile as phone,
user_display as adminName
FROM sys_user
<where>
AND site = #{site}
<if test = "adminID != null and adminID != ''">
AND username LIKE '%' + #{adminID}+'%'
</if>
<if test = "adminName != null and adminName != ''">
AND user_display LIKE '%' + #{adminName}+'%'
</if>
</where>
</select>
<!-- 点检工单审核 -->
<update id="checkWorkOrder" parameterType="EamWorkOrderInData">
UPDATE eam_workOrder

Loading…
Cancel
Save