方案交底结论导入导出，物料对应配置，erp导入后，成功匹配备注填写

src/main/java/com/jeeplus/modules/sg/financial/settlement/service/DonorMaterialService.java

@@ -362,7 +362,7 @@ public class DonorMaterialService extends CrudService<DonorMaterialMapper, Donor
                     if (i == 0) {
                         for (DonorMaterial use :
                                 useList) {
-                            use.setRemarks("已完成领料");
+                            use.setRemarks("已匹配");
                             mapper.updateRemarks(use);
                         }
                     }

src/main/java/com/jeeplus/modules/sg/managementcenter/reserveManagement/entity/ExportScheme.java

@@ -58,7 +58,7 @@ public class ExportScheme extends DataEntity<ExportScheme> {
     private String zhengDifficultyWarn;  //varchar(255) NULL  政处难点提醒
     private String disclosureFinishDateStr;
 
-
+    @ExcelField(title="项目名称", align=2, sort=2)
     public String getProjectName() {
         return projectName;
     }
@@ -84,7 +84,7 @@ public class ExportScheme extends DataEntity<ExportScheme> {
         this.projectReserveId = projectReserveId;
     }
 
-    @ExcelField(title="交底牵头部门", align=2, sort=2)
+    @ExcelField(title="交底牵头部门", align=2, sort=3)
     public String getDisclosureToCoordinate() {
         return disclosureToCoordinate;
     }
@@ -93,7 +93,7 @@ public class ExportScheme extends DataEntity<ExportScheme> {
         this.disclosureToCoordinate = disclosureToCoordinate;
     }
 
-    @ExcelField(title="交底参与部门", align=2, sort=3)
+    @ExcelField(title="交底参与部门", align=2, sort=4)
     public String getDisclosureParticipate() {
         return disclosureParticipate;
     }
@@ -102,7 +102,7 @@ public class ExportScheme extends DataEntity<ExportScheme> {
         this.disclosureParticipate = disclosureParticipate;
     }
 
-    @ExcelField(title="是否完成交底", align=2, sort=4)
+    @ExcelField(title="是否完成交底", align=2, sort=5)
     public String getWhetherFinishDisclosure() {
         return whetherFinishDisclosure;
     }
@@ -111,7 +111,7 @@ public class ExportScheme extends DataEntity<ExportScheme> {
         this.whetherFinishDisclosure = whetherFinishDisclosure;
     }
 
-    @ExcelField(title="项目管理中心人员", align=2, sort=5)
+    @ExcelField(title="项目管理中心人员", align=2, sort=6)
     public String getProjectManagementPeople() {
         return projectManagementPeople;
     }
@@ -120,7 +120,7 @@ public class ExportScheme extends DataEntity<ExportScheme> {
         this.projectManagementPeople = projectManagementPeople;
     }
 
-    @ExcelField(title="设计院人员", align=2, sort=6)
+    @ExcelField(title="设计院人员", align=2, sort=7)
     public String getDesigningInstitutePeople() {
         return designingInstitutePeople;
     }
@@ -129,7 +129,7 @@ public class ExportScheme extends DataEntity<ExportScheme> {
         this.designingInstitutePeople = designingInstitutePeople;
     }
 
-    @ExcelField(title="经研所人员", align=2, sort=7)
+    @ExcelField(title="经研所人员", align=2, sort=8)
     public String getIfoPeople() {
         return ifoPeople;
     }
@@ -138,7 +138,7 @@ public class ExportScheme extends DataEntity<ExportScheme> {
         this.ifoPeople = ifoPeople;
     }
 
-    @ExcelField(title="区域中心人员", align=2, sort=8)
+    @ExcelField(title="区域中心人员", align=2, sort=9)
     public String getRegionalCenterPeople() {
         return regionalCenterPeople;
     }
@@ -147,7 +147,7 @@ public class ExportScheme extends DataEntity<ExportScheme> {
         this.regionalCenterPeople = regionalCenterPeople;
     }
 
-    @ExcelField(title="不停电作业中心人员", align=2, sort=9)
+    @ExcelField(title="不停电作业中心人员", align=2, sort=10)
     public String getUninterruptedOperationPeople() {
         return uninterruptedOperationPeople;
     }
@@ -156,7 +156,7 @@ public class ExportScheme extends DataEntity<ExportScheme> {
         this.uninterruptedOperationPeople = uninterruptedOperationPeople;
     }
 
-    @ExcelField(title="作业方式", align=2, sort=10)
+    @ExcelField(title="作业方式", align=2, sort=11)
     public String getWorkMode() {
         return workMode;
     }
@@ -165,7 +165,7 @@ public class ExportScheme extends DataEntity<ExportScheme> {
         this.workMode = workMode;
     }
 
-    @ExcelField(title="交底完成日期", align=2, sort=11)
+    @ExcelField(title="交底完成日期", align=2, sort=12)
     public Date getDisclosureFinishDate() {
         return disclosureFinishDate;
     }
@@ -174,7 +174,7 @@ public class ExportScheme extends DataEntity<ExportScheme> {
         this.disclosureFinishDate = disclosureFinishDate;
     }
 
-    @ExcelField(title="备注", align=2, sort=12)
+    @ExcelField(title="备注", align=2, sort=13)
     public String getDisclosureRemarks() {
         return disclosureRemarks;
     }
@@ -183,7 +183,7 @@ public class ExportScheme extends DataEntity<ExportScheme> {
         this.disclosureRemarks = disclosureRemarks;
     }
 
-    @ExcelField(title="立项说明", align=2, sort=13)
+    @ExcelField(title="立项说明", align=2, sort=14)
     public String getProjectDescription() {
         return projectDescription;
     }
@@ -192,7 +192,7 @@ public class ExportScheme extends DataEntity<ExportScheme> {
         this.projectDescription = projectDescription;
     }
 
-    @ExcelField(title="不具备立项条件说明", align=2, sort=14)
+    @ExcelField(title="不具备立项条件说明", align=2, sort=15)
     public String getDoNotPossessProjectDescription() {
         return doNotPossessProjectDescription;
     }
@@ -201,7 +201,7 @@ public class ExportScheme extends DataEntity<ExportScheme> {
         this.doNotPossessProjectDescription = doNotPossessProjectDescription;
     }
 
-    @ExcelField(title="方案变更说明", align=2, sort=15)
+    @ExcelField(title="方案变更说明", align=2, sort=16)
     public String getChangedProgramsExplain() {
         return changedProgramsExplain;
     }
@@ -210,7 +210,7 @@ public class ExportScheme extends DataEntity<ExportScheme> {
         this.changedProgramsExplain = changedProgramsExplain;
     }
 
-    @ExcelField(title="政处难度初判", align=2, sort=16)
+    @ExcelField(title="政处难度初判", align=2, sort=17)
     public String getInitialDifficulty() {
         return initialDifficulty;
     }
@@ -219,7 +219,7 @@ public class ExportScheme extends DataEntity<ExportScheme> {
         this.initialDifficulty = initialDifficulty;
     }
 
-    @ExcelField(title="是否有资本设备", align=2, sort=17)
+    @ExcelField(title="是否有资本设备", align=2, sort=18)
     public String getCapitalEquipment() {
         return capitalEquipment;
     }
@@ -228,7 +228,7 @@ public class ExportScheme extends DataEntity<ExportScheme> {
         this.capitalEquipment = capitalEquipment;
     }
 
-    @ExcelField(title="是否有变电站新出线", align=2, sort=18)
+    @ExcelField(title="是否有变电站新出线", align=2, sort=19)
     public String getSubstationNewLine() {
         return substationNewLine;
     }
@@ -237,7 +237,7 @@ public class ExportScheme extends DataEntity<ExportScheme> {
         this.substationNewLine = substationNewLine;
     }
 
-    @ExcelField(title="是否已实施", align=2, sort=19)
+    @ExcelField(title="是否已实施", align=2, sort=20)
     public String getWhetherImplement() {
         return whetherImplement;
     }
@@ -246,7 +246,7 @@ public class ExportScheme extends DataEntity<ExportScheme> {
         this.whetherImplement = whetherImplement;
     }
 
-    @ExcelField(title="现场情况描述", align=2, sort=20)
+    @ExcelField(title="现场情况描述", align=2, sort=21)
     public String getFieldDescription() {
         return fieldDescription;
     }
@@ -255,7 +255,7 @@ public class ExportScheme extends DataEntity<ExportScheme> {
         this.fieldDescription = fieldDescription;
     }
 
-    @ExcelField(title="是否有实施必要性", align=2, sort=21)
+    @ExcelField(title="是否有实施必要性", align=2, sort=22)
     public String getNecessaryOfImplementation() {
         return necessaryOfImplementation;
     }
@@ -264,7 +264,7 @@ public class ExportScheme extends DataEntity<ExportScheme> {
         this.necessaryOfImplementation = necessaryOfImplementation;
     }
 
-    @ExcelField(title="实施无必要描述", align=2, sort=22)
+    @ExcelField(title="实施无必要描述", align=2, sort=23)
     public String getUnnecessaryDescription() {
         return unnecessaryDescription;
     }
@@ -273,7 +273,7 @@ public class ExportScheme extends DataEntity<ExportScheme> {
         this.unnecessaryDescription = unnecessaryDescription;
     }
 
-    @ExcelField(title="是否存在前置条件", align=2, sort=23)
+    @ExcelField(title="是否存在前置条件", align=2, sort=24)
     public String getPrecondition() {
         return precondition;
     }
@@ -282,7 +282,7 @@ public class ExportScheme extends DataEntity<ExportScheme> {
         this.precondition = precondition;
     }
 
-    @ExcelField(title="前置条件描述", align=2, sort=24)
+    @ExcelField(title="前置条件描述", align=2, sort=25)
     public String getConditionsDescribed() {
         return conditionsDescribed;
     }
@@ -291,7 +291,7 @@ public class ExportScheme extends DataEntity<ExportScheme> {
         this.conditionsDescribed = conditionsDescribed;
     }
 
-    @ExcelField(title="是否存在施工方案问题", align=2, sort=25)
+    @ExcelField(title="是否存在施工方案问题", align=2, sort=26)
     public String getConstructionSchemeProblem() {
         return constructionSchemeProblem;
     }
@@ -300,7 +300,7 @@ public class ExportScheme extends DataEntity<ExportScheme> {
         this.constructionSchemeProblem = constructionSchemeProblem;
     }
 
-    @ExcelField(title="施工方案问题描述", align=2, sort=26)
+    @ExcelField(title="施工方案问题描述", align=2, sort=27)
     public String getProblemDescriptionOfConstructionScheme() {
         return problemDescriptionOfConstructionScheme;
     }
@@ -309,7 +309,7 @@ public class ExportScheme extends DataEntity<ExportScheme> {
         this.problemDescriptionOfConstructionScheme = problemDescriptionOfConstructionScheme;
     }
 
-    @ExcelField(title="现场是否存在安全隐患", align=2, sort=27)
+    @ExcelField(title="现场是否存在安全隐患", align=2, sort=28)
     public String getExistingSecurityThreat() {
         return existingSecurityThreat;
     }
@@ -318,7 +318,7 @@ public class ExportScheme extends DataEntity<ExportScheme> {
         this.existingSecurityThreat = existingSecurityThreat;
     }
 
-    @ExcelField(title="安全隐患描述", align=2, sort=28)
+    @ExcelField(title="安全隐患描述", align=2, sort=29)
     public String getSafetyHazardDescription() {
         return safetyHazardDescription;
     }
@@ -327,7 +327,7 @@ public class ExportScheme extends DataEntity<ExportScheme> {
         this.safetyHazardDescription = safetyHazardDescription;
     }
 
-    @ExcelField(title="是否需要定制物资", align=2, sort=29)
+    @ExcelField(title="是否需要定制物资", align=2, sort=30)
     public String getCustomizedMaterials() {
         return customizedMaterials;
     }
@@ -336,7 +336,7 @@ public class ExportScheme extends DataEntity<ExportScheme> {
         this.customizedMaterials = customizedMaterials;
     }
 
-    @ExcelField(title="定制物资描述", align=2, sort=30)
+    @ExcelField(title="定制物资描述", align=2, sort=31)
     public String getMaterialDescription() {
         return materialDescription;
     }
@@ -345,7 +345,7 @@ public class ExportScheme extends DataEntity<ExportScheme> {
         this.materialDescription = materialDescription;
     }
 
-    @ExcelField(title="是否有拆旧物资", align=2, sort=31)
+    @ExcelField(title="是否有拆旧物资", align=2, sort=32)
     public String getDismantlingTheOldMaterial() {
         return dismantlingTheOldMaterial;
     }
@@ -354,7 +354,7 @@ public class ExportScheme extends DataEntity<ExportScheme> {
         this.dismantlingTheOldMaterial = dismantlingTheOldMaterial;
     }
 
-    @ExcelField(title="作业方式", align=2, sort=32)
+    @ExcelField(title="作业方式", align=2, sort=33)
     public String getOperatingType() {
         return operatingType;
     }
@@ -363,7 +363,7 @@ public class ExportScheme extends DataEntity<ExportScheme> {
         this.operatingType = operatingType;
     }
 
-    @ExcelField(title="停电问题描述", align=2, sort=33)
+    @ExcelField(title="停电问题描述", align=2, sort=34)
     public String getProblemDescription() {
         return problemDescription;
     }
@@ -372,7 +372,7 @@ public class ExportScheme extends DataEntity<ExportScheme> {
         this.problemDescription = problemDescription;
     }
 
-    @ExcelField(title="是否有土建工作量", align=2, sort=34)
+    @ExcelField(title="是否有土建工作量", align=2, sort=35)
     public String getCivilWork() {
         return civilWork;
     }
@@ -381,7 +381,7 @@ public class ExportScheme extends DataEntity<ExportScheme> {
         this.civilWork = civilWork;
     }
 
-    @ExcelField(title="是否有立杆工作量", align=2, sort=35)
+    @ExcelField(title="是否有立杆工作量", align=2, sort=36)
     public String getVerticalRodWorkload() {
         return verticalRodWorkload;
     }
@@ -390,7 +390,7 @@ public class ExportScheme extends DataEntity<ExportScheme> {
         this.verticalRodWorkload = verticalRodWorkload;
     }
 
-    @ExcelField(title="总工作量描述", align=2, sort=36)
+    @ExcelField(title="总工作量描述", align=2, sort=37)
     public String getTotalWorkloadDescription() {
         return totalWorkloadDescription;
     }
@@ -399,7 +399,7 @@ public class ExportScheme extends DataEntity<ExportScheme> {
         this.totalWorkloadDescription = totalWorkloadDescription;
     }
 
-    @ExcelField(title="区域中心", align=2, sort=37)
+    @ExcelField(title="区域中心", align=2, sort=38)
     public String getRegionalCenter() {
         return regionalCenter;
     }
@@ -408,7 +408,7 @@ public class ExportScheme extends DataEntity<ExportScheme> {
         this.regionalCenter = regionalCenter;
     }
 
-    @ExcelField(title="供电所辖区", align=2, sort=38)
+    @ExcelField(title="供电所辖区", align=2, sort=39)
     public String getPowerSupplyArea() {
         return powerSupplyArea;
     }
@@ -417,7 +417,7 @@ public class ExportScheme extends DataEntity<ExportScheme> {
         this.powerSupplyArea = powerSupplyArea;
     }
 
-    @ExcelField(title="政处地点", align=2, sort=39)
+    @ExcelField(title="政处地点", align=2, sort=40)
     public String getZhengLocation() {
         return zhengLocation;
     }
@@ -426,7 +426,7 @@ public class ExportScheme extends DataEntity<ExportScheme> {
         this.zhengLocation = zhengLocation;
     }
 
-    @ExcelField(title="政处类型", align=2, sort=40)
+    @ExcelField(title="政处类型", align=2, sort=41)
     public String getZhengType() {
         return zhengType;
     }
@@ -435,7 +435,7 @@ public class ExportScheme extends DataEntity<ExportScheme> {
         this.zhengType = zhengType;
     }
 
-    @ExcelField(title="政处对象", align=2, sort=41)
+    @ExcelField(title="政处对象", align=2, sort=42)
     public String getZhengObject() {
         return zhengObject;
     }
@@ -444,7 +444,7 @@ public class ExportScheme extends DataEntity<ExportScheme> {
         this.zhengObject = zhengObject;
     }
 
-    @ExcelField(title="政处描述", align=2, sort=42)
+    @ExcelField(title="政处描述", align=2, sort=43)
     public String getZhengDescribe() {
         return zhengDescribe;
     }
@@ -453,7 +453,7 @@ public class ExportScheme extends DataEntity<ExportScheme> {
         this.zhengDescribe = zhengDescribe;
     }
 
-    @ExcelField(title="是否需规划报批", align=2, sort=43)
+    @ExcelField(title="是否需规划报批", align=2, sort=44)
     public String getProjectApproval() {
         return projectApproval;
     }
@@ -462,7 +462,7 @@ public class ExportScheme extends DataEntity<ExportScheme> {
         this.projectApproval = projectApproval;
     }
 
-    @ExcelField(title="是否需办理安评航评手续", align=2, sort=44)
+    @ExcelField(title="是否需办理安评航评手续", align=2, sort=45)
     public String getCourseEvaluationProcedures() {
         return courseEvaluationProcedures;
     }
@@ -471,7 +471,7 @@ public class ExportScheme extends DataEntity<ExportScheme> {
         this.courseEvaluationProcedures = courseEvaluationProcedures;
     }
 
-    @ExcelField(title="政处难点提醒", align=2, sort=45)
+    @ExcelField(title="政处难点提醒", align=2, sort=46)
     public String getZhengDifficultyWarn() {
         return zhengDifficultyWarn;
     }

src/main/java/com/jeeplus/modules/sg/managementcenter/reserveManagement/mapper/xml/ReserveManagementMapper.xml

@@ -563,85 +563,32 @@
             update_by = #{updateBy.id},
             update_date = #{updateDate},
             remarks = #{remarks}
-
-            <if test="projectNature!=null and projectNature != ''">
                 ,projectNature = #{projectNature}
-            </if>
-            <if test="demandUnit!=null and demandUnit != ''">
                 ,demandUnit = #{demandUnit}
-            </if>
-            <if test="district!=null and district != ''">
                 ,district = #{district}
-            </if>
-            <if test="projectGroup!=null and projectGroup != ''">
                 ,projectGroup = #{projectGroup}
-            </if>
-            <if test="reserveBatches!=null and reserveBatches != ''">
                 ,reserveBatches = #{reserveBatches}
-            </if>
-            <if test="projectName!=null and projectName != ''">
                 ,projectName = #{projectName}
-            </if>
-            <if test="blockSupply!=null and blockSupply != ''">
                 ,blockSupply = #{blockSupply}
-            </if>
-            <if test="gridNumber!=null and gridNumber != ''">
                 ,gridNumber = #{gridNumber}
-            </if>
-            <if test="cellNumber!=null and cellNumber != ''">
                 ,cellNumber = #{cellNumber}
-            </if>
-            <if test="powerGridProjectId!=null and powerGridProjectId != ''">
                 ,powerGridProjectId = #{powerGridProjectId}
-            </if>
-            <if test="constructionNecessityAndContent!=null and constructionNecessityAndContent != ''">
                 ,constructionNecessityAndContent = #{constructionNecessityAndContent}
-            </if>
-            <if test="substationName!=null and substationName != ''">
                 ,substationName = #{substationName}
-            </if>
-            <if test="circuitName!=null and circuitName != ''">
                 ,circuitName = #{circuitName}
-            </if>
-            <if test="netRackProjectDivide!=null and netRackProjectDivide != ''">
                 ,netRackProjectDivide = #{netRackProjectDivide}
-            </if>
-            <if test="projectType!=null and projectType != ''">
                 ,projectType = #{projectType}
-            </if>
-            <if test="costEstimate!=null and costEstimate != ''">
                 ,costEstimate = #{costEstimate}
-            </if>
-            <if test="whetherWindwardProject!=null and whetherWindwardProject != ''">
                 ,whetherWindwardProject = #{whetherWindwardProject}
-            </if>
-            <if test="projectUrgencyDegree!=null and projectUrgencyDegree != ''">
                 ,projectUrgencyDegree = #{projectUrgencyDegree}
-            </if>
-            <if test="implementIssuedYear!=null and implementIssuedYear != ''">
                 ,implementIssuedYear = #{implementIssuedYear}
-            </if>
-            <if test="implementBatch!=null and implementBatch != ''">
                 ,implementBatch = #{implementBatch}
-            </if>
-            <if test="basicRemarks!=null and basicRemarks != ''">
                 ,basicRemarks = #{basicRemarks}
-            </if>
-            <if test="designCondition!=null and designCondition != ''">
                 ,designCondition = #{designCondition}
-            </if>
-            <if test="whetherPassReview!=null and whetherPassReview != ''">
                 ,whetherPassReview = #{whetherPassReview}
-            </if>
-            <if test="whetherNeedWiringDiagram!=null and whetherNeedWiringDiagram != ''">
                 ,whetherNeedWiringDiagram = #{whetherNeedWiringDiagram}
-            </if>
-            <if test="whetherFinishMaterials!=null and whetherFinishMaterials != ''">
                 ,whetherFinishMaterials = #{whetherFinishMaterials}
-            </if>
-            <if test="whetherFinishDrawing!=null and whetherFinishDrawing != ''">
                 ,whetherFinishDrawing = #{whetherFinishDrawing}
-            </if>
         where id = #{id}
 	</update>
 
@@ -652,52 +599,23 @@
         update_by = #{updateBy.id},
         update_date = #{updateDate},
         remarks = #{remarks}
-
-        <if test="disclosureToCoordinate!=null and disclosureToCoordinate != ''">
             ,disclosureToCoordinate = #{disclosureToCoordinate}
-        </if>
-        <if test="disclosureParticipate!=null and disclosureParticipate != ''">
             ,disclosureParticipate = #{disclosureParticipate}
-        </if>
         <if test="whetherFinishDisclosure!=null and whetherFinishDisclosure != ''">
             ,whetherFinishDisclosure = #{whetherFinishDisclosure}
         </if>
-        <if test="projectManagementPeople!=null and projectManagementPeople != ''">
-            ,projectManagementPeople = #{projectManagementPeople}
-        </if>
-        <if test="designingInstitutePeople!=null and designingInstitutePeople != ''">
-            ,designingInstitutePeople = #{designingInstitutePeople}
-        </if>
-        <if test="ifoPeople!=null and ifoPeople != ''">
-            ,ifoPeople = #{ifoPeople}
-        </if>
-        <if test="regionalCenterPeople!=null and regionalCenterPeople != ''">
-            ,regionalCenterPeople = #{regionalCenterPeople}
-        </if>
-        <if test="uninterruptedOperationPeople!=null and uninterruptedOperationPeople != ''">
-            ,uninterruptedOperationPeople = #{uninterruptedOperationPeople}
-        </if>
-        <if test="workMode!=null and workMode != ''">
-            ,workMode = #{workMode}
-        </if>
-        <if test="disclosureFinishDate!=null and disclosureFinishDate != ''">
-            ,disclosureFinishDate = #{disclosureFinishDate}
-        </if>
-        <if test="disclosureRemarks!=null and disclosureRemarks != ''">
-            ,disclosureRemarks = #{disclosureRemarks}
-        </if>
-        <if test="projectDescription!=null and projectDescription != ''">
-            ,projectDescription = #{projectDescription}
-        </if>
-        <if test="doNotPossessProjectDescription!=null and doNotPossessProjectDescription != ''">
-            ,doNotPossessProjectDescription = #{doNotPossessProjectDescription}
-        </if>
-        <if test="changedProgramsExplain!=null and changedProgramsExplain != ''">
-            ,changedProgramsExplain = #{changedProgramsExplain}
-        </if>
-        <if test="initialDifficulty!=null and initialDifficulty != ''">
-            ,initialDifficulty = #{initialDifficulty}
-        </if>
+        ,projectManagementPeople = #{projectManagementPeople}
+        ,designingInstitutePeople = #{designingInstitutePeople}
+        ,ifoPeople = #{ifoPeople}
+        ,regionalCenterPeople = #{regionalCenterPeople}
+        ,uninterruptedOperationPeople = #{uninterruptedOperationPeople}
+        ,workMode = #{workMode}
+        ,disclosureFinishDate = #{disclosureFinishDate}
+        ,disclosureRemarks = #{disclosureRemarks}
+        ,projectDescription = #{projectDescription}
+        ,doNotPossessProjectDescription = #{doNotPossessProjectDescription}
+        ,changedProgramsExplain = #{changedProgramsExplain}
+        ,initialDifficulty = #{initialDifficulty}
         <if test="capitalEquipment!=null and capitalEquipment != ''">
             ,capitalEquipment = #{capitalEquipment}
         </if>
@@ -707,84 +625,52 @@
         <if test="whetherImplement!=null and whetherImplement != ''">
             ,whetherImplement = #{whetherImplement}
         </if>
-        <if test="fieldDescription!=null and fieldDescription != ''">
-            ,fieldDescription = #{fieldDescription}
-        </if>
+        ,fieldDescription = #{fieldDescription}
         <if test="necessaryOfImplementation!=null and necessaryOfImplementation != ''">
             ,necessaryOfImplementation = #{necessaryOfImplementation}
         </if>
-        <if test="unnecessaryDescription!=null and unnecessaryDescription != ''">
-            ,unnecessaryDescription = #{unnecessaryDescription}
-        </if>
+        ,unnecessaryDescription = #{unnecessaryDescription}
         <if test="precondition!=null and precondition != ''">
             ,precondition = #{precondition}
         </if>
-        <if test="conditionsDescribed!=null and conditionsDescribed != ''">
-            ,conditionsDescribed = #{conditionsDescribed}
-        </if>
+        ,conditionsDescribed = #{conditionsDescribed}
         <if test="constructionSchemeProblem!=null and constructionSchemeProblem != ''">
             ,constructionSchemeProblem = #{constructionSchemeProblem}
         </if>
-        <if test="problemDescriptionOfConstructionScheme!=null and problemDescriptionOfConstructionScheme != ''">
-            ,problemDescriptionOfConstructionScheme = #{problemDescriptionOfConstructionScheme}
-        </if>
+        ,problemDescriptionOfConstructionScheme = #{problemDescriptionOfConstructionScheme}
         <if test="existingSecurityThreat!=null and existingSecurityThreat != ''">
             ,existingSecurityThreat = #{existingSecurityThreat}
         </if>
-        <if test="safetyHazardDescription!=null and safetyHazardDescription != ''">
-            ,safetyHazardDescription = #{safetyHazardDescription}
-        </if>
+        ,safetyHazardDescription = #{safetyHazardDescription}
         <if test="customizedMaterials!=null and customizedMaterials != ''">
             ,customizedMaterials = #{customizedMaterials}
         </if>
-        <if test="materialDescription!=null and materialDescription != ''">
-            ,materialDescription = #{materialDescription}
-        </if>
+        ,materialDescription = #{materialDescription}
         <if test="dismantlingTheOldMaterial!=null and dismantlingTheOldMaterial != ''">
             ,dismantlingTheOldMaterial = #{dismantlingTheOldMaterial}
         </if>
-        <if test="operatingType!=null and operatingType != ''">
-            ,operatingType = #{operatingType}
-        </if>
-        <if test="problemDescription!=null and problemDescription != ''">
-            ,problemDescription = #{problemDescription}
-        </if>
+        ,operatingType = #{operatingType}
+        ,problemDescription = #{problemDescription}
         <if test="civilWork!=null and civilWork != ''">
             ,civilWork = #{civilWork}
         </if>
         <if test="verticalRodWorkload!=null and verticalRodWorkload != ''">
             ,verticalRodWorkload = #{verticalRodWorkload}
         </if>
-        <if test="totalWorkloadDescription!=null and totalWorkloadDescription != ''">
-            ,totalWorkloadDescription = #{totalWorkloadDescription}
-        </if>
-        <if test="regionalCenter!=null and regionalCenter != ''">
-            ,regionalCenter = #{regionalCenter}
-        </if>
-        <if test="powerSupplyArea!=null and powerSupplyArea != ''">
-            ,powerSupplyArea = #{powerSupplyArea}
-        </if>
-        <if test="zhengLocation!=null and zhengLocation != ''">
-            ,zhengLocation = #{zhengLocation}
-        </if>
-        <if test="zhengType!=null and zhengType != ''">
-            ,zhengType = #{zhengType}
-        </if>
-        <if test="zhengObject!=null and zhengObject != ''">
-            ,zhengObject = #{zhengObject}
-        </if>
-        <if test="zhengDescribe!=null and zhengDescribe != ''">
-            ,zhengDescribe = #{zhengDescribe}
-        </if>
+        ,totalWorkloadDescription = #{totalWorkloadDescription}
+        ,regionalCenter = #{regionalCenter}
+        ,powerSupplyArea = #{powerSupplyArea}
+        ,zhengLocation = #{zhengLocation}
+        ,zhengType = #{zhengType}
+        ,zhengObject = #{zhengObject}
+        ,zhengDescribe = #{zhengDescribe}
         <if test="projectApproval!=null and projectApproval != ''">
             ,projectApproval = #{projectApproval}
         </if>
         <if test="courseEvaluationProcedures!=null and courseEvaluationProcedures != ''">
             ,courseEvaluationProcedures = #{courseEvaluationProcedures}
         </if>
-        <if test="zhengDifficultyWarn!=null and zhengDifficultyWarn != ''">
-            ,zhengDifficultyWarn = #{zhengDifficultyWarn}
-        </if>
+        ,zhengDifficultyWarn = #{zhengDifficultyWarn}
         where id = #{id}
     </update>
 
@@ -794,59 +680,29 @@
         where id = #{id}
     </update>
     <update id="updateScheme">
-
         update
         cb_reserve_management
         set
         update_by = #{updateBy.id},
         update_date = #{updateDate},
         remarks = #{remarks}
-
-        <if test="disclosureToCoordinate!=null and disclosureToCoordinate != ''">
             ,disclosureToCoordinate = #{disclosureToCoordinate}
-        </if>
-        <if test="disclosureParticipate!=null and disclosureParticipate != ''">
             ,disclosureParticipate = #{disclosureParticipate}
-        </if>
         <if test="whetherFinishDisclosure!=null and whetherFinishDisclosure != ''">
             ,whetherFinishDisclosure = #{whetherFinishDisclosure}
         </if>
-        <if test="projectManagementPeople!=null and projectManagementPeople != ''">
             ,projectManagementPeople = #{projectManagementPeople}
-        </if>
-        <if test="designingInstitutePeople!=null and designingInstitutePeople != ''">
             ,designingInstitutePeople = #{designingInstitutePeople}
-        </if>
-        <if test="ifoPeople!=null and ifoPeople != ''">
             ,ifoPeople = #{ifoPeople}
-        </if>
-        <if test="regionalCenterPeople!=null and regionalCenterPeople != ''">
             ,regionalCenterPeople = #{regionalCenterPeople}
-        </if>
-        <if test="uninterruptedOperationPeople!=null and uninterruptedOperationPeople != ''">
             ,uninterruptedOperationPeople = #{uninterruptedOperationPeople}
-        </if>
-        <if test="workMode!=null and workMode != ''">
             ,workMode = #{workMode}
-        </if>
-        <if test="disclosureFinishDate!=null and disclosureFinishDate != ''">
             ,disclosureFinishDate = #{disclosureFinishDate}
-        </if>
-        <if test="disclosureRemarks!=null and disclosureRemarks != ''">
             ,disclosureRemarks = #{disclosureRemarks}
-        </if>
-        <if test="projectDescription!=null and projectDescription != ''">
             ,projectDescription = #{projectDescription}
-        </if>
-        <if test="doNotPossessProjectDescription!=null and doNotPossessProjectDescription != ''">
             ,doNotPossessProjectDescription = #{doNotPossessProjectDescription}
-        </if>
-        <if test="changedProgramsExplain!=null and changedProgramsExplain != ''">
             ,changedProgramsExplain = #{changedProgramsExplain}
-        </if>
-        <if test="initialDifficulty!=null and initialDifficulty != ''">
             ,initialDifficulty = #{initialDifficulty}
-        </if>
         <if test="capitalEquipment!=null and capitalEquipment != ''">
             ,capitalEquipment = #{capitalEquipment}
         </if>
@@ -856,85 +712,53 @@
         <if test="whetherImplement!=null and whetherImplement != ''">
             ,whetherImplement = #{whetherImplement}
         </if>
-        <if test="fieldDescription!=null and fieldDescription != ''">
             ,fieldDescription = #{fieldDescription}
-        </if>
         <if test="necessaryOfImplementation!=null and necessaryOfImplementation != ''">
             ,necessaryOfImplementation = #{necessaryOfImplementation}
         </if>
-        <if test="unnecessaryDescription!=null and unnecessaryDescription != ''">
             ,unnecessaryDescription = #{unnecessaryDescription}
-        </if>
         <if test="precondition!=null and precondition != ''">
             ,precondition = #{precondition}
         </if>
-        <if test="conditionsDescribed!=null and conditionsDescribed != ''">
             ,conditionsDescribed = #{conditionsDescribed}
-        </if>
         <if test="constructionSchemeProblem!=null and constructionSchemeProblem != ''">
             ,constructionSchemeProblem = #{constructionSchemeProblem}
         </if>
-        <if test="problemDescriptionOfConstructionScheme!=null and problemDescriptionOfConstructionScheme != ''">
             ,problemDescriptionOfConstructionScheme = #{problemDescriptionOfConstructionScheme}
-        </if>
         <if test="existingSecurityThreat!=null and existingSecurityThreat != ''">
             ,existingSecurityThreat = #{existingSecurityThreat}
         </if>
-        <if test="safetyHazardDescription!=null and safetyHazardDescription != ''">
             ,safetyHazardDescription = #{safetyHazardDescription}
-        </if>
         <if test="customizedMaterials!=null and customizedMaterials != ''">
             ,customizedMaterials = #{customizedMaterials}
         </if>
-        <if test="materialDescription!=null and materialDescription != ''">
-            ,materialDescription = #{materialDescription}
-        </if>
+          ,materialDescription = #{materialDescription}
         <if test="dismantlingTheOldMaterial!=null and dismantlingTheOldMaterial != ''">
             ,dismantlingTheOldMaterial = #{dismantlingTheOldMaterial}
         </if>
-        <if test="operatingType!=null and operatingType != ''">
             ,operatingType = #{operatingType}
-        </if>
-        <if test="problemDescription!=null and problemDescription != ''">
             ,problemDescription = #{problemDescription}
-        </if>
         <if test="civilWork!=null and civilWork != ''">
             ,civilWork = #{civilWork}
-        </if>
+          </if>
         <if test="verticalRodWorkload!=null and verticalRodWorkload != ''">
             ,verticalRodWorkload = #{verticalRodWorkload}
         </if>
-        <if test="totalWorkloadDescription!=null and totalWorkloadDescription != ''">
             ,totalWorkloadDescription = #{totalWorkloadDescription}
-        </if>
-        <if test="regionalCenter!=null and regionalCenter != ''">
             ,regionalCenter = #{regionalCenter}
-        </if>
-        <if test="powerSupplyArea!=null and powerSupplyArea != ''">
             ,powerSupplyArea = #{powerSupplyArea}
-        </if>
-        <if test="zhengLocation!=null and zhengLocation != ''">
             ,zhengLocation = #{zhengLocation}
-        </if>
-        <if test="zhengType!=null and zhengType != ''">
             ,zhengType = #{zhengType}
-        </if>
-        <if test="zhengObject!=null and zhengObject != ''">
             ,zhengObject = #{zhengObject}
-        </if>
-        <if test="zhengDescribe!=null and zhengDescribe != ''">
             ,zhengDescribe = #{zhengDescribe}
-        </if>
         <if test="projectApproval!=null and projectApproval != ''">
             ,projectApproval = #{projectApproval}
         </if>
         <if test="courseEvaluationProcedures!=null and courseEvaluationProcedures != ''">
-            ,courseEvaluationProcedures = #{courseEvaluationProcedures}
+          ,courseEvaluationProcedures = #{courseEvaluationProcedures}
         </if>
-        <if test="zhengDifficultyWarn!=null and zhengDifficultyWarn != ''">
             ,zhengDifficultyWarn = #{zhengDifficultyWarn}
-        </if>
-        where id = #{id}
+        where projectReserveId = #{projectReserveId}
 
     </update>
 

src/main/java/com/jeeplus/modules/sg/managementcenter/reserveManagement/service/ReserveManagementService.java

@@ -53,15 +53,7 @@ public class ReserveManagementService extends CrudService<ReserveManagementMappe
     public void save(ReserveManagement reserveManagement) {
         //查询数据表中是否含有同项目储备编号的数据 若有则进行修改 没有则新增
         //根据项目储备编号 查询数据
-        ReserveManagement reserveManagementByProjectReserveId = dao.queryByProjectReserveId(reserveManagement);
-        //如果存在则修改信息
-        if(null !=reserveManagementByProjectReserveId){
-            reserveManagement.preUpdate();
-            reserveManagement.setId(reserveManagementByProjectReserveId.getId());
-            mapper.update(reserveManagement);
-        }else{
-            super.save(reserveManagement);
-        }
+        super.save(reserveManagement);
     }
 
     @Transactional(readOnly = false)
@@ -84,6 +76,7 @@ public class ReserveManagementService extends CrudService<ReserveManagementMappe
     public void update(ReserveManagement reserveManagement) {
         super.save(reserveManagement);
     }
+
     /**
      * 经理修改方法
      * @param reserveManagement

src/main/java/com/jeeplus/modules/sg/managementcenter/reserveManagement/utils/ReserveExportUtil.java

@@ -307,14 +307,13 @@ public class ReserveExportUtil {
                 cell36.setCellValue(exportScheme.getWorkMode());
 
                 Date dateStr = exportScheme.getDisclosureFinishDate();
-                SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
-                String format = simpleDateFormat.format(dateStr);
-                if (StringUtils.isNotBlank(format)) {
+                if (null != dateStr) {
+                    SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+                    String format = simpleDateFormat.format(dateStr);
                     cell37.setCellValue(format);
-                } else {
+                }else {
                     cell37.setCellValue("");
                 }
-
                 cell38.setCellValue(exportScheme.getDisclosureRemarks());
                 cell39.setCellValue(exportScheme.getProjectDescription());
                 cell40.setCellValue(exportScheme.getDoNotPossessProjectDescription());

src/main/java/com/jeeplus/modules/sg/managementcenter/reserveManagement/web/ReserveManagementController.java

@@ -299,7 +299,7 @@ public class ReserveManagementController extends BaseController {
     public AjaxJson jlImportBasic(@RequestParam("file") MultipartFile file, HttpServletResponse response, HttpServletRequest request) {
         AjaxJson j = new AjaxJson();
         try {
-            ImportExcel ei = new ImportExcel(file, 1, 0);
+            ImportExcel ei = new ImportExcel(file, 3, 0);
             List<ExportScheme> list = ei.getDataList(ExportScheme.class);
             for (ExportScheme s :
                     list) {
@@ -354,7 +354,7 @@ public class ReserveManagementController extends BaseController {
      * 下载导入基础信息数据模板
      */
     @ResponseBody
-    @RequiresPermissions("test:managementcenter:reserveManagement:import")
+    @RequiresPermissions("sg:managementcenter:reserveManagement:import")
     @RequestMapping(value = "template")
     public AjaxJson importTemplate(HttpServletResponse response) {
         AjaxJson j = new AjaxJson();
@@ -375,7 +375,7 @@ public class ReserveManagementController extends BaseController {
      * 下载导入基础信息数据模板
      */
     @ResponseBody
-    @RequiresPermissions("test:managementcenter:reserveManagement:import")
+    @RequiresPermissions("sg:managementcenter:reserveManagement:import")
     @RequestMapping(value = "schemeTemplate")
     public AjaxJson importSchemeTemplate(HttpServletResponse response) {
         AjaxJson j = new AjaxJson();

src/main/webapp/webpage/modules/sg/managementcenter/reserveManagement/disClosureReserveModuleList.js

@@ -406,11 +406,11 @@ $(document).ready(function () {
             auto: true,
             title: "导入数据",
             content: "${ctx}/tag/importExcel",
-            btn: ['下载模板','确定', '关闭'],
-            btn1: function (index) {
+            btn: ['确定', '关闭'],
+/*            btn1: function (index) {
                 jp.downloadFile('${ctx}/sg/managementCenter/reserveManagement/schemeTemplate');
-            },
-            btn2: function (index, layero) {
+            },*/
+            btn1: function (index, layero) {
                 var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
                 iframeWin.contentWindow.importExcel('${ctx}/sg/managementCenter/reserveManagement/jlImport', function (data) {
                     if (data.success) {
@@ -424,7 +424,7 @@ $(document).ready(function () {
                 return false;
             },
 
-            btn3: function (index) {
+            btn2: function (index) {
                 //  jp.close(index);
             }
         });

src/main/webapp/webpage/modules/sg/managementcenter/reserveManagement/reserveManagementInformation.js

@@ -257,11 +257,8 @@ $(document).ready(function () {
             auto: true,
             title: "导入数据",
             content: "${ctx}/tag/importExcel",
-            btn: ['下载模板','确定', '关闭'],
-            btn1: function (index) {
-                jp.downloadFile('${ctx}/sg/managementCenter/reserveManagement/template');
-            },
-            btn2: function (index, layero) {
+            btn: ['确定', '关闭'],
+            btn1: function (index, layero) {
                 var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
                 iframeWin.contentWindow.importExcel('${ctx}/sg/managementCenter/reserveManagement/import', function (data) {
                     if (data.success) {
@@ -274,8 +271,7 @@ $(document).ready(function () {
                 });//调用保存事件
                 return false;
             },
-
-            btn3: function (index) {
+            btn2: function (index) {
                 //  jp.close(index);
             }
         });