新增归属年份字段，修改，导入，导出模板

src/main/java/com/jeeplus/modules/act/web/ActTaskController.java

@@ -549,6 +549,13 @@ public class ActTaskController extends BaseController {
             }
             String comment = URLDecoder.decode(act.getComment(), "UTF-8");
             act.setComment(comment);
+            String processingType = construction.getQuantity().getProcessingType();
+            if (processingType == null || "".equals(processingType)) {
+
+            } else {
+                //有政策处理问题，暂定为1
+                materialProjectService.updatePolicyStatus(construction1.getReserveProjectName());
+            }
             actTaskService.engineering(act,construction1);
         } catch (UnsupportedEncodingException e) {
             e.printStackTrace();

src/main/java/com/jeeplus/modules/sg/managementcenter/materialproject/entity/MaterialProject.java

@@ -42,53 +42,7 @@ public class MaterialProject extends DataEntity<MaterialProject>{
 
     private String secondPower;//是否二次设电 1-未二次涉电 1-二次涉电
 
-    public String getSecondPower() {
-        return secondPower;
-    }
-
-    public void setSecondPower(String secondPower) {
-        this.secondPower = secondPower;
-    }
-
-    public String getArrageProject1() {
-        return arrageProject1;
-    }
-
-    public void setArrageProject1(String arrageProject1) {
-        this.arrageProject1 = arrageProject1;
-    }
 
-    public String getArrageProject() {
-        return arrageProject;
-    }
-
-    public void setArrageProject(String arrageProject) {
-        this.arrageProject = arrageProject;
-    }
-
-    public String[] getReserveCodes() {
-        return reserveCodes;
-    }
-
-    public void setReserveCodes(String[] reserveCodes) {
-        this.reserveCodes = reserveCodes;
-    }
-
-    public String[] getProjectCodes() {
-        return projectCodes;
-    }
-
-    public void setProjectCodes(String[] projectCodes) {
-        this.projectCodes = projectCodes;
-    }
-
-    public String getProjectStatus() {
-        return projectStatus;
-    }
-
-    public void setProjectStatus(String projectStatus) {
-        this.projectStatus = projectStatus;
-    }
 
     @ExcelField(title="储备项目名称", align=2, sort=1)
     public String getReserveProjectName() {
@@ -99,16 +53,7 @@ public class MaterialProject extends DataEntity<MaterialProject>{
         this.reserveProjectName = reserveProjectName;
     }
 
-    @ExcelField(title="项目名称", align=2, sort=2)
-    public String getProjectName() {
-        return projectName;
-    }
-
-    public void setProjectName(String projectName) {
-        this.projectName = projectName;
-    }
-
-    @ExcelField(title="储备编码", align=2, sort=3)
+    @ExcelField(title="储备编码", align=2, sort=2)
     public String getReserveCode() {
         return reserveCode;
     }
@@ -117,6 +62,7 @@ public class MaterialProject extends DataEntity<MaterialProject>{
         this.reserveCode = reserveCode;
     }
 
+    @ExcelField(title="项目类型", align=2, sort=3)
     public String getProjectType() {
         return projectType;
     }
@@ -125,6 +71,7 @@ public class MaterialProject extends DataEntity<MaterialProject>{
         this.projectType = projectType;
     }
 
+    @ExcelField(title="项目计划年度批次", align=2, sort=4)
     public String getBatchPlan() {
         return batchPlan;
     }
@@ -133,6 +80,7 @@ public class MaterialProject extends DataEntity<MaterialProject>{
         this.batchPlan = batchPlan;
     }
 
+    @ExcelField(title="项目正式发文批次", align=2, sort=5)
     public String getIssuePlan() {
         return issuePlan;
     }
@@ -141,6 +89,7 @@ public class MaterialProject extends DataEntity<MaterialProject>{
         this.issuePlan = issuePlan;
     }
 
+    @ExcelField(title="项目年度实施计划", align=2, sort=6)
     public String getMonthPlan() {
         return monthPlan;
     }
@@ -149,6 +98,7 @@ public class MaterialProject extends DataEntity<MaterialProject>{
         this.monthPlan = monthPlan;
     }
 
+    @ExcelField(title="年度计划有无预测", align=2, sort=7)
     public String getHasPlan() {
         return hasPlan;
     }
@@ -157,6 +107,7 @@ public class MaterialProject extends DataEntity<MaterialProject>{
         this.hasPlan = hasPlan;
     }
 
+    @ExcelField(title="项目物资执行计划", align=2, sort=8)
     public String getHalfPlan() {
         return halfPlan;
     }
@@ -165,6 +116,7 @@ public class MaterialProject extends DataEntity<MaterialProject>{
         this.halfPlan = halfPlan;
     }
 
+    @ExcelField(title="项目定义", align=2, sort=9)
     public String getProjectId() {
         return projectId;
     }
@@ -173,14 +125,16 @@ public class MaterialProject extends DataEntity<MaterialProject>{
         this.projectId = projectId;
     }
 
-    public String getIsSecondary() {
-        return isSecondary;
+    @ExcelField(title="项目名称", align=2, sort=10)
+    public String getProjectName() {
+        return projectName;
     }
 
-    public void setIsSecondary(String isSecondary) {
-        this.isSecondary = isSecondary;
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
     }
 
+    @ExcelField(title="归属年份", align=2, sort=11)
     public String getAttributionYear() {
         return attributionYear;
     }
@@ -188,4 +142,60 @@ public class MaterialProject extends DataEntity<MaterialProject>{
     public void setAttributionYear(String attributionYear) {
         this.attributionYear = attributionYear;
     }
+
+    public String getIsSecondary() {
+        return isSecondary;
+    }
+
+    public void setIsSecondary(String isSecondary) {
+        this.isSecondary = isSecondary;
+    }
+
+    public String getSecondPower() {
+        return secondPower;
+    }
+
+    public void setSecondPower(String secondPower) {
+        this.secondPower = secondPower;
+    }
+
+    public String getArrageProject1() {
+        return arrageProject1;
+    }
+
+    public void setArrageProject1(String arrageProject1) {
+        this.arrageProject1 = arrageProject1;
+    }
+
+    public String getArrageProject() {
+        return arrageProject;
+    }
+
+    public void setArrageProject(String arrageProject) {
+        this.arrageProject = arrageProject;
+    }
+
+    public String[] getReserveCodes() {
+        return reserveCodes;
+    }
+
+    public void setReserveCodes(String[] reserveCodes) {
+        this.reserveCodes = reserveCodes;
+    }
+
+    public String[] getProjectCodes() {
+        return projectCodes;
+    }
+
+    public void setProjectCodes(String[] projectCodes) {
+        this.projectCodes = projectCodes;
+    }
+
+    public String getProjectStatus() {
+        return projectStatus;
+    }
+
+    public void setProjectStatus(String projectStatus) {
+        this.projectStatus = projectStatus;
+    }
 }

src/main/java/com/jeeplus/modules/sg/managementcenter/materialproject/mapper/MaterialProjectMapper.java

@@ -25,4 +25,9 @@ public interface MaterialProjectMapper extends BaseMapper<MaterialProject> {
     void updateList(List<MaterialProject> materialProjectList);
 
     List<MaterialProject> findJugdeReserve(MaterialProject materialProject);
+
+    /**
+     *根据项目名称修改项目政策处理状态
+     * */
+    void updatePolicyStatus(String reserveProjectName);
 }

src/main/java/com/jeeplus/modules/sg/managementcenter/materialproject/mapper/xml/MaterialProjectMapper.xml

@@ -19,7 +19,8 @@
 		a.hasPlan,
 		a.halfPlan,
 		a.projectName,
-		a.projectId
+		a.projectId,
+        a.attributionYear
     </sql>
 
 
@@ -164,7 +165,8 @@
                                         hasPlan,
                                         halfPlan,
                                         projectName,
-                                        projectId)
+                                        projectId,
+                                        attributionYear)
         VALUES (#{id},
                 #{createBy.id},
                 #{createDate},
@@ -181,7 +183,9 @@
                 #{hasPlan},
                 #{halfPlan},
                 #{projectName},
-                #{projectId})
+                #{projectId},
+                #{attributionYear}
+                )
     </insert>
 
     <insert id="insertList">
@@ -202,7 +206,8 @@
         hasPlan,
         halfPlan,
         projectName,
-        projectId
+        projectId,
+        attributionYear
         ) VALUES
         <foreach collection="list" item="item" index="index" separator=",">
             (
@@ -222,7 +227,8 @@
             #{item.hasPlan},
             #{item.halfPlan},
             #{item.projectName},
-            #{item.projectId}
+            #{item.projectId},
+            #{item.attributionYear}
             )
         </foreach>
     </insert>
@@ -245,7 +251,8 @@
         hasPlan,
         halfPlan,
         projectName,
-        projectId
+        projectId,
+        attributionYear
         ) VALUES
         <foreach collection="list" item="item" index="index" separator=",">
             (
@@ -265,7 +272,8 @@
             #{item.hasPlan},
             #{item.halfPlan},
             #{item.projectName},
-            #{item.projectId}
+            #{item.projectId},
+            #{item.attributionYear}
             )
         </foreach>
     </insert>
@@ -282,7 +290,8 @@
             hasPlan            = #{hasPlan},
             halfPlan           = #{halfPlan},
             projectName        = #{projectName},
-            projectId          = #{projectId}
+            projectId          = #{projectId},
+            attributionYear    = #{attributionYear}
         WHERE id = #{id}
     </update>
 
@@ -298,7 +307,8 @@
             hasPlan = #{item.hasPlan},
             halfPlan = #{item.halfPlan},
             projectName = #{item.projectName},
-            projectId = #{item.projectId}
+            projectId = #{item.projectId},
+            attributionYear = #{item.attributionYear}
             where reserveProjectName = #{item.reserveProjectName}
         </foreach>
     </update>

src/main/java/com/jeeplus/modules/sg/managementcenter/materialproject/service/MaterialProjectService.java

@@ -117,4 +117,12 @@ public class MaterialProjectService extends CrudService<MaterialProjectMapper, M
 	public List<MaterialProject> findJugdeReserve(MaterialProject materialProject){
 		return materialProjectMapper.findJugdeReserve(materialProject);
 	}
+
+	/**
+	 *根据项目名称修改项目政策处理状态
+	 * */
+	@Transactional(readOnly = false)
+	public void updatePolicyStatus(String reserveProjectName) {
+		materialProjectMapper.updatePolicyStatus(reserveProjectName);
+	}
 }

src/main/java/com/jeeplus/modules/sg/managementcenter/materialproject/util/MaterialProUtil.java

@@ -33,6 +33,7 @@ public  class MaterialProUtil {
                 materialProject.setHalfPlan((String)importUtil.getCellValue(row,7));
                 materialProject.setProjectId((String)importUtil.getCellValue(row,8));
                 materialProject.setProjectName((String)importUtil.getCellValue(row,9));
+                materialProject.setAttributionYear((String)importUtil.getCellValue(row,10));
                 list.add(materialProject);
             }
         }

src/main/java/com/jeeplus/modules/sg/managementcenter/materialproject/web/MaterialProjectController.java

@@ -14,7 +14,9 @@ import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.web.BaseController;
 import com.jeeplus.modules.act.service.ActProcessService;
 import com.jeeplus.modules.act.service.ActTaskService;
+import com.jeeplus.modules.sg.audit.information.entity.append;
 import com.jeeplus.modules.sg.managementcenter.activiti.utils.MyActiviUtils;
+import com.jeeplus.modules.sg.managementcenter.activiti.utils.MyImportUtils;
 import com.jeeplus.modules.sg.managementcenter.materialinfo.entity.MaterialInfo;
 import com.jeeplus.modules.sg.managementcenter.materialinfo.service.MaterialInfoService;
 import com.jeeplus.modules.sg.managementcenter.materialproject.entity.MaterialProject;
@@ -23,6 +25,7 @@ import com.jeeplus.modules.sg.managementcenter.materialproject.util.ImportUtil;
 import com.jeeplus.modules.sg.managementcenter.materialproject.util.MaterialProUtil;
 import com.jeeplus.modules.sg.managementcenter.project.entity.Project;
 import com.jeeplus.modules.sg.managementcenter.project.service.ProjectService;
+import com.jeeplus.modules.sg.managementcenter.project.util.ProjectImportUtil;
 import com.jeeplus.modules.sg.materialmodule.activiti.entity.NonPower;
 import com.jeeplus.modules.sg.materialmodule.activiti.service.NonPowerService;
 import com.jeeplus.modules.sg.picking.activiti.entity.ShowList;
@@ -116,8 +119,12 @@ public class MaterialProjectController extends BaseController {
     @RequiresPermissions(value = {"managementcenter:materialproject:view", "managementcenter:materialproject:add", "managementcenter:materialproject:edit"}, logical = Logical.OR)
     @RequestMapping(value = "form")
     public String form(MaterialProject materialProject, Model model) {
-        List<MaterialProject> list = materialProjectService.findBatch();
-        model.addAttribute("batch", list);
+        Boolean aBoolean = ProjectImportUtil.CHECKACQ(materialProject.getReserveProjectName());
+        if (aBoolean) {
+            model.addAttribute("aBoolean", true);
+        } else {
+            model.addAttribute("aBoolean", false);
+        }
         model.addAttribute("materialProject", materialProject);
         return "modules/sg/managementcenter/materialproject/materialProjectForm";
     }
@@ -148,7 +155,7 @@ public class MaterialProjectController extends BaseController {
         Project byName = projectService.findByName(materialProject.getReserveProjectName());
         if ("2".equals(byName.getStatus())) {
             String acquisitionStatus = byName.getAcquisitionStatus();
-            if ("0".equals(acquisitionStatus) || "1".equals(acquisitionStatus)) {
+            if ("0".equals(acquisitionStatus)) {
                 if ("0".equals(acquisitionStatus)) {
                     //获取项目第几次发起领料
                     String number = showListService.findNumber(projectId);
@@ -161,13 +168,8 @@ public class MaterialProjectController extends BaseController {
                     showList.setProjectId(projectId);
                     showList.setProjectName(projectName);
                     showList.setReserveProjectName(reserveProjectName);
-                } else {
-                    showList.setTheNumber("1");
-                    showList.setProjectName(projectName);
-                    showList.setReserveProjectName(reserveProjectName);
-                    showList.setProjectId(projectId);
+                    showListService.updateAcqStatus(reserveProjectName);
                 }
-                showListService.updateAcqStatus(reserveProjectName);
                 //保存数据
                 showListService.save(showList);
                 // 启动物资领料流程
@@ -265,6 +267,26 @@ public class MaterialProjectController extends BaseController {
         return j;
     }
 
+
+    /**
+     * 年度物资上报模板下载
+     */
+    @ResponseBody
+    @RequestMapping(value = "templates")
+    public AjaxJson importFileTemplateS(HttpServletResponse response) {
+        AjaxJson j = new AjaxJson();
+        try {
+            String fileName = "年度物资模板.xlsx";
+            List<append> list = Lists.newArrayList();
+            new ExportExcel("", MaterialProject.class, 1).setDataList(list).write(response, fileName).dispose();
+            return null;
+        } catch (Exception e) {
+            j.setSuccess(false);
+            j.setMsg("导入送审下载失败！失败信息：" + e.getMessage());
+        }
+        return j;
+    }
+
     /**
      * 项目列表导出
      *
@@ -314,10 +336,11 @@ public class MaterialProjectController extends BaseController {
 //			Boolean materialProjectFlag = MaterialProUtil.getMaterialProjectFlag(importUtil);
             //获取导入表格所有数据
             List<MaterialProject> materialProjects = MaterialProUtil.getProjectUtil(importUtil);
+            //新建表格用来存储符合现有项目信息的list
             List<MaterialProject> updateList = new ArrayList<>();
             //获取所以已经存在储备项目暂定名称的项目
             List<String> allReserveName = materialProjectService.findAllReserveName();
-            //判断没有项目结束导入
+            //判断没有项目-结束导入
             if (allReserveName.size() <= 0) {
                 j.setSuccess(true);
                 return j;
@@ -330,7 +353,21 @@ public class MaterialProjectController extends BaseController {
                     }
                 }
             }
-            //判断项目是否发送流程，发送流程的项目，无法修改
+            //判断项目是否已经发起物资领料流程，若发送流程不可修改项目定义号及项目名称
+            for (MaterialProject materialProject : updateList
+            ) {
+                Project byName = projectService.findByName(materialProject.getReserveProjectName());
+                String acquisitionStatus = byName.getAcquisitionStatus();
+                String advanceStatus = byName.getAdvanceStatus();
+                String constructionStatus = byName.getConstructionStatus();
+                String settStatus = byName.getSettStatus();
+                //判断是否在流程中
+                if (!"0".equals(acquisitionStatus) || !"0".equals(constructionStatus) || !"0".equals(settStatus) || !"0".equals(advanceStatus)) {
+                    materialProject.setProjectId(byName.getProjectId());
+                    materialProject.setProjectName(byName.getProjectName());
+                }
+            }
+            //获取项目定义号和项目名称部位空的数据，便于判断项目定义号是否循环
             List<MaterialProject> needList = new ArrayList<>();
             for (MaterialProject m : updateList
             ) {
@@ -340,7 +377,7 @@ public class MaterialProjectController extends BaseController {
                     needList.add(m);
                 }
             }
-            //等到可以发送施工交底流程，土建流程项目信息
+            //获取可以发送施工交底流程，土建流程x项目信息
             for (MaterialProject pro : needList
             ) {
                 ShowList showList = new ShowList();
@@ -350,29 +387,12 @@ public class MaterialProjectController extends BaseController {
                 Project byName = projectService.findByName(pro.getReserveProjectName());
                 if ("2".equals(byName.getStatus())) {
                     String acquisitionStatus = byName.getAcquisitionStatus();
-                    if ("0".equals(acquisitionStatus) || "1".equals(acquisitionStatus)) {
-                        if ("1".equals(acquisitionStatus)) {
-                            //获取项目第几次发起领料
-                            String number = showListService.findNumber(projectId);
-                            int a = 0;
-                            if (number != null && !"".equals(number)) {
-                                int i = Integer.parseInt(number);
-                                 a = i + 1;
-                            } else {
-                                a = 1;
-                            }
-                            showList.setTheNumber(String.valueOf(a));
-                            showList.setsVersion(MyActiviUtils.findDic().getValue());
-                            showList.setProjectId(projectId);
-                            showList.setProjectName(projectName);
-                            showList.setReserveProjectName(reserveProjectName);
-                        } else {
-                            showList.setsVersion(MyActiviUtils.findDic().getValue());
-                            showList.setTheNumber("1");
-                            showList.setProjectName(projectName);
-                            showList.setReserveProjectName(reserveProjectName);
-                            showList.setProjectId(projectId);
-                        }
+                    if ("0".equals(acquisitionStatus)) {
+                        showList.setsVersion(MyActiviUtils.findDic().getValue());
+                        showList.setTheNumber("1");
+                        showList.setProjectName(projectName);
+                        showList.setReserveProjectName(reserveProjectName);
+                        showList.setProjectId(projectId);
                         showListService.updateAcqStatus(reserveProjectName);
                         //保存数据
                         showListService.save(showList);

src/main/java/com/jeeplus/modules/sg/managementcenter/project/entity/Project.java

@@ -36,6 +36,8 @@ public class Project extends DataEntity<Project> {
     private String whetherCloseStatus;
     //结算状态
     private String settStatus;
+    //政策处理状态
+    private String policyStatus;
     //判断项目是否可以提前发起领料
     private String earlyMaterial;
     //判断项目是否可以提前施工
@@ -155,6 +157,14 @@ public class Project extends DataEntity<Project> {
         this.settStatus = settStatus;
     }
 
+    public String getPolicyStatus() {
+        return policyStatus;
+    }
+
+    public void setPolicyStatus(String policyStatus) {
+        this.policyStatus = policyStatus;
+    }
+
     public String getEarlyMaterial() {
         return earlyMaterial;
     }

src/main/java/com/jeeplus/modules/sg/managementcenter/project/entity/Project1.java

@@ -1,751 +0,0 @@
-package com.jeeplus.modules.sg.managementcenter.project.entity;
-
-import com.jeeplus.common.utils.excel.annotation.ExcelField;
-import com.jeeplus.core.persistence.DataEntity;
-
-import java.util.List;
-
-public class Project1 extends DataEntity<Project1> {
-    private static final long serialVersionUID = 1L;
-    private String serialNumber;
-    private String type;//类型
-    private String demandUnit;//需求提出单位
-    private String bdzName;//变电站名称
-    private String lineName;//线路名称
-    private String requireName;//需求项目名称
-
-    private String reserveNumber;//储备编号
-
-    private String projectId;//工程编号
-    private String projectName;//项目名称
-    private String projectNumber;//项目定义号
-    private String projectManageRole;//配网项目经理
-    private String distributionEngineering;//配网工程专职
-    private String distributionMaterials;//配网物资专职
-    private String distributionSystem;//配网系统专职
-    private String distributionPolicy;//配网政策处理专职
-    private String managementLeader;//项目管理中心领导
-
-    private String skillByFull;//项目管理中心技经专职
-
-    private String runUnit;//运行单位
-    private String runUnitRole;//运行单位角色(储备)
-
-    private String runUnitInspectionRole;//运行单位角色（运检）
-
-    private String throughResearchRole;//经研所角色
-
-    private String constructionContractUnit; //施工合同单位
-    private Double constructionContractRate; //施工合同率
-    private String constructionContractSub; //施工分包单位
-
-    private String constructionUnit;//施工单位
-    private String constructionUnitRole;//施工单位角色
-    private String constructionUnitManage;//施工单位项目经理
-    private String constructionUnitLeader;//施工单位领导
-
-    private String constructionSkillByFull;//施工单位技经专职
-
-
-    private String designUnit;//设计单位
-    private String designUnitManage;//设计单位角色
-    private String designUnitLeader;//施工 单位领导
-    private String clarificaitonType;//交底类型
-    private String bulidClassificationResons;//建设理由分类
-    private String bulbidResons;//建设理由
-    private String asicEquipment;//设备基本情况
-    private String runTheClass;//运行班
-
-    private String projectTeam;//项目组（不要）
-
-    private Double costEstimate;//费用估算
-    private String whetherRheUpwind;//是否迎风期度夏项目
-    private String sureDaDate;//确定下达时间
-    private String textRemark;//备注
-    private String powerLine;//停电线路
-    private String powerScope;//停电范围
-    private List<String> powerScopeList;//停电范围拆分list
-    private String rezkey;
-
-    public String getRezkey() {
-        return rezkey;
-    }
-
-    public void setRezkey(String rezkey) {
-        this.rezkey = rezkey;
-    }
-
-    public List<String> getPowerScopeList() {
-        return powerScopeList;
-    }
-
-    public void setPowerScopeList(List<String> powerScopeList) {
-        this.powerScopeList = powerScopeList;
-    }
-
-    private String projectType;//项目类型
-    private String powerFlagPackage;//是否为停电打包项目
-    private String preliminaryJudgment;//证处初步判断
-    private String flagCivilEngineering;//是否含土建（不含钢管杆）
-    private String steelTubePole;//钢管杆基础类型
-    private String flagApprovalPlanning;//是否需要规矩报批
-    private String equCreateType;//设备改造类型
-    private String equCreateSize;//改造设备尺寸及间隔数
-    private String flagNewEquName;//是否新设备命名
-    private String includeBdzNews;//是否含变电站新闻格投运
-    private String flagNoElectrical;//是否非涉电电气施工
-    private String drawingsWork;//图纸标注的带点作业情况
-    private String flagAutomation;//是否含自动化
-    private String twoAndThreeRemote;//二或三
-    private String phoneStyle;//通信方式
-    private String stayOpenArea;//柱开集中或就业地
-    private String ringNetworkCabinet;//环网柜DTU户内或户外
-
-    private String automatedRemarks;//自动化备注
-
-    private String stationDtu;//站房DTU
-    private String status;//
-    private String acquisitionStatus;//领料状态
-    private String constructionStatus;//施工状态
-    private String whetherCloseStatus;//是否项目关闭
-    private String settStatus;
-    private Integer earlyMaterial;//判断项目是否可以提前发起领料
-    private Integer preConstruction;//判断项目是否可以提前施工
-
-    private String loginNameFind;//登录名称
-    private String loginNameFindStats;//登录状态
-
-    public String getLoginNameFind() {
-        return loginNameFind;
-    }
-
-    public void setLoginNameFind(String loginNameFind) {
-        this.loginNameFind = loginNameFind;
-    }
-
-    public String getLoginNameFindStats() {
-        return loginNameFindStats;
-    }
-
-    public void setLoginNameFindStats(String loginNameFindStats) {
-        this.loginNameFindStats = loginNameFindStats;
-    }
-
-    @ExcelField(title = "序号", align = 2, sort = 1)
-    public String getSerialNumber() {
-        return serialNumber;
-    }
-
-    public void setSerialNumber(String serialNumber) {
-        this.serialNumber = serialNumber;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public String getAcquisitionStatus() {
-        return acquisitionStatus;
-    }
-
-    public void setAcquisitionStatus(String acquisitionStatus) {
-        this.acquisitionStatus = acquisitionStatus;
-    }
-
-    public String getConstructionStatus() {
-        return constructionStatus;
-    }
-
-    public void setConstructionStatus(String constructionStatus) {
-        this.constructionStatus = constructionStatus;
-    }
-
-    public String getWhetherCloseStatus() {
-        return whetherCloseStatus;
-    }
-
-    public void setWhetherCloseStatus(String whetherCloseStatus) {
-        this.whetherCloseStatus = whetherCloseStatus;
-    }
-
-    public String getSettStatus() {
-        return settStatus;
-    }
-
-    public void setSettStatus(String settStatus) {
-        this.settStatus = settStatus;
-    }
-
-    @ExcelField(title = "类型", align = 2, sort = 2)
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    @ExcelField(title = "需求提出单位", align = 2, sort = 3)
-    public String getDemandUnit() {
-        return demandUnit;
-    }
-
-    public void setDemandUnit(String demandUnit) {
-        this.demandUnit = demandUnit;
-    }
-
-    @ExcelField(title = "变电站名称", align = 2, sort = 4)
-    public String getBdzName() {
-        return bdzName;
-    }
-
-    public void setBdzName(String bdzName) {
-        this.bdzName = bdzName;
-    }
-
-    @ExcelField(title = "线路名称", align = 2, sort = 5)
-    public String getLineName() {
-        return lineName;
-    }
-
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
-    }
-
-    @ExcelField(title = "项目需求名称", align = 2, sort = 6)
-    public String getRequireName() {
-        return requireName;
-    }
-
-    @ExcelField(title = "工程编号", align = 2, sort = 7)
-    public String getProjectId() {
-        return projectId;
-    }
-
-    public void setProjectId(String projectId) {
-        this.projectId = projectId;
-    }
-
-    @ExcelField(title = "项目名称", align = 2, sort = 8)
-    public String getProjectName() {
-        return projectName;
-    }
-
-    public void setProjectName(String projectName) {
-        this.projectName = projectName;
-    }
-
-    @ExcelField(title = "项目定义号", align = 2, sort = 9)
-    public String getProjectNumber() {
-        return projectNumber;
-    }
-
-    public void setProjectNumber(String projectNumber) {
-        this.projectNumber = projectNumber;
-    }
-
-    @ExcelField(title = "项目经理角色", align = 2, sort = 10)
-    public String getProjectManageRole() {
-        return projectManageRole;
-    }
-
-    @ExcelField(title = "配网工程专职角色", align = 2, sort = 11)
-    public String getDistributionEngineering() {
-        return distributionEngineering;
-    }
-
-    public void setDistributionEngineering(String distributionEngineering) {
-        this.distributionEngineering = distributionEngineering;
-    }
-
-    @ExcelField(title = "配网物资专职角色", align = 2, sort = 12)
-    public String getDistributionMaterials() {
-        return distributionMaterials;
-    }
-
-    public void setDistributionMaterials(String distributionMaterials) {
-        this.distributionMaterials = distributionMaterials;
-    }
-
-    @ExcelField(title = "配网系统专职角色", align = 2, sort = 13)
-    public String getDistributionSystem() {
-        return distributionSystem;
-    }
-
-    public void setDistributionSystem(String distributionSystem) {
-        this.distributionSystem = distributionSystem;
-    }
-
-    @ExcelField(title = "配网政策处理专职角色", align = 2, sort = 14)
-    public String getDistributionPolicy() {
-        return distributionPolicy;
-    }
-
-    public void setDistributionPolicy(String distributionPolicy) {
-        this.distributionPolicy = distributionPolicy;
-    }
-
-    @ExcelField(title = "项目管理中心领导角色", align = 2, sort = 15)
-    public String getManagementLeader() {
-        return managementLeader;
-    }
-
-    public void setManagementLeader(String managementLeader) {
-        this.managementLeader = managementLeader;
-    }
-
-    @ExcelField(title = "运行单位", align = 2, sort = 16)
-    public String getRunUnit() {
-        return runUnit;
-    }
-
-    public void setRunUnit(String runUnit) {
-        this.runUnit = runUnit;
-    }
-
-    @ExcelField(title = "运行单位角色", align = 2, sort = 17)
-    public String getRunUnitRole() {
-        return runUnitRole;
-    }
-
-    public void setRunUnitRole(String runUnitRole) {
-        this.runUnitRole = runUnitRole;
-    }
-
-    @ExcelField(title = "经研所角色", align = 2, sort = 18)
-    public String getThroughResearchRole() {
-        return throughResearchRole;
-    }
-
-    public void setThroughResearchRole(String throughResearchRole) {
-        this.throughResearchRole = throughResearchRole;
-    }
-
-    public void setProjectManageRole(String projectManageRole) {
-        this.projectManageRole = projectManageRole;
-    }
-
-    @ExcelField(title = "施工单位", align = 2, sort = 19)
-    public String getConstructionUnit() {
-        return constructionUnit;
-    }
-
-    public void setConstructionUnit(String constructionUnit) {
-        this.constructionUnit = constructionUnit;
-    }
-
-    @ExcelField(title = "施工单位角色", align = 2, sort = 20)
-    public String getConstructionUnitRole() {
-        return constructionUnitRole;
-    }
-
-    @ExcelField(title = "施工单位项目经理", align = 2, sort = 21)
-    public String getConstructionUnitManage() {
-        return constructionUnitManage;
-    }
-
-    public void setConstructionUnitManage(String constructionUnitManage) {
-        this.constructionUnitManage = constructionUnitManage;
-    }
-    @ExcelField(title = "施工单位领导", align = 2, sort = 22)
-    public String getConstructionUnitLeader() {
-        return constructionUnitLeader;
-    }
-
-    public void setConstructionUnitLeader(String constructionUnitLeader) {
-        this.constructionUnitLeader = constructionUnitLeader;
-    }
-
-    @ExcelField(title = "设计单位", align = 2, sort = 23)
-    public String getDesignUnit() {
-        return designUnit;
-    }
-
-    public void setDesignUnit(String designUnit) {
-        this.designUnit = designUnit;
-    }
-
-    @ExcelField(title = "设计单位角色", align = 2, sort = 24)
-    public String getDesignUnitManage() {
-        return designUnitManage;
-    }
-
-    public void setDesignUnitManage(String designUnitManage) {
-        this.designUnitManage = designUnitManage;
-    }
-
-    @ExcelField(title = "设计单位领导", align = 2, sort = 25)
-    public String getDesignUnitLeader() {
-        return designUnitLeader;
-    }
-
-    public void setDesignUnitLeader(String designUnitLeader) {
-        this.designUnitLeader = designUnitLeader;
-    }
-
-    public void setConstructionUnitRole(String constructionUnitRole) {
-        this.constructionUnitRole = constructionUnitRole;
-    }
-
-    @ExcelField(title = "交底类型", align = 2, sort = 26)
-    public String getClarificaitonType() {
-        return clarificaitonType;
-    }
-
-    public void setClarificaitonType(String clarificaitonType) {
-        this.clarificaitonType = clarificaitonType;
-    }
-
-    public void setRequireName(String requireName) {
-        this.requireName = requireName;
-    }
-
-    @ExcelField(title = "建设理由分类", align = 2, sort = 27)
-    public String getBulidClassificationResons() {
-        return bulidClassificationResons;
-    }
-
-    public void setBulidClassificationResons(String bulidClassificationResons) {
-        this.bulidClassificationResons = bulidClassificationResons;
-    }
-
-    @ExcelField(title = "建设理由", align = 2, sort = 28)
-    public String getBulbidResons() {
-        return bulbidResons;
-    }
-
-    public void setBulbidResons(String bulbidResons) {
-        this.bulbidResons = bulbidResons;
-    }
-
-    @ExcelField(title = "设备基本情况", align = 2, sort = 29)
-    public String getAsicEquipment() {
-        return asicEquipment;
-    }
-
-    public void setAsicEquipment(String asicEquipment) {
-        this.asicEquipment = asicEquipment;
-    }
-
-    @ExcelField(title = "运行班", align = 2, sort = 30)
-    public String getRunTheClass() {
-        return runTheClass;
-    }
-
-    public void setRunTheClass(String runTheClass) {
-        this.runTheClass = runTheClass;
-    }
-
-    public String getProjectTeam() {
-        return projectTeam;
-    }
-
-    public void setProjectTeam(String projectTeam) {
-        this.projectTeam = projectTeam;
-    }
-
-    @ExcelField(title = "费用估算", align = 2, sort = 32)
-    public Double getCostEstimate() {
-        return costEstimate;
-    }
-
-    public void setCostEstimate(Double costEstimate) {
-        this.costEstimate = costEstimate;
-    }
-
-    @ExcelField(title = "是否迎风期度夏项目", align = 2, sort = 33)
-    public String getWhetherRheUpwind() {
-        return whetherRheUpwind;
-    }
-
-    public void setWhetherRheUpwind(String whetherRheUpwind) {
-        this.whetherRheUpwind = whetherRheUpwind;
-    }
-
-    @ExcelField(title = "确定下达时间", align = 2, sort = 34)
-    public String getSureDaDate() {
-        return sureDaDate;
-    }
-
-    public void setSureDaDate(String sureDaDate) {
-        this.sureDaDate = sureDaDate;
-    }
-
-    @ExcelField(title = "备注", align = 2, sort = 35)
-    public String getTextRemark() {
-        return textRemark;
-    }
-
-    public static long getSerialVersionUID() {
-        return serialVersionUID;
-    }
-
-    public void setTextRemark(String textRemark) {
-        this.textRemark = textRemark;
-    }
-
-    @ExcelField(title = "停电线路", align = 2, sort = 36)
-    public String getPowerLine() {
-        return powerLine;
-    }
-
-    public void setPowerLine(String powerLine) {
-        this.powerLine = powerLine;
-    }
-
-    @ExcelField(title = "停电范围", align = 2, sort = 37)
-    public String getPowerScope() {
-        return powerScope;
-    }
-
-    public void setPowerScope(String powerScope) {
-        this.powerScope = powerScope;
-    }
-
-    @ExcelField(title = "项目类型", align = 2, sort = 38)
-    public String getProjectType() {
-        return projectType;
-    }
-
-    public void setProjectType(String projectType) {
-        this.projectType = projectType;
-    }
-
-    @ExcelField(title = "是否为停电打包项目", align = 2, sort = 39)
-    public String getPowerFlagPackage() {
-        return powerFlagPackage;
-    }
-
-    public void setPowerFlagPackage(String powerFlagPackage) {
-        this.powerFlagPackage = powerFlagPackage;
-    }
-
-    @ExcelField(title = "证处初步判断", align = 2, sort = 40)
-    public String getPreliminaryJudgment() {
-        return preliminaryJudgment;
-    }
-
-    public void setPreliminaryJudgment(String preliminaryJudgment) {
-        this.preliminaryJudgment = preliminaryJudgment;
-    }
-
-    @ExcelField(title = "是否含土建（不含钢管杆）", align = 2, sort = 41)
-    public String getFlagCivilEngineering() {
-        return flagCivilEngineering;
-    }
-
-    public void setFlagCivilEngineering(String flagCivilEngineering) {
-        this.flagCivilEngineering = flagCivilEngineering;
-    }
-
-    @ExcelField(title = "钢管杆基础类型", align = 2, sort = 42)
-    public String getSteelTubePole() {
-        return steelTubePole;
-    }
-
-    public void setSteelTubePole(String steelTubePole) {
-        this.steelTubePole = steelTubePole;
-    }
-
-    @ExcelField(title = "是否需要规矩报批", align = 2, sort = 43)
-    public String getFlagApprovalPlanning() {
-        return flagApprovalPlanning;
-    }
-
-    public void setFlagApprovalPlanning(String flagApprovalPlanning) {
-        this.flagApprovalPlanning = flagApprovalPlanning;
-    }
-
-    @ExcelField(title = "设备改造类型", align = 2, sort = 44)
-    public String getEquCreateType() {
-        return equCreateType;
-    }
-
-    public void setEquCreateType(String equCreateType) {
-        this.equCreateType = equCreateType;
-    }
-
-    @ExcelField(title = "改造设备尺寸及间隔数", align = 2, sort = 45)
-    public String getEquCreateSize() {
-        return equCreateSize;
-    }
-
-    public void setEquCreateSize(String equCreateSize) {
-        this.equCreateSize = equCreateSize;
-    }
-
-    @ExcelField(title = "是否新设备命名", align = 2, sort = 46)
-    public String getFlagNewEquName() {
-        return flagNewEquName;
-    }
-
-    public void setFlagNewEquName(String flagNewEquName) {
-        this.flagNewEquName = flagNewEquName;
-    }
-
-    @ExcelField(title = "是否含变电站新闻隔投运", align = 2, sort = 47)
-    public String getIncludeBdzNews() {
-        return includeBdzNews;
-    }
-
-    public void setIncludeBdzNews(String includeBdzNews) {
-        this.includeBdzNews = includeBdzNews;
-    }
-
-    @ExcelField(title = "是否非涉电电气施工", align = 2, sort = 48)
-    public String getFlagNoElectrical() {
-        return flagNoElectrical;
-    }
-
-    public void setFlagNoElectrical(String flagNoElectrical) {
-        this.flagNoElectrical = flagNoElectrical;
-    }
-
-    @ExcelField(title = "图纸标注的带点作业情况", align = 2, sort = 49)
-    public String getDrawingsWork() {
-        return drawingsWork;
-    }
-
-    public void setDrawingsWork(String drawingsWork) {
-        this.drawingsWork = drawingsWork;
-    }
-
-    @ExcelField(title = "是否含自动化", align = 2, sort = 50)
-    public String getFlagAutomation() {
-        return flagAutomation;
-    }
-
-    public void setFlagAutomation(String flagAutomation) {
-        this.flagAutomation = flagAutomation;
-    }
-
-    @ExcelField(title = "二摇或三摇", align = 2, sort = 51)
-    public String getTwoAndThreeRemote() {
-        return twoAndThreeRemote;
-    }
-
-    public void setTwoAndThreeRemote(String twoAndThreeRemote) {
-        this.twoAndThreeRemote = twoAndThreeRemote;
-    }
-
-    @ExcelField(title = "通信方式", align = 2, sort = 52)
-    public String getPhoneStyle() {
-        return phoneStyle;
-    }
-
-    public void setPhoneStyle(String phoneStyle) {
-        this.phoneStyle = phoneStyle;
-    }
-
-    @ExcelField(title = "柱开集中或就业地", align = 2, sort = 53)
-    public String getStayOpenArea() {
-        return stayOpenArea;
-    }
-
-    public void setStayOpenArea(String stayOpenArea) {
-        this.stayOpenArea = stayOpenArea;
-    }
-
-    @ExcelField(title = "环网柜", align = 2, sort = 54)
-    public String getRingNetworkCabinet() {
-        return ringNetworkCabinet;
-    }
-
-    public void setRingNetworkCabinet(String ringNetworkCabinet) {
-        this.ringNetworkCabinet = ringNetworkCabinet;
-    }
-
-    @ExcelField(title = "站房DTU", align = 2, sort = 55)
-    public String getStationDtu() {
-        return stationDtu;
-    }
-
-
-    public void setStationDtu(String stationDtu) {
-        this.stationDtu = stationDtu;
-    }
-
-    public Integer getEarlyMaterial() {
-        return earlyMaterial;
-    }
-
-    public void setEarlyMaterial(Integer earlyMaterial) {
-        this.earlyMaterial = earlyMaterial;
-    }
-
-    public Integer getPreConstruction() {
-        return preConstruction;
-    }
-
-    public void setPreConstruction(Integer preConstruction) {
-        this.preConstruction = preConstruction;
-    }
-    @ExcelField(title = "储备编号", align = 2, sort = 31)
-    public String getReserveNumber() {
-        return reserveNumber;
-    }
-
-    public void setReserveNumber(String reserveNumber) {
-        this.reserveNumber = reserveNumber;
-    }
-    @ExcelField(title = "项目管理中心技经专职", align = 2, sort = 56)
-    public String getSkillByFull() {
-        return skillByFull;
-    }
-
-    public void setSkillByFull(String skillByFull) {
-        this.skillByFull = skillByFull;
-    }
-    @ExcelField(title = "运行单位角色（运检", align = 2, sort = 57)
-    public String getRunUnitInspectionRole() {
-        return runUnitInspectionRole;
-    }
-
-    public void setRunUnitInspectionRole(String runUnitInspectionRole) {
-        this.runUnitInspectionRole = runUnitInspectionRole;
-    }
-    @ExcelField(title = "施工合同单位", align = 2, sort = 58)
-    public String getConstructionContractUnit() {
-        return constructionContractUnit;
-    }
-
-    public void setConstructionContractUnit(String constructionContractUnit) {
-        this.constructionContractUnit = constructionContractUnit;
-    }
-    @ExcelField(title = "施工合同率", align = 2, sort =59)
-    public Double getConstructionContractRate() {
-        return constructionContractRate;
-    }
-
-    public void setConstructionContractRate(Double constructionContractRate) {
-        this.constructionContractRate = constructionContractRate;
-    }
-    @ExcelField(title = "施工分包单位", align = 2, sort = 60)
-    public String getConstructionContractSub() {
-        return constructionContractSub;
-    }
-
-    public void setConstructionContractSub(String constructionContractSub) {
-        this.constructionContractSub = constructionContractSub;
-    }
-    @ExcelField(title = "施工单位技经专职", align = 2, sort = 61)
-    public String getConstructionSkillByFull() {
-        return constructionSkillByFull;
-    }
-
-    public void setConstructionSkillByFull(String constructionSkillByFull) {
-        this.constructionSkillByFull = constructionSkillByFull;
-    }
-    @ExcelField(title = "自动化备注", align = 2, sort = 62)
-    public String getAutomatedRemarks() {
-        return automatedRemarks;
-    }
-
-    public void setAutomatedRemarks(String automatedRemarks) {
-        this.automatedRemarks = automatedRemarks;
-    }
-}

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

@@ -40,7 +40,7 @@
 		b.workAreaRemarks AS `basicInformation.workAreaRemarks`
     </sql>
     <sql id="assignmentColumns">
-        c.reserveProjectName as `assignment.reserveProjectName`,
+            c.reserveProjectName as `assignment.reserveProjectName`,
             c.disclosureType as `assignment.disclosureType`,
             c.projectReleaseBatch as `assignment.projectReleaseBatch`,
             c.deliveryDate as `assignment.deliveryDate`,
@@ -1384,6 +1384,10 @@
         a.status,
         a.acquisitionStatus,
         a.advanceStatus,
+        a.constructionStatus,
+        a.settStatus,
+        a.policyStatus,
+        a.whetherCloseStatus,
         <include refid="assignmentColumns"/>
         from xm_material_project a
         LEFT JOIN xm_construction_clarificaiton b
@@ -1391,6 +1395,7 @@
         left join xm_project_assignment c
         on a.reserveProjectName = c.reserveProjectName
         where a.reserveProjectName = #{reserveProjectName};
+
     </select>
     <select id="findMaterialProject"
             resultType="com.jeeplus.modules.sg.managementcenter.project.entity.Project">

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

@@ -449,6 +449,23 @@ public class ProjectImportUtil {
     }
 
     /**
+     * 根据储备项目名称查询项目是否在流程中
+     */
+    public static Boolean CHECKACQ(String name) {
+        Project process = projectMapper.findProcess(name);
+        String acquisitionStatus = process.getAcquisitionStatus();
+        String advanceStatus = process.getAdvanceStatus();
+        String constructionStatus = process.getConstructionStatus();
+        String whetherCloseStatus = process.getWhetherCloseStatus();
+        String settStatus = process.getSettStatus();
+        if ("0".equals(acquisitionStatus) && "0".equals(constructionStatus) && "0".equals(whetherCloseStatus) && "0".equals(settStatus) && "0".equals(advanceStatus)) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    /**
      * 判断人员是否存在
      */
     public static String checkMember(Project project) {

src/main/webapp/webpage/modules/sg/managementcenter/materialproject/materialProjectForm.jsp

@@ -84,11 +84,31 @@
 				<tr>
 					<td class="width-15 active"><label class="pull-right">项目定义：</label></td>
 					<td class="width-35">
-						<form:input path="projectId" htmlEscape="false"    class="form-control required"/>
+						<c:choose>
+							<c:when test="${!aBoolean}">
+								<form:input path="projectId" readonly="true" htmlEscape="false"  class="form-control required"/>
+							</c:when>
+							<c:otherwise>
+								<form:input path="projectId" htmlEscape="false"  class="form-control required"/>
+							</c:otherwise>
+						</c:choose>
 					</td>
 					<td class="width-15 active"><label class="pull-right">项目名称：</label></td>
 					<td class="width-35">
-						<form:input path="projectName" htmlEscape="false"    class="form-control required"/>
+						<c:choose>
+							<c:when test="${!aBoolean}">
+								<form:input path="projectName" readonly="true" htmlEscape="false"  class="form-control required"/>
+							</c:when>
+							<c:otherwise>
+								<form:input path="projectName" htmlEscape="false"  class="form-control required"/>
+							</c:otherwise>
+						</c:choose>
+					</td>
+				</tr>
+				<tr>
+					<td class="width-15 active"><label class="pull-right">归属年份：</label></td>
+					<td class="width-35">
+						<form:input path="attributionYear" htmlEscape="false" class="form-control required"/>
 					</td>
 				</tr>
 		 	</tbody>

src/main/webapp/webpage/modules/sg/managementcenter/materialproject/materialProjectList.js

@@ -138,7 +138,10 @@ $(document).ready(function() {
                ,{
                    field: 'projectName',
                    title: '项目名称'
-               }
+               },{
+                       field: 'attributionYear',
+                       title: '归属年份'
+                   }
 
 		     ]
 		
@@ -163,8 +166,11 @@ $(document).ready(function() {
             auto: true,
             title:"导入数据",
             content: "${ctx}/tag/importExcel" ,
-            btn: ['确定', '关闭'],
-            btn1: function(index, layero){
+            btn: ['导出模板','确定', '关闭'],
+            btn1: function () {
+                jp.downloadFile('${ctx}/managementcenter/materialproject/templates')
+            },
+            btn2: function(index, layero){
                 var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
                 iframeWin.contentWindow.importExcel('${ctx}/managementcenter/materialproject/import', function (data) {
                     if(data.success){
@@ -177,8 +183,7 @@ $(document).ready(function() {
                 });//调用保存事件
                 return false;
             },
-
-            btn2: function(index){
+            btn3: function(index){
                 //  jp.close(index);
             }
         });