三单

business-common/src/main/java/com/rongwei/bscommon/sys/dao/ZhcxPMQMDao.java

@@ -1,4 +1,5 @@
 package com.rongwei.bscommon.sys.dao;
+import com.rongwei.bsentity.domain.ZhcxPmqManagementMapDo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;
 
@@ -13,6 +14,10 @@ public interface ZhcxPMQMDao {
     @Select("SELECT PROJECT_CODE FROM ZHCX_PROJECT_MANAGE WHERE DELETED = '0' AND PROJECT_CODE IS NOT NULL")
     List<Map<String, Object>> getAllProjectCode();
 
-    @Select("select a.PROJECT_CODE from INCONTROL.ZHCX_PROJECT_MANAGE a WHERE a.PROPERTIES = '长兴基地项目' AND DELETED = '0' AND STATUS = '在制'")
+    // a.PROPERTIES = '长兴基地项目' AND
+    @Select("select a.PROJECT_CODE from INCONTROL.ZHCX_PROJECT_MANAGE a WHERE  DELETED = '0' AND STATUS = '在制'")
     List<String> getAllProjectCodeInZz();
+
+    @Select("SELECT * FROM INCONTROL.ZHCX_PMQ_MANAGEMENT_MAP WHERE DELETED = '0' AND DEPTTYPE IS NULL; ")
+    List<ZhcxPmqManagementMapDo> getAllZhcxPmqManagementMapDoList();
 }

business-common/src/main/java/com/rongwei/bscommon/sys/dao/ZhcxPmqManagementDistributionDao.java

@@ -41,6 +41,9 @@ public interface ZhcxPmqManagementDistributionDao extends BaseMapper<ZhcxPmqMana
      */
     List<String> getAllMachinseNoByProjectId(@Param("projectId") String projectId);
 
+    /**
+     * 三单查询第二层sql
+     */
     List<ZhcxPmqManageChildVo> getAllDeptByPid(@Param("id") String id);
 
     // 第三层

business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxPMQMServiceImpl.java

@@ -4,6 +4,7 @@ import cn.hutool.core.date.DateUtil;
 import com.rongwei.bscommon.sys.dao.*;
 import com.rongwei.bscommon.sys.service.ZhcxPMQMService;
 import com.rongwei.bscommon.sys.service.ZhcxPmqManagementDistributionDetailService;
+import com.rongwei.bscommon.sys.service.ZhcxPmqManagementMapService;
 import com.rongwei.bscommon.sys.utils.ZhcxCommon;
 import com.rongwei.bsentity.domain.ZhcxPmqManagementDo;
 import com.rongwei.bsentity.domain.ZhcxPmqManagementMapDo;
@@ -58,15 +59,19 @@ public class ZhcxPMQMServiceImpl implements ZhcxPMQMService {
 
     @Autowired
     private ZhcxPmqManagementSourceDao sourceDao;
+
     @Autowired
     private ZhcxPMQMDao zhcxPMQMDao;
 
     @Autowired
     private ZhcxPmqManagementDistributionDetailService zhcxPmqManagementDistributionDetailService;
 
+    @Autowired
+    private ZhcxPmqManagementMapService zhcxPmqManagementMapService;
+
     @Override
     public List<Map<String, Object>> getPMQMData(Map<String, String> map) {
-        List<Map<String, Object>> res = new ArrayList<>();
+        //List<Map<String, Object>> res = new ArrayList<>();
         Date currentDate = new Date();
 
         // 抽取NX系统数据
@@ -165,11 +170,43 @@ public class ZhcxPMQMServiceImpl implements ZhcxPMQMService {
             }
         });
         sourceDao.updateProjectId();
+        // 去更新部门
+        updateDeptForMap();
+        log.info("三单拉取数据执行完毕");
+        return null;
+    }
 
-        return res;
+    private void updateDeptForMap(){
+        // 部门级别 一级部门:20 二级部门:10 分包商:30
+        List<ZhcxPmqManagementMapDo> list = zhcxPMQMDao.getAllZhcxPmqManagementMapDoList();
+        if(!list.isEmpty()){
+            log.info("开始完善NX映射部门");
+            for (ZhcxPmqManagementMapDo zhcxPmqManagementMapDo : list) {
+                String url ="jdbc:sqlserver://"+nxurl+":1433;databaseName="+nxdbname+";"+nxurlfix+"";
+                log.info("NX映射部门连接字符串" + url);
+                try(Connection connection = DriverManager.getConnection(url,nxdbuser,nxdbpw);
+                    Statement statement = connection.createStatement()) {
+                    String sqlStr = "SELECT * FROM NEVU_187 WHERE [挂靠ID] = N'"+zhcxPmqManagementMapDo.getNxdeptid()+"'";
+                    log.info("NX映射部门连接SQL:" + sqlStr);
+                    ResultSet resultSet = statement.executeQuery(sqlStr);
+                    while (resultSet.next()) {
+                        String deptTypeStr = resultSet.getString(1);
+                        deptTypeStr = (deptTypeStr.equals("一级部门"))? "20" : ((deptTypeStr.equals("二级部门"))? "10" : "30");
+                        // 更新部门级别
+                        zhcxPmqManagementMapDo.setDepttype(deptTypeStr);
+                        // 更新上级部门
+                        zhcxPmqManagementMapDo.setParentnxdeptname(resultSet.getString(2));
+                    }
+                }catch (Exception e1) {
+                    e1.printStackTrace();
+                }
+            }
+            zhcxPmqManagementMapService.updateBatchById(list);
+            log.info("结束完善NX映射部门");
+        }
     }
 
-    void newMapData(List<ZhcxPmqManagementSourceDo> nxSystemData) {
+    private void newMapData(List<ZhcxPmqManagementSourceDo> nxSystemData) {
         Date currentDate = new Date();
         for (ZhcxPmqManagementSourceDo item : nxSystemData) {
             String userName = item.getQcname();
@@ -233,7 +270,7 @@ public class ZhcxPMQMServiceImpl implements ZhcxPMQMService {
         if (!tempList1.isEmpty() && tempList1.get(0) != null && tempList1.get(0).getDistributetime() != null) {
             maxTime = DateFormatUtils.format(tempList1.get(0).getDistributetime(), "yyyy-MM-dd HH:mm:ss");
         }
-        // 查找本项目下 所有项目性质是长兴基地项目和项目状态为在制 的项目工号
+        // 查找本项目下 所有项目性质是 "项目状态为在制" 的项目工号
         List<String> projectNo = zhcxPMQMDao.getAllProjectCodeInZz();
         List<ZhcxPmqManagementSourceDo> list = new ArrayList<>();
         String url ="jdbc:sqlserver://"+nxurl+":1433;databaseName="+nxdbname+";"+nxurlfix+"";

business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxPmqManagementRecoredServiceImpl.java

@@ -134,7 +134,8 @@ public class ZhcxPmqManagementRecoredServiceImpl extends ServiceImpl<ZhcxPmqMana
             return R.error("暂无文件可预览");
         }
         // 根据rid和fileid 去sqlserver拿数据
-        List<JuFileInfoDto> fileList = getFileInfoInSqlServer(rid,fileid);
+        //List<JuFileInfoDto> fileList = getFileInfoInSqlServer(rid,fileid);
+        List<JuFileInfoDto> fileList = getFileInfoInSqlServer(fileid);
         if(fileList.isEmpty()){
             return R.error("获取文件失败");
         }
@@ -195,4 +196,31 @@ public class ZhcxPmqManagementRecoredServiceImpl extends ServiceImpl<ZhcxPmqMana
         }
         return resultList;
     }
+
+    private List<JuFileInfoDto> getFileInfoInSqlServer(String fileid){
+        // 结果集
+        List<JuFileInfoDto> resultList = new ArrayList<>();
+        String url ="jdbc:sqlserver://"+nxurl+":1433;databaseName="+nxdbname+";"+nxurlfix+"";
+        log.info("SQLSERVER文件读取连接字符串" + url);
+        try(Connection connection = DriverManager.getConnection(url,nxdbuser,nxdbpw);
+            Statement statement = connection.createStatement()) {
+            String sqlStr = "SELECT * FROM [JU_fileinfo] WHERE FileID = '"+fileid+"' ";
+            log.info("SQLSERVER文件读取SQL:" + sqlStr);
+            ResultSet resultSet = statement.executeQuery(sqlStr);
+            while (resultSet.next()) {
+                JuFileInfoDto fileInfoDto = new JuFileInfoDto();
+                fileInfoDto.setFileId(resultSet.getString(1));
+                fileInfoDto.setRecordId(resultSet.getString(2));
+                fileInfoDto.setFileName(resultSet.getString(3));
+                fileInfoDto.setFileBinary(resultSet.getString(4));
+                fileInfoDto.setDir(resultSet.getString(5));
+                fileInfoDto.setNxfsId(resultSet.getString(6));
+                resultList.add(fileInfoDto);
+            }
+        }catch(Exception e2){
+            log.error("SQLSERVER文件读取异常");
+            e2.printStackTrace();
+        }
+        return resultList;
+    }
 }

business-common/src/main/resources/mybatis/business/ZhcxPmqManagementDistributionDao.xml

@@ -74,17 +74,15 @@
             manage.ID AS pid,
             recored.SEQNO AS seqno,
             recored.DEPTID AS deptId,
-            recored.DEPTNAME AS deptName
+            m.PARENTNXDEPTNAME ||'/'||recored.DEPTNAME AS deptName
         FROM
             INCONTROL.ZHCX_PMQ_MANAGEMENT_RECORED recored
-                LEFT JOIN INCONTROL.ZHCX_PMQ_MANAGEMENT manage ON
-                manage.ID = recored.PMQMID
-                    AND manage.DELETED = '0'
+                LEFT JOIN INCONTROL.ZHCX_PMQ_MANAGEMENT manage ON manage.ID = recored.PMQMID AND manage.DELETED = '0'
+                LEFT JOIN INCONTROL.ZHCX_PMQ_MANAGEMENT_MAP m ON recored.DEPTID = m.NXDEPTID
         WHERE
             recored.DELETED = '0'
           AND recored.PMQMID = #{id}
-        ORDER BY
-            recored.SEQNO DESC
+        ORDER BY m.SORTORDER
     </select>
 
     <select id="getMachinesStatus" resultType="com.rongwei.bsentity.vo.report.MachineState">

business-entity/src/main/java/com/rongwei/bsentity/domain/ZhcxPmqManagementMapDo.java

@@ -102,4 +102,16 @@ public class ZhcxPmqManagementMapDo extends BaseDo implements Serializable {
      */
     @TableField("NXDEPTID")
     private String nxdeptid;
+
+    /**
+     * 排序
+     */
+    @TableField("SORT")
+    private String sort;
+
+    /**
+     * 排序代码
+     */
+    @TableField("SORTORDER")
+    private String sortorder;
 }

business-entity/src/main/java/com/rongwei/bsentity/vo/report/ZhcxPmqManageChildVo.java

@@ -26,7 +26,7 @@ public class ZhcxPmqManageChildVo {
     // 部门id
     private String deptId;
 
-    // 部门id
+    // 部门名
     private String deptName;
 
     // 对应机台的状态