Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/sg/financial/erpcredit/util/ErpInfo.java

@@ -565,21 +565,21 @@ public  class ErpInfo {
         Double total=0.0;//其他：监理费
         Double otherLegalManage = 0.0;//法人管理费
         for (ErpCredit erpCredit1:erpCredits){
-            total = 0.0;
+            total = 0.0;//合计
             if (null!=erpCredit1.getOtherSupervisorFee()){
-                total  += erpCredit1.getOtherSupervisorFee();
+                total  += erpCredit1.getOtherSupervisorFee();//监理费
             }
             if (null!=erpCredit1.getOtherDesignFee()){
-                total += erpCredit1.getOtherDesignFee();
+                total += erpCredit1.getOtherDesignFee();//设计费
             }
             if (null!=erpCredit1.getOtherBeWorkFee()){
-                total += erpCredit1.getOtherBeWorkFee();
+                total += erpCredit1.getOtherBeWorkFee();//项目前期工作费
             }
-            if (null!=erpCredit1.getConsBuildingFee()){
-                total += erpCredit1.getOtherBuildLoan();
+            if (null!=erpCredit1.getOtherBuildLoan()){
+                total += erpCredit1.getOtherBuildLoan();//建设期贷款利息
             }
             if (null!=erpCredit1.getOtherLineDamages()){
-                total += erpCredit1.getOtherLineDamages();
+                total += erpCredit1.getOtherLineDamages();//线路施工赔偿费
             }
             if (null!=erpCredit1.getOtherLegalManage()){
                 otherLegalManage = erpCredit1.getOtherLegalManage();

src/main/java/com/jeeplus/modules/sg/financial/erpcredit/util/ExportUtilCalculate.java

@@ -5,10 +5,7 @@ import com.jeeplus.modules.sg.financial.settlement.entity.MaintainData;
 
 import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.TreeSet;
+import java.util.*;
 
 /**
  * 导出数据计算类
@@ -26,6 +23,10 @@ public class ExportUtilCalculate {
     public static String POWER_KGGCOUNT="160200010";
     public static String POWER_HJ="合计";
 
+    public static String POWER_WU = "无";
+
+    public static String POWER_YU = "有";
+
     /**
      * 一览表汇总
      * @param erpCreditList
@@ -514,22 +515,6 @@ public class ExportUtilCalculate {
                 for (ErpCreditEquipment erpCreditEquipment:erpCreditChild1s){//所有设备费合计
                     eqmValue+=erpCreditEquipment.getEqmBookedFee1();
                 }
-//                for (ErpCreditEquipment erpCreditChild11:erpCreditChild1s){//循环设备费
-//                    if (null!=erpCreditChild11.getEqmNumbers()){//当前项目定义号所有的台数合计
-//                        eqmNumbers+=erpCreditChild11.getEqmNumbers();
-//                    }
-//                    if (null!=erpCreditChild11.getEqmBookedFee1()){
-//                        eqmBookedFee+=erpCreditChild11.getEqmBookedFee1();//设备入账金额
-//                    }
-//                }
-//                if (null!=erpCredit.getConsInstallFee()){//得到分摊后安装费
-//                    eqmNumbers=erpCredit.getConsTotalFee()/eqmNumbers;
-//                }
-//                if (null==erpCredit.getTenKvModel()||erpCredit.getTenKvModel()==""){//若10KV电缆、架空导线型号为空：得到设备价值
-//                    eqmValue = eqmBookedFee + eqmNumbers + eqmValue;//设备H6的和
-//                }else {
-//                    eqmValue = eqmBookedFee;
-//                }
             }
             //添加固定数据:线路
             transferOfPower1  = new TransferOfPowerLine();//得到线路集合
@@ -603,149 +588,6 @@ public class ExportUtilCalculate {
         return transferOfPower1s;
     }
 
-//    /**
-//     * 移交资产—配电网资产一览表(设备)
-//     * @param erpCredits
-//     * @return
-//     */
-//    public static List<TransferOfEquipment> getTransferOfPower2(List<ErpCredit> erpCredits){
-//        DecimalFormat decimalFormat   = new DecimalFormat("#0.00");
-//        DecimalFormat decimalFormat1   = new DecimalFormat("#0");
-//        List<TransferOfEquipment> transferOfPower2s =  new ArrayList<TransferOfEquipment>();//得到设备表集合
-//        List<ErpCreditEquipment> erpCreditChild1s = null;//定义设备 费对象
-//        TransferOfEquipment transferOfPower2 = null;//定义设备表对象
-//
-//        Double materialTotal = 0.0;//材料费总计
-//        Double powerValueTotal = 0.0;//当前erp账户 所有设备费合计
-//        Double powerValue = 0.0;
-//        Double eqmFtIntalls = 0.0;//获取分摊安装费
-//        Double powerInstallFee = 0.0;//安装费用(线路)
-//        Double powerEqmMater=0.0;//物料材料合计
-//        Double powerStandInFee = 0.0;//摊入费用
-//        Double powerDeliveredAssets=0.0;//交付使用资产价值
-//        //合计
-//        Double eqmNumbersAll = 0.0;//数量合计
-//        Double powerValueAll=0.0;//价值合计
-//        Double powerStandInFeeAll=0.0;//摊入费用
-//        Double powerDeliveredAssetsAll=0.0;//交付使用资产价值
-//        Double erpCreditMaterial = 0.0;
-//        for (ErpCredit erpCredit:erpCredits){
-//            erpCreditMaterial = getErpCreditMaterial(erpCredit);
-//            erpCreditMaterial = erpCreditMaterial/erpCredit.getErpCreditChild1s().size();
-//            powerValueTotal = 0.0;//当前erp账户 所有设备费合计 赋值初始值
-//            //材料费合计
-//            materialTotal = getErpCreditMaterial(erpCredit);//得到材料费
-//
-//            erpCreditChild1s = erpCredit.getErpCreditChild1s();//得到设备费集合
-//            //所有设备费累加
-//            for (ErpCreditEquipment erpCreditEquipment:erpCreditChild1s){
-//                powerValueTotal += erpCreditEquipment.getEqmBookedFee1();
-//            }
-//            //得到安装费用
-////            if (null!=erpCredit.getConsInstallFee()&&erpCredit.getTenKvModel()!=null){ //安装费（x线路表）
-////                powerInstallFee = erpCredit.getConsInstallFee()+materialTotal;
-////            }
-////            if (null!=erpCredit.getConsBuildingFee()&&erpCredit.getTenKvModel()!=null){
-////                powerInstallFee = erpCredit.getConsBuildingFee()+materialTotal;//赋值powerInstallfe为建筑费
-////            }
-//            if (null!=erpCredit.getConsInstallFee()){ //安装费（x线路表）
-//                powerInstallFee = erpCredit.getConsInstallFee()+materialTotal;
-//            }
-//            if (null!=erpCredit.getConsBuildingFee()){
-//                powerInstallFee = erpCredit.getConsBuildingFee()+materialTotal;//赋值powerInstallfe为建筑费
-//            }
-//            if (null!=erpCreditChild1s && erpCreditChild1s.size()>=0){//
-//                for (ErpCreditEquipment erpCreditChild1:erpCreditChild1s){
-//                    eqmFtIntalls = 0.0;//定义台数初始值
-//                    powerDeliveredAssets=0.0;//交付使用价值初始值
-//                    transferOfPower2 = new TransferOfEquipment();//定义设备表对象
-//                    transferOfPower2.setPowerId(erpCredit.getItemId());//赋值项目定义编号
-//                    transferOfPower2.setPowerName(erpCredit.getItemName());//添加项目名称
-//                    transferOfPower2.setPowerArea("-");//线路起始地带
-//                    transferOfPower2.setPowerDepartment(ExportUtilCalculate.POWER_DEPARTMENT);//添加保管
-//                    if (null!=erpCredit.getConsInstallFee()&& null != erpCreditChild1.getEqmBookedFee1()){//得到分摊后安装费
-//                        eqmFtIntalls=erpCredit.getConsInstallFee()/erpCreditChild1.getEqmBookedFee1();
-//                        eqmFtIntalls = eqmFtIntalls*erpCreditChild1.getEqmBookedFee1();
-//                        eqmFtIntalls = eqmFtIntalls/erpCreditChild1s.size();
-//                    }
-//                    if (null!=erpCreditChild1.getEqmNumbers()){//得到配变数量（erp账户中设备台数）
-//                        transferOfPower2.setPowerNumber(decimalFormat1.format(erpCreditChild1.getEqmNumbers()));
-//                        eqmNumbersAll+=erpCreditChild1.getEqmNumbers();//配电数量合计金额累加
-//                    }
-//                    if (null!=erpCreditChild1.getEqmUnit()){//计量单位
-//                        transferOfPower2.setPowerUnit(erpCreditChild1.getEqmUnit());
-//                    }
-//                    //配电容量
-//                    transferOfPower2.setPowerCapacity(erpCreditChild1.getEqmMaterialDetails1());
-//                    //设备价值
-//                    if (null!=erpCreditChild1.getEqmBookedFee1()){//如果入账金额不为空
-//                        if (null!=transferOfPower2.getPowerCapacity()&& null == erpCredit.getTenKvModel()){
-//                            powerValue=erpCreditChild1.getEqmBookedFee1()+eqmFtIntalls+erpCreditMaterial;//价值合计 设备入账金额+安装费（安装费按比例分摊）
-//                            transferOfPower2.setPowerValue(decimalFormat.format(powerValue));//赋值设备价值
-//                        }else {
-//                            powerValue=erpCreditChild1.getEqmBookedFee1();//价值合计 设备入账金额
-//                            transferOfPower2.setPowerValue(decimalFormat.format(powerValue));//赋值设备价值
-//                        }
-//                        powerDeliveredAssets +=powerValue;//交付使用价值合计
-//                        powerValueAll+=powerValue;//合计//设备价值合计
-//                    }else {
-//                        powerValue=erpCreditChild1.getEqmBookedFee1();
-//                        transferOfPower2.setPowerValue(decimalFormat.format(powerValue));
-//                        powerDeliveredAssets+=powerValue;
-//                        powerValueAll+=powerValue;//合计
-//                    }
-//                    //计算摊入费用
-////                    powerEqmMater = Double.parseDouble(transferOfPower2.getPowerValue())+powerInstallFee;//设备价值加上安装费设备价值
-////                    if (erpCredit.getOtherTotalFee()!=null){
-////                        powerStandInFee=Double.parseDouble(transferOfPower2.getPowerValue())/powerEqmMater*erpCredit.getOtherTotalFee();
-////                    }else {
-////                        powerStandInFee =0.0;
-////                    }
-//                    powerEqmMater = powerValueTotal+powerInstallFee;//设备价值加上安装费设备价
-//                    if (erpCredit.getOtherTotalFee()!=null){
-//                        powerStandInFee=Double.parseDouble(transferOfPower2.getPowerValue())/powerEqmMater*erpCredit.getOtherTotalFee();
-//                    }else {
-//                        powerStandInFee =0.0;
-//                    }
-////                    if (null==erpCredit.getTenKvModel()){
-////                        powerStandInFee = erpCredit.getOtherTotalFee();
-////                    }
-//                    transferOfPower2.setPowerStandInFee(decimalFormat.format(powerStandInFee));//赋值设备分摊费用
-//                    if (null!=erpCredit.getConsInstallFee()){
-//                        powerDeliveredAssets+=powerStandInFee;//交付使用费用累加
-//                        powerStandInFeeAll+=powerStandInFee;//分摊费用累加W
-//                    }else {
-//                        transferOfPower2.setPowerStandInFee("-");//赋值设备分摊费用
-//                    }
-//
-//                    //添加资产类别
-//                    if (transferOfPower2.getPowerCapacity().contains(POWER_BDZ)){
-//                        transferOfPower2.setPowerAssetClass(POWER_BDZCOUNT);
-//                    }
-//                    if (transferOfPower2.getPowerCapacity().contains(POWER_BOXBDZ)){
-//                        transferOfPower2.setPowerAssetClass(POWER_BOXCOUNT);
-//                    }
-//                    if (transferOfPower2.getPowerCapacity().contains(POWER_HGW)){
-//                        transferOfPower2.setPowerAssetClass(POWER_HGWCOUNT);
-//                    }
-//                    if (transferOfPower2.getPowerCapacity().contains(POWER_KGG)){
-//                        transferOfPower2.setPowerAssetClass(POWER_KGGCOUNT);
-//                    }
-//                    transferOfPower2.setPowerDeliveredAssets(decimalFormat.format(powerDeliveredAssets));//交付使用资产价值
-//                    powerDeliveredAssetsAll+=powerDeliveredAssets;
-//                    transferOfPower2s.add(transferOfPower2);
-//                }
-//            }
-//        }
-//        transferOfPower2 = new TransferOfEquipment();
-//        transferOfPower2.setPowerName(POWER_HJ);
-//        transferOfPower2.setPowerNumber(decimalFormat1.format(eqmNumbersAll));//配电数量合计
-//        transferOfPower2.setPowerValue(decimalFormat.format(powerValueAll));//计量价值合计
-//        transferOfPower2.setPowerStandInFee(decimalFormat.format(powerStandInFeeAll));//摊入费用合计
-//        transferOfPower2.setPowerDeliveredAssets(decimalFormat.format(powerDeliveredAssetsAll));//交付使用资产价值合计
-//        transferOfPower2s.add(transferOfPower2);
-//        return transferOfPower2s;
-//    }
     /**
      * 移交资产—配电网资产一览表(设备)
      * @param erpCredits
@@ -807,11 +649,6 @@ public class ExportUtilCalculate {
                     transferOfPower2.setPowerName(erpCredit.getItemName());//添加项目名称
                     transferOfPower2.setPowerArea("-");//线路起始地带
                     transferOfPower2.setPowerDepartment(ExportUtilCalculate.POWER_DEPARTMENT);//添加保管
-//                    if (null!=erpCredit.getConsInstallFee()&& null != erpCreditChild1.getEqmBookedFee1()){//得到分摊后安装费
-//                        eqmFtIntalls= erpCredit.getConsInstallFee()/erpCreditChild1.getEqmBookedFee1();
-//                        eqmFtIntalls = eqmFtIntalls*erpCreditChild1.getEqmBookedFee1();
-//                        eqmFtIntalls = eqmFtIntalls/erpCreditChild1s.size();
-//                    }
                     if (null!=erpCredit.getConsInstallFee()&& null != erpCreditChild1.getEqmBookedFee1()){//得到分摊后安装费
                         eqmFtIntalls= erpCreditChild1.getEqmBookedFee1()/powerValueTotal;
                         eqmFtIntalls = eqmFtIntalls*powerInstallFee;
@@ -869,7 +706,8 @@ public class ExportUtilCalculate {
                     if (transferOfPower2.getPowerCapacity().contains(POWER_BOXBDZ)){
                         transferOfPower2.setPowerAssetClass(POWER_BOXCOUNT);
                     }
-                    if (transferOfPower2.getPowerCapacity().contains(POWER_HGW)){
+                    if (transferOfPower2.getPowerCapacity().contains(POWER_HGW)&&!transferOfPower2.getPowerCapacity().contains(POWER_WU)
+                        &&!transferOfPower2.getPowerCapacity().contains(POWER_YU)){
                         transferOfPower2.setPowerAssetClass(POWER_HGWCOUNT);
                     }
                     if (transferOfPower2.getPowerCapacity().contains(POWER_KGG)){
@@ -949,18 +787,18 @@ public class ExportUtilCalculate {
                         +maintainData.getEquipmentFee()+maintainData.getMaterialFee();
             }
             if (null!=organDataList&&organDataList.size()>0){
-                //去重
-//                for (int i = 0; i < organDataList.size(); i++) {
-//                    for (int j = 0; j < organDataList.size(); j++) {
-//                        if(i!=j&&organDataList.get(i)==organDataList.get(j)) {
-//                            organDataList.remove(organDataList.get(j));
-//                        }
-//                    }
-//                }
-//                for(String str:organDataList){
-//                    organData+=str+",";
-//                }
-                generalSituation.setOrganDataNumber(organDataList.get(0));
+                Set set1 = new HashSet();
+                List<String> newList1 = new ArrayList();
+                for (String string:organDataList) {
+                    if(set1.add(string)) {
+                        newList1.add(string);
+                    }
+                }
+                for (String str:newList1){
+                    organData+=str+"、";
+                }
+                String substring = organData.substring(0, organData.length() - 1);
+                generalSituation.setOrganDataNumber(substring);
             }
             if (null!=commencementDateSet&&commencementDateSet.size()>0){
                 generalSituation.setCommencementDate(sdf.format(commencementDateSet.first()));
@@ -981,6 +819,7 @@ public class ExportUtilCalculate {
         TheAssetsTotal theAssetsTotal3 = new TheAssetsTotal();
         Double buildProject=0.0;//建筑工程
         Double intallProject=0.0;//安装工程费
+        Double intallProject2 = 0.0;//安装工程费2
         Double equipmentValue=0.0;//设备价值
         Double costSharing=0.0;//分摊费用
         Double deliveryCostValue=0.0;//交付使用资产价值
@@ -1011,6 +850,9 @@ public class ExportUtilCalculate {
         theAssetsTotal1.setDeliveryCostValue(decimalFormat.format(deliveryCostValue));
         for (int i = 0; i < transferOfPower2s.size(); i++) {
             if (i==transferOfPower2s.size()-1){
+                if (null!=transferOfPower2s.get(i).getPowerInstallFee()){
+                    intallProject2 = Double.valueOf(transferOfPower2s.get(i).getPowerInstallFee());
+                }
                 if (null!=transferOfPower2s.get(i).getPowerValue()){//设备价值
                     equipmentValue1=Double.valueOf(transferOfPower2s.get(i).getPowerValue());
                 }
@@ -1022,12 +864,13 @@ public class ExportUtilCalculate {
                 }
             }
         }
+        theAssetsTotal2.setIntallProject(decimalFormat.format(intallProject2));
         theAssetsTotal2.setEquipmentValue(decimalFormat.format(equipmentValue1));
         theAssetsTotal2.setCostSharing(decimalFormat.format(costSharing1));
         theAssetsTotal2.setDeliveryCostValue(decimalFormat.format(deliveryCostValue1));
         //添加三
         theAssetsTotal3.setBuildProject(decimalFormat.format(buildProject));
-        theAssetsTotal3.setIntallProject(decimalFormat.format(intallProject));
+        theAssetsTotal3.setIntallProject(decimalFormat.format(intallProject+intallProject2));
         theAssetsTotal3.setEquipmentValue(decimalFormat.format(equipmentValue1));
         theAssetsTotal3.setCostSharing(decimalFormat.format(costSharing+costSharing1));
         theAssetsTotal3.setDeliveryCostValue(decimalFormat.format(deliveryCostValue+deliveryCostValue1));

src/main/java/com/jeeplus/modules/sg/managementcenter/project/mapper/ProjectMapper.java

@@ -26,4 +26,6 @@ public interface ProjectMapper extends BaseMapper<Project> {
     void updateStatusBy(@Param("status") String status,@Param("procInsId") String procInsId);
 
     public List<Project> findListById(String[] proListId);
+
+    int insertList(@Param("list") List<Project> list);
 }

src/main/java/com/jeeplus/modules/sg/managementcenter/project/mapper/xml/ProjectMapper.xml

@@ -160,7 +160,10 @@
 			stay_open_area,
 			ring_network_cabinet,
 			station_dtu,
-			status
+			status,
+			acquisition_status,
+			construction_status,
+			whether_close_status
 		) VALUES (
 			#{id},
 			#{createBy.id},
@@ -209,10 +212,124 @@
     	 	#{stayOpenArea},
     	 	#{ringNetworkCabinet},
     	 	#{stationDtu},
-    		#{status}
+    		#{status},
+    		#{acquisitionStatus},
+    		#{constructionStatus},
+    		#{whetherCloseStatus}
 		)
 	</insert>
-	
+
+	<insert id="insertList">
+		replace INTO xm_project_details(
+		id,
+		create_by,
+		create_date,
+		update_by,
+		update_date,
+		remarks,
+		del_flag,
+		pro_type,
+		demand_unit,
+		bdz_name,
+		line_name,
+		require_name,
+		project_id,
+		project_name,
+		project_number,
+		project_manage_role,
+		construction_unit,
+		construction_unit_role,
+		clarificaiton_type,
+		build_classification_resons,
+		bulbid_resons,
+		asic_equipment,
+		run_the_class,
+		project_team,
+		cost_estimate,
+		whether_rhe_upwind,
+		sure_da_date,
+		text_remark,
+		power_line,
+		power_scope,
+		project_type,
+		power_flag_package,
+		preliminary_judgment,
+		flag_civil_engineering,
+		steel_tube_pole,
+		flag_approval_planning,
+		equ_create_type,
+		equ_create_size,
+		flag_new_equ_name,
+		flag_no_electrical,
+		drawings_work,
+		flag_automation,
+		two_and_three_remote,
+		phone_style,
+		stay_open_area,
+		ring_network_cabinet,
+		station_dtu,
+		status,
+		acquisition_status,
+		construction_status,
+		whether_close_status
+		) VALUES
+		<foreach collection="list" item="item" index="index" separator="," >
+			(
+			#{item.id},
+			#{item.createBy.id},
+			#{item.createDate},
+			#{item.updateBy.id},
+			#{item.updateDate},
+			#{item.remarks},
+			#{item.delFlag},
+			#{item.type},
+			#{item.demandUnit},
+			#{item.bdzName},
+			#{item.lineName},
+			#{item.requireName},
+			#{item.projectId},
+			#{item.projectName},
+			#{item.projectNumber},
+			#{item.projectManageRole},
+			#{item.constructionUnit},
+			#{item.constructionUnitRole},
+			#{item.clarificaitonType},
+			#{item.bulidClassificationResons},
+			#{item.bulbidResons},
+			#{item.asicEquipment},
+			#{item.runTheClass},
+			#{item.projectTeam},
+			#{item.costEstimate},
+			#{item.whetherRheUpwind},
+			#{item.sureDaDate},
+			#{item.textRemark},
+			#{item.powerLine},
+			#{item.powerScope},
+			#{item.projectType},
+			#{item.powerFlagPackage},
+			#{item.preliminaryJudgment},
+			#{item.flagCivilEngineering},
+			#{item.steelTubePole},
+			#{item.flagApprovalPlanning},
+			#{item.equCreateType},
+			#{item.equCreateSize},
+			#{item.flagNewEquName},
+			#{item.flagNoElectrical},
+			#{item.drawingsWork},
+			#{item.flagAutomation},
+			#{item.twoAndThreeRemote},
+			#{item.phoneStyle},
+			#{item.stayOpenArea},
+			#{item.ringNetworkCabinet},
+			#{item.stationDtu},
+			#{item.status},
+			#{item.acquisitionStatus},
+			#{item.constructionStatus},
+			#{item.whetherCloseStatus}
+		)
+		</foreach>
+	</insert>
+
 	<update id="update">
 		UPDATE xm_project_details SET
 			update_by = #{updateBy.id},

src/main/java/com/jeeplus/modules/sg/managementcenter/project/service/ProjectService.java

@@ -4,7 +4,9 @@
 package com.jeeplus.modules.sg.managementcenter.project.service;
 
 import java.util.List;
+import java.util.UUID;
 
+import com.jeeplus.modules.sg.financial.settlement.entity.MaintainData;
 import com.jeeplus.modules.sg.managementcenter.project.entity.Project;
 import com.jeeplus.modules.sg.managementcenter.project.mapper.ProjectMapper;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -63,5 +65,15 @@ public class ProjectService extends CrudService<ProjectMapper, Project> {
 		projectMapper.updateStatusBy(status,procInsId);
 	}
 
-
+	@Transactional(readOnly = false)
+	public void saveList(List<Project> projects) {
+		for(Project project:projects){
+			project.preInsert();
+			project.setStatus("0");
+			project.setAcquisitionStatus("0");
+			project.setConstructionStatus("0");
+			project.setWhetherCloseStatus("0");
+		}
+		projectMapper.insertList(projects);
+	}
 }

src/main/java/com/jeeplus/modules/sg/managementcenter/project/util/ProExcelInfo.java

@@ -18,7 +18,7 @@ public  class ProExcelInfo {
         List<Project> list = new ArrayList<Project>();
         Project project = null;
         String costEstimate="";//费用估算
-        for(int i=2; i<lastRow;i++){
+        for(int i=2; i<=lastRow;i++){
             project = new Project();
             Row row = importUtil.getRow(i);
             String requireCode = (String) importUtil.getCellValue(row,5);

src/main/java/com/jeeplus/modules/sg/managementcenter/project/web/ProjectController.java

@@ -180,32 +180,17 @@ public class ProjectController extends BaseController {
 	@ResponseBody
 	@RequiresPermissions("sg:managementcenter:project:import")
     @RequestMapping(value = "import")
-   	public AjaxJson importFile(@RequestParam("file")MultipartFile file, HttpServletResponse response, HttpServletRequest request){
+   	public AjaxJson importFile(@RequestParam("file")MultipartFile file, HttpServletResponse response, HttpServletRequest request) throws IOException, InvalidFormatException {
 		AjaxJson j = new AjaxJson();
-		try {
-			int successNum = 0;
-			int failureNum = 0;
-			StringBuilder failureMsg = new StringBuilder();
+//		try {
 			ImportUtil importUtil = new ImportUtil(file, 0, 0);
 			List<Project> projects = ProExcelInfo.getProjectUtil(importUtil);
-			for (Project project : projects){
-				try{
-					projectService.save(project);
-					successNum++;
-				}catch(ConstraintViolationException ex){
-					failureNum++;
-				}catch (Exception ex) {
-					failureNum++;
-				}
-			}
-			if (failureNum>0){
-				failureMsg.insert(0, "，失败 "+failureNum+" 条项目表单记录。");
-			}
-			j.setMsg( "已成功导入 "+successNum+" 条项目表单记录"+failureMsg);
-		} catch (Exception e) {
-			j.setSuccess(false);
-			j.setMsg("导入项目表单失败！失败信息："+e.getMessage());
-		}
+			projectService.saveList(projects);
+			j.setMsg( "已成功导入 "+projects.size()+" 条项目表单记录");
+//		} catch (Exception e) {
+//			j.setSuccess(false);
+//			j.setMsg("导入项目表单失败！失败信息："+e.getMessage());
+//		}
 		return j;
     }
 }

src/main/webapp/webpage/modules/sg/managementcenter/project/projectList.js

@@ -84,31 +84,6 @@ $(document).ready(function() {
 		       
 		    }
 			,{
-		        field: 'type',
-		        title: '类型',
-                width:50
-
-		       
-		    }
-			,{
-		        field: 'demandUnit',
-		        title: '需求提出单位',
-                width:120
-		       
-		    }
-			,{
-		        field: 'bdzName',
-		        title: '变电站名称',
-                width:100
-		       
-		    }
-			,{
-		        field: 'lineName',
-		        title: '线路名称',
-                width:90
-		       
-		    }
-			,{
 		        field: 'requireName',
 		        title: '项目需求名称',
                 width:160
@@ -149,6 +124,31 @@ $(document).ready(function() {
                        width:110
                    }
                    ,{
+                       field: 'type',
+                       title: '类型',
+                       width:50
+
+
+                   }
+                   ,{
+                       field: 'demandUnit',
+                       title: '需求提出单位',
+                       width:120
+
+                   }
+                   ,{
+                       field: 'bdzName',
+                       title: '变电站名称',
+                       width:100
+
+                   }
+                   ,{
+                       field: 'lineName',
+                       title: '线路名称',
+                       width:90
+
+                   }
+                   ,{
                        field: 'constructionUnit',
                        title: '施工单位',
                        width:120