获取修改单

qcs-common/src/main/java/com/rongwei/bscommon/sys/dao/QcsMdfFileDao.java

@@ -0,0 +1,7 @@
+package com.rongwei.bscommon.sys.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rongwei.bsentity.domain.QcsMdfFileDo;
+
+public interface QcsMdfFileDao extends BaseMapper<QcsMdfFileDo> {
+}

qcs-common/src/main/java/com/rongwei/bscommon/sys/dao/QcsMdfFormDao.java

@@ -0,0 +1,13 @@
+package com.rongwei.bscommon.sys.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rongwei.bsentity.domain.QcsMdfFormDo;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+public interface QcsMdfFormDao extends BaseMapper<QcsMdfFormDo> {
+    @Select("select ID from qcs_mdf_form where DELETED='0' and DTWHOAPPROVETIME>='${dtwhoapproveTime} 00:00:00' and DTWHOAPPROVETIME<='${dtwhoapproveTime} 23:59:59'")
+    List<QcsMdfFormDo> getQcsMdfForms(@Param("dtwhoapproveTime") String dtwhoapproveTime);
+}

qcs-common/src/main/java/com/rongwei/bscommon/sys/dao/QcsMdfRowDao.java

@@ -0,0 +1,7 @@
+package com.rongwei.bscommon.sys.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rongwei.bsentity.domain.QcsMdfRowDo;
+
+public interface QcsMdfRowDao extends BaseMapper<QcsMdfRowDo> {
+}

qcs-common/src/main/java/com/rongwei/bscommon/sys/dao/QcsMdfSectionDao.java

@@ -0,0 +1,7 @@
+package com.rongwei.bscommon.sys.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rongwei.bsentity.domain.QcsMdfSectionDo;
+
+public interface QcsMdfSectionDao extends BaseMapper<QcsMdfSectionDo> {
+}

qcs-common/src/main/java/com/rongwei/bscommon/sys/service/CommonService.java

@@ -7,4 +7,6 @@ public interface CommonService {
     R getProjectCode();
 
     R getPartno();
+
+    R getMdfFormInfo(String dtwhoapproveTime) throws Exception;
 }

qcs-common/src/main/java/com/rongwei/bscommon/sys/service/QcsMdfFileService.java

@@ -0,0 +1,7 @@
+package com.rongwei.bscommon.sys.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rongwei.bsentity.domain.QcsMdfFileDo;
+
+public interface QcsMdfFileService extends IService<QcsMdfFileDo> {
+}

qcs-common/src/main/java/com/rongwei/bscommon/sys/service/QcsMdfFormService.java

@@ -0,0 +1,7 @@
+package com.rongwei.bscommon.sys.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rongwei.bsentity.domain.QcsMdfFormDo;
+
+public interface QcsMdfFormService extends IService<QcsMdfFormDo> {
+}

qcs-common/src/main/java/com/rongwei/bscommon/sys/service/QcsMdfRowService.java

@@ -0,0 +1,7 @@
+package com.rongwei.bscommon.sys.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rongwei.bsentity.domain.QcsMdfRowDo;
+
+public interface QcsMdfRowService extends IService<QcsMdfRowDo> {
+}

qcs-common/src/main/java/com/rongwei/bscommon/sys/service/QcsMdfSectionService.java

@@ -0,0 +1,7 @@
+package com.rongwei.bscommon.sys.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rongwei.bsentity.domain.QcsMdfSectionDo;
+
+public interface QcsMdfSectionService extends IService<QcsMdfSectionDo> {
+}

qcs-common/src/main/java/com/rongwei/bscommon/sys/service/impl/CommonServiceImpl.java

@@ -1,20 +1,48 @@
 package com.rongwei.bscommon.sys.service.impl;
 
+import com.alibaba.fastjson.JSON;
+import com.rongwei.bscommon.sys.dao.QcsMdfFormDao;
 import com.rongwei.bscommon.sys.dao.SlaveDao;
-import com.rongwei.bscommon.sys.service.CommonService;
+import com.rongwei.bscommon.sys.service.*;
+import com.rongwei.bscommon.sys.utils.MdfApi;
+import com.rongwei.bsentity.domain.QcsMdfFileDo;
+import com.rongwei.bsentity.domain.QcsMdfFormDo;
+import com.rongwei.bsentity.domain.QcsMdfRowDo;
+import com.rongwei.bsentity.domain.QcsMdfSectionDo;
+import com.rongwei.bsentity.vo.QcsMdfFormVo;
+import com.rongwei.bsentity.vo.QcsMdfRowVo;
+import com.rongwei.bsentity.vo.QcsMdfSectionVo;
 import com.rongwei.rwcommon.base.R;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 @Service
 public class CommonServiceImpl implements CommonService {
     private final Logger log = LoggerFactory.getLogger(this.getClass().getName());
 
+    @Autowired
+    private MdfApi mdfApi;
+    @Autowired
+    private QcsMdfFormService qcsMdfFormService;
+    @Autowired
+    private QcsMdfSectionService qcsMdfSectionService;
+    @Autowired
+    private QcsMdfRowService qcsMdfRowService;
+    @Autowired
+    private QcsMdfFileService qcsMdfFileService;
+    @Autowired
+    private QcsMdfFormDao qcsMdfFormDao;
+
     @Autowired
     SlaveDao slaveDao;
 
@@ -47,4 +75,77 @@ public class CommonServiceImpl implements CommonService {
         }
         return r;
     }
+
+    //获取修改单信息
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public R getMdfFormInfo(String dtwhoapproveTime) throws Exception {
+        R r = new R();
+        if (dtwhoapproveTime == null || dtwhoapproveTime.length() == 0) {
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+            dtwhoapproveTime = sdf.format(new Date());
+        }
+        Map<String, Object> mdfmap = mdfApi.apiCall(dtwhoapproveTime);
+        if (mdfmap.get("code").equals("200")) {
+            List<QcsMdfFormVo> mdfFormVoList = JSON.parseArray(JSON.toJSONString(mdfmap.get("data")), QcsMdfFormVo.class);
+            if (mdfFormVoList.size() > 0) {
+                //已有修改单数据
+                List<QcsMdfFormDo> qcsMdfFormDos = qcsMdfFormDao.getQcsMdfForms(dtwhoapproveTime);
+
+                List<QcsMdfFormDo> qcsMdfFormDoList = new ArrayList<>();
+                List<QcsMdfSectionDo> qcsMdfSectionDoList = new ArrayList<>();
+                List<QcsMdfRowDo> qcsMdfRowDoList = new ArrayList<>();
+                List<QcsMdfFileDo> qcsMdfFileDoList = new ArrayList<>();
+                for (QcsMdfFormVo qcsMdfFormVo : mdfFormVoList) {
+                    List<QcsMdfFormDo> hasMdfForms = qcsMdfFormDos.stream().filter(mdf -> mdf.getId().equals(qcsMdfFormVo.getId())).collect(Collectors.toList());
+                    if (hasMdfForms.size() > 0) {
+                        continue;
+                    }
+                    qcsMdfFormDoList.add(qcsMdfFormVo);
+                    for (QcsMdfSectionVo qcsMdfSectionVo : qcsMdfFormVo.getSections()) {
+                        if (qcsMdfSectionVo.getFormid() == null) {
+                            qcsMdfSectionVo.setFormid(qcsMdfFormVo.getId());
+                        }
+                        qcsMdfSectionDoList.add(qcsMdfSectionVo);
+                        for (QcsMdfRowVo qcsMdfRowVo : qcsMdfSectionVo.getRows()) {
+                            if (qcsMdfRowVo.getFormid() == null) {
+                                qcsMdfRowVo.setFormid(qcsMdfFormVo.getId());
+                            }
+                            if (qcsMdfRowVo.getSectionid() == null) {
+                                qcsMdfRowVo.setSectionid(qcsMdfSectionVo.getId());
+                            }
+                            qcsMdfRowDoList.add(qcsMdfRowVo);
+                            for (QcsMdfFileDo qcsMdfFileDo : qcsMdfRowVo.getFiles()) {
+                                if (qcsMdfFileDo.getFormid() == null) {
+                                    qcsMdfFileDo.setFormid(qcsMdfFormVo.getId());
+                                }
+                                if (qcsMdfFileDo.getSectionid() == null) {
+                                    qcsMdfFileDo.setSectionid(qcsMdfSectionVo.getId());
+                                }
+                                if (qcsMdfFileDo.getRowsid() == null) {
+                                    qcsMdfFileDo.setRowsid(qcsMdfRowVo.getId());
+                                }
+                                qcsMdfFileDoList.add(qcsMdfFileDo);
+                            }
+                        }
+                    }
+                }
+                if (qcsMdfFormDoList.size() > 0) {
+                    qcsMdfFormService.saveBatch(qcsMdfFormDoList);
+                }
+                if (qcsMdfSectionDoList.size() > 0) {
+                    qcsMdfSectionService.saveBatch(qcsMdfSectionDoList);
+                }
+                if (qcsMdfRowDoList.size() > 0) {
+                    qcsMdfRowService.saveBatch(qcsMdfRowDoList);
+                }
+                if (qcsMdfFileDoList.size() > 0) {
+                    qcsMdfFileService.saveBatch(qcsMdfFileDoList);
+                }
+            }
+        }
+        r.setCode(mdfmap.get("code").toString());
+        r.setMsg(mdfmap.get("msg").toString());
+        return r;
+    }
 }

qcs-common/src/main/java/com/rongwei/bscommon/sys/service/impl/QcsMdfFileServiceImpl.java

@@ -0,0 +1,11 @@
+package com.rongwei.bscommon.sys.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rongwei.bscommon.sys.dao.QcsMdfFileDao;
+import com.rongwei.bscommon.sys.service.QcsMdfFileService;
+import com.rongwei.bsentity.domain.QcsMdfFileDo;
+import org.springframework.stereotype.Service;
+
+@Service
+public class QcsMdfFileServiceImpl extends ServiceImpl<QcsMdfFileDao, QcsMdfFileDo> implements QcsMdfFileService {
+}

qcs-common/src/main/java/com/rongwei/bscommon/sys/service/impl/QcsMdfFormServiceImpl.java

@@ -0,0 +1,11 @@
+package com.rongwei.bscommon.sys.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rongwei.bscommon.sys.dao.QcsMdfFormDao;
+import com.rongwei.bscommon.sys.service.QcsMdfFormService;
+import com.rongwei.bsentity.domain.QcsMdfFormDo;
+import org.springframework.stereotype.Service;
+
+@Service
+public class QcsMdfFormServiceImpl extends ServiceImpl<QcsMdfFormDao, QcsMdfFormDo> implements QcsMdfFormService {
+}

qcs-common/src/main/java/com/rongwei/bscommon/sys/service/impl/QcsMdfRowServiceImpl.java

@@ -0,0 +1,11 @@
+package com.rongwei.bscommon.sys.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rongwei.bscommon.sys.dao.QcsMdfRowDao;
+import com.rongwei.bscommon.sys.service.QcsMdfRowService;
+import com.rongwei.bsentity.domain.QcsMdfRowDo;
+import org.springframework.stereotype.Service;
+
+@Service
+public class QcsMdfRowServiceImpl extends ServiceImpl<QcsMdfRowDao, QcsMdfRowDo> implements QcsMdfRowService {
+}

qcs-common/src/main/java/com/rongwei/bscommon/sys/service/impl/QcsMdfSectionServiceImpl.java

@@ -0,0 +1,11 @@
+package com.rongwei.bscommon.sys.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rongwei.bscommon.sys.dao.QcsMdfSectionDao;
+import com.rongwei.bscommon.sys.service.QcsMdfSectionService;
+import com.rongwei.bsentity.domain.QcsMdfSectionDo;
+import org.springframework.stereotype.Service;
+
+@Service
+public class QcsMdfSectionServiceImpl extends ServiceImpl<QcsMdfSectionDao, QcsMdfSectionDo> implements QcsMdfSectionService {
+}

qcs-common/src/main/java/com/rongwei/bscommon/sys/utils/MdfApi.java

@@ -0,0 +1,58 @@
+package com.rongwei.bscommon.sys.utils;
+
+import cn.hutool.http.HttpUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.rongwei.commonservice.service.SysConfigService;
+import lombok.Getter;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Component
+public class MdfApi {
+    private static final Logger logger = LogManager.getLogger(MdfApi.class);
+
+    @Autowired
+    private SysConfigService sysConfigService;
+
+    /**
+     * 获取修改单
+     */
+    public Map<String, Object> apiCall(String dtwhoapproveTime) throws Exception {
+        Map<String, Object> retMap = new HashMap<>();
+        String apiUrl = null;
+        String resultJson = null;
+        try {
+            // 请求接口URL
+            String configContent = sysConfigService.getContentByConfigCode("mdfApiConfig");
+            JSONObject jsonObject = JSON.parseObject(configContent);
+            apiUrl = jsonObject.get("mdfApi").toString() + "?dtwhoapproveTime=" + dtwhoapproveTime;
+            resultJson = HttpUtil.get(apiUrl);
+
+            JSONObject apiReturnJson = JSON.parseObject(resultJson);
+            if (apiReturnJson.get("code").equals(200)) {
+                logger.info("sendMDFData" + "发送的JSON:" + apiUrl + "回传的JSON:" + resultJson);
+                // 日志记录
+//                saveApiLog(apiUrl, resultJson, "sendMDFData");
+                retMap.put("code", "200");
+                retMap.put("msg", "操作成功");
+                retMap.put("data", apiReturnJson.get("data"));
+            } else {
+                retMap.put("code", "500");
+                retMap.put("msg", apiReturnJson.get("message").toString());
+            }
+        } catch (Exception ex) {
+            logger.info(ex.getMessage());
+            ex.printStackTrace();
+            logger.info("sendMDFData" + "发送的JSON:" + apiUrl + "回传的JSON:" + resultJson);
+            retMap.put("code", "500");
+            retMap.put("msg", ex.getMessage());
+        }
+        return retMap;
+    }
+}

qcs-entity/src/main/java/com/rongwei/bsentity/domain/QcsMdfFileDo.java

@@ -0,0 +1,88 @@
+package com.rongwei.bsentity.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.rongwei.rwcommon.base.BaseDo;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author dlc
+ * @since 2024-11-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("qcs_mdf_file")
+public class QcsMdfFileDo extends BaseDo {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @TableField("ID")
+    private Integer id;
+    /**
+     * 租户ID
+     */
+    @TableField("TENANTID")
+    private String tenantid;
+    /**
+     * 扩展json格式配置
+     */
+    @TableField("ROPTION")
+    private String roption;
+    /**
+     * 创建人
+     */
+    @TableField("ADMINID")
+    private Integer adminid;
+    /**
+     * 内容显示的url
+     */
+    @TableField("CONTENT")
+    private String content;
+    /**
+     * 创建时间
+     */
+    @TableField("CREATETIME")
+    private String createtime;
+    /**
+     * 下载地址
+     */
+    @TableField("DOWN")
+    private String down;
+    /**
+     * 修改单id
+     */
+    @TableField("FORMID")
+    private Integer formid;
+    /**
+     * 附件名称
+     */
+    @TableField("NAME")
+    private String name;
+    /**
+     * 绝对路径
+     */
+    @TableField("PATH")
+    private String path;
+    /**
+     * 排号组id
+     */
+    @TableField("ROWSID")
+    private Integer rowsid;
+    /**
+     * 序列组id
+     */
+    @TableField("SECTIONID")
+    private Integer sectionid;
+
+
+}

qcs-entity/src/main/java/com/rongwei/bsentity/domain/QcsMdfFormDo.java

@@ -0,0 +1,233 @@
+package com.rongwei.bsentity.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.rongwei.rwcommon.base.BaseDo;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author dlc
+ * @since 2024-11-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("qcs_mdf_form")
+public class QcsMdfFormDo extends BaseDo {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @TableField("ID")
+    private Integer id;
+    /**
+     * 租户ID
+     */
+    @TableField("TENANTID")
+    private String tenantid;
+    /**
+     * 扩展json格式配置
+     */
+    @TableField("ROPTION")
+    private String roption;
+    /**
+     * adminId
+     */
+    @TableField("ADMINID")
+    private Integer adminid;
+    /**
+     * 创单姓名
+     */
+    @TableField("ADMINNICKNAME")
+    private String adminnickname;
+    /**
+     * 用户权限 1->仅查看 2->编辑 3->校对按钮 4->审核按钮 5->发送邮件按钮 6 -> 修改单 审核人 仅支持上传签名
+     */
+    @TableField("AUTH")
+    private Integer auth;
+    /**
+     * baseEmailsStr
+     */
+    @TableField("BASEEMAILSSTR")
+    private String baseemailsstr;
+    /**
+     * 竣工日期
+     */
+    @TableField("COMPLETETIME")
+    private String completetime;
+    /**
+     * 创建时间
+     */
+    @TableField("CREATETIME")
+    private String createtime;
+    /**
+     * 删除时间
+     */
+    @TableField("DELETETIME")
+    private String deletetime;
+    /**
+     * 引起关联部件的修改 0: 未选 1: 勾选
+     */
+    @TableField("DESIGNMODIFY")
+    private Integer designmodify;
+    /**
+     * 通知设计人 0： 未勾选 1: 已勾选
+     */
+    @TableField("DESIGNNOTICE")
+    private Integer designnotice;
+    /**
+     * 部件 通知修改 0: 未选 1: 勾选
+     */
+    @TableField("DESIGNNOTICEMODIFY")
+    private Integer designnoticemodify;
+    /**
+     * 审批人id
+     */
+    @TableField("DTWHOAPPROVEADMINID")
+    private Integer dtwhoapproveadminid;
+    /**
+     * 审批人名字
+     */
+    @TableField("DTWHOAPPROVEADMINNICKNAME")
+    private String dtwhoapproveadminnickname;
+    /**
+     * 装船时 审批人 签名地址
+     */
+    @TableField("DTWHOAPPROVECONTENT")
+    private String dtwhoapprovecontent;
+    /**
+     * 审核时间
+     */
+    @TableField("DTWHOAPPROVETIME")
+    private String dtwhoapprovetime;
+    /**
+     * 校对时间
+     */
+    @TableField("DTWHOCOLLATETIME")
+    private String dtwhocollatetime;
+    /**
+     * 生成修改单excel路径
+     */
+    @TableField("EXCEL")
+    private String excel;
+    /**
+     * 项目主管id
+     */
+    @TableField("MANAGEADMINID")
+    private Integer manageadminid;
+    /**
+     * 项目主管名称
+     */
+    @TableField("MANAGEADMINNICKNAME")
+    private String manageadminnickname;
+    /**
+     * 总编号id
+     */
+    @TableField("NUMBERID")
+    private Integer numberid;
+    /**
+     * 总编号名称
+     */
+    @TableField("NUMBERNAME")
+    private String numbername;
+    /**
+     * 生成修改单 pdf 路径
+     */
+    @TableField("PDF")
+    private String pdf;
+    /**
+     * 生成阶段名称
+     */
+    @TableField("PRODUCENAME")
+    private String producename;
+    /**
+     * 项目工号
+     */
+    @TableField("PROJECTDLPROJID")
+    private String projectdlprojid;
+    /**
+     * 项目名称
+     */
+    @TableField("PROJECTDLPROJNAME")
+    private String projectdlprojname;
+    /**
+     * 项目id
+     */
+    @TableField("PROJECTID")
+    private Integer projectid;
+    /**
+     * 整改编号
+     */
+    @TableField("RECTIFYCODE")
+    private String rectifycode;
+    /**
+     * relationEmailsStr
+     */
+    @TableField("RELATIONEMAILSSTR")
+    private String relationemailsstr;
+    /**
+     * 引起关联部门的修改 0: 未选 1: 勾选
+     */
+    @TableField("ROLEMODIFY")
+    private Integer rolemodify;
+    /**
+     * 部门 通知修改 0: 未选 1: 勾选
+     */
+    @TableField("ROLENOTICEMODIFY")
+    private Integer rolenoticemodify;
+    /**
+     * 对应的sectionIds
+     */
+    @TableField("SECTIONIDS")
+    private String sectionids;
+    /**
+     * 状态排序字段 0-> 新建 10->待校对 20->待审核 30->校对驳回 40->审核驳回 50->审核通过
+     */
+    @TableField("SORT")
+    private Integer sort;
+    /**
+     * 修改源id
+     */
+    @TableField("SOURCEID")
+    private Integer sourceid;
+    /**
+     * 修改源头名称
+     */
+    @TableField("SOURCENAME")
+    private String sourcename;
+    /**
+     * 编号
+     */
+    @TableField("SOURCENUMBERCODE")
+    private String sourcenumbercode;
+    /**
+     * 修改单状态 1:新增 2:待校对 3:校对退回 4:待审核 5:审核退回 6:审核通过
+     */
+    @TableField("STATUS")
+    private Integer status;
+    /**
+     * 类型编码
+     */
+    @TableField("TYPECODE")
+    private String typecode;
+    /**
+     * 类型名字
+     */
+    @TableField("TYPENAME")
+    private String typename;
+    /**
+     * updateTime
+     */
+    @TableField("UPDATETIME")
+    private String updatetime;
+
+
+}

qcs-entity/src/main/java/com/rongwei/bsentity/domain/QcsMdfRowDo.java

@@ -0,0 +1,153 @@
+package com.rongwei.bsentity.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.rongwei.rwcommon.base.BaseDo;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author dlc
+ * @since 2024-11-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("qcs_mdf_row")
+public class QcsMdfRowDo extends BaseDo {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @TableField("ID")
+    private Integer id;
+    /**
+     * 租户ID
+     */
+    @TableField("TENANTID")
+    private String tenantid;
+    /**
+     * 扩展json格式配置
+     */
+    @TableField("ROPTION")
+    private String roption;
+    /**
+     * 创建时间
+     */
+    @TableField("CREATETIME")
+    private String createtime;
+    /**
+     * 序号
+     */
+    @TableField("ROWSN")
+    private String rowsn;
+    /**
+     * 创建人
+     */
+    @TableField("ADMINID")
+    private Integer adminid;
+    /**
+     * 修改单id
+     */
+    @TableField("FORMID")
+    private Integer formid;
+    /**
+     * 序列组id
+     */
+    @TableField("SECTIONID")
+    private Integer sectionid;
+    /**
+     * 任务部件 id
+     */
+    @TableField("TASKDESIGNID")
+    private Integer taskdesignid;
+    /**
+     * 任务部件名称
+     */
+    @TableField("TASKDESIGNDTPARTNAME")
+    private String taskdesigndtpartname;
+    /**
+     * 次级部件图号
+     */
+    @TableField("MINORDESIGNDTDRAWINGNO")
+    private String minordesigndtdrawingno;
+    /**
+     * 次级部件图名
+     */
+    @TableField("MINORDESIGNDTPARTNAME")
+    private String minordesigndtpartname;
+    /**
+     * 电子图时间
+     */
+    @TableField("ELECTRONICDRAWINGTIME")
+    private String electronicdrawingtime;
+    /**
+     * 蜡底图时间
+     */
+    @TableField("CANDLEDRAWINGTIME")
+    private String candledrawingtime;
+    /**
+     * 标记
+     */
+    @TableField("NOS")
+    private String nos;
+    /**
+     * 修改内容
+     */
+    @TableField("CONTENT")
+    private String content;
+    /**
+     * 附件
+     */
+    @TableField("FILENO")
+    private String fileno;
+    /**
+     * 任务部件图号
+     */
+    @TableField("TASKDESIGNDTDRAWINGNO")
+    private String taskdesigndtdrawingno;
+    /**
+     * 图中位置
+     */
+    @TableField("POSITIONDRAWING")
+    private String positiondrawing;
+    /**
+     * 修改人名称
+     */
+    @TableField("MODIFYADMINNICKNAME")
+    private String modifyadminnickname;
+    /**
+     * 修改单校对人名称
+     */
+    @TableField("DTWHOCOLLATEADMINNICKNAME")
+    private String dtwhocollateadminnickname;
+    /**
+     * 审批人名字
+     */
+    @TableField("DTWHOAPPROVEADMINNICKNAME")
+    private String dtwhoapproveadminnickname;
+    /**
+     * 修改人路径
+     */
+    @TableField("MODIFYPATH")
+    private String modifypath;
+    /**
+     * 校对人路径
+     */
+    @TableField("DTWHOCOLLATEPATH")
+    private String dtwhocollatepath;
+    /**
+     * 审核人路径
+     */
+    @TableField("DTWHOAPPROVEPATH")
+    private String dtwhoapprovepath;
+
+
+}

qcs-entity/src/main/java/com/rongwei/bsentity/domain/QcsMdfSectionDo.java

@@ -0,0 +1,194 @@
+package com.rongwei.bsentity.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.rongwei.rwcommon.base.BaseDo;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author dlc
+ * @since 2024-11-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("qcs_mdf_section")
+public class QcsMdfSectionDo extends BaseDo {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * ID
+     */
+    @TableField("ID")
+    private Integer id;
+    /**
+     * 租户ID
+     */
+    @TableField("TENANTID")
+    private String tenantid;
+    /**
+     * 扩展json格式配置
+     */
+    @TableField("ROPTION")
+    private String roption;
+    /**
+     * 创建时间
+     */
+    @TableField("CREATETIME")
+    private String createtime;
+    /**
+     * 创建人
+     */
+    @TableField("ADMINID")
+    private Integer adminid;
+    /**
+     * 修改单id
+     */
+    @TableField("FORMID")
+    private Integer formid;
+    /**
+     * 设计错误部件id
+     */
+    @TableField("ERRORDESIGNID")
+    private Integer errordesignid;
+    /**
+     * 设计错误部件名称
+     */
+    @TableField("ERRORDESIGNDTPARTNAME")
+    private String errordesigndtpartname;
+    /**
+     * 修改责任方
+     */
+    @TableField("MODIFYBY")
+    private String modifyby;
+    /**
+     * 常规错误
+     */
+    @TableField("ERRORROUTINE")
+    private String errorroutine;
+    /**
+     * 二过错误
+     */
+    @TableField("ERRORAGAIN")
+    private String erroragain;
+    /**
+     * 较难发现错误
+     */
+    @TableField("ERRORHARD")
+    private String errorhard;
+    /**
+     * 外部影响配合时间差错误
+     */
+    @TableField("ERROROUTSIDE")
+    private String erroroutside;
+    /**
+     * 设计人
+     */
+    @TableField("DTDESIGNER")
+    private String dtdesigner;
+    /**
+     * 校对人
+     */
+    @TableField("DTWHOCOLLATE")
+    private String dtwhocollate;
+    /**
+     * 审核人
+     */
+    @TableField("DTWHOAPPROVE")
+    private String dtwhoapprove;
+    /**
+     * 修改单修改人id
+     */
+    @TableField("MODIFYADMINID")
+    private Integer modifyadminid;
+    /**
+     * 修改单修改人名称
+     */
+    @TableField("MODIFYADMINNICKNAME")
+    private String modifyadminnickname;
+    /**
+     * 修改单校对人id
+     */
+    @TableField("DTWHOCOLLATEADMINID")
+    private Integer dtwhocollateadminid;
+    /**
+     * 修改单校对人名称
+     */
+    @TableField("DTWHOCOLLATEADMINNICKNAME")
+    private String dtwhocollateadminnickname;
+    /**
+     * 审批人id
+     */
+    @TableField("DTWHOAPPROVEADMINID")
+    private Integer dtwhoapproveadminid;
+    /**
+     * 审批人名字
+     */
+    @TableField("DTWHOAPPROVEADMINNICKNAME")
+    private String dtwhoapproveadminnickname;
+    /**
+     * 序号
+     */
+    @TableField("SECTIONSN")
+    private String sectionsn;
+    /**
+     * 校对表错误 0:未勾选 1: 勾选
+     */
+    @TableField("ERRORTABLE")
+    private Integer errortable;
+    /**
+     * 错误设计图号
+     */
+    @TableField("ERRORDESIGNDTDRAWINGNO")
+    private String errordesigndtdrawingno;
+    /**
+     * 设计人id
+     */
+    @TableField("DTDESIGNERUSERADMINID")
+    private Integer dtdesigneruseradminid;
+    /**
+     * 校对人id
+     */
+    @TableField("DTWHOCOLLATEUSERADMINID")
+    private Integer dtwhocollateuseradminid;
+    /**
+     * 审核人id
+     */
+    @TableField("DTWHOAPPROVEUSERADMINID")
+    private Integer dtwhoapproveuseradminid;
+    /**
+     * 设计人id(图纸平台)
+     */
+    @TableField("DTDESIGNERUSERUSERID")
+    private String dtdesigneruseruserid;
+    /**
+     * 校对人id (图纸平台)
+     */
+    @TableField("DTWHOCOLLATEUSERUSERID")
+    private String dtwhocollateuseruserid;
+    /**
+     * 审核人id(图纸平台)
+     */
+    @TableField("DTWHOAPPROVEUSERUSERID")
+    private String dtwhoapproveuseruserid;
+    /**
+     * 修改人签名地址
+     */
+    @TableField("MODIFYCONTENT")
+    private String modifycontent;
+    /**
+     * 修改人签名path
+     */
+    @TableField("MODIFYPATH")
+    private String modifypath;
+
+
+}

qcs-entity/src/main/java/com/rongwei/bsentity/vo/QcsMdfFormVo.java

@@ -0,0 +1,11 @@
+package com.rongwei.bsentity.vo;
+
+import com.rongwei.bsentity.domain.QcsMdfFormDo;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class QcsMdfFormVo extends QcsMdfFormDo {
+    private List<QcsMdfSectionVo> sections;
+}

qcs-entity/src/main/java/com/rongwei/bsentity/vo/QcsMdfRowVo.java

@@ -0,0 +1,12 @@
+package com.rongwei.bsentity.vo;
+
+import com.rongwei.bsentity.domain.QcsMdfFileDo;
+import com.rongwei.bsentity.domain.QcsMdfRowDo;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class QcsMdfRowVo extends QcsMdfRowDo {
+    List<QcsMdfFileDo> files;
+}

qcs-entity/src/main/java/com/rongwei/bsentity/vo/QcsMdfSectionVo.java

@@ -0,0 +1,10 @@
+package com.rongwei.bsentity.vo;
+
+import com.rongwei.bsentity.domain.QcsMdfSectionDo;
+import lombok.Data;
+
+import java.util.List;
+@Data
+public class QcsMdfSectionVo extends QcsMdfSectionDo {
+    List<QcsMdfRowVo> rows;
+}

qcs-server/src/main/java/com/rongwei/controller/CommonController.java

@@ -2,11 +2,13 @@ package com.rongwei.controller;
 
 import com.rongwei.bscommon.sys.service.CommonService;
 import com.rongwei.rwcommon.base.R;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+@Slf4j
 @RestController
 @RequestMapping("/common")
 public class CommonController {
@@ -24,4 +26,16 @@ public class CommonController {
     public R getPartno() {
         return commonService.getPartno();
     }
+
+    //获取修改单信息
+    @RequestMapping("/getMdfFormInfo")
+    public R getMdfFormInfo(String dtwhoapproveTime) {
+        try {
+            log.info("获取修改单信息参数：" + dtwhoapproveTime);
+            return commonService.getMdfFormInfo(dtwhoapproveTime);
+        } catch (Exception e) {
+            log.info(e.getMessage());
+            return R.error("获取修改单信息异常");
+        }
+    }
 }