工作内容文件上传

src/main/java/com/jeeplus/modules/projectVisa/entity/ProjectVisa.java

@@ -2,6 +2,7 @@ package com.jeeplus.modules.projectVisa.entity;
 
 import com.google.common.collect.Lists;
 import com.jeeplus.common.persistence.DataEntity;
+import com.jeeplus.common.utils.excel.annotation.ExcelField;
 import com.jeeplus.modules.projectType.entity.ProjectType;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientAttachment;
 
@@ -37,6 +38,7 @@ public class ProjectVisa extends DataEntity<ProjectVisa> {
         this.contractId = contractId;
     }
 
+    @ExcelField(title="签证编号", align=2, sort=10)
     public String getNumber() {
         return number;
     }
@@ -54,6 +56,7 @@ public class ProjectVisa extends DataEntity<ProjectVisa> {
     }
 
 
+    @ExcelField(title="送审金额", align=2, sort=13)
     public Double getSendMoney() {
         return sendMoney;
     }
@@ -62,6 +65,7 @@ public class ProjectVisa extends DataEntity<ProjectVisa> {
         this.sendMoney = sendMoney;
     }
 
+    @ExcelField(title="定审金额", align=2, sort=15)
     public Double getConfirmMoney() {
         return confirmMoney;
     }
@@ -78,6 +82,7 @@ public class ProjectVisa extends DataEntity<ProjectVisa> {
         this.type = type;
     }
 
+    @ExcelField(title="审批手续合规性", align=2, sort=14)
     public String getProcedure() {
         return procedure;
     }
@@ -86,6 +91,7 @@ public class ProjectVisa extends DataEntity<ProjectVisa> {
         this.procedure = procedure;
     }
 
+    @ExcelField(title="签证内容", align=2, sort=12)
     public String getContent() {
         return content;
     }
@@ -118,6 +124,7 @@ public class ProjectVisa extends DataEntity<ProjectVisa> {
         this.contentId = contentId;
     }
 
+    @ExcelField(title="签证时间", align=2, sort=11)
     public String getDateStr() {
         return dateStr;
     }

src/main/java/com/jeeplus/modules/projectVisa/web/ProjectClaimController.java

@@ -3,6 +3,8 @@ package com.jeeplus.modules.projectVisa.web;
 import com.jeeplus.common.config.Global;
 import com.jeeplus.common.persistence.Page;
 import com.jeeplus.common.utils.StringUtils;
+import com.jeeplus.common.utils.ThisLocalityDownloadUtil;
+import com.jeeplus.common.utils.excel.ImportExcel;
 import com.jeeplus.common.web.BaseController;
 import com.jeeplus.modules.projectConstruction.entity.ConstructionContract;
 import com.jeeplus.modules.projectConstruction.service.ContractService;
@@ -26,14 +28,13 @@ import com.jeeplus.modules.sys.utils.DictUtils;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import com.jeeplus.modules.workclientinfo.dao.WorkClientAttachmentDao;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientAttachment;
+import com.jeeplus.modules.workreceiptsregister.entity.ResponseEntity;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import javax.servlet.http.HttpServletRequest;
@@ -346,4 +347,43 @@ public class ProjectClaimController extends BaseController {
         return j;
     }
 
+    /**
+     * 导入Excel数据
+     */
+    @ResponseBody
+    @RequestMapping(value = "import", method= RequestMethod.POST)
+    public ResponseEntity importFile(MultipartFile file, RedirectAttributes redirectAttributes) {
+        ResponseEntity<ProjectVisa> responseEntity = new ResponseEntity<>();
+        try {
+            ImportExcel ei = new ImportExcel(file, 1, 0);
+            List<ProjectVisa> list = ei.getDataList(ProjectVisa.class);
+            List<ProjectVisa> listAll = new ArrayList<>();
+            for (ProjectVisa ctrlprice : list) {
+                if(StringUtils.isNotBlank(ctrlprice.getNumber()) && StringUtils.isNotBlank(ctrlprice.getDateStr()) && null != ctrlprice.getSendMoney() && null != ctrlprice.getConfirmMoney()){
+                    listAll.add(ctrlprice);
+                }
+            }
+            responseEntity.setData(listAll);
+        } catch (Exception e) {
+            logger.error("导入索赔管理一览表失败！",e);
+            responseEntity.setCode(400);
+            responseEntity.setMessage("导入索赔管理一览表失败！"+e.getMessage());
+        }
+        return responseEntity;
+    }
+
+    /**
+     * 下载导入  清单及控制价编审数据模板
+     */
+    @RequestMapping(value = "import/template")
+    public String importFileTemplate(HttpServletResponse response, HttpServletRequest request, RedirectAttributes redirectAttributes) {
+        try {
+            ThisLocalityDownloadUtil download = new ThisLocalityDownloadUtil();
+            download.download("索赔管理一览表.xlsx",request,response);
+        } catch (Exception e) {
+            logger.error("索赔管理一览表模板下载失败！",e);
+        }
+        return "redirect:"+Global.getAdminPath()+"/project/projectDesignChange/?repage";
+    }
+
 }

src/main/java/com/jeeplus/modules/projectVisa/web/ProjectDesignController.java

@@ -3,6 +3,8 @@ package com.jeeplus.modules.projectVisa.web;
 import com.jeeplus.common.config.Global;
 import com.jeeplus.common.persistence.Page;
 import com.jeeplus.common.utils.StringUtils;
+import com.jeeplus.common.utils.ThisLocalityDownloadUtil;
+import com.jeeplus.common.utils.excel.ImportExcel;
 import com.jeeplus.common.web.BaseController;
 import com.jeeplus.modules.projectConstruction.entity.ConstructionContract;
 import com.jeeplus.modules.projectConstruction.service.ContractService;
@@ -26,15 +28,15 @@ import com.jeeplus.modules.sys.utils.DictUtils;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import com.jeeplus.modules.workclientinfo.dao.WorkClientAttachmentDao;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientAttachment;
+import com.jeeplus.modules.workcontent.entity.WorkContentCtrlprice;
 import com.jeeplus.modules.workcontent.entity.WorkScheduleInfo;
+import com.jeeplus.modules.workreceiptsregister.entity.ResponseEntity;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import javax.servlet.http.HttpServletRequest;
@@ -386,4 +388,43 @@ public class ProjectDesignController extends BaseController {
         return j;
     }
 
+    /**
+     * 导入Excel数据
+     */
+    @ResponseBody
+    @RequestMapping(value = "import", method= RequestMethod.POST)
+    public ResponseEntity importFile(MultipartFile file, RedirectAttributes redirectAttributes) {
+        ResponseEntity<ProjectVisa> responseEntity = new ResponseEntity<>();
+        try {
+            ImportExcel ei = new ImportExcel(file, 1, 0);
+            List<ProjectVisa> list = ei.getDataList(ProjectVisa.class);
+            List<ProjectVisa> listAll = new ArrayList<>();
+            for (ProjectVisa ctrlprice : list) {
+                if(StringUtils.isNotBlank(ctrlprice.getNumber()) && StringUtils.isNotBlank(ctrlprice.getDateStr()) && null != ctrlprice.getSendMoney() && null != ctrlprice.getConfirmMoney()){
+                    listAll.add(ctrlprice);
+                }
+            }
+            responseEntity.setData(listAll);
+        } catch (Exception e) {
+            logger.error("导入设计变更一览表失败！",e);
+            responseEntity.setCode(400);
+            responseEntity.setMessage("导入设计变更一览表失败！"+e.getMessage());
+        }
+        return responseEntity;
+    }
+
+    /**
+     * 下载导入  清单及控制价编审数据模板
+     */
+    @RequestMapping(value = "import/template")
+    public String importFileTemplate(HttpServletResponse response, HttpServletRequest request, RedirectAttributes redirectAttributes) {
+        try {
+            ThisLocalityDownloadUtil download = new ThisLocalityDownloadUtil();
+            download.download("设计变更一览表.xlsx",request,response);
+        } catch (Exception e) {
+            logger.error("设计变更一览表模板下载失败！",e);
+        }
+        return "redirect:"+Global.getAdminPath()+"/project/projectDesignChange/?repage";
+    }
+
 }

src/main/java/com/jeeplus/modules/projectVisa/web/ProjectVisaController.java

@@ -4,6 +4,8 @@ import com.jeeplus.common.config.Global;
 import com.jeeplus.common.persistence.Page;
 import com.jeeplus.common.utils.MyBeanUtils;
 import com.jeeplus.common.utils.StringUtils;
+import com.jeeplus.common.utils.ThisLocalityDownloadUtil;
+import com.jeeplus.common.utils.excel.ImportExcel;
 import com.jeeplus.common.web.BaseController;
 import com.jeeplus.modules.act.entity.Act;
 import com.jeeplus.modules.projectConstruction.entity.ConstructionContract;
@@ -32,6 +34,7 @@ import com.jeeplus.modules.workclientinfo.entity.WorkClientInfo;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientLinkman;
 import com.jeeplus.modules.workcontent.entity.WorkConcealProject;
 import com.jeeplus.modules.workcontractinfo.entity.WorkContractInfo;
+import com.jeeplus.modules.workreceiptsregister.entity.ResponseEntity;
 import org.activiti.engine.runtime.ProcessInstance;
 import org.activiti.engine.task.Task;
 import org.apache.shiro.authz.annotation.Logical;
@@ -40,6 +43,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import javax.servlet.http.HttpServletRequest;
@@ -404,4 +408,43 @@ public class ProjectVisaController extends BaseController {
         return j;
     }
 
+    /**
+     * 导入Excel数据
+     */
+    @ResponseBody
+    @RequestMapping(value = "import", method= RequestMethod.POST)
+    public ResponseEntity importFile(MultipartFile file, RedirectAttributes redirectAttributes) {
+        ResponseEntity<ProjectVisa> responseEntity = new ResponseEntity<>();
+        try {
+            ImportExcel ei = new ImportExcel(file, 1, 0);
+            List<ProjectVisa> list = ei.getDataList(ProjectVisa.class);
+            List<ProjectVisa> listAll = new ArrayList<>();
+            for (ProjectVisa ctrlprice : list) {
+                if(StringUtils.isNotBlank(ctrlprice.getNumber()) && StringUtils.isNotBlank(ctrlprice.getDateStr()) && null != ctrlprice.getSendMoney() && null != ctrlprice.getConfirmMoney()){
+                    listAll.add(ctrlprice);
+                }
+            }
+            responseEntity.setData(listAll);
+        } catch (Exception e) {
+            logger.error("导入现场签证一览表失败！",e);
+            responseEntity.setCode(400);
+            responseEntity.setMessage("导入现场签证一览表失败！"+e.getMessage());
+        }
+        return responseEntity;
+    }
+
+    /**
+     * 下载导入  清单及控制价编审数据模板
+     */
+    @RequestMapping(value = "import/template")
+    public String importFileTemplate(HttpServletResponse response, HttpServletRequest request, RedirectAttributes redirectAttributes) {
+        try {
+            ThisLocalityDownloadUtil download = new ThisLocalityDownloadUtil();
+            download.download("现场签证一览表.xlsx",request,response);
+        } catch (Exception e) {
+            logger.error("现场签证一览表模板下载失败！",e);
+        }
+        return "redirect:"+Global.getAdminPath()+"/project/projectDesignChange/?repage";
+    }
+
 }

src/main/java/com/jeeplus/modules/workcontent/entity/WorkConcealProject.java

@@ -16,6 +16,7 @@ public class WorkConcealProject extends DataEntity<WorkConcealProject> {
     private String contractName;          //实施合同名称
     private String contractNumber;          //实施合同编号
     private String typeName;    //类型名称
+    protected String remarks;	// 备注
 
     public WorkConcealProject() {
         super();
@@ -68,6 +69,17 @@ public class WorkConcealProject extends DataEntity<WorkConcealProject> {
         this.workConcealProjectSerialNum = workConcealProjectSerialNum;
     }
 
+    @Override
+    @ExcelField(title="备注", align=2, sort=13)
+    public String getRemarks() {
+        return remarks;
+    }
+
+    @Override
+    public void setRemarks(String remarks) {
+        this.remarks = remarks;
+    }
+
     public String getType() {
         return type;
     }

src/main/java/com/jeeplus/modules/workcontent/entity/WorkContentBranchAccount.java

@@ -54,6 +54,7 @@ public class WorkContentBranchAccount extends DataEntity<WorkContentBranchAccoun
 		this.contentId = contentId;
 	}
 
+	@ExcelField(title="工程费用名称", align=2, sort=10)
 	public String getAccountName() {
 		return AccountName;
 	}
@@ -62,6 +63,7 @@ public class WorkContentBranchAccount extends DataEntity<WorkContentBranchAccoun
 		AccountName = accountName;
 	}
 
+	@ExcelField(title="合同价", align=2, sort=11)
 	public Double getContractAccount() {
 		return contractAccount;
 	}
@@ -70,6 +72,7 @@ public class WorkContentBranchAccount extends DataEntity<WorkContentBranchAccoun
 		this.contractAccount = contractAccount;
 	}
 
+	@ExcelField(title="送审价", align=2, sort=12)
 	public Double getSubmitAccount() {
 		return submitAccount;
 	}
@@ -78,6 +81,7 @@ public class WorkContentBranchAccount extends DataEntity<WorkContentBranchAccoun
 		this.submitAccount = submitAccount;
 	}
 
+	@ExcelField(title="定审价", align=2, sort=13)
 	public Double getSetAccount() {
 		return setAccount;
 	}
@@ -86,6 +90,7 @@ public class WorkContentBranchAccount extends DataEntity<WorkContentBranchAccoun
 		this.setAccount = setAccount;
 	}
 
+	@ExcelField(title="核增额", align=2, sort=14)
 	public Double getBusinessAdd() {
 		return businessAdd;
 	}
@@ -94,6 +99,7 @@ public class WorkContentBranchAccount extends DataEntity<WorkContentBranchAccoun
 		this.businessAdd = businessAdd;
 	}
 
+	@ExcelField(title="核减额", align=2, sort=15)
 	public Double getBusinessReduce() {
 		return businessReduce;
 	}
@@ -102,6 +108,7 @@ public class WorkContentBranchAccount extends DataEntity<WorkContentBranchAccoun
 		this.businessReduce = businessReduce;
 	}
 
+	@ExcelField(title="核增减率", align=2, sort=16)
 	public Double getBusinessRate() {
 		return businessRate;
 	}

src/main/java/com/jeeplus/modules/workcontent/entity/WorkContentCompleteAccount.java

@@ -5,6 +5,7 @@ package com.jeeplus.modules.workcontent.entity;
 
 
 import com.jeeplus.common.persistence.DataEntity;
+import com.jeeplus.common.utils.excel.annotation.ExcelField;
 import org.springframework.format.annotation.NumberFormat;
 
 /**
@@ -50,6 +51,7 @@ public class WorkContentCompleteAccount extends DataEntity<WorkContentCompleteAc
 		this.contentId = contentId;
 	}
 
+	@ExcelField(title="工程单位名称", align=2, sort=10)
 	public String getCompleteName() {
 		return completeName;
 	}
@@ -58,6 +60,7 @@ public class WorkContentCompleteAccount extends DataEntity<WorkContentCompleteAc
 		this.completeName = completeName;
 	}
 
+	@ExcelField(title="合同价", align=2, sort=11)
 	public Double getCompleteContract() {
 		return completeContract;
 	}
@@ -66,6 +69,7 @@ public class WorkContentCompleteAccount extends DataEntity<WorkContentCompleteAc
 		this.completeContract = completeContract;
 	}
 
+	@ExcelField(title="送审价", align=2, sort=12)
 	public Double getCompleteSubmit() {
 		return completeSubmit;
 	}
@@ -74,6 +78,7 @@ public class WorkContentCompleteAccount extends DataEntity<WorkContentCompleteAc
 		this.completeSubmit = completeSubmit;
 	}
 
+	@ExcelField(title="定审价", align=2, sort=13)
 	public Double getCompleteExamine() {
 		return completeExamine;
 	}
@@ -82,6 +87,7 @@ public class WorkContentCompleteAccount extends DataEntity<WorkContentCompleteAc
 		this.completeExamine = completeExamine;
 	}
 
+	@ExcelField(title="核增额", align=2, sort=14)
 	public Double getCompleteAdd() {
 		return completeAdd;
 	}
@@ -90,6 +96,7 @@ public class WorkContentCompleteAccount extends DataEntity<WorkContentCompleteAc
 		this.completeAdd = completeAdd;
 	}
 
+	@ExcelField(title="核减额", align=2, sort=15)
 	public Double getCompleteReduce() {
 		return completeReduce;
 	}
@@ -98,6 +105,7 @@ public class WorkContentCompleteAccount extends DataEntity<WorkContentCompleteAc
 		this.completeReduce = completeReduce;
 	}
 
+	@ExcelField(title="核增减率", align=2, sort=16)
 	public Double getCompleteRate() {
 		return completeRate;
 	}

src/main/java/com/jeeplus/modules/workcontent/entity/WorkContentCtrlprice.java

@@ -32,6 +32,7 @@ public class WorkContentCtrlprice extends DataEntity<WorkContentCtrlprice> {
 	@NumberFormat(style = NumberFormat.Style.CURRENCY)
 	private Double highestBidAdjust;		// 工程量清单最高投标限价调整额
 	private String type;          //数据状态
+	private String remarks;	// 备注
 
 	public WorkContentCtrlprice() {
 		super();
@@ -126,6 +127,17 @@ public class WorkContentCtrlprice extends DataEntity<WorkContentCtrlprice> {
 	public void setType(String type) {
 		this.type = type;
 	}
+
+	@Override
+	@ExcelField(title="备注", align=2, sort=16)
+	public String getRemarks() {
+		return remarks;
+	}
+
+	@Override
+	public void setRemarks(String remarks) {
+		this.remarks = remarks;
+	}
 	/*private static final long serialVersionUID = 1L;
 	private String projectId;		// 项目id
 	private String contentId;		// 工作内容ID

src/main/java/com/jeeplus/modules/workcontent/entity/WorkFiveDirectionsAffirm.java

@@ -73,6 +73,7 @@ public class WorkFiveDirectionsAffirm extends DataEntity<WorkFiveDirectionsAffir
 		this.contentId = contentId;
 	}
 
+	@ExcelField(title="采购申请号", align=2, sort=10)
 	public String getOwnerPurchasingRequisitionNum() {
 		return ownerPurchasingRequisitionNum;
 	}
@@ -81,6 +82,7 @@ public class WorkFiveDirectionsAffirm extends DataEntity<WorkFiveDirectionsAffir
 		this.ownerPurchasingRequisitionNum = ownerPurchasingRequisitionNum;
 	}
 
+	@ExcelField(title="物料编码", align=2, sort=11)
 	public String getOwnerMaterialCode() {
 		return ownerMaterialCode;
 	}
@@ -89,6 +91,7 @@ public class WorkFiveDirectionsAffirm extends DataEntity<WorkFiveDirectionsAffir
 		this.ownerMaterialCode = ownerMaterialCode;
 	}
 
+	@ExcelField(title="物料描述", align=2, sort=12)
 	public String getOwnerMaterialDescription() {
 		return ownerMaterialDescription;
 	}
@@ -97,6 +100,7 @@ public class WorkFiveDirectionsAffirm extends DataEntity<WorkFiveDirectionsAffir
 		this.ownerMaterialDescription = ownerMaterialDescription;
 	}
 
+	@ExcelField(title="单位", align=2, sort=13)
 	public String getOwnerUnits() {
 		return ownerUnits;
 	}
@@ -105,6 +109,7 @@ public class WorkFiveDirectionsAffirm extends DataEntity<WorkFiveDirectionsAffir
 		this.ownerUnits = ownerUnits;
 	}
 
+	@ExcelField(title="招标量", align=2, sort=14)
 	public String getOwnerTenderNum() {
 		return ownerTenderNum;
 	}
@@ -113,6 +118,7 @@ public class WorkFiveDirectionsAffirm extends DataEntity<WorkFiveDirectionsAffir
 		this.ownerTenderNum = ownerTenderNum;
 	}
 
+	@ExcelField(title="施工图物料名称及规格型号", align=2, sort=15)
 	public String getDesignMaterialName() {
 		return designMaterialName;
 	}
@@ -121,6 +127,7 @@ public class WorkFiveDirectionsAffirm extends DataEntity<WorkFiveDirectionsAffir
 		this.designMaterialName = designMaterialName;
 	}
 
+	@ExcelField(title="图纸净量", align=2, sort=16)
 	public String getDesignDrawingAmount() {
 		return designDrawingAmount;
 	}
@@ -129,6 +136,7 @@ public class WorkFiveDirectionsAffirm extends DataEntity<WorkFiveDirectionsAffir
 		this.designDrawingAmount = designDrawingAmount;
 	}
 
+	@ExcelField(title="损耗率", align=2, sort=17)
 	public String getDesignAttritionRate() {
 		return designAttritionRate;
 	}
@@ -137,6 +145,7 @@ public class WorkFiveDirectionsAffirm extends DataEntity<WorkFiveDirectionsAffir
 		this.designAttritionRate = designAttritionRate;
 	}
 
+	@ExcelField(title="确认合计量", align=2, sort=18)
 	public String getDesignAffirmTotal() {
 		return designAffirmTotal;
 	}
@@ -145,6 +154,7 @@ public class WorkFiveDirectionsAffirm extends DataEntity<WorkFiveDirectionsAffir
 		this.designAffirmTotal = designAffirmTotal;
 	}
 
+	@ExcelField(title="备注", align=2, sort=19)
 	public String getDesignRemarks() {
 		return designRemarks;
 	}
@@ -153,6 +163,7 @@ public class WorkFiveDirectionsAffirm extends DataEntity<WorkFiveDirectionsAffir
 		this.designRemarks = designRemarks;
 	}
 
+	@ExcelField(title="图纸净量", align=2, sort=20)
 	public String getRoadworkDrawingAmount() {
 		return roadworkDrawingAmount;
 	}
@@ -161,6 +172,7 @@ public class WorkFiveDirectionsAffirm extends DataEntity<WorkFiveDirectionsAffir
 		this.roadworkDrawingAmount = roadworkDrawingAmount;
 	}
 
+	@ExcelField(title="损耗率", align=2, sort=21)
 	public String getRoadworkAttritionRate() {
 		return roadworkAttritionRate;
 	}
@@ -169,6 +181,7 @@ public class WorkFiveDirectionsAffirm extends DataEntity<WorkFiveDirectionsAffir
 		this.roadworkAttritionRate = roadworkAttritionRate;
 	}
 
+	@ExcelField(title="需求用量", align=2, sort=22)
 	public String getRoadworkDemandDosage() {
 		return roadworkDemandDosage;
 	}
@@ -185,6 +198,7 @@ public class WorkFiveDirectionsAffirm extends DataEntity<WorkFiveDirectionsAffir
 		this.roadworkDemandDate = roadworkDemandDate;
 	}
 
+	@ExcelField(title="备注", align=2, sort=24)
 	public String getRoadworkRemarks() {
 		return roadworkRemarks;
 	}
@@ -193,6 +207,7 @@ public class WorkFiveDirectionsAffirm extends DataEntity<WorkFiveDirectionsAffir
 		this.roadworkRemarks = roadworkRemarks;
 	}
 
+	@ExcelField(title="图纸净量", align=2, sort=25)
 	public String getConsultDrawingAmount() {
 		return consultDrawingAmount;
 	}
@@ -201,6 +216,7 @@ public class WorkFiveDirectionsAffirm extends DataEntity<WorkFiveDirectionsAffir
 		this.consultDrawingAmount = consultDrawingAmount;
 	}
 
+	@ExcelField(title="损耗率", align=2, sort=26)
 	public String getConsultAttritionRate() {
 		return consultAttritionRate;
 	}
@@ -209,6 +225,7 @@ public class WorkFiveDirectionsAffirm extends DataEntity<WorkFiveDirectionsAffir
 		this.consultAttritionRate = consultAttritionRate;
 	}
 
+	@ExcelField(title="审核合计量", align=2, sort=27)
 	public String getConsultAuditTotal() {
 		return consultAuditTotal;
 	}
@@ -217,6 +234,7 @@ public class WorkFiveDirectionsAffirm extends DataEntity<WorkFiveDirectionsAffir
 		this.consultAuditTotal = consultAuditTotal;
 	}
 
+	@ExcelField(title="备注", align=2, sort=28)
 	public String getConsultRemarks() {
 		return consultRemarks;
 	}
@@ -233,6 +251,7 @@ public class WorkFiveDirectionsAffirm extends DataEntity<WorkFiveDirectionsAffir
 		this.type = type;
 	}
 
+	@ExcelField(title="需求日期", align=2, sort=23)
 	public String getRoadworkDemandDateStr() {
 		return roadworkDemandDateStr;
 	}

src/main/java/com/jeeplus/modules/workcontent/entity/WorkMaterialsPrice.java

@@ -5,6 +5,7 @@ package com.jeeplus.modules.workcontent.entity;
 
 
 import com.jeeplus.common.persistence.DataEntity;
+import com.jeeplus.common.utils.excel.annotation.ExcelField;
 import org.springframework.format.annotation.NumberFormat;
 
 /**
@@ -29,6 +30,7 @@ public class WorkMaterialsPrice extends DataEntity<WorkMaterialsPrice> {
 	private String contractId;          //实施合同id
 	private String contractName;          //实施合同名称
 	private String contractNumber;          //实施合同编号
+	protected String remarks;	// 备注
 
 	public WorkMaterialsPrice() {
 		super();
@@ -54,6 +56,7 @@ public class WorkMaterialsPrice extends DataEntity<WorkMaterialsPrice> {
 		this.contentId = contentId;
 	}
 
+	@ExcelField(title="材料名称", align=2, sort=10)
 	public String getMaterialsName() {
 		return materialsName;
 	}
@@ -62,6 +65,7 @@ public class WorkMaterialsPrice extends DataEntity<WorkMaterialsPrice> {
 		this.materialsName = materialsName;
 	}
 
+	@ExcelField(title="规格及名称", align=2, sort=11)
 	public String getSpecificationName() {
 		return specificationName;
 	}
@@ -70,6 +74,7 @@ public class WorkMaterialsPrice extends DataEntity<WorkMaterialsPrice> {
 		this.specificationName = specificationName;
 	}
 
+	@ExcelField(title="施工工艺使用部分", align=2, sort=12)
 	public String getPartUsed() {
 		return partUsed;
 	}
@@ -78,6 +83,7 @@ public class WorkMaterialsPrice extends DataEntity<WorkMaterialsPrice> {
 		this.partUsed = partUsed;
 	}
 
+	@ExcelField(title="材料单价", align=2, sort=13)
 	public String getMaterialPrice() {
 		return materialPrice;
 	}
@@ -86,6 +92,7 @@ public class WorkMaterialsPrice extends DataEntity<WorkMaterialsPrice> {
 		this.materialPrice = materialPrice;
 	}
 
+	@ExcelField(title="甲方、咨询核定价", align=2, sort=14)
 	public Double getNuclearPrice() {
 		return nuclearPrice;
 	}
@@ -94,6 +101,17 @@ public class WorkMaterialsPrice extends DataEntity<WorkMaterialsPrice> {
 		this.nuclearPrice = nuclearPrice;
 	}
 
+	@Override
+	@ExcelField(title="备注", align=2, sort=15)
+	public String getRemarks() {
+		return remarks;
+	}
+
+	@Override
+	public void setRemarks(String remarks) {
+		this.remarks = remarks;
+	}
+
 	public String getType() {
 		return type;
 	}

src/main/java/com/jeeplus/modules/workcontent/entity/WorkScheduleInfo.java

@@ -48,6 +48,7 @@ public class WorkScheduleInfo extends DataEntity<WorkScheduleInfo> {
 	private String type;          //数据状态
 	private String contractName;          //合同名称
 	private String contractNumber;          //合同编号
+	private String remarks;                 //备注
 
 	public WorkScheduleInfo() {
 		super();
@@ -73,6 +74,7 @@ public class WorkScheduleInfo extends DataEntity<WorkScheduleInfo> {
 		this.contentId = contentId;
 	}
 
+	@ExcelField(title="签约合同价款", align=2, sort=10)
 	public Double getContractMoney() {
 		return contractMoney;
 	}
@@ -81,6 +83,7 @@ public class WorkScheduleInfo extends DataEntity<WorkScheduleInfo> {
 		this.contractMoney = contractMoney;
 	}
 
+	@ExcelField(title="已累计完成价款", align=2, sort=11)
 	public Double getBeforeCumulativeCompletionMoney() {
 		return beforeCumulativeCompletionMoney;
 	}
@@ -89,6 +92,7 @@ public class WorkScheduleInfo extends DataEntity<WorkScheduleInfo> {
 		this.beforeCumulativeCompletionMoney = beforeCumulativeCompletionMoney;
 	}
 
+	@ExcelField(title="已累计支付价款", align=2, sort=12)
 	public Double getBeforeTotalPaymentMoney() {
 		return beforeTotalPaymentMoney;
 	}
@@ -97,6 +101,7 @@ public class WorkScheduleInfo extends DataEntity<WorkScheduleInfo> {
 		this.beforeTotalPaymentMoney = beforeTotalPaymentMoney;
 	}
 
+	@ExcelField(title="支付比例", align=2, sort=13)
 	public Double getBeforePayRatio() {
 		return beforePayRatio;
 	}
@@ -105,6 +110,7 @@ public class WorkScheduleInfo extends DataEntity<WorkScheduleInfo> {
 		this.beforePayRatio = beforePayRatio;
 	}
 
+	@ExcelField(title="完成价款", align=2, sort=14)
 	public Double getCurrentAccomplishMoney() {
 		return currentAccomplishMoney;
 	}
@@ -113,6 +119,7 @@ public class WorkScheduleInfo extends DataEntity<WorkScheduleInfo> {
 		this.currentAccomplishMoney = currentAccomplishMoney;
 	}
 
+	@ExcelField(title="按约定比例应支付价款", align=2, sort=15)
 	public Double getCurrentAppointPayMoney() {
 		return currentAppointPayMoney;
 	}
@@ -121,6 +128,7 @@ public class WorkScheduleInfo extends DataEntity<WorkScheduleInfo> {
 		this.currentAppointPayMoney = currentAppointPayMoney;
 	}
 
+	@ExcelField(title="其他应扣款", align=2, sort=17)
 	public Double getCurrentShouldDeductMoney() {
 		return currentShouldDeductMoney;
 	}
@@ -129,6 +137,7 @@ public class WorkScheduleInfo extends DataEntity<WorkScheduleInfo> {
 		this.currentShouldDeductMoney = currentShouldDeductMoney;
 	}
 
+	@ExcelField(title="实际应支付", align=2, sort=18)
 	public Double getCurrentPracticalPayMoney() {
 		return currentPracticalPayMoney;
 	}
@@ -137,6 +146,7 @@ public class WorkScheduleInfo extends DataEntity<WorkScheduleInfo> {
 		this.currentPracticalPayMoney = currentPracticalPayMoney;
 	}
 
+	@ExcelField(title="已累计完成价款", align=2, sort=19)
 	public Double getCurrentCumulativeCompletionMoney() {
 		return currentCumulativeCompletionMoney;
 	}
@@ -145,6 +155,7 @@ public class WorkScheduleInfo extends DataEntity<WorkScheduleInfo> {
 		this.currentCumulativeCompletionMoney = currentCumulativeCompletionMoney;
 	}
 
+	@ExcelField(title="已累计支付价款", align=2, sort=20)
 	public Double getCurrentTotalPaymentMoney() {
 		return currentTotalPaymentMoney;
 	}
@@ -153,6 +164,7 @@ public class WorkScheduleInfo extends DataEntity<WorkScheduleInfo> {
 		this.currentTotalPaymentMoney = currentTotalPaymentMoney;
 	}
 
+	@ExcelField(title="支付比例", align=2, sort=21)
 	public String getCurrentPayRatio() {
 		return currentPayRatio;
 	}
@@ -161,6 +173,7 @@ public class WorkScheduleInfo extends DataEntity<WorkScheduleInfo> {
 		this.currentPayRatio = currentPayRatio;
 	}
 
+	@ExcelField(title="应扣预付款", align=2, sort=16)
 	public Double getCurrentShouldDeductPrepayMoney() {
 		return currentShouldDeductPrepayMoney;
 	}
@@ -169,6 +182,17 @@ public class WorkScheduleInfo extends DataEntity<WorkScheduleInfo> {
 		this.currentShouldDeductPrepayMoney = currentShouldDeductPrepayMoney;
 	}
 
+	@Override
+	@ExcelField(title="备注", align=2, sort=22)
+	public String getRemarks() {
+		return remarks;
+	}
+
+	@Override
+	public void setRemarks(String remarks) {
+		this.remarks = remarks;
+	}
+
 	public String getType() {
 		return type;
 	}

src/main/java/com/jeeplus/modules/workcontent/web/WorkConcealProjectController.java

@@ -6,6 +6,7 @@ package com.jeeplus.modules.workcontent.web;
 import com.google.common.collect.Lists;
 import com.jeeplus.common.config.Global;
 import com.jeeplus.common.utils.StringUtils;
+import com.jeeplus.common.utils.ThisLocalityDownloadUtil;
 import com.jeeplus.common.utils.excel.ExportExcel;
 import com.jeeplus.common.utils.excel.ImportExcel;
 import com.jeeplus.common.web.BaseController;
@@ -137,9 +138,9 @@ public class WorkConcealProjectController extends BaseController {
 			}
             responseEntity.setData(listAll);
 		} catch (Exception e) {
-		    logger.error("导入工程费用失败！",e);
+		    logger.error("导入信息失败！",e);
 		    responseEntity.setCode(400);
-		    responseEntity.setMessage("导入工程费用失败！"+e.getMessage());
+		    responseEntity.setMessage("导入信息失败！"+e.getMessage());
 		}
 		return responseEntity;
     }
@@ -148,16 +149,37 @@ public class WorkConcealProjectController extends BaseController {
 	 * 下载导入设计概算编制审核调整数据模板
 	 */
     @RequestMapping(value = "import/template")
-    public String importFileTemplate(HttpServletResponse response, RedirectAttributes redirectAttributes) {
+	public String importFileTemplate(String type, HttpServletResponse response, HttpServletRequest request, RedirectAttributes redirectAttributes) {
 		try {
+			ThisLocalityDownloadUtil download = new ThisLocalityDownloadUtil();
+			if(StringUtils.isNotBlank(type)){
+				//判断是否为场平
+				if("workSiteLevel".equals(type)){
+					download.download("场平工程量确认单.xlsx",request,response);
+				}else if ("workConcealProject".equals(type)){   //判断是否为隐蔽工程量
+					download.download("隐蔽工程量确认单.xlsx",request,response);
+				}
+			}
+		} catch (Exception e) {
+			if(StringUtils.isNotBlank(type)){
+				//判断是否为场平
+				if("workSiteLevel".equals(type)){
+					logger.error("场平工程量确认单模板下载失败！",e);
+				}else if ("workConcealProject".equals(type)){   //判断是否为隐蔽工程量
+					logger.error("隐蔽工程量确认单模板下载失败！",e);
+				}
+			}
+		}
+    	/*try {
             String fileName = "设计概算编制审核调整数据导入模板.xlsx";
     		List<WorkConcealProject> list = Lists.newArrayList();
     		new ExportExcel("设计概算编制审核调整数据", WorkConcealProject.class, 1).setDataList(list).write(response, fileName).dispose();
     		return null;
 		} catch (Exception e) {
 			addMessage(redirectAttributes, "导入模板下载失败！失败信息："+e.getMessage());
-		}
-		return "redirect:"+Global.getAdminPath()+"/workPreliminary/workConcealProject/?repage";
+		}*/
+		//return "redirect:"+Global.getAdminPath()+"/workConcealProject/workConcealProject/?repage";
+		return null;
     }
 	
 }

src/main/java/com/jeeplus/modules/workcontent/web/WorkContentBranchAccountController.java

@@ -6,6 +6,7 @@ package com.jeeplus.modules.workcontent.web;
 import com.google.common.collect.Lists;
 import com.jeeplus.common.config.Global;
 import com.jeeplus.common.utils.StringUtils;
+import com.jeeplus.common.utils.ThisLocalityDownloadUtil;
 import com.jeeplus.common.utils.excel.ExportExcel;
 import com.jeeplus.common.utils.excel.ImportExcel;
 import com.jeeplus.common.web.BaseController;
@@ -123,9 +124,9 @@ public class WorkContentBranchAccountController extends BaseController {
 			}
             responseEntity.setData(listAll);
 		} catch (Exception e) {
-		    logger.error("导入工程分部结算失败！",e);
+		    logger.error("导入分布结算审核表失败！",e);
 		    responseEntity.setCode(400);
-		    responseEntity.setMessage("导入工程分部结算失败！"+e.getMessage());
+		    responseEntity.setMessage("导入分布结算审核表失败！"+e.getMessage());
 		}
 		return responseEntity;
     }
@@ -134,15 +135,21 @@ public class WorkContentBranchAccountController extends BaseController {
 	 * 下载导入工程费用数据模板
 	 */
     @RequestMapping(value = "import/template")
-    public String importFileTemplate(HttpServletResponse response, RedirectAttributes redirectAttributes) {
+	public String importFileTemplate(HttpServletResponse response, HttpServletRequest request, RedirectAttributes redirectAttributes) {
 		try {
+			ThisLocalityDownloadUtil download = new ThisLocalityDownloadUtil();
+			download.download("分布结算审核表.xlsx",request,response);
+		} catch (Exception e) {
+			logger.error("分布结算审核表模板下载失败！",e);
+		}
+    	/*try {
             String fileName = "工程分部结算数据导入模板.xlsx";
     		List<WorkContentBranchAccount> list = Lists.newArrayList();
     		new ExportExcel("工程分部结算数据", WorkContentBranchAccount.class, 1).setDataList(list).write(response, fileName).dispose();
     		return null;
 		} catch (Exception e) {
 			addMessage(redirectAttributes, "导入模板下载失败！失败信息："+e.getMessage());
-		}
+		}*/
 		return "redirect:"+Global.getAdminPath()+"/workcontentbranchAccount/workcontentBranchAccount/?repage";
     }
 	/**

src/main/java/com/jeeplus/modules/workcontent/web/WorkContentCompleteAccountController.java

@@ -6,6 +6,7 @@ package com.jeeplus.modules.workcontent.web;
 import com.google.common.collect.Lists;
 import com.jeeplus.common.config.Global;
 import com.jeeplus.common.utils.StringUtils;
+import com.jeeplus.common.utils.ThisLocalityDownloadUtil;
 import com.jeeplus.common.utils.excel.ExportExcel;
 import com.jeeplus.common.utils.excel.ImportExcel;
 import com.jeeplus.common.web.BaseController;
@@ -112,15 +113,21 @@ public class WorkContentCompleteAccountController extends BaseController {
 	 * 下载导入工程竣工结算数据模板
 	 */
     @RequestMapping(value = "import/template")
-    public String importFileTemplate(HttpServletResponse response, RedirectAttributes redirectAttributes) {
+    public String importFileTemplate(HttpServletResponse response, HttpServletRequest request, RedirectAttributes redirectAttributes) {
 		try {
+			ThisLocalityDownloadUtil download = new ThisLocalityDownloadUtil();
+			download.download("施工竣工结算审核（初）并出具审核报价表.xlsx",request,response);
+		} catch (Exception e) {
+			logger.error("施工竣工结算审核（初）并出具审核报价表模板下载失败！",e);
+		}
+    	/*try {
             String fileName = "工程竣工结算数据导入模板.xlsx";
     		List<WorkContentCompleteAccount> list = Lists.newArrayList();
     		new ExportExcel("工程竣工结算数据", WorkContentCompleteAccount.class, 1).setDataList(list).write(response, fileName).dispose();
     		return null;
 		} catch (Exception e) {
 			addMessage(redirectAttributes, "导入模板下载失败！失败信息："+e.getMessage());
-		}
+		}*/
 		return "redirect:"+Global.getAdminPath()+"/workContent/WorkContentCompleteAccount/?repage";
     }
 	/**

src/main/java/com/jeeplus/modules/workcontent/web/WorkContentCtrlpriceController.java

@@ -6,6 +6,7 @@ package com.jeeplus.modules.workcontent.web;
 import com.google.common.collect.Lists;
 import com.jeeplus.common.config.Global;
 import com.jeeplus.common.utils.StringUtils;
+import com.jeeplus.common.utils.ThisLocalityDownloadUtil;
 import com.jeeplus.common.utils.excel.ExportExcel;
 import com.jeeplus.common.utils.excel.ImportExcel;
 import com.jeeplus.common.web.BaseController;
@@ -138,15 +139,21 @@ public class WorkContentCtrlpriceController extends BaseController {
 	 * 下载导入  清单及控制价编审数据模板
 	 */
     @RequestMapping(value = "import/template")
-    public String importFileTemplate(HttpServletResponse response, RedirectAttributes redirectAttributes) {
+    public String importFileTemplate(HttpServletResponse response, HttpServletRequest request, RedirectAttributes redirectAttributes) {
 		try {
+			ThisLocalityDownloadUtil download = new ThisLocalityDownloadUtil();
+			download.download("工程量清单、招标控制价审核表.xlsx",request,response);
+		} catch (Exception e) {
+			logger.error("工程量清单、招标控制价审核表模板下载失败！",e);
+		}
+    	/*try {
             String fileName = "  清单及控制价编审数据导入模板.xlsx";
     		List<WorkContentCtrlprice> list = Lists.newArrayList(); 
     		new ExportExcel("  清单及控制价编审数据", WorkContentCtrlprice.class, 1).setDataList(list).write(response, fileName).dispose();
     		return null;
 		} catch (Exception e) {
 			addMessage(redirectAttributes, "导入模板下载失败！失败信息："+e.getMessage());
-		}
+		}*/
 		return "redirect:"+Global.getAdminPath()+"/workcontentctrlprice/workContentCtrlprice/?repage";
     }
 
@@ -160,6 +167,6 @@ public class WorkContentCtrlpriceController extends BaseController {
 		List<String> tableType = workContentCtrlpriceService.getTableType(contentId);
 		return tableType;
 	}
-	
+
 
 }

src/main/java/com/jeeplus/modules/workcontent/web/WorkContentInvestmentCostController.java

@@ -6,6 +6,7 @@ package com.jeeplus.modules.workcontent.web;
 import com.google.common.collect.Lists;
 import com.jeeplus.common.config.Global;
 import com.jeeplus.common.utils.StringUtils;
+import com.jeeplus.common.utils.ThisLocalityDownloadUtil;
 import com.jeeplus.common.utils.excel.ExportExcel;
 import com.jeeplus.common.utils.excel.ImportExcel;
 import com.jeeplus.common.web.BaseController;
@@ -111,15 +112,21 @@ public class WorkContentInvestmentCostController extends BaseController {
 	 * 下载导入工程费用数据模板
 	 */
     @RequestMapping(value = "import/template")
-    public String importFileTemplate(HttpServletResponse response, RedirectAttributes redirectAttributes) {
+    public String importFileTemplate(HttpServletResponse response, HttpServletRequest request, RedirectAttributes redirectAttributes) {
 		try {
+			ThisLocalityDownloadUtil download = new ThisLocalityDownloadUtil();
+			download.download("施工图预算审核表.xlsx",request,response);
+		} catch (Exception e) {
+			logger.error("施工图预算审核表模板下载失败！",e);
+		}
+    	/*try {
             String fileName = "工程费用数据导入模板.xlsx";
     		List<WorkContentInvestmentCost> list = Lists.newArrayList(); 
     		new ExportExcel("工程费用数据", WorkContentInvestmentCost.class, 1).setDataList(list).write(response, fileName).dispose();
     		return null;
 		} catch (Exception e) {
 			addMessage(redirectAttributes, "导入模板下载失败！失败信息："+e.getMessage());
-		}
+		}*/
 		return "redirect:"+Global.getAdminPath()+"/workcontentinvestmentcost/workContentInvestmentCost/?repage";
     }
 

src/main/java/com/jeeplus/modules/workcontent/web/WorkFiveDirectionsAffirmController.java

@@ -6,6 +6,7 @@ package com.jeeplus.modules.workcontent.web;
 import com.google.common.collect.Lists;
 import com.jeeplus.common.config.Global;
 import com.jeeplus.common.utils.StringUtils;
+import com.jeeplus.common.utils.ThisLocalityDownloadUtil;
 import com.jeeplus.common.utils.excel.ExportExcel;
 import com.jeeplus.common.utils.excel.ImportExcel;
 import com.jeeplus.common.web.BaseController;
@@ -142,16 +143,24 @@ public class WorkFiveDirectionsAffirmController extends BaseController {
 			ImportExcel ei = new ImportExcel(file, 1, 0);
             List<WorkFiveDirectionsAffirm> list = ei.getDataList(WorkFiveDirectionsAffirm.class);
 			List<WorkFiveDirectionsAffirm> listAll = new ArrayList<>();
-			for (WorkFiveDirectionsAffirm investmentCost : list) {
+			//标题为两行 过滤第一行标题行
+			for(int i = 0; i <list.size();i++){
+				if(i>0){
+					if(StringUtils.isNotBlank(list.get(i).getOwnerPurchasingRequisitionNum()) && null != list.get(i).getOwnerMaterialCode() && null != list.get(i).getOwnerMaterialDescription() && null != list.get(i).getOwnerUnits()){
+						listAll.add(list.get(i));
+					}
+				}
+			}
+			/*for (WorkFiveDirectionsAffirm investmentCost : list) {
 				if(StringUtils.isNotBlank(investmentCost.getOwnerPurchasingRequisitionNum()) && null != investmentCost.getOwnerMaterialCode() && null != investmentCost.getOwnerMaterialDescription() && null != investmentCost.getOwnerUnits()){
 					listAll.add(investmentCost);
 				}
-			}
+			}*/
             responseEntity.setData(listAll);
 		} catch (Exception e) {
-		    logger.error("导入工程费用失败！",e);
+		    logger.error("导入甲供物资五方确认表失败！",e);
 		    responseEntity.setCode(400);
-		    responseEntity.setMessage("导入工程费用失败！"+e.getMessage());
+		    responseEntity.setMessage("导入甲供物资五方确认表失败！"+e.getMessage());
 		}
 		return responseEntity;
     }
@@ -160,15 +169,21 @@ public class WorkFiveDirectionsAffirmController extends BaseController {
 	 * 下载导入设计概算编制审核调整数据模板
 	 */
     @RequestMapping(value = "import/template")
-    public String importFileTemplate(HttpServletResponse response, RedirectAttributes redirectAttributes) {
+	public String importFileTemplate(HttpServletResponse response, HttpServletRequest request, RedirectAttributes redirectAttributes) {
 		try {
+			ThisLocalityDownloadUtil download = new ThisLocalityDownloadUtil();
+			download.download("甲供物资五方确认表.xlsx",request,response);
+		} catch (Exception e) {
+			logger.error("甲供物资五方确认表模板下载失败！",e);
+		}
+    	/*try {
             String fileName = "设计概算编制审核调整数据导入模板.xlsx";
     		List<WorkFiveDirectionsAffirm> list = Lists.newArrayList();
     		new ExportExcel("设计概算编制审核调整数据", WorkFiveDirectionsAffirm.class, 1).setDataList(list).write(response, fileName).dispose();
     		return null;
 		} catch (Exception e) {
 			addMessage(redirectAttributes, "导入模板下载失败！失败信息："+e.getMessage());
-		}
+		}*/
 		return "redirect:"+Global.getAdminPath()+"/fiveDirectionsAffirm/workFiveDirectionsAffirmList/?repage";
     }
 	

src/main/java/com/jeeplus/modules/workcontent/web/WorkMaterialsPriceController.java

@@ -6,6 +6,7 @@ package com.jeeplus.modules.workcontent.web;
 import com.google.common.collect.Lists;
 import com.jeeplus.common.config.Global;
 import com.jeeplus.common.utils.StringUtils;
+import com.jeeplus.common.utils.ThisLocalityDownloadUtil;
 import com.jeeplus.common.utils.excel.ExportExcel;
 import com.jeeplus.common.utils.excel.ImportExcel;
 import com.jeeplus.common.web.BaseController;
@@ -134,9 +135,9 @@ public class WorkMaterialsPriceController extends BaseController {
 			}
             responseEntity.setData(listAll);
 		} catch (Exception e) {
-		    logger.error("暂定材料价审核审核表失败！",e);
+		    logger.error("暂定材料价的审核、特殊材料价格的询价审核表失败！",e);
 		    responseEntity.setCode(400);
-		    responseEntity.setMessage("暂定材料价审核审核表失败！"+e.getMessage());
+		    responseEntity.setMessage("暂定材料价的审核、特殊材料价格的询价审核表失败！"+e.getMessage());
 		}
 		return responseEntity;
     }
@@ -145,15 +146,21 @@ public class WorkMaterialsPriceController extends BaseController {
 	 * 下载导入设计概算编制审核调整数据模板
 	 */
     @RequestMapping(value = "import/template")
-    public String importFileTemplate(HttpServletResponse response, RedirectAttributes redirectAttributes) {
+	public String importFileTemplate(HttpServletResponse response, HttpServletRequest request, RedirectAttributes redirectAttributes) {
 		try {
+			ThisLocalityDownloadUtil download = new ThisLocalityDownloadUtil();
+			download.download("暂定材料价的审核、特殊材料价格的询价审核表.xlsx",request,response);
+		} catch (Exception e) {
+			logger.error("暂定材料价的审核、特殊材料价格的询价审核表模板下载失败！",e);
+		}
+    	/*try {
             String fileName = "暂定材料价审核导入模板.xlsx";
     		List<WorkMaterialsPrice> list = Lists.newArrayList();
     		new ExportExcel("暂定材料价审核调整数据", WorkMaterialsPrice.class, 1).setDataList(list).write(response, fileName).dispose();
     		return null;
 		} catch (Exception e) {
 			addMessage(redirectAttributes, "导入模板下载失败！失败信息："+e.getMessage());
-		}
+		}*/
 		return "redirect:"+Global.getAdminPath()+"/workMaterialsPrice/workMaterialsPrice/?repage";
     }
 	

src/main/java/com/jeeplus/modules/workcontent/web/WorkPreliminaryDesignEstimateController.java

@@ -6,6 +6,7 @@ package com.jeeplus.modules.workcontent.web;
 import com.google.common.collect.Lists;
 import com.jeeplus.common.config.Global;
 import com.jeeplus.common.utils.StringUtils;
+import com.jeeplus.common.utils.ThisLocalityDownloadUtil;
 import com.jeeplus.common.utils.excel.ExportExcel;
 import com.jeeplus.common.utils.excel.ImportExcel;
 import com.jeeplus.common.web.BaseController;
@@ -126,15 +127,21 @@ public class WorkPreliminaryDesignEstimateController extends BaseController {
 	 * 下载导入设计概算编制审核调整数据模板
 	 */
     @RequestMapping(value = "import/template")
-    public String importFileTemplate(HttpServletResponse response, RedirectAttributes redirectAttributes) {
+    public String importFileTemplate(HttpServletResponse response, HttpServletRequest request, RedirectAttributes redirectAttributes) {
 		try {
+			ThisLocalityDownloadUtil download = new ThisLocalityDownloadUtil();
+			download.download("工程初步设计概算审查表.xlsx",request,response);
+		} catch (Exception e) {
+			logger.error("工程初步设计概算审查表模板下载失败！",e);
+		}
+    	/*try {
             String fileName = "设计概算编制审核调整数据导入模板.xlsx";
     		List<WorkPreliminaryDesignEstimate> list = Lists.newArrayList();
     		new ExportExcel("设计概算编制审核调整数据", WorkPreliminaryDesignEstimate.class, 1).setDataList(list).write(response, fileName).dispose();
     		return null;
 		} catch (Exception e) {
 			addMessage(redirectAttributes, "导入模板下载失败！失败信息："+e.getMessage());
-		}
+		}*/
 		return "redirect:"+Global.getAdminPath()+"/workPreliminary/workPreliminaryDesignEstimate/?repage";
     }
 	

src/main/java/com/jeeplus/modules/workcontent/web/WorkScheduleController.java

@@ -6,6 +6,7 @@ package com.jeeplus.modules.workcontent.web;
 import com.google.common.collect.Lists;
 import com.jeeplus.common.config.Global;
 import com.jeeplus.common.utils.StringUtils;
+import com.jeeplus.common.utils.ThisLocalityDownloadUtil;
 import com.jeeplus.common.utils.excel.ExportExcel;
 import com.jeeplus.common.utils.excel.ImportExcel;
 import com.jeeplus.common.web.BaseController;
@@ -146,15 +147,21 @@ public class WorkScheduleController extends BaseController {
 	 * 下载导入设计概算编制审核调整数据模板
 	 */
     @RequestMapping(value = "import/template")
-    public String importFileTemplate(HttpServletResponse response, RedirectAttributes redirectAttributes) {
+    public String importFileTemplate(HttpServletResponse response, HttpServletRequest request, RedirectAttributes redirectAttributes) {
 		try {
+			ThisLocalityDownloadUtil download = new ThisLocalityDownloadUtil();
+			download.download("工程进度款明细表.xlsx",request,response);
+		} catch (Exception e) {
+			logger.error("工程进度款明细表模板下载失败！",e);
+		}
+    	/*try {
             String fileName = "工程进度款审核导入模板.xlsx";
     		List<WorkMaterialsPrice> list = Lists.newArrayList();
     		new ExportExcel("工程进度款审核调整数据", WorkMaterialsPrice.class, 1).setDataList(list).write(response, fileName).dispose();
     		return null;
 		} catch (Exception e) {
 			addMessage(redirectAttributes, "导入模板下载失败！失败信息："+e.getMessage());
-		}
+		}*/
 		return "redirect:"+Global.getAdminPath()+"/workSchedule/workSchedule/?repage";
     }
 	

src/main/webapp/WEB-INF/tags/table/importExcelCostHideImport.tag

@@ -16,7 +16,7 @@
 			<select id="concealType" name="conceal">
 				<option value="">请选择</option>
 				<option value="workSiteLevel" selected="">场平工程量确认单</option>
-				<option value="workConcealProject">屏蔽工程量确认单</option>
+				<option value="workConcealProject">隐蔽工程量确认单</option>
 			</select>
 		</div>
 
@@ -33,7 +33,15 @@
 				content:$("#importBox").html() ,
 				btn: ['下载模板','确定', '关闭'],
 				btn1: function(index, layero){
-					window.location.href='${url}/template';
+					var type = top.$("#concealType").val();
+					if(null == type || "" == type) {
+						top.layer.open({
+							title: '提示'
+							, content: '请选择需要下载的数据类型'
+						});
+						return false;
+					}
+					window.location.href='${url}/template?type='+type;
 				},
 				btn2: function(index, layero){
 					var formData = new FormData();

src/main/webapp/webpage/modules/workcontent/workClaimList.jsp

@@ -28,7 +28,7 @@
 <form id="subForm"  action="#" onsubmit="return false;" method="post" class="form-horizontal">
     <div class="layui-item nav-btns" style="padding-left:0px;">
         <a class="nav-btn nav-btn-add" onclick="addRowCost('#investmentCostList',investmentCostIdx,investmentCostTpl)" title="新增"><i class="fa fa-plus"></i> 新增</a>
-        <table:importExcelCost url="${ctx}/workContent/workContentCompleteAccount/import"></table:importExcelCost><!-- 导入按钮 -->
+        <table:importExcelCost url="${ctx}/project/projectClaim/import"></table:importExcelCost><!-- 导入按钮 -->
     </div>
 
     <table id="contentTable" class="table table-bordered table-condensed can-edit">

src/main/webapp/webpage/modules/workcontent/workContentBranchAccountList.jsp

@@ -33,7 +33,7 @@
         <c:if test="${sign =='branchAccount'}">
             <div class="layui-item nav-btns" style="padding-left:0px;">
                 <a class="nav-btn nav-btn-add" onclick="addRowCost('#investmentCostList',investmentCostIdx,investmentCostTpl)" title="新增"><i class="fa fa-plus"></i> 新增</a>
-                <table:importExcelCost url="${ctx}/workcontentbranchaccount/workContentBranchAccount/import"></table:importExcelCost><!-- 导入按钮 -->
+                <table:importExcelCost url="${ctx}/workcontentbranchaccount/workcontentBranchAccount/import"></table:importExcelCost><!-- 导入按钮 -->
             </div>
 
             <table id="contentTable" class="table table-bordered table-condensed can-edit">

src/main/webapp/webpage/modules/workcontent/workDesignChangeList.jsp

@@ -28,7 +28,7 @@
 <form id="subForm"  action="#" onsubmit="return false;" method="post" class="form-horizontal">
     <div class="layui-item nav-btns" style="padding-left:0px;">
         <a class="nav-btn nav-btn-add" onclick="addRowCost('#investmentCostList',investmentCostIdx,investmentCostTpl)" title="新增"><i class="fa fa-plus"></i> 新增</a>
-        <table:importExcelCost url="${ctx}/workContent/workContentCompleteAccount/import"></table:importExcelCost><!-- 导入按钮 -->
+        <table:importExcelCost url="${ctx}/project/projectDesignChange/import"></table:importExcelCost><!-- 导入按钮 -->
     </div>
 
     <table id="contentTable" class="table table-bordered table-condensed can-edit">

src/main/webapp/webpage/modules/workcontent/workMaterialsPriceList.jsp

@@ -37,7 +37,7 @@
         <c:if test="${sign =='materialsPrice'}">
             <div class="layui-item nav-btns" style="padding-left:0px;">
                 <a class="nav-btn nav-btn-add" onclick="addRowCost('#workScheduleList',preliminaryIdx,preliminaryTpl)" title="新增"><i class="fa fa-plus"></i> 新增</a>
-                <table:importExcelCost url="${ctx}/workPreliminary/workPreliminaryDesignEstimate/import"></table:importExcelCost><!-- 导入按钮 -->
+                <table:importExcelCost url="${ctx}/workMaterialsPrice/workMaterialsPrice/import"></table:importExcelCost><!-- 导入按钮 -->
             </div>
 
             <table id="contentTable" class="table table-bordered table-condensed can-edit">

src/main/webapp/webpage/modules/workcontent/workScheduleList.jsp

@@ -37,7 +37,7 @@
         <c:if test="${sign =='workSchedule'}">
             <div class="layui-item nav-btns" style="padding-left:0px;">
                 <a class="nav-btn nav-btn-add" onclick="addRowCost('#workScheduleList',preliminaryIdx,preliminaryTpl)" title="新增"><i class="fa fa-plus"></i> 新增</a>
-                <table:importExcelCost url="${ctx}/workPreliminary/workPreliminaryDesignEstimate/import"></table:importExcelCost><!-- 导入按钮 -->
+                <table:importExcelCost url="${ctx}/workSchedule/workSchedule/import"></table:importExcelCost><!-- 导入按钮 -->
             </div>
 
             <table id="contentTable" class="table table-bordered table-condensed can-edit">

src/main/webapp/webpage/modules/workcontent/workSiteVisaList.jsp

@@ -27,7 +27,7 @@
 <form id="subForm"  action="#" onsubmit="return false;" method="post" class="form-horizontal">
     <div class="layui-item nav-btns" style="padding-left:0px;">
         <a class="nav-btn nav-btn-add" onclick="addRowCost('#investmentCostList',investmentCostIdx,investmentCostTpl)" title="新增"><i class="fa fa-plus"></i> 新增</a>
-        <table:importExcelCost url="${ctx}/workContent/workContentCompleteAccount/import"></table:importExcelCost><!-- 导入按钮 -->
+        <table:importExcelCost url="${ctx}/project/projectVisa/import"></table:importExcelCost><!-- 导入按钮 -->
     </div>
 
     <table id="contentTable" class="table table-bordered table-condensed can-edit">