2023-06-21，设备和质量修改

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

@@ -8,6 +8,7 @@ import com.xujie.sys.modules.pms.data.*;
 import com.xujie.sys.modules.pms.entity.vo.PartSpareVo;
 import com.xujie.sys.modules.pms.service.EamService;
 import com.xujie.sys.modules.pms.util.ResponseData;
+import com.xujie.sys.modules.sys.entity.SysUserEntity;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -755,17 +756,8 @@ public class EamController {
      */
     @PostMapping("getEmpyDeptList")
     public Object getEmpyDeptList(@RequestBody EmpyDept empyDept) {
-        Map<String, Object> resultMap = new HashMap<>();
-        try {
-            List<EmpyDept> list = eamService.getEmpyDeptList(empyDept);
-            resultMap.put("rows", list);
-            resultMap.put("success", true);
-
-        } catch (Exception e) {
-            resultMap.put("msg", e.getMessage());
-            resultMap.put("success", false);
-        }
-        return resultMap;
+        List<EmpyDept> list = eamService.getEmpyDeptList(empyDept);
+        return R.ok().put("rows", list);
     }
 
     /**
@@ -1865,5 +1857,30 @@ public class EamController {
         return R.ok();
     }
 
+    /**
+     * @description: 查询设备的点检历史记录
+     * @author: fengyuan_yang
+     * @date: 2023/6/20 17:31
+     * @param: [data]
+     * @return: com.xujie.sys.common.utils.R
+     **/
+    @PostMapping("/queryHistoryRecord")
+    public R queryHistoryRecord(@RequestBody EamWorkOrderInData data){
+        List<EamWorkOrderInData> list = eamService.queryHistoryRecord(data);
+        return R.ok().put("rows", list);
+    }
+
+    /**
+     * @description: 获取可用的MES账号
+     * @author: fengyuan_yang
+     * @date: 2023/6/21 12:07
+     * @param: [data]
+     * @return: com.xujie.sys.common.utils.R
+     **/
+    @PostMapping("/getMesList")
+    public R getMesList(@RequestBody SysUserEntity data){
+        List<SysUserEntity> list = eamService.getMesList(data);
+        return R.ok().put("rows", list);
+    }
 
 }

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.xujie.sys.modules.oss.entity.SysOssEntity;
 import com.xujie.sys.modules.pms.data.*;
 import com.xujie.sys.modules.pms.entity.vo.PartSpareVo;
+import com.xujie.sys.modules.sys.entity.SysUserEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
@@ -1052,7 +1053,7 @@ public interface EamMapper {
 
     String selectDeptByObjectID(String site, String objectID);
 
-    String selectDeptByUserName(String site, String username);
+    List<String> selectAdminIdByUserName(String site, String username);
 
     void defectReportWorkOrder(EamWorkOrderInData inData);
 
@@ -1061,4 +1062,16 @@ public interface EamMapper {
     List<EamAdminData> selectNameByMes(EamAdminData data);
 
     void submitDefect(EamWorkOrderInData data);
+
+    List<EamWorkOrderInData> queryHistoryRecord(EamWorkOrderInData data);
+
+    List<EmpyDept> getEmpyDeptList(EmpyDept empyDept);
+
+    void saveAdminDepartment(String site, String adminID, String deptId);
+
+    List<String> getDeptList(String site, String adminID);
+
+    void deleteAdminDepartment(String site, String adminID);
+
+    List<SysUserEntity> getMesList(SysUserEntity data);
 }

src/main/java/com/xujie/sys/modules/pms/mapper/Impl/EamDaoImpl.java

@@ -454,14 +454,14 @@ public class EamDaoImpl implements EamDao {
     public void saveNewEamAdmin(EamAdminData inData){
         StringBuilder sql = new StringBuilder();
         Map<String, Object> paramMap = new HashMap<>();
-        sql.append("Insert into eam_admin (Site,AdminID,AdminName,Active,Phone,Department,Email,Tel,LevelID,MesUser,CreatedDate,update_date, update_by, created_by) ");
-        sql.append(" values (:Site,:AdminID,:AdminName,:Active,:Phone,:Department,:Email,:Tel,:LevelID,:MesUser,GetDate(),getDate(), :updateBy, :createdBy)");
+        sql.append("Insert into eam_admin (Site,AdminID,AdminName,Active,Phone,Email,Tel,LevelID,MesUser,CreatedDate,update_date, update_by, created_by) ");
+        sql.append(" values (:Site,:AdminID,:AdminName,:Active,:Phone,:Email,:Tel,:LevelID,:MesUser,GetDate(),getDate(), :updateBy, :createdBy)");
         paramMap.put("Site", inData.getSite());
         paramMap.put("AdminID", inData.getAdminID());
         paramMap.put("AdminName", inData.getAdminName());
         paramMap.put("Active", inData.getActive());
         paramMap.put("Phone", inData.getPhone());
-        paramMap.put("Department", inData.getDepartment());
+//        paramMap.put("Department", inData.getDepartment());
         paramMap.put("Email", inData.getEmail());
         paramMap.put("Tel", inData.getTel());
         paramMap.put("LevelID", inData.getLevelID());
@@ -660,14 +660,14 @@ public class EamDaoImpl implements EamDao {
     @Override
     public List<EmpyDept> getEmpyDeptList(EmpyDept empyDept) {
         StringBuilder sql = new StringBuilder();
-        sql.append(" select site , dept_id, dept_name  " );
-        sql.append("  from view_empy_dept          ");
-        sql.append(" where site =:site  ");
+        sql.append(" select site, dept_id, dept_name ");
+        sql.append(" from view_empy_dept ");
+        sql.append(" where site = :site ");
         if(StringUtils.isNotEmpty(empyDept.getDeptId())){
-            sql.append( " dept_id = :deptId" );
+            sql.append(" dept_id = :deptId ");
         }
         if(StringUtils.isNotEmpty(empyDept.getDeptName())){
-            sql.append( " dept_name = :deptName" );
+            sql.append(" dept_name = :deptName");
         }
         return parameterJdbcTemplate.query(sql.toString(), new BeanPropertySqlParameterSource(empyDept) ,new BeanPropertyRowMapper<>(EmpyDept.class));
 

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

@@ -7,6 +7,7 @@ import com.xujie.sys.modules.oss.entity.SysOssEntity;
 import com.xujie.sys.modules.pms.data.*;
 import com.xujie.sys.modules.pms.entity.vo.PartSpareVo;
 import com.xujie.sys.modules.pms.util.ResponseData;
+import com.xujie.sys.modules.sys.entity.SysUserEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.web.bind.annotation.RequestBody;
 
@@ -1075,4 +1076,8 @@ public interface EamService {
     List<EamAdminData> selectNameByMes(EamAdminData data);
 
     void submitDefect(EamWorkOrderInData data);
+
+    List<EamWorkOrderInData> queryHistoryRecord(EamWorkOrderInData data);
+
+    List<SysUserEntity> getMesList(SysUserEntity data);
 }

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

@@ -13,6 +13,7 @@ import com.xujie.sys.modules.pms.mapper.EamMapper;
 import com.xujie.sys.modules.pms.service.EamService;
 import com.xujie.sys.modules.pms.util.ResponseData;
 import com.xujie.sys.modules.report.dao.ProcedureDao;
+import com.xujie.sys.modules.sys.entity.SysUserEntity;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -266,25 +267,43 @@ public class EamServiceImpl implements EamService {
     //------------------------机修人员----------------------------
     @Override
     public PageUtils eamAdminSearch(EamAdminData inData){
-        IPage<EamAdminData> eamAdminList = this.eamMapper.eamAdminSearch(
-                new Page<EamAdminData>(inData.getPage(), inData.getLimit()), inData);
+        IPage<EamAdminData> eamAdminList = this.eamMapper.eamAdminSearch(new Page<EamAdminData>(inData.getPage(), inData.getLimit()), inData);
+        // 拼接部门
+        for(EamAdminData data : eamAdminList.getRecords()){
+            List<String> deptList = eamMapper.getDeptList(data.getSite(), data.getAdminID());
+            String dept = "";
+            for (int i = 0; i < deptList.size(); i++) {
+                if (dept.equals("")){
+                    dept = deptList.get(i);
+                }else {
+                    dept = dept + ";" + deptList.get(i);
+                }
+            }
+            data.setDepartment(dept);
+        }
         return new PageUtils(eamAdminList);
     }
 
     @Override
+    @Transactional
     public ResponseData eamAdminSave(EamAdminData inData){
-        ResponseData responseData=new ResponseData();
-        List<EamAdminData> checkEamAdmin=eamDao.checkEamAdmin(inData);
-        if(checkEamAdmin.size()>0){
+        ResponseData responseData = new ResponseData();
+        List<EamAdminData> checkEamAdmin = eamDao.checkEamAdmin(inData);
+        if(checkEamAdmin.size() > 0){
             throw new RuntimeException("该人员编码已存在!");
         }
-        EamAdminLevelData checkIn=new EamAdminLevelData();
+        EamAdminLevelData checkIn = new EamAdminLevelData();
         checkIn.setSite(inData.getSite());
         checkIn.setAdminLevelID(inData.getLevelID());
-        List<EamAdminLevelData> checkEamAdminLevel=eamDao.checkEamAdminLevel(checkIn);
-        if(checkEamAdminLevel.size()==0){
+        List<EamAdminLevelData> checkEamAdminLevel = eamDao.checkEamAdminLevel(checkIn);
+        if(checkEamAdminLevel.size() == 0){
             throw new RuntimeException("该等级编码不存在!");
         }
+        // 保存人员所属部门
+        String[] deptList = inData.getDepartment().split(";");
+        for (String deptId : deptList){
+            eamMapper.saveAdminDepartment(inData.getSite(), inData.getAdminID(), deptId);
+        }
         eamDao.saveNewEamAdmin(inData);
         responseData.setMsg("保存成功！");
         responseData.setSuccess(true);
@@ -292,6 +311,7 @@ public class EamServiceImpl implements EamService {
         return responseData;
     }
     @Override
+    @Transactional
     public ResponseData eamAdminEdit(EamAdminData inData){
         ResponseData responseData=new ResponseData();
         List<EamAdminData> checkEamAdmin=eamDao.checkEamAdmin(inData);
@@ -305,6 +325,13 @@ public class EamServiceImpl implements EamService {
         if(checkEamAdminLevel.size()==0){
             throw new RuntimeException("该等级编码不存在!");
         }
+        // 修改人员所属部门
+        String[] deptList = inData.getDepartment().split(";");
+        // 删除旧数据
+        eamMapper.deleteAdminDepartment(inData.getSite(), inData.getAdminID());
+        for (String deptId : deptList){
+            eamMapper.saveAdminDepartment(inData.getSite(), inData.getAdminID(), deptId);
+        }
         eamDao.eamAdminEdit(inData);
         responseData.setMsg("修改成功！");
         responseData.setSuccess(true);
@@ -313,8 +340,12 @@ public class EamServiceImpl implements EamService {
     }
 
     @Override
+    @Transactional
     public ResponseData eamAdminDelete(EamAdminData inData){
-        ResponseData responseData=new ResponseData();
+        ResponseData responseData = new ResponseData();
+        // 删除部门记录
+        eamMapper.deleteAdminDepartment(inData.getSite(), inData.getAdminID());
+        // 删除人员记录
         eamDao.eamAdminDelete(inData);
         responseData.setMsg("删除成功！");
         responseData.setSuccess(true);
@@ -453,9 +484,16 @@ public class EamServiceImpl implements EamService {
 
 
 
+    /**
+     * @description: 查询部门列表
+     * @author: fengyuan_yang
+     * @date: 2023/6/21 9:39
+     * @param: [empyDept]
+     * @return: java.util.List<com.xujie.sys.modules.pms.data.EmpyDept>
+     **/
     @Override
     public List<EmpyDept> getEmpyDeptList(EmpyDept empyDept) {
-        return eamDao.getEmpyDeptList(empyDept);
+        return eamMapper.getEmpyDeptList(empyDept);
     }
 
 
@@ -973,8 +1011,9 @@ public class EamServiceImpl implements EamService {
                 // 查询设备所属部门
                 String objDepartment = eamMapper.selectDeptByObjectID(ewoData.getSite(), ewoData.getObjectID());
                 // 查询用户所属部门
-                String userDepartment = eamMapper.selectDeptByUserName(ewoData.getSite(), inData.getUsername());
-                if (objDepartment.equals(userDepartment)){
+                List<String> adminIDList = eamMapper.selectAdminIdByUserName(ewoData.getSite(), inData.getUsername());
+                List<String> deptList = eamMapper.getDeptList(ewoData.getSite(), adminIDList.get(0));
+                if (deptList.contains(objDepartment)){
                     list.add(ewoData);
                 }
             }
@@ -1629,4 +1668,44 @@ public class EamServiceImpl implements EamService {
         eamMapper.submitDefect(data);
     }
 
+    /**
+     * @description: 查询设备的点检历史记录
+     * @author: fengyuan_yang
+     * @date: 2023/6/20 17:39
+     * @param: [data]
+     * @return: java.util.List<com.xujie.sys.modules.pms.data.EamWorkOrderInData>
+     **/
+    @Override
+    public List<EamWorkOrderInData> queryHistoryRecord(EamWorkOrderInData data) {
+        // 查询设备的历史记录
+        List<EamWorkOrderInData> list = eamMapper.queryHistoryRecord(data);
+        // 拼接机修人员
+        for(EamWorkOrderInData ewoData : list){
+            List<String> actualOperatorList = eamMapper.getActualOperatorList(ewoData.getSite(), ewoData.getOrderNo(), ewoData.getFunctionType());
+            String operator = "";
+            for (int i = 0; i < actualOperatorList.size(); i++) {
+                if (operator.equals("")){
+                    operator = actualOperatorList.get(i);
+                }else {
+                    operator = operator + ";" + actualOperatorList.get(i);
+                }
+            }
+            ewoData.setActualOperatorName(operator);
+        }
+        return list;
+    }
+
+    /**
+     * @description: 获取可用的MES账号
+     * @author: fengyuan_yang
+     * @date: 2023/6/21 12:11
+     * @param: [data]
+     * @return: java.util.List<com.xujie.sys.modules.sys.entity.SysUserEntity>
+     **/
+    @Override
+    public List<SysUserEntity> getMesList(SysUserEntity data) {
+        List<SysUserEntity> list = eamMapper.getMesList(data);
+        return list;
+    }
+
 }

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

@@ -10,7 +10,6 @@
             ea.AdminID,
             ea.AdminName,
             ea.Phone,
-            ea.Department,
             ea.Email,
             ea.Tel,
             ea.LevelID,
@@ -1466,8 +1465,8 @@ b.MinValue,b.ItemRemark,b.ItemType
     </select>
 
     <!-- 查询用户所属部门 -->
-    <select id="selectDeptByUserName" resultType="string" parameterType="string">
-        SELECT Department
+    <select id="selectAdminIdByUserName" resultType="string" parameterType="string">
+        SELECT AdminID
         FROM eam_admin
         WHERE site = #{site}
         AND MesUser = #{username}
@@ -1498,4 +1497,75 @@ b.MinValue,b.ItemRemark,b.ItemType
         WHERE Site = #{site}
         AND OrderNo = #{orderNo}
     </update>
+
+    <!-- 检查系统操作人和审核人员是否一致 -->
+    <select id="queryHistoryRecord" resultType="EamWorkOrderInData" parameterType="EamWorkOrderInData">
+        SELECT
+            ewo.OrderNo,
+            ewo.PlanID,
+            ewo.PlanDesc,
+            ewo.ActualDate,
+            ewo.ObjectID,
+            eo.ObjectDesc,
+            ewo.Remark
+        FROM eam_workOrder as ewo
+        LEFT JOIN eam_object as eo ON ewo.site = eo.site and ewo.ObjectID = eo.ObjectID
+        WHERE ewo.site = #{site}
+        AND ewo.ObjectID = #{objectID}
+        AND ewo.FunctionType = #{functionType}
+        AND ewo.Status = '已完工'
+    </select>
+
+    <!-- 查询部门列表 -->
+    <select id="getEmpyDeptList" resultType="EmpyDept" parameterType="EmpyDept">
+        SELECT
+            site,
+            dept_id,
+            dept_name
+        FROM view_empy_dept
+        <where>
+            site = #{site}
+        <if test = "deptId != null and deptId != ''">
+            AND dept_id LIKE '%' + #{deptId}+'%'
+        </if>
+        <if test = "deptName != null and deptName != ''">
+            AND dept_name LIKE '%' + #{deptName}+'%'
+        </if>
+        </where>
+    </select>
+
+    <!-- 生成新的维修工单 -->
+    <insert id="saveAdminDepartment">
+        INSERT INTO eam_admin_dept
+                (Site, admin_id, dept_id)
+        VALUES (#{site}, #{adminID}, #{deptId})
+    </insert>
+
+    <!-- 查询部门列表 -->
+    <select id="getDeptList" resultType="string" parameterType="string">
+        SELECT
+            dept_id
+        FROM eam_admin_dept
+        WHERE site = #{site}
+        AND admin_id = #{adminID}
+    </select>
+
+    <!-- 删除旧数据-->
+    <delete id="deleteAdminDepartment">
+        DELETE FROM eam_admin_dept
+        WHERE site = #{site}
+        AND admin_id = #{adminID}
+    </delete>
+
+    <!-- 获取可用的MES账号 -->
+    <select id="getMesList" resultType="SysUserEntity" parameterType="SysUserEntity">
+        SELECT
+            a.username,
+            a.user_display
+        FROM sys_user a
+        LEFT JOIN eam_admin b
+        ON b.MesUser = a.username and a.site = b.site
+        WHERE a.site = #{site}
+        AND b.MesUser is null
+    </select>
 </mapper>