20191114

src/main/java/com/jeeplus/modules/sg/financial/erpcredit/service/ErpCreditService.java

@@ -29,7 +29,9 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.*;
 import java.net.URLEncoder;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 
 @Service
@@ -144,13 +146,17 @@ public class ErpCreditService extends CrudService<ErpCreditMapper,ErpCredit> {
 
     //维护表
     public List<MaintainData> getFindListMain(List<String> strings){
-        return dataMaintenanceMapper.getFindListMain(strings);
+        return dataMaintenanceMapper.findListMain(strings);
     }
 
     //导出
     public void getExport(List<String> strings, HttpServletResponse response){
+        List<String> str = new ArrayList<String>();
         List<ErpCredit> erpCreditList = getListErpCredit(strings);
-        List<MaintainData> maintainDatas = getFindListMain(strings);
+        for (ErpCredit erpCredit:erpCreditList){
+            str.add(erpCredit.getItemId());
+        }
+        List<MaintainData> maintainDatas = getFindListMain(str);
         ExportTemplate exportTemplate = new ExportTemplate();
         File newFile = exportTemplate.createNewFile();
         // 新文件写入数据，并下载
@@ -235,47 +241,82 @@ public class ErpCreditService extends CrudService<ErpCreditMapper,ErpCredit> {
      */
     public List getCheck(String ids){
         List<String> lists = new ArrayList<String>();
-        boolean flag = true;
+        Map<String,String> map = new HashMap<String, String>();
+        List<String> itemIdList = new ArrayList<String>();
+        List<String> sortList = null;
+        List<String> sortList2=null;
+        boolean flag = false;
         String[] idArray =ids.split(",");
-        for (String str:idArray){
-            lists.add(str);
+        for (String str:idArray){ lists.add(str); }
+        List<ErpCredit> erpCreditList = getListErpCredit(lists);
+        for (ErpCredit erpCredit:erpCreditList){
+            map.put(erpCredit.getId(),erpCredit.getItemId());
+            itemIdList.add(erpCredit.getItemId());
+        }
+        List<MaintainData> maintainDatas =getFindListMain(itemIdList);//维护数据集合
+//        System.out.println(maintainDatas.size()+"维护数据长度");
+        List<Information> informationList = informationService.findNoFinishList(itemIdList);
+        if (null!=informationList&&informationList.size()>0){
+            sortList = new ArrayList<String>();
+            sortList2=new ArrayList<String>();
+            for (String list2:itemIdList) {
+                for(Information information:informationList){
+                    if (information.getProjectId().equals(list2)){
+                        sortList.add(list2);
+                        break;
+                    }
+                }
+            }
+            for(Map.Entry<String, String> entry : map.entrySet()){
+                String mapKey = entry.getKey();
+                String mapValue = entry.getValue();
+                for (String str : sortList){
+                    if (mapValue.equals(str)){
+                        sortList2.add(mapKey);
+                    }
+                }
+            }
+            for (int i = 0; i < lists.size(); i++) {
+                for (String str2:sortList2){
+                    if (str2.equals(lists.get(i))){
+                        lists.remove(i);
+                        i--;
+                        break;
+                    }
+                }
+            }
+        }
+        if (null!=maintainDatas&&maintainDatas.size()>0){
+            sortList = new ArrayList<String>();
+            sortList2 = new ArrayList<String>();
+            for (MaintainData maintainData:maintainDatas){
+               for (String str3:itemIdList){
+                   sortList.add(str3);//有数据
+               }
+            }
+            for(Map.Entry<String, String> entry : map.entrySet()){
+                String mapKey1 = entry.getKey();
+                String mapValue1 = entry.getValue();
+                for (String str4: sortList){
+                    if (mapValue1.equals(str4)){
+                        sortList2.add(mapKey1);
+                    }
+                }
+            }
+            for (int i = 0; i < lists.size(); i++) {
+                flag = true;
+                for (String str2:sortList2){
+                    if (str2.equals(lists.get(i))){
+                        flag=false;
+                        break;
+                    }
+                }
+                if (flag){
+                    lists.remove(i);
+                    i--;
+                }
+            }
         }
-//        List<MaintainData> maintainDatas = getFindListMain(lists);
-        List<Information> informationList = informationService.findNoFinishList(lists);
-//        if (null!=informationList&&informationList.size()>0){
-//            for (int k = 0; k < lists.size(); k++) {
-//                flag = true;
-//                for(Information information:informationList){
-//                    if (information.getProjectId().equals(lists.get(k))){
-//                        flag=false;
-//                        break;
-//                    }
-//                }
-//                if (flag){
-//                    lists.remove(k);
-//                    k--;
-//                }
-//            }
-//        }else {
-//            lists=new ArrayList<String>();
-//        }
-//        if (null!=maintainDatas&&maintainDatas.size()>0){
-//             for (int i = 0; i < lists.size(); i++) {
-//                flag=true;
-//                for (MaintainData maintainData:maintainDatas){
-//                    if (maintainData.getProjectId().equals(lists.get(i))){
-//                        flag=false;
-//                        break;
-//                    }
-//                }
-//                if (flag){
-//                    lists.remove(i);
-//                    i--;
-//                }
-//             }
-//        }else {
-//            lists=null;
-//        }
         return lists;
     }
 }

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

@@ -5,6 +5,7 @@ import com.jeeplus.modules.sg.financial.settlement.entity.MaintainData;
 
 import javax.xml.crypto.Data;
 import java.text.DecimalFormat;
+import java.text.SimpleDateFormat;
 import java.util.*;
 
 public class ExportUtil1 {
@@ -263,7 +264,8 @@ public class ExportUtil1 {
             if (null!=erpCreditChild2s&&erpCreditChild2s.size()>0){
                 for (ErpCreditMaterial erpCreditChild2:erpCreditChild2s){
                     count=0.0;
-                    //得到材料费项目定义好
+                    materialEquipment=new MaterialEquipment();
+                    //得到材料费项目定义号
                     materialEquipment.setId(erpCredit.getItemId());
                     //得到材料费名称
                     materialEquipment.setMeName(erpCreditChild2.getEqmMaterialDetails2());
@@ -488,6 +490,7 @@ public class ExportUtil1 {
     }
     //概况表
     public static GeneralSituation getFeneraSituation(List<ErpCredit> erpCredits, List<MaintainData> maintainDataList){
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         GeneralSituation generalSituation = new GeneralSituation();
         Double lineLength=0.0;//线路长度
         Double tenKvLength=0.0;//其中：10kv线路
@@ -529,9 +532,7 @@ public class ExportUtil1 {
                 if (null!=maintainData.getApprovalNumber()){//如果审批文号不为空
                     organDataList.add(maintainData.getApprovalNumber());
                 }
-                if (maintainData.getStartDate().toString()!=null&&maintainData.getStartDate().toString().length()>0){
-                    commencementDateList.add(maintainData.getStartDate());
-                }
+                commencementDateList.add(maintainData.getStartDate());
                 if (null!=maintainData.getEndDate()&&maintainData.getEndDate().toString().length()>0){
                     completionDateList.add(maintainData.getEndDate());
                 }
@@ -552,10 +553,12 @@ public class ExportUtil1 {
                 generalSituation.setOrganDataNumber(organData);
             }
             if (null!=commencementDateList&&commencementDateList.size()>0){
-                generalSituation.setCommencementDate(Collections.min(commencementDateList).toString());
+                generalSituation.setCommencementDate("2019-11-08 11:10:26");
+//                generalSituation.setCommencementDate(sdf.format(Collections.min(commencementDateList)));
             }
             if (null!=completionDateList&&completionDateList.size()>0){
-                generalSituation.setCompletionDate(Collections.max(completionDateList).toString());
+                generalSituation.setCompletionDate("2019-11-08 11:10:26");
+//                generalSituation.setCompletionDate(sdf.format(Collections.max(completionDateList)));
             }
             generalSituation.setInvestmentBudget(String.valueOf(investmentBudget));
         }

src/main/java/com/jeeplus/modules/sg/financial/erpcredit/web/ErpCreditController.java

@@ -157,7 +157,7 @@ public class ErpCreditController extends BaseController {
 	public AjaxJson exportFile(String ids, HttpServletRequest request, HttpServletResponse response){
 		AjaxJson j = new AjaxJson();
 		List<String> strings = erpCreditService.getCheck(ids);
-		if (null==strings&&strings.size()<=0){
+		if (null==strings&&strings.size()==0){
 			j.setSuccess(false);
 			j.setMsg("导出失败！失败信："+"不符合条件");
 			return j;

src/main/java/com/jeeplus/modules/sg/financial/settlement/mapper/DataMaintenanceMapper.java

@@ -15,5 +15,5 @@ import java.util.List;
 public interface DataMaintenanceMapper extends BaseMapper<MaintainData> {
 	int insertList(@Param("list") List<MaintainData> list);
 	void deleteData(String projectId);
-	List<MaintainData> getFindListMain(List<String> strings);
+	List<MaintainData> findListMain(List<String> strings);
 }

src/main/java/com/jeeplus/modules/sg/financial/settlement/mapper/xml/DataMaintenanceMapper.xml

@@ -248,7 +248,7 @@
 		select * FROM js_maintain_data  where ${propertyName} = '${value}'
 	</select>
 
-	<select id="getFindListMain" parameterType="java.util.List" resultType="maintainData">
+	<select id="findListMain" parameterType="java.util.List" resultType="MaintainData">
 		select
 		<include refid="infoColumns"/>
 		FROM js_maintain_data a