From e5c9acd39162bb8fdd1552a76622307681b99431 Mon Sep 17 00:00:00 2001
From: guo <guo@guo>
Date: Fri, 19 Jan 2024 19:09:17 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MaterialApproachRecordController.java     |   2 ++
 .../xmgl/modules/project/entity/Project.java  |   6 ++++++
 .../template/材料进场记录导入模板.xlsx        | Bin 19968 -> 20480 bytes
 3 files changed, 8 insertions(+)

diff --git a/src/main/java/com/zhgd/xmgl/modules/material/controller/MaterialApproachRecordController.java b/src/main/java/com/zhgd/xmgl/modules/material/controller/MaterialApproachRecordController.java
index 8f957c3cd..0a071a63d 100644
--- a/src/main/java/com/zhgd/xmgl/modules/material/controller/MaterialApproachRecordController.java
+++ b/src/main/java/com/zhgd/xmgl/modules/material/controller/MaterialApproachRecordController.java
@@ -213,6 +213,7 @@ public class MaterialApproachRecordController {
     @ApiOperation(value = "通过excel导入材料进场记录 信息", notes = "通过excel导入材料进场记录 信息", httpMethod = "POST")
     @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        String projectSn = request.getParameter("projectSn");
         MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
         Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
         for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
@@ -224,6 +225,7 @@ public class MaterialApproachRecordController {
             try {
                 List<MaterialApproachRecord> listMaterialApproachRecords = ExcelImportUtil.importExcel(file.getInputStream(), MaterialApproachRecord.class, params);
                 for (MaterialApproachRecord materialApproachRecordExcel : listMaterialApproachRecords) {
+                    materialApproachRecordExcel.setProjectSn(projectSn);
                     materialApproachRecordService.save(materialApproachRecordExcel);
                 }
                 return Result.ok("文件导入成功！数据行数：" + listMaterialApproachRecords.size());
diff --git a/src/main/java/com/zhgd/xmgl/modules/project/entity/Project.java b/src/main/java/com/zhgd/xmgl/modules/project/entity/Project.java
index 2e4c25299..2cc99ab06 100644
--- a/src/main/java/com/zhgd/xmgl/modules/project/entity/Project.java
+++ b/src/main/java/com/zhgd/xmgl/modules/project/entity/Project.java
@@ -267,6 +267,12 @@ public class Project implements Serializable {
     private String jzgProjectCode;
     @ApiModelProperty(value = "金筑工访问host")
     private String jzgHost;
+    /**
+     * 弃用，使用xiwonUrl
+     */
+    @Deprecated
+    @ApiModelProperty(value = "携稳扬尘url")
+    private String xiwonDustUrl;
     @ApiModelProperty(value = "'携稳的appId'")
     private String xiwonAppId;
     @ApiModelProperty(value = "'携稳的appSecret'")
diff --git a/src/main/resources/template/材料进场记录导入模板.xlsx b/src/main/resources/template/材料进场记录导入模板.xlsx
index 723e93a19ca2c7a76c5095a6b4a2d2dfca9c226e..e806973a695dad1fb7fa53588938467a6b7b7d9c 100644
GIT binary patch
delta 688
zcmX|<O=uHA6vzK>yGhzr6O)GGC&bzc1+8g5s$vp%w;Ey$rQ)Gi@uE`2i<cT`BObg|
z&`dli0c%g*O4*Bo^iYZ+C%p-RQ1m8(2!24&#{VP|hX2g_y?OKY&AhGDrLrs!GcvrE
zZHSC2pHU7U0<hg~x3xxSAMqX-x1?&`2+n+a(QFhy$YFZnQ+Lb-qn=YOb3t4+?<<St
z{q(H{gIkDle*%JiKvX@A9`L)kcmMli?{zeCRDP+qb~dn%AcKNx&?zojkObmLAc<pK
zPjOE0ya`#UT_``hG;_5N;$EApt<(aLyY&LnIDu(Qa;78A*d#|B;}jhe+)2~yIg&`>
zWG|u(iyt394eVqI7Sv5=*fMC227p-3d*WC!rWs5I^c%bX+Z&<{TS6V5h5&x3m+su+
zU#8LQbWU_hNd5G6$si5%sE=gz$RzFPk&mPc>z?zIc9GsQ*H^AlTtUu=U|p96o5}zx
zH?`p{mqe;(V=88tW4d=bqt2sk{njB$-y}>$s6lFb?c%CDx@=bSLxCZqHT$XMdI$3Z
z#@;{DxetDabPB;%7I=4@uce+(Im#|9g)3iP?SI3c!R9`i^Ua3(SomBm-uCNimxOUe
zZ?kBN+B~1BmiC;9^Zgw*Y!Z16hdpyS$Jv<_edpM9-SZS9;-n-=N9nFQwA0>f>AL&_
D`2LJk

delta 362
zcmX|+u}cDR6vy8?PEW0*LgWYp(+t9pQm-;Py3<qS5~IB#+JwkOf>PxE0EfIcv=r3j
zXmV?VL(m)ufonrUb4!EQyQLp|zrXMAeSYu9`&o}@-Q(>6u8!0<#5M8>?S+}^x}K5%
zkaGG$6Z>bPEnbAjEm;|uQ%o=zi*zG)g$I>>#V+pCwXcmq=f^h;%bh?3Isv}(zjR1s
z-W$#&vb>2+`qEVC7$l|=rFBzsAp`-4(zl)tAy-q3lByFgh7gg`r5K%-&VwJ|hb!+z
zN*fcq5?}O24Dor6<z?CuWSosohCFV-u12M>F!gUFbthI03Y0Nd$TE9N@FK5!f6%zg
zx^(jciXDC0b<M7|{PSGvAw3zU^IFr8jC$lyfjuZg1$JPYU4b0voDImc7h#uGU|xVM
XrwV(PNsfCI-b+w+?&=MsXG8k~wUuHL