三单

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

@@ -25,6 +25,6 @@ public interface ZhcxPmqManagementMapDao extends BaseMapper<ZhcxPmqManagementMap
     @Select("SELECT * FROM ZHCX_PMQ_MANAGEMENT_MAP WHERE DELETED = '0' AND NXDEPTNAME = #{dept} AND NXQCUSERNAME = #{user}")
     List<ZhcxPmqManagementMapDo> getDataByNXUserAndDept(Map<String, String> map);
 
-    @Select("SELECT * FROM ZHCX_PMQ_MANAGEMENT_MAP WHERE DELETED = '0' AND NXDEPTNAME = #{dept}")
+    @Select("SELECT * FROM ZHCX_PMQ_MANAGEMENT_MAP WHERE DELETED = '0' AND NXDEPTID = #{deptid}")
     List<ZhcxPmqManagementMapDo> getDataByNXUserAndDept2(Map<String, String> map);
 }

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

@@ -130,6 +130,11 @@ public class ZhcxPMQMServiceImpl implements ZhcxPMQMService {
                 recordDo.setCurrenttimes(item.getCurrenttimes());
                 recordDo.setTotaltimes(item.getTotaltimes());
                 recordDo.setDeptname(item.getDeptname());
+                // 部门id
+                recordDo.setDeptid(item.getDeptid());
+                // 附件
+                recordDo.setRid(item.getRid());
+                recordDo.setFileid(item.getFileid());
                 String qcName = item.getQcname();
                 if (StringUtils.isNotBlank(qcName)) {
                     String[] qcNames = qcName.replace("/", ",").split(",");
@@ -169,10 +174,13 @@ public class ZhcxPMQMServiceImpl implements ZhcxPMQMService {
         for (ZhcxPmqManagementSourceDo item : nxSystemData) {
             String userName = item.getQcname();
             String deptName = item.getDeptname();
+            // 部门id 作唯一标识符
+            String deptId = item.getDeptid();
             Map<String, String> queryMap = new HashMap<>();
-            queryMap.put("user", userName);
-            queryMap.put("dept", deptName);
-            if (StringUtils.isNotBlank(deptName) && StringUtils.isNotBlank(userName)) {
+            //queryMap.put("user", userName);
+            //queryMap.put("dept", deptName);
+            queryMap.put("deptid", deptId);
+            if (StringUtils.isNotBlank(deptName) && StringUtils.isNotBlank(deptId)) {
                 //List<ZhcxPmqManagementMapDo> list = mapDao.getDataByNXUserAndDept(queryMap);
                 List<ZhcxPmqManagementMapDo> list = mapDao.getDataByNXUserAndDept2(queryMap);
                 if (list.isEmpty()) {
@@ -183,6 +191,8 @@ public class ZhcxPMQMServiceImpl implements ZhcxPMQMService {
                     saveRow.setModifydate(currentDate);
                     saveRow.setNxqcusername(userName);
                     saveRow.setNxdeptname(deptName);
+                    // 部门id 唯一标识符
+                    saveRow.setNxdeptid(deptId);
                     mapDao.insert(saveRow);
                 }
             }
@@ -263,6 +273,11 @@ public class ZhcxPMQMServiceImpl implements ZhcxPMQMService {
 
                     entity.setDeptname(resultSet.getString(10));
                     entity.setQcname(resultSet.getString(11));
+                    // 附件id
+                    entity.setRid(resultSet.getString(12));
+                    entity.setFileid(resultSet.getString(13));
+                    // 部门id
+                    entity.setDeptid(resultSet.getString(14));
                     sourceDao.insert(entity);
                     list.add(entity);
                 }

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

@@ -97,5 +97,9 @@ public class ZhcxPmqManagementMapDo extends BaseDo implements Serializable {
     @TableField("HASMAPPING")
     private String hasmapping;
 
-
+    /**
+     * 部门id(唯一标识符)
+     */
+    @TableField("NXDEPTID")
+    private String nxdeptid;
 }

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

@@ -120,4 +120,22 @@ public class ZhcxPmqManagementRecoredDo extends BaseDo {
      */
     @TableField("DISPATCHSTATUS")
     private String dispatchstatus;
+
+    /**
+     * 最后的质检确认时间
+     */
+    @TableField("LASTCLOSEDATA")
+    private Date lastclosedata;
+
+    /**
+     * 附件id
+     */
+    @TableField("RID")
+    private String rid;
+
+    /**
+     * 附件id
+     */
+    @TableField("FILEID")
+    private String fileid;
 }

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

@@ -96,5 +96,21 @@ public class ZhcxPmqManagementSourceDo extends BaseDo {
     @TableField("SEQNO")
     private Integer seqno;
 
+    /**
+     * 附件
+     */
+    @TableField("RID")
+    private String rid;
 
+    /**
+     * 附件
+     */
+    @TableField("FILEID")
+    private String fileid;
+
+    /**
+     * 部门id
+     */
+    @TableField("DEPTID")
+    private String deptid;
 }