2019 11-18 17-19

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

@@ -249,15 +249,16 @@ public class ErpCreditService extends CrudService<ErpCreditMapper,ErpCredit> {
         // 删除创建的新文件
         // this.deleteFile(newFile);
     }
-
-    public List<ErpJudge> getCheck1(List<ErpCredit> erpCredits){
-        List<ErpJudge> erpJudges = new ArrayList<>();
+    //判断条件
+    public List<ErpJudge> getCheck(List<ErpCredit> erpCredits){
+        List<ErpJudge> erpJudges = new ArrayList<ErpJudge>();
         ErpJudge erpJudge = null;
         Map<String,List> map = new  HashMap<String,List>();
         List<String> strings = new ArrayList<String>();
         for (ErpCredit erpCredit:erpCredits){
             strings.add(erpCredit.getItemId());
         }
+        //得到物料是为完成数据
         List<Information> informationList = informationService.findNoFinishList(strings);
         List<String> maintainDataList = dataMaintenanceService.getJudge(strings);
         if (null!=informationList&&informationList.size()>0){
@@ -266,14 +267,14 @@ public class ErpCreditService extends CrudService<ErpCreditMapper,ErpCredit> {
                 erpJudge.setItemId(information.getProjectId());
                 erpJudge.setMainFlag("有");
                 erpJudge.setInfoFlag("否");
+                erpJudges.add(erpJudge);
             }
-            erpJudges.add(erpJudge);
         }
         if (null!=maintainDataList&&maintainDataList.size()>0){
             Boolean flag = true;
             for (String maintain:maintainDataList){
                 flag=true;
-                if (null!=informationList&&informationList.size()>0){
+                if (null!=erpCredits&&erpCredits.size()>0){
                     for (ErpJudge erpJudge1:erpJudges){
                        if (erpJudge1.getItemId().equals(maintain)){
                            erpJudge1.setMainFlag("无");
@@ -293,92 +294,4 @@ public class ErpCreditService extends CrudService<ErpCreditMapper,ErpCredit> {
         }
         return erpJudges;
     }
-    /**
-     * 判断
-     * @return
-     */
-    public List getCheck(String ids){
-        List<String> lists = new ArrayList<String>();
-//        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); }
-//        List<ErpCredit> erpCreditList = getListErpCredit(lists);
-//        for (ErpCredit erpCredit:erpCreditList){
-//            map.put(erpCredit.getId(),erpCredit.getItemId());
-//            itemIdList.add(erpCredit.getItemId());
-//        }
-//        List<MaintainData> maintainDatas =getFindListMain(itemIdList);//维护数据集合
-//        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){
-//                   if (maintainData.getProjectId().equals(str3)){
-//                       sortList.add(str3);//有数据
-//                       break;
-//                   }
-//               }
-//            }
-//            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--;
-//                }
-//            }
-//        }else {
-//            lists=null;
-//        }
-        return lists;
-    }
 }

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

@@ -260,7 +260,7 @@ public class ExportUtil1 {
             }
         }
         //项目建设技术服务费（暂无）
-        technicalFee=surveyFee+economicFee;
+        technicalFee=designFee;
         //项目建设管理费
         managementFee=itemManageFee+supervisionFee+preWorkingFee;
         //建设场地征用费
@@ -497,7 +497,16 @@ public class ExportUtil1 {
                 transferOfPower1.setPowerInstallFee("-");
             }
             if (transferOfPower1.getPowerInstallFee().equals("-")){//摊入费用
-                transferOfPower1.setPowerStandInFee("-");
+                if (transferOfPower1.getPowerBuildFee()!=null){
+                    standInFee = Double.valueOf(transferOfPower1.getPowerBuildFee())+eqmValue;
+                    standInFee = Double.valueOf(transferOfPower1.getPowerBuildFee())/standInFee;
+                    if (erpCredit.getOtherTotalFee()!=null){
+                        standInFee = standInFee*erpCredit.getOtherTotalFee();//乘其他费用合计
+                    }
+                    transferOfPower1.setPowerStandInFee(decimalFormat.format(standInFee));//添加摊入费用
+                    powerDeliveredAssets+=standInFee;//交付使用资产价值
+                    standInFeeAll+=standInFee;//摊入费用合计
+                }
             }else {
                 //摊入费用
                 standInFee = Double.valueOf(transferOfPower1.getPowerInstallFee())+eqmValue;
@@ -704,7 +713,8 @@ public class ExportUtil1 {
                 if (null!=maintainData.getEndDate()&&maintainData.getEndDate().toString().length()>0){
                     completionDateList.add(maintainData.getEndDate());
                 }
-                investmentBudget+=maintainData.getTotalFee();
+                investmentBudget+=maintainData.getTotalFee()+maintainData.getBuildingFee()+maintainData.getInstallFee()
+                +maintainData.getEquipmentFee()+maintainData.getMaterialFee();
             }
             if (null!=organDataList&&organDataList.size()>0){
                 //去重
@@ -730,7 +740,6 @@ public class ExportUtil1 {
                     }
                 }
                 generalSituation.setCommencementDate(sdf.format(beforeDate));
-//                generalSituation.setCommencementDate(sdf.format(Collections.min(commencementDateList)));
             }
             if (null!=completionDateList&&completionDateList.size()>0){
                 for (Date date:completionDateList){
@@ -742,7 +751,6 @@ public class ExportUtil1 {
                     }
                 }
                 generalSituation.setCompletionDate(sdf.format(endDate));
-//                generalSituation.setCompletionDate(sdf.format(Collections.max(completionDateList)));
             }
             generalSituation.setInvestmentBudget(String.valueOf(decimalFormat.format(investmentBudget)));
         }
@@ -770,7 +778,7 @@ public class ExportUtil1 {
                 if (null!= transferOfPower1s.get(i).getPowerBuildFee()){//建筑
                     buildProject+=Double.parseDouble(transferOfPower1s.get(i).getPowerBuildFee());
                 }
-                if (null!=transferOfPower1s.get(i).getPowerInstallFee()&&!transferOfPower1s.get(i).getPowerStandInFee().equals("-")){
+                if (null!=transferOfPower1s.get(i).getPowerInstallFee()&&!transferOfPower1s.get(i).getPowerInstallFee().equals("-")){
                     intallProject+=Double.parseDouble(transferOfPower1s.get(i).getPowerInstallFee());
                 }
                 if (null!=transferOfPower1s.get(i).getPowerStandInFee()&&!transferOfPower1s.get(i).getPowerStandInFee().equals("-")){//分摊费用
@@ -831,10 +839,11 @@ public class ExportUtil1 {
             }
         }
         completed=transferAssets+vatDeduction;
-//        for (MaintainData maintainData:maintainDataList){
-//            appropriatedFunds+=maintainData.getDesignFee()+maintainData.getSupervisionFee()+maintainData.getPreliminaryWorkFee()
-//                    +maintainData.getDamages()+maintainData.getManagementFee();
-//        }
+        for (MaintainData maintainData:maintainDataList){
+            appropriatedFunds+=maintainData.getTotalFee()+maintainData.getBuildingFee()+maintainData.getInstallFee()
+                    +maintainData.getEquipmentFee()+maintainData.getMaterialFee();
+        }
+        mCompletionProject.setTransferAssets(decimalFormat.format(transferAssets));
         mCompletionProject.setAppropriatedFunds(decimalFormat.format(appropriatedFunds));
         mCompletionProject.setFixedAssets(decimalFormat.format(fixedAssets));
         mCompletionProject.setVatDeduction(decimalFormat.format(vatDeduction));

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

@@ -16,6 +16,7 @@ import com.jeeplus.modules.sg.financial.erpcredit.service.ErpCreditService;
 import com.jeeplus.modules.sg.financial.erpcredit.util.*;
 import com.jeeplus.modules.sg.financial.settlement.entity.MaintainData;
 import com.jeeplus.modules.sg.financial.settlement.service.DataMaintenanceService;
+import com.jeeplus.modules.test.one.dialog.entity.Leave1;
 import groovy.util.IFileNameFinder;
 import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
 import org.apache.poi.xssf.usermodel.XSSFCell;
@@ -230,11 +231,11 @@ public class ErpCreditController extends BaseController {
 			List<ErpAccount> erpAccounts = ErpInfo.getErpAccount(importUtil);//获取表格数据
 			List<ErpCredit> erpCredits = ErpInfo.getAllErpCreditList(erpAccounts);//获取单条数据
 			//判断条件
-			List<ErpJudge> erpJudges  = erpCreditService.getCheck1(erpCredits);
+			List<ErpJudge> erpJudges  = erpCreditService.getCheck(erpCredits);
 			if (null!=erpJudges&&erpJudges.size()>0){
 				String judge = "";
 				for (ErpJudge erpJudge:erpJudges){
-					judge = erpJudge.getItemId()+","+erpJudge.getMainFlag()+","+erpJudge.getInfoFlag()+"-";
+					judge += erpJudge.getItemId()+","+erpJudge.getMainFlag()+","+erpJudge.getInfoFlag()+"-";
 				}
 				judge = judge.substring(0,judge.length()-1);
 				j.setList(judge);

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

@@ -74,17 +74,22 @@ public class DataMaintenanceService extends CrudService<DataMaintenanceMapper, M
 		List<String> list = new ArrayList<>();//定义一个集合
 		List<MaintainData> maintainDatas = dataMaintenanceMapper.findListMain();//得到维护表所有数据
 		if (null!=strings&&strings.size()>0){
-			for (MaintainData maintainData:maintainDatas){
-				flag = true;
-				for (String str:strings){
-					if (maintainData.getProjectId().equals(str)){
-						flag=false;
-						break;
+			if (null!=maintainDatas&&maintainDatas.size()>0){
+				for (String str :strings){
+					flag = true;
+					for (MaintainData maintainData:maintainDatas){
+						if (str.equals(maintainData.getProjectId())){
+							flag = false;
+							break;
+						}
+					}
+					if (flag){
+						list.add(str);
 					}
 				}
-				if (flag){
-					list.add(maintainData.getProjectId());
-				}
+			}
+			for (MaintainData maintainData:maintainDatas){
+				System.out.println(maintainData+"---");
 			}
 		}
 		return list;

src/main/webapp/webpage/modules/sg/financial/erp/erpCreditList.jsp

@@ -2,7 +2,7 @@
 <%@ include file="/webpage/include/taglib.jsp"%>
 <html>
 <head>
-	<title>Erp项目管理</title>
+	<title>送审决算信息</title>
 	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
 	<meta name="decorator" content="ani"/>
 	<%@ include file="/webpage/include/bootstraptable.jsp"%>