获取修改单接口

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

@@ -79,16 +79,28 @@ public class ZhcxMdfFormServiceImpl extends ServiceImpl<ZhcxMdfFormDao, ZhcxMdfF
                     }
                     zhcxMdfFormDoList.add(zhcxMdfFormVo);
                     for (ZhcxMdfSectionVo zhcxMdfSectionVo : zhcxMdfFormVo.getSections()) {
-                        zhcxMdfSectionVo.setFormid(zhcxMdfFormVo.getId());
+                        if (zhcxMdfSectionVo.getFormid() == null) {
+                            zhcxMdfSectionVo.setFormid(zhcxMdfFormVo.getId());
+                        }
                         zhcxMdfSectionDoList.add(zhcxMdfSectionVo);
                         for (ZhcxMdfRowVo zhcxMdfRowVo : zhcxMdfSectionVo.getRows()) {
-                            zhcxMdfRowVo.setFormid(zhcxMdfFormVo.getId());
-                            zhcxMdfRowVo.setSectionid(zhcxMdfSectionVo.getId());
+                            if (zhcxMdfRowVo.getFormid() == null) {
+                                zhcxMdfRowVo.setFormid(zhcxMdfFormVo.getId());
+                            }
+                            if (zhcxMdfRowVo.getSectionid() == null) {
+                                zhcxMdfRowVo.setSectionid(zhcxMdfSectionVo.getId());
+                            }
                             zhcxMdfRowDoList.add(zhcxMdfRowVo);
                             for (ZhcxMdfFileDo zhcxMdfFileDo : zhcxMdfRowVo.getFiles()) {
-                                zhcxMdfFileDo.setFormid(zhcxMdfFormVo.getId());
-                                zhcxMdfFileDo.setSectionid(zhcxMdfSectionVo.getId());
-                                zhcxMdfFileDo.setRowsid(zhcxMdfRowVo.getId());
+                                if (zhcxMdfFileDo.getFormid() == null) {
+                                    zhcxMdfFileDo.setFormid(zhcxMdfFormVo.getId());
+                                }
+                                if (zhcxMdfFileDo.getSectionid() == null) {
+                                    zhcxMdfFileDo.setSectionid(zhcxMdfSectionVo.getId());
+                                }
+                                if (zhcxMdfFileDo.getRowsid() == null) {
+                                    zhcxMdfFileDo.setRowsid(zhcxMdfRowVo.getId());
+                                }
                                 zhcxMdfFileDoList.add(zhcxMdfFileDo);
                             }
                         }
@@ -125,30 +137,35 @@ public class ZhcxMdfFormServiceImpl extends ServiceImpl<ZhcxMdfFormDao, ZhcxMdfF
             Date yesterday = calendar.getTime();
             dtwhoapproveTime = sdf.format(yesterday);
         }
-        //主表信息
-        List<ZhcxMdfFormVo> zhcxMdfFormVos = zhcxMdfFormDao.getZhcxMdfFormVos(dtwhoapproveTime);
-        List<Integer> formIds = new ArrayList<>();
-        for (ZhcxMdfFormVo zhcxMdfFormVo : zhcxMdfFormVos) {
-            formIds.add(zhcxMdfFormVo.getId());
-        }
-        //各子表信息
-        List<ZhcxMdfSectionVo> zhcxMdfSectionVos = zhcxMdfFormDao.getZhcxMdfSectionDos(formIds);
-        List<ZhcxMdfRowVo> zhcxMdfRowVos = zhcxMdfFormDao.getZhcxMdfRowDos(formIds);
-        List<ZhcxMdfFileDo> zhcxMdfFileDos = zhcxMdfFormDao.getZhcxMdfFileDos(formIds);
         //接口发送的数据
         List<ZhcxMdfFormVo> sendMdfFormVos = new ArrayList<>();
-        for (ZhcxMdfFormVo mdfFormVo : zhcxMdfFormVos) {
-            List<ZhcxMdfSectionVo> mdfSectionVos = zhcxMdfSectionVos.stream().filter(s -> s.getFormid().equals(mdfFormVo.getId())).collect(Collectors.toList());
-            for (ZhcxMdfSectionVo mdfSectionVo : mdfSectionVos) {
-                List<ZhcxMdfRowVo> mdfRowVos = zhcxMdfRowVos.stream().filter(mr -> mr.getFormid().equals(mdfFormVo.getId()) && mr.getSectionid().equals(mdfSectionVo.getId())).collect(Collectors.toList());
-                for (ZhcxMdfRowVo mdfRowVo : mdfRowVos) {
-                    List<ZhcxMdfFileDo> mdfFileDos = zhcxMdfFileDos.stream().filter(f -> f.getFormid().equals(mdfFormVo.getId()) && f.getSectionid().equals(mdfSectionVo.getId()) && f.getRowsid().equals(mdfRowVo.getId())).collect(Collectors.toList());
-                    mdfRowVo.setFiles(mdfFileDos);
+        //主表信息
+        List<ZhcxMdfFormVo> zhcxMdfFormVos = zhcxMdfFormDao.getZhcxMdfFormVos(dtwhoapproveTime);
+        if (zhcxMdfFormVos.size() > 0) {
+            List<Integer> formIds = new ArrayList<>();
+            for (ZhcxMdfFormVo zhcxMdfFormVo : zhcxMdfFormVos) {
+                formIds.add(zhcxMdfFormVo.getId());
+            }
+            //各子表信息
+            List<ZhcxMdfSectionVo> zhcxMdfSectionVos = zhcxMdfFormDao.getZhcxMdfSectionDos(formIds);
+            List<ZhcxMdfRowVo> zhcxMdfRowVos = zhcxMdfFormDao.getZhcxMdfRowDos(formIds);
+            List<ZhcxMdfFileDo> zhcxMdfFileDos = zhcxMdfFormDao.getZhcxMdfFileDos(formIds);
+            for (ZhcxMdfFormVo mdfFormVo : zhcxMdfFormVos) {
+                List<ZhcxMdfSectionVo> mdfSectionVos = zhcxMdfSectionVos.stream().filter(s -> s.getFormid().equals(mdfFormVo.getId())).collect(Collectors.toList());
+                for (ZhcxMdfSectionVo mdfSectionVo : mdfSectionVos) {
+                    List<ZhcxMdfRowVo> mdfRowVos = zhcxMdfRowVos.stream().filter(mr -> mr.getFormid().equals(mdfFormVo.getId()) && mr.getSectionid().equals(mdfSectionVo.getId())).collect(Collectors.toList());
+                    for (ZhcxMdfRowVo mdfRowVo : mdfRowVos) {
+                        List<ZhcxMdfFileDo> mdfFileDos = zhcxMdfFileDos.stream().filter(f -> f.getFormid().equals(mdfFormVo.getId()) && f.getSectionid().equals(mdfSectionVo.getId()) && f.getRowsid().equals(mdfRowVo.getId())).collect(Collectors.toList());
+                        for (ZhcxMdfFileDo mdfFileDo : mdfFileDos) {
+                            mdfFileDo.setDown("");
+                        }
+                        mdfRowVo.setFiles(mdfFileDos);
+                    }
+                    mdfSectionVo.setRows(mdfRowVos);
                 }
-                mdfSectionVo.setRows(mdfRowVos);
+                mdfFormVo.setSections(mdfSectionVos);
+                sendMdfFormVos.add(mdfFormVo);
             }
-            mdfFormVo.setSections(mdfSectionVos);
-            sendMdfFormVos.add(mdfFormVo);
         }
 
         r.setCode("200");

business-common/src/main/java/com/rongwei/bscommon/sys/utils/CodeGeneration.java

@@ -38,7 +38,7 @@ public class CodeGeneration {
         gc.setEnableCache(false);// XML 二级缓存
         gc.setBaseResultMap(true);// XML ResultMap
         gc.setBaseColumnList(false);// XML columList
-        gc.setAuthor("wm");// 作者
+        gc.setAuthor("dlc");// 作者
         gc.setDateType(DateType.ONLY_DATE);
 
         // 自定义文件命名，注意 %s 会自动填充表实体属性！
@@ -57,7 +57,7 @@ public class CodeGeneration {
         dsc.setDriverName("dm.jdbc.driver.DmDriver");
         dsc.setUsername("INCONTROL");
         dsc.setPassword("INCONTROL");
-        dsc.setUrl("jdbc:dm://61.177.40.178:5237");  //指定数据库
+        dsc.setUrl("jdbc:dm://192.168.0.204:5237");  //指定数据库
         autoGenerator.setDataSource(dsc);
 
         // 3、包的配置
@@ -85,7 +85,7 @@ public class CodeGeneration {
         strategy.setSuperEntityClass(BaseDo.class);
         strategy.setRestControllerStyle(true);
         // 设置要映射的表名（重要，需要修改的地方）
-        strategy.setInclude("ZHCX_PROJECT_RECTIFY_MACHINE");
+        strategy.setInclude("ZHCX_MDF_FILE");
         strategy.setNaming(NamingStrategy.underline_to_camel); // 自动转换表名的驼峰命名法
         strategy.setColumnNaming(NamingStrategy.no_change); // 自动转换列名的驼峰命名法
         strategy.setEntityLombokModel(true); // 是否使用lombox

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

@@ -7,8 +7,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
-import java.util.Date;
-
 /**
  * <p>
  *
@@ -54,7 +52,7 @@ public class ZhcxMdfFileDo extends BaseDo {
      * 创建时间
      */
     @TableField("CREATETIME")
-    private Date createtime;
+    private String createtime;
     /**
      * 下载地址
      */

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

@@ -7,8 +7,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
-import java.util.Date;
-
 /**
  * <p>
  *
@@ -69,12 +67,12 @@ public class ZhcxMdfFormDo extends BaseDo {
      * 创建时间
      */
     @TableField("CREATETIME")
-    private Date createtime;
+    private String createtime;
     /**
      * 删除时间
      */
     @TableField("DELETETIME")
-    private Date deletetime;
+    private String deletetime;
     /**
      * 引起关联部件的修改 0: 未选 1: 勾选
      */
@@ -109,12 +107,12 @@ public class ZhcxMdfFormDo extends BaseDo {
      * 审核时间
      */
     @TableField("DTWHOAPPROVETIME")
-    private Date dtwhoapprovetime;
+    private String dtwhoapprovetime;
     /**
      * 校对时间
      */
     @TableField("DTWHOCOLLATETIME")
-    private Date dtwhocollatetime;
+    private String dtwhocollatetime;
     /**
      * 生成修改单excel路径
      */
@@ -229,7 +227,7 @@ public class ZhcxMdfFormDo extends BaseDo {
      * updateTime
      */
     @TableField("UPDATETIME")
-    private Date updatetime;
+    private String updatetime;
 
 
 }

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

@@ -1,9 +1,8 @@
 package com.rongwei.bsentity.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 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;
@@ -22,7 +21,7 @@ import lombok.experimental.Accessors;
 @TableName("ZHCX_MDF_ROW")
 public class ZhcxMdfRowDo extends BaseDo {
 
-    private static final long serialVersionUID=1L;
+    private static final long serialVersionUID = 1L;
 
     /**
      * ID
@@ -43,7 +42,7 @@ public class ZhcxMdfRowDo extends BaseDo {
      * 创建时间
      */
     @TableField("CREATETIME")
-    private Date createtime;
+    private String createtime;
     /**
      * 序号
      */

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

@@ -43,7 +43,7 @@ public class ZhcxMdfSectionDo extends BaseDo {
      * 创建时间
      */
     @TableField("CREATETIME")
-    private Date createtime;
+    private String createtime;
     /**
      * 创建人
      */

business-server/src/main/java/com/rongwei/bsserver/controller/ZhcxMdfFormController.java

@@ -41,7 +41,7 @@ public class ZhcxMdfFormController {
     @RequestMapping("/sendMdfFormInfo")
     public R sendMdfFormInfo(String dtwhoapproveTime) {
         try {
-            log.info("发送原始修改单信息参数："+dtwhoapproveTime);
+            log.info("发送原始修改单信息参数：" + dtwhoapproveTime);
             return zhcxMdfFormService.sendMdfFormInfo(dtwhoapproveTime);
         } catch (Exception e) {
             log.info(e.getMessage());