20200108

src/main/java/com/jeeplus/core/persistence/Page.java

@@ -23,7 +23,7 @@ import com.jeeplus.common.utils.CookieUtils;
  * @version 2016-7-2
  * @param <T>
  */
-public class Page<T>{
+public class Page<T> implements Serializable{
 	
 	protected int pageNo = 1; // 当前页码
 	protected int pageSize = Integer.valueOf(Global.getConfig("page.pageSize")); // 页面大小，设置为“-1”表示不进行分页（分页无效）

src/main/java/com/jeeplus/modules/act/service/ActTaskService.java

@@ -6,6 +6,8 @@ package com.jeeplus.modules.act.service;
 import java.io.InputStream;
 import java.util.*;
 
+import com.jeeplus.modules.sg.advence.activiti.entity.Advance;
+import com.jeeplus.modules.sg.advence.activiti.service.AdvanceService;
 import com.jeeplus.modules.sg.managementcenter.activiti.entity.Construction;
 import com.jeeplus.modules.sg.managementcenter.activiti.entity.Disclose;
 import com.jeeplus.modules.sg.managementcenter.activiti.entity.ProcessPersonnel;
@@ -102,6 +104,9 @@ public class ActTaskService extends BaseService {
 	private ConstructionService constructionService;
 	@Autowired
 	private ShowListService showListService;
+
+	@Autowired
+	private AdvanceService advanceService;
 	/**
 	 * 获取待办任务列表
 	 * @return
@@ -2446,4 +2451,36 @@ public class ActTaskService extends BaseService {
 		complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
 	}
 
+
+	/**
+	 * 保存审核意见
+	 * @param act
+	 */
+	@Transactional(readOnly = false)
+	public void contructionManager(Act act) {
+		// 设置意见
+		act.setComment(("yes".equals(act.getFlag())?"[同意] ":"[驳回] ")+act.getComment());
+		act.preUpdate();
+		// 对不同环节的业务逻辑进行操作
+		String taskDefKey = act.getTaskDefKey();
+		// 提交流程任务
+		Map<String, Object> vars = Maps.newHashMap();
+		String status = "";
+		//选择项目发起请求
+		String flag = act.getFlag();
+		String procInsId = act.getProcInsId();
+		Project project = constructionService.findNameByInsID(procInsId);
+		Advance advance = new Advance();
+		advance.setId(project.getId());
+		if ("yes".equals(flag)) {
+			status = project.getRequireName() + "提前施工通过";
+			advance.setPreConstruction(1);
+		} else {
+			status = project.getRequireName() + "提前施工未通过";
+			advance.setPreConstruction(0);
+		}
+		advanceService.updatePreConstruction(advance);
+//		act.setComment(("yes".equals(act.getFlag())?"[同意] ":"[驳回] ")+act.getComment());
+		complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
+	}
 }

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

@@ -1361,4 +1361,21 @@ public class ActTaskController extends BaseController {
 		return j;
 	}
 
+	/**
+	 * 项目经理审核流程提前施工
+	 * */
+	@ResponseBody
+	@RequestMapping(value = "contructionManager")
+	public AjaxJson contructionManager(Act act) {
+		AjaxJson j = new AjaxJson();
+		try {
+			String comment = URLDecoder.decode(act.getComment(), "UTF-8");
+			act.setComment(comment);
+			actTaskService.contructionManager(act);
+		} catch (UnsupportedEncodingException e) {
+			e.printStackTrace();
+		}
+		j.setMsg("审批成功");
+		return j;
+	}
 }

src/main/java/com/jeeplus/modules/sg/advence/activiti/entity/Advance.java

@@ -0,0 +1,615 @@
+package com.jeeplus.modules.sg.advence.activiti.entity;
+
+import com.jeeplus.common.utils.excel.annotation.ExcelField;
+import com.jeeplus.core.persistence.ActEntity;
+import com.jeeplus.core.persistence.DataEntity;
+import com.jeeplus.modules.sg.managementcenter.project.entity.Project;
+
+public class Advance extends ActEntity<Advance> {
+    private static final long serialVersionUID = 1L;
+    private String type;//类型
+    private String demandUnit;//需求提出单位
+    private String bdzName;//变电站名称
+    private String lineName;//线路名称
+    private String requireName;//需求项目名称
+    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 runUnit;//运行单位
+    private String runUnitRole;//运行单位角色
+    private String throughResearchRole;//经研所角色
+    private String constructionUnit;//施工单位
+    private String constructionUnitRole;//施工单位角色
+    private String constructionUnitManage;//施工单位项目经理
+    private String constructionUnitLeader;//施工单位领导
+    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 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;//环网柜
+    private String stationDtu;//站房dtu
+    private String itemType;//项目类型
+    private String status;
+    private String acquisitionStatus;//领料状态
+    private String constructionStatus;//施工状态
+    private String whetherCloseStatus;//是否项目关闭
+    private Integer earlyMaterial;//判断项目是否可以提前发起领料
+    private Integer preConstruction;//判断项目是否可以提前施工
+
+    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;
+    }
+
+    @ExcelField(title = "类型", align = 2, sort = 1)
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    @ExcelField(title = "需求提出单位", align = 2, sort = 2)
+    public String getDemandUnit() {
+        return demandUnit;
+    }
+
+    public void setDemandUnit(String demandUnit) {
+        this.demandUnit = demandUnit;
+    }
+
+    @ExcelField(title = "变电站名称", align = 2, sort = 3)
+    public String getBdzName() {
+        return bdzName;
+    }
+
+    public void setBdzName(String bdzName) {
+        this.bdzName = bdzName;
+    }
+
+    @ExcelField(title = "线路名称", align = 2, sort = 4)
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    @ExcelField(title = "项目需求名称", align = 2, sort = 5)
+    public String getRequireName() {
+        return requireName;
+    }
+
+    @ExcelField(title = "工程编号", align = 2, sort = 6)
+    public String getProjectId() {
+        return projectId;
+    }
+
+    public void setProjectId(String projectId) {
+        this.projectId = projectId;
+    }
+
+    @ExcelField(title = "项目名称", align = 2, sort = 7)
+    public String getProjectName() {
+        return projectName;
+    }
+
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
+
+    @ExcelField(title = "项目定义号", align = 2, sort = 8)
+    public String getProjectNumber() {
+        return projectNumber;
+    }
+
+    public void setProjectNumber(String projectNumber) {
+        this.projectNumber = projectNumber;
+    }
+
+    @ExcelField(title = "项目经理角色", align = 2, sort = 9)
+    public String getProjectManageRole() {
+        return projectManageRole;
+    }
+
+    @ExcelField(title = "配网工程专职角色", align = 2, sort = 10)
+    public String getDistributionEngineering() {
+        return distributionEngineering;
+    }
+
+    public void setDistributionEngineering(String distributionEngineering) {
+        this.distributionEngineering = distributionEngineering;
+    }
+
+    @ExcelField(title = "配网物资专职角色", align = 2, sort = 11)
+    public String getDistributionMaterials() {
+        return distributionMaterials;
+    }
+
+    public void setDistributionMaterials(String distributionMaterials) {
+        this.distributionMaterials = distributionMaterials;
+    }
+
+    @ExcelField(title = "配网系统专职角色", align = 2, sort = 12)
+    public String getDistributionSystem() {
+        return distributionSystem;
+    }
+
+    public void setDistributionSystem(String distributionSystem) {
+        this.distributionSystem = distributionSystem;
+    }
+
+    @ExcelField(title = "配网政策处理专职角色", align = 2, sort = 13)
+    public String getDistributionPolicy() {
+        return distributionPolicy;
+    }
+
+    public void setDistributionPolicy(String distributionPolicy) {
+        this.distributionPolicy = distributionPolicy;
+    }
+
+    @ExcelField(title = "项目管理中心领导角色", align = 2, sort = 14)
+    public String getManagementLeader() {
+        return managementLeader;
+    }
+
+    public void setManagementLeader(String managementLeader) {
+        this.managementLeader = managementLeader;
+    }
+
+    @ExcelField(title = "运行单位", align = 2, sort = 15)
+    public String getRunUnit() {
+        return runUnit;
+    }
+
+    public void setRunUnit(String runUnit) {
+        this.runUnit = runUnit;
+    }
+
+    @ExcelField(title = "运行单位角色", align = 2, sort = 16)
+    public String getRunUnitRole() {
+        return runUnitRole;
+    }
+
+    public void setRunUnitRole(String runUnitRole) {
+        this.runUnitRole = runUnitRole;
+    }
+
+    @ExcelField(title = "经研所角色", align = 2, sort = 17)
+    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 = 18)
+    public String getConstructionUnit() {
+        return constructionUnit;
+    }
+
+    public void setConstructionUnit(String constructionUnit) {
+        this.constructionUnit = constructionUnit;
+    }
+
+    @ExcelField(title = "施工单位角色", align = 2, sort = 19)
+    public String getConstructionUnitRole() {
+        return constructionUnitRole;
+    }
+
+    @ExcelField(title = "设计单位", align = 2, sort = 20)
+    public String getDesignUnit() {
+        return designUnit;
+    }
+
+    public void setDesignUnit(String designUnit) {
+        this.designUnit = designUnit;
+    }
+
+    @ExcelField(title = "设计单位角色", align = 2, sort = 21)
+    public String getDesignUnitManage() {
+        return designUnitManage;
+    }
+
+    public void setDesignUnitManage(String designUnitManage) {
+        this.designUnitManage = designUnitManage;
+    }
+
+    public void setConstructionUnitRole(String constructionUnitRole) {
+        this.constructionUnitRole = constructionUnitRole;
+    }
+
+    @ExcelField(title = "交底类型", align = 2, sort = 22)
+    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 = 23)
+    public String getBulidClassificationResons() {
+        return bulidClassificationResons;
+    }
+
+    public void setBulidClassificationResons(String bulidClassificationResons) {
+        this.bulidClassificationResons = bulidClassificationResons;
+    }
+
+    @ExcelField(title = "建设理由", align = 2, sort = 24)
+    public String getBulbidResons() {
+        return bulbidResons;
+    }
+
+    public void setBulbidResons(String bulbidResons) {
+        this.bulbidResons = bulbidResons;
+    }
+
+    @ExcelField(title = "设备基本情况", align = 2, sort = 25)
+    public String getAsicEquipment() {
+        return asicEquipment;
+    }
+
+    public void setAsicEquipment(String asicEquipment) {
+        this.asicEquipment = asicEquipment;
+    }
+
+    @ExcelField(title = "运行班", align = 2, sort = 26)
+    public String getRunTheClass() {
+        return runTheClass;
+    }
+
+    public void setRunTheClass(String runTheClass) {
+        this.runTheClass = runTheClass;
+    }
+
+    @ExcelField(title = "项目组", align = 2, sort = 27)
+    public String getProjectTeam() {
+        return projectTeam;
+    }
+
+    public void setProjectTeam(String projectTeam) {
+        this.projectTeam = projectTeam;
+    }
+
+    @ExcelField(title = "费用估算", align = 2, sort = 28)
+    public Double getCostEstimate() {
+        return costEstimate;
+    }
+
+    public void setCostEstimate(Double costEstimate) {
+        this.costEstimate = costEstimate;
+    }
+
+    @ExcelField(title = "是否迎风期度夏项目", align = 2, sort = 29)
+    public String getWhetherRheUpwind() {
+        return whetherRheUpwind;
+    }
+
+    public void setWhetherRheUpwind(String whetherRheUpwind) {
+        this.whetherRheUpwind = whetherRheUpwind;
+    }
+
+    @ExcelField(title = "确定下达时间", align = 2, sort = 30)
+    public String getSureDaDate() {
+        return sureDaDate;
+    }
+
+    public void setSureDaDate(String sureDaDate) {
+        this.sureDaDate = sureDaDate;
+    }
+
+    @ExcelField(title = "备注", align = 2, sort = 31)
+    public String getTextRemark() {
+        return textRemark;
+    }
+
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    public void setTextRemark(String textRemark) {
+        this.textRemark = textRemark;
+    }
+
+    @ExcelField(title = "停电线路", align = 2, sort = 32)
+    public String getPowerLine() {
+        return powerLine;
+    }
+
+    public void setPowerLine(String powerLine) {
+        this.powerLine = powerLine;
+    }
+
+    @ExcelField(title = "停电范围", align = 2, sort = 33)
+    public String getPowerScope() {
+        return powerScope;
+    }
+
+    public void setPowerScope(String powerScope) {
+        this.powerScope = powerScope;
+    }
+
+    @ExcelField(title = "项目类型", align = 2, sort = 34)
+    public String getProjectType() {
+        return projectType;
+    }
+
+    public void setProjectType(String projectType) {
+        this.projectType = projectType;
+    }
+
+    @ExcelField(title = "是否为停电打包项目", align = 2, sort = 35)
+    public String getPowerFlagPackage() {
+        return powerFlagPackage;
+    }
+
+    public void setPowerFlagPackage(String powerFlagPackage) {
+        this.powerFlagPackage = powerFlagPackage;
+    }
+
+    @ExcelField(title = "证处初步判断", align = 2, sort = 36)
+    public String getPreliminaryJudgment() {
+        return preliminaryJudgment;
+    }
+
+    public void setPreliminaryJudgment(String preliminaryJudgment) {
+        this.preliminaryJudgment = preliminaryJudgment;
+    }
+
+    @ExcelField(title = "是否含土建（不含钢管杆）", align = 2, sort = 37)
+    public String getFlagCivilEngineering() {
+        return flagCivilEngineering;
+    }
+
+    public void setFlagCivilEngineering(String flagCivilEngineering) {
+        this.flagCivilEngineering = flagCivilEngineering;
+    }
+
+    @ExcelField(title = "钢管杆基础类型", align = 2, sort = 38)
+    public String getSteelTubePole() {
+        return steelTubePole;
+    }
+
+    public void setSteelTubePole(String steelTubePole) {
+        this.steelTubePole = steelTubePole;
+    }
+
+    @ExcelField(title = "是否需要规矩报批", align = 2, sort = 39)
+    public String getFlagApprovalPlanning() {
+        return flagApprovalPlanning;
+    }
+
+    public void setFlagApprovalPlanning(String flagApprovalPlanning) {
+        this.flagApprovalPlanning = flagApprovalPlanning;
+    }
+
+    @ExcelField(title = "设备改造类型", align = 2, sort = 40)
+    public String getEquCreateType() {
+        return equCreateType;
+    }
+
+    public void setEquCreateType(String equCreateType) {
+        this.equCreateType = equCreateType;
+    }
+
+    @ExcelField(title = "改造设备尺寸及间隔数", align = 2, sort = 41)
+    public String getEquCreateSize() {
+        return equCreateSize;
+    }
+
+    public void setEquCreateSize(String equCreateSize) {
+        this.equCreateSize = equCreateSize;
+    }
+
+    @ExcelField(title = "是否新设备命名", align = 2, sort = 42)
+    public String getFlagNewEquName() {
+        return flagNewEquName;
+    }
+
+    public void setFlagNewEquName(String flagNewEquName) {
+        this.flagNewEquName = flagNewEquName;
+    }
+
+    @ExcelField(title = "是否含变电站新闻隔投运", align = 2, sort = 43)
+    public String getIncludeBdzNews() {
+        return includeBdzNews;
+    }
+
+    public void setIncludeBdzNews(String includeBdzNews) {
+        this.includeBdzNews = includeBdzNews;
+    }
+
+    @ExcelField(title = "是否非涉电电气施工", align = 2, sort = 44)
+    public String getFlagNoElectrical() {
+        return flagNoElectrical;
+    }
+
+    public void setFlagNoElectrical(String flagNoElectrical) {
+        this.flagNoElectrical = flagNoElectrical;
+    }
+
+    @ExcelField(title = "图纸标注的带点作业情况", align = 2, sort = 45)
+    public String getDrawingsWork() {
+        return drawingsWork;
+    }
+
+    public void setDrawingsWork(String drawingsWork) {
+        this.drawingsWork = drawingsWork;
+    }
+
+    @ExcelField(title = "是否含自动化", align = 2, sort = 46)
+    public String getFlagAutomation() {
+        return flagAutomation;
+    }
+
+    public void setFlagAutomation(String flagAutomation) {
+        this.flagAutomation = flagAutomation;
+    }
+
+    @ExcelField(title = "二摇或三摇", align = 2, sort = 47)
+    public String getTwoAndThreeRemote() {
+        return twoAndThreeRemote;
+    }
+
+    public void setTwoAndThreeRemote(String twoAndThreeRemote) {
+        this.twoAndThreeRemote = twoAndThreeRemote;
+    }
+
+    @ExcelField(title = "通信方式", align = 2, sort = 48)
+    public String getPhoneStyle() {
+        return phoneStyle;
+    }
+
+    public void setPhoneStyle(String phoneStyle) {
+        this.phoneStyle = phoneStyle;
+    }
+
+    @ExcelField(title = "柱开集中或就业地", align = 2, sort = 49)
+    public String getStayOpenArea() {
+        return stayOpenArea;
+    }
+
+    public void setStayOpenArea(String stayOpenArea) {
+        this.stayOpenArea = stayOpenArea;
+    }
+
+    @ExcelField(title = "环网柜", align = 2, sort = 50)
+    public String getRingNetworkCabinet() {
+        return ringNetworkCabinet;
+    }
+
+    public void setRingNetworkCabinet(String ringNetworkCabinet) {
+        this.ringNetworkCabinet = ringNetworkCabinet;
+    }
+
+    @ExcelField(title = "站房DTU", align = 2, sort = 51)
+    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 String getConstructionUnitManage() {
+        return constructionUnitManage;
+    }
+
+    public void setConstructionUnitManage(String constructionUnitManage) {
+        this.constructionUnitManage = constructionUnitManage;
+    }
+
+    public String getConstructionUnitLeader() {
+        return constructionUnitLeader;
+    }
+
+    public void setConstructionUnitLeader(String constructionUnitLeader) {
+        this.constructionUnitLeader = constructionUnitLeader;
+    }
+
+    public String getDesignUnitLeader() {
+        return designUnitLeader;
+    }
+
+    public void setDesignUnitLeader(String designUnitLeader) {
+        this.designUnitLeader = designUnitLeader;
+    }
+
+    public String getItemType() {
+        return itemType;
+    }
+
+    public void setItemType(String itemType) {
+        this.itemType = itemType;
+    }
+
+    public Integer getPreConstruction() {
+        return preConstruction;
+    }
+
+    public void setPreConstruction(Integer preConstruction) {
+        this.preConstruction = preConstruction;
+    }
+
+}

src/main/java/com/jeeplus/modules/sg/advence/activiti/mapper/AdvanceMapper.java

@@ -0,0 +1,22 @@
+/**
+ * Copyright &copy; 2015-2020 <a href="http://www.jeeplus.org/">JeePlus</a> All rights reserved.
+ */
+package com.jeeplus.modules.sg.advence.activiti.mapper;
+
+import com.jeeplus.core.persistence.BaseMapper;
+import com.jeeplus.core.persistence.annotation.MyBatisMapper;
+import com.jeeplus.modules.sg.advence.activiti.entity.Advance;
+import com.jeeplus.modules.sg.managementcenter.project.entity.Project;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 请假表单MAPPER接口
+ * @author lgf
+ * @version 2018-06-12
+ */
+@MyBatisMapper
+public interface AdvanceMapper extends BaseMapper<Advance> {
+    Integer updatePreConstruction(Advance advance);
+}

src/main/java/com/jeeplus/modules/sg/advence/activiti/mapper/xml/AdvanceMapper.xml

@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.jeeplus.modules.sg.advence.activiti.mapper.AdvanceMapper">
+    
+	<sql id="projectColumns">
+		a.id AS "id",
+		a.create_by AS "createBy.id",
+		a.create_date AS "createDate",
+		a.update_by AS "updateBy.id",
+		a.update_date AS "updateDate",
+		a.remarks AS "remarks",
+		a.del_flag AS "delFlag",
+		a.pro_type As "type",
+		a.demand_unit AS "demandUnit",
+		a.bdz_name As "bdzName",
+	  	a.line_name As "lineName",
+	  	a.require_name AS "requireName",
+	  	a.project_id AS "projectId",
+	  	a.project_name AS "projectName",
+	  	a.project_number AS "projectNumber",
+		a.project_manage_role AS "projectManageRole",
+		a.distribution_engineering AS "distributionEngineering",
+		a.distribution_materials AS "distributionMaterials",
+		a.distribution_system AS "distributionSystem",
+		a.distribution_policy AS "distributionPolicy",
+		a.management_leader AS "managementLeader",
+		a.run_unit AS "runUnit",
+		a.run_unit_role AS "runUnitRole",
+		a.through_research_role AS "throughResearchRole",
+		a.construction_unit AS "constructionUnit",
+		a.construction_unit_role AS "constructionUnitRole",
+		a.construction_unit_manage AS "constructionUnitManage",
+		a.construction_unit_leader AS "constructionUnitLeader",
+    	a.design_unit AS "design_unit",
+		a.design_unit_manage AS "designUnitManage",
+		a.design_unit_leader AS "designUnitLeader",
+		a.clarificaiton_type AS "clarificaitonType",
+		a.build_classification_resons As "bulidClassificationResons",
+		a.bulbid_resons As "bulbidResons",
+		a.asic_equipment AS "asicEquipment",
+		a.run_the_class As "runTheClass",
+		a.project_team AS "projectTeam",
+		a.cost_estimate As "costEstimate",
+		a.whether_rhe_upwind AS "whetherRheUpwind",
+		a.sure_da_date AS "sureDaDate",
+		a.text_remark AS "textRemark",
+		a.power_line AS "powerLine",
+    	a.power_scope AS "powerScope",
+    	a.project_type AS "projectType",
+        a.power_flag_package AS "powerFlagPackage",
+     	a.preliminary_judgment AS "preliminaryJudgment",
+    	a.flag_civil_engineering AS "flagCivilEngineering",
+    	a.steel_tube_pole AS "steelTubePole",
+    	a.flag_approval_planning AS "flagApprovalPlanning",
+    	a.equ_create_type AS "equCreateType",
+    	a.equ_create_size AS "equCreateSize",
+    	a.flag_new_equ_name AS "flagNewEquName",
+    	a.include_bdz_news AS "includeBdzNews",
+    	a.flag_no_electrical AS "flagNoElectrical",
+		a.drawings_work AS "drawingsWork",
+    	a.flag_automation AS "flagAutomation",
+    	a.two_and_three_remote AS "twoAndThreeRemote",
+    	a.phone_style AS "phoneStyle",
+    	a.stay_open_area AS "stayOpenArea",
+    	a.ring_network_cabinet AS "ringNetworkCabinet",
+    	a.station_dtu AS "stationDtu",
+    	a.item_type AS "itemType",
+		a.status As "status",
+		a.acquisition_status AS "acquisitionStatus",
+		a.construction_status AS "constructionStatus",
+		a.whether_close_status AS "whetherCloseStatus",
+		a.earlyMaterial AS "earlyMaterial",
+		a.preConstruction AS "preConstruction"
+	</sql>
+    
+	<select id="get" resultType="Advance" >
+		SELECT 
+			<include refid="projectColumns"/>
+		FROM xm_project_details a
+		WHERE a.id = #{id}
+	</select>
+	
+	<select id="findList" resultType="Advance" >
+		SELECT
+		<include refid="projectColumns"/>
+		FROM xm_project_details a
+		<where>
+			a.del_flag = #{DEL_FLAG_NORMAL}
+			${dataScope}
+			<if test="status != null and  status != ''">
+				AND a.status = #{status}
+			</if>
+			<if test="whetherCloseStatus != null and  whetherCloseStatus != ''">
+				AND a.whether_close_status = #{whetherCloseStatus}
+			</if>
+			<if test="id != null and  id != ''">
+				AND a.id = #{id}
+			</if>
+			<if test="requireName != null and  requireName != ''">
+				AND a.require_name LIKE CONCAT(CONCAT('%',#{requireName},'%'))
+			</if>
+			<if test="constructionUnitRole != null and  constructionUnitRole != ''">
+				AND a.construction_unit_role = #{constructionUnitRole}
+			</if>
+			<if test="earlyMaterial != null and  earlyMaterial != ''">
+				or a.earlyMaterial = #{earlyMaterial}
+			</if>
+			<if test="preConstruction != null and  preConstruction != ''">
+				or a.preConstruction = #{preConstruction}
+			</if>
+		</where>
+		<choose>
+			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+				ORDER BY ${page.orderBy}
+			</when>
+			<otherwise>
+				ORDER BY a.update_date DESC
+			</otherwise>
+		</choose>
+	</select>
+	<!--修改提前施工状态0未提前施工，1提前施工-->
+	<update id="updatePreConstruction">
+		update xm_project_details set preConstruction = #{preConstruction} where id = #{id};
+	</update>
+
+
+</mapper>

src/main/java/com/jeeplus/modules/sg/advence/activiti/service/AdvanceService.java

@@ -0,0 +1,62 @@
+/**
+ * Copyright &copy; 2015-2020 <a href="http://www.jeeplus.org/">JeePlus</a> All rights reserved.
+ */
+package com.jeeplus.modules.sg.advence.activiti.service;
+
+import java.util.List;
+import java.util.UUID;
+
+import com.jeeplus.modules.sg.advence.activiti.entity.Advance;
+import com.jeeplus.modules.sg.advence.activiti.mapper.AdvanceMapper;
+import com.jeeplus.modules.sg.financial.settlement.entity.MaintainData;
+import com.jeeplus.modules.sg.managementcenter.project.entity.Project;
+import com.jeeplus.modules.sg.managementcenter.project.mapper.ProjectMapper;
+import io.swagger.models.auth.In;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.jeeplus.core.persistence.Page;
+import com.jeeplus.core.service.CrudService;
+
+/**
+ * 请假表单Service
+ * @author lgf
+ * @version 2018-06-12
+ */
+@Service
+@Transactional(readOnly = true)
+public class AdvanceService extends CrudService<AdvanceMapper, Advance> {
+    @Autowired
+	private AdvanceMapper advanceMapper;
+
+	public Advance get(String id) {
+		Advance advance = super.get(id);
+		return advance;
+	}
+
+	public List<Advance> findList(Advance advance) {
+		return super.findList(advance);
+	}
+
+	public Page<Advance> findPage(Page<Advance> page, Advance advance) {
+		return super.findPage(page,advance);
+	}
+
+	@Transactional(readOnly = false)
+	public void save(Advance advance) {
+		super.save(advance);
+	}
+
+	@Transactional(readOnly = false)
+	public void delete(Advance advance) {
+		super.delete(advance);
+	}
+
+	//修改提前施工状态0-未提前施工 2-提前施工
+	@Transactional(readOnly = false)
+	public void updatePreConstruction(Advance advance){
+		advanceMapper.updatePreConstruction(advance);
+	}
+}

src/main/java/com/jeeplus/modules/sg/advence/activiti/web/AdvanceController.java

@@ -0,0 +1,169 @@
+/**
+ * Copyright &copy; 2015-2020 <a href="http://www.jeeplus.org/">JeePlus</a> All rights reserved.
+ */
+package com.jeeplus.modules.sg.advence.activiti.web;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.ConstraintViolationException;
+
+import com.google.common.collect.Maps;
+import com.jeeplus.modules.act.service.ActProcessService;
+import com.jeeplus.modules.act.service.ActTaskService;
+import com.jeeplus.modules.sg.advence.activiti.entity.Advance;
+import com.jeeplus.modules.sg.advence.activiti.service.AdvanceService;
+import com.jeeplus.modules.sg.managementcenter.activiti.service.ConstructionService;
+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.ImportUtil;
+import com.jeeplus.modules.sg.managementcenter.project.util.ProExcelInfo;
+import com.jeeplus.modules.sg.picking.activiti.entity.PickApplication;
+import com.jeeplus.modules.sg.picking.activiti.service.ShowListService;
+import com.jeeplus.modules.sys.utils.UserUtils;
+import org.activiti.engine.repository.ProcessDefinition;
+import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
+import org.apache.shiro.authz.annotation.Logical;
+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.multipart.MultipartFile;
+
+import com.jeeplus.common.utils.DateUtils;
+import com.jeeplus.common.json.AjaxJson;
+import com.jeeplus.core.persistence.Page;
+import com.jeeplus.core.web.BaseController;
+import com.jeeplus.common.utils.StringUtils;
+import com.jeeplus.common.utils.excel.ExportExcel;
+
+import static com.jeeplus.modules.sg.managementcenter.project.util.ProExcelInfo.getProjectUtilFlag;
+
+/**
+ * 表单Controller
+ * @author lgf
+ * @version 2018-06-12
+ */
+@Controller
+@RequestMapping(value = "${adminPath}/advance/project")
+public class AdvanceController extends BaseController {
+
+	@Autowired
+	private AdvanceService advanceService;
+
+	@Autowired
+	private ActTaskService actTaskService;
+
+	@Autowired
+	private ActProcessService actProcessService;
+
+	@Autowired
+	private ProjectService projectService;
+
+	@Autowired
+	private ShowListService showListService;
+
+	@Autowired
+	private ConstructionService constructionService;
+
+	@ModelAttribute
+	public Advance get(@RequestParam(required=false) String id) {
+		Advance entity = null;
+		if (StringUtils.isNotBlank(id)){
+			entity = advanceService.get(id);
+		}
+		if (entity == null){
+			entity = new Advance();
+		}
+		return entity;
+	}
+	
+	/**
+	 * 工程管理表单列表页面
+	 */
+	@RequestMapping(value = {"list", ""})
+	public String list(Advance advance, Model model) {
+		model.addAttribute("advance", advance);
+		return "modules/sg/managementcenter/project/projectList";
+	}
+
+	    /**
+     * 提前施工
+     */
+    @RequestMapping(value = "constructionAdvanceForm")
+    public String constructionAdvanceForm(Advance advance, Model model) {
+        model.addAttribute("advance", advance);
+        return "modules/sg/advence/activiti/constructionAdvanceForm";
+    }
+	/**
+	 * 项目经理审核
+	 * 政策处理专职发起项目，交与项目经理审核页面
+	 */
+	@RequestMapping(value = "constructionManager")
+	public String applicationAudit(PickApplication pickApplication, Model model) {
+		String id = pickApplication.getId();
+		String projectId = showListService.selectProjectId(id);
+		Project project = projectService.get(projectId);
+		model.addAttribute("pickApplication", pickApplication);
+		model.addAttribute("project", project);
+		return "modules/sg/advence/activiti/constructionManager";
+	}
+	/**
+	 * 提前施工
+	 */
+	@ResponseBody
+	@RequestMapping(value = "save")
+	public AjaxJson save(PickApplication pickApplication, Model model) throws Exception {
+		AjaxJson j = new AjaxJson();
+		/**
+		 * 后台hibernate-validation插件校验
+		 */
+		String errMsg = beanValidator(pickApplication);
+		if (StringUtils.isNotBlank(errMsg)) {
+			j.setSuccess(false);
+			j.setMsg(errMsg);
+			return j;
+		}
+		String projectId = pickApplication.getProjectId();
+		if (projectId == null||"".equals(projectId)) {
+			j.setSuccess(false);
+			j.setMsg("请选择项目");
+			return j;
+		}
+		showListService.newSave(pickApplication);
+		// 启动流程
+		// 启动流程
+		Map<String, Object> vars = Maps.newHashMap();
+		vars.put("noPass", false);
+		vars.put("pass", false);
+		String loginName = UserUtils.getUser().getLoginName();
+		//配网政策处理专职
+		String s = constructionService.nameFindOffice(loginName);
+
+		if ("施工经理".equals(s)) {
+			vars.put("noPass", true);
+			vars.put("manager", "项目经理A");
+			j.setMsg("发起流程审批成功!");
+		}else {
+			vars.put("pass", true);
+			j.setMsg("发起提前施工成功!");
+		}
+		Advance advance = new Advance();
+		advance.setId(pickApplication.getProjectId());
+		advance.setPreConstruction(1);
+		advanceService.updatePreConstruction(advance);
+		ProcessDefinition p = actProcessService.getProcessDefinition(pickApplication.getAct().getProcDefId());
+		String title = pickApplication.getCurrentUser().getName() + "在" + DateUtils.getDateTime() + "发起" + p.getName();
+		actTaskService.startProcess(p.getKey(), "md_picking_application", pickApplication.getId(), title, vars);
+		j.getBody().put("targetUrl", "/act/task/process/");
+		return j;
+	}
+}

src/main/java/com/jeeplus/modules/sg/managementcenter/materialProvided/entity/MaterialProvided.java

@@ -26,7 +26,8 @@ public class MaterialProvided extends DataEntity<MaterialProvided> {
 	private String extendedDescription;//扩展编码描述
 	private String measuringUnit;//计量单位
 	private Double referencePrice;//参考概算价格
-	private Integer version;//版本号
+	private String version;//版本号
+	private String versionName;//版本名称
 
 	public Integer getSerialNumber() {
 		return serialNumber;
@@ -107,12 +108,21 @@ public class MaterialProvided extends DataEntity<MaterialProvided> {
 	public void setReferencePrice(Double referencePrice) {
 		this.referencePrice = referencePrice;
 	}
-	@ExcelField(title="版本号", align=2, sort=10)
-	public Integer getVersion() {
+
+	@ExcelField(title="版本名称", align=2, sort=10)
+	public String getVersionName() {
+		return versionName;
+	}
+
+	public void setVersionName(String versionName) {
+		this.versionName = versionName;
+	}
+
+	public String getVersion() {
 		return version;
 	}
 
-	public void setVersion(Integer version) {
+	public void setVersion(String version) {
 		this.version = version;
 	}
 }

src/main/java/com/jeeplus/modules/sg/managementcenter/materialProvided/entity/MaterialProvidedVersion.java

@@ -0,0 +1,32 @@
+package com.jeeplus.modules.sg.managementcenter.materialProvided.entity;
+
+import com.jeeplus.core.persistence.DataEntity;
+
+public class MaterialProvidedVersion extends DataEntity<MaterialProvidedVersion> {
+    private String versionName;
+    private String versionAlias;
+
+    public String getVersionName() {
+        return versionName;
+    }
+
+    public void setVersionName(String versionName) {
+        this.versionName = versionName;
+    }
+
+    public String getVersionAlias() {
+        return versionAlias;
+    }
+
+    public void setVersionAlias(String versionAlias) {
+        this.versionAlias = versionAlias;
+    }
+
+    @Override
+    public String toString() {
+        return "MaterialProvidedVersion{" +
+                "versionName='" + versionName + '\'' +
+                ", versionAlias='" + versionAlias + '\'' +
+                '}';
+    }
+}

src/main/java/com/jeeplus/modules/sg/managementcenter/materialProvided/mapper/MaterialProvidedMapper.java

@@ -13,6 +13,4 @@ import java.util.List;
 @MyBatisMapper
 public interface MaterialProvidedMapper extends BaseMapper<MaterialProvided> {
     public Integer insertList(@Param("list") List<MaterialProvided> list);
-    Integer findMaxVersion();
-    List<MaterialProvided> findAllVersion(MaterialProvided materialProvided);
 }

src/main/java/com/jeeplus/modules/sg/managementcenter/materialProvided/mapper/MaterialProvidedVersionMapper.java

@@ -0,0 +1,20 @@
+/**
+ * Copyright &copy; 2015-2020 <a href="http://www.jeeplus.org/">JeePlus</a> All rights reserved.
+ */
+package com.jeeplus.modules.sg.managementcenter.materialProvided.mapper;
+
+import com.jeeplus.core.persistence.BaseMapper;
+import com.jeeplus.core.persistence.annotation.MyBatisMapper;
+import com.jeeplus.modules.sg.managementcenter.materialProvided.entity.MaterialProvided;
+import com.jeeplus.modules.sg.managementcenter.materialProvided.entity.MaterialProvidedVersion;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@MyBatisMapper
+public interface MaterialProvidedVersionMapper extends BaseMapper<MaterialProvidedVersion> {
+    MaterialProvidedVersion findMaxVersion();
+    List<MaterialProvidedVersion> findAllVersion();
+
+    MaterialProvidedVersion findById(MaterialProvidedVersion materialProvidedVersion);
+}

src/main/java/com/jeeplus/modules/sg/managementcenter/materialProvided/mapper/xml/MaterialProvidedMapper.xml

@@ -20,8 +20,8 @@
 		a.extendedDescription As "extendedDescription",
 		a.measuringUnit As "measuringUnit",
 		a.referencePrice As "referencePrice",
-		a.version AS "version"
-
+		a.version AS "version",
+        a.versionName AS "versionName"
 	</sql>
 	<select id="get" resultType="MaterialProvided" >
 		SELECT 
@@ -49,8 +49,8 @@
 			<if test="extendedDescription != null and  extendedDescription != ''">
 				AND a.extendedDescription LIKE CONCAT(CONCAT('%',#{extendedDescription},'%'))
 			</if>
-			<if test="version != null and  version != ''">
-				AND a.version LIKE CONCAT(CONCAT('%',#{version},'%'))
+			<if test="versionName != null and  versionName != ''">
+				AND a.versionName LIKE CONCAT(CONCAT('%',#{versionName},'%'))
 			</if>
 		</where>
 		<choose>
@@ -101,7 +101,8 @@
 			extendedDescription,
 			measuringUnit,
 			referencePrice,
-			version
+			version,
+			versionName
 		) VALUES (
 			#{id},
 			#{createBy.id},
@@ -120,7 +121,8 @@
 			#{extendedDescription},
 			#{measuringUnit},
 			#{referencePrice},
-			#{version}
+			#{version},
+			#{versionName}
 		)
 	</insert>
 
@@ -143,7 +145,8 @@
 			extendedDescription,
 			measuringUnit,
 			referencePrice,
-			version
+			version,
+            versionName
 		) VALUES
 		<foreach collection="list" item="item" index="index" separator="," >
 			(
@@ -164,7 +167,8 @@
 			#{item.extendedDescription},
 			#{item.measuringUnit},
 			#{item.referencePrice},
-			#{item.version}
+			#{item.version},
+            #{item.versionName}
 			)
 		</foreach>
 	</insert>
@@ -195,16 +199,4 @@
 		select * FROM xm_material_provided  where ${propertyName} = '${value}'
 	</select>
 
-	<!-- 查找最大的版本号 -->
-	<select id="findMaxVersion" resultType="java.lang.Integer">
-		select version from xm_material_provided group by version order by version desc LIMIT 1
-	</select>
-
-	<select id="findAllVersion" resultType="com.jeeplus.modules.sg.managementcenter.materialProvided.entity.MaterialProvided">
-		select version from xm_material_provided
-		<where>
-			del_flag = '0'
-		</where>
-		group by version order by version DESC
-	</select>
 </mapper>

src/main/java/com/jeeplus/modules/sg/managementcenter/materialProvided/mapper/xml/MaterialProvidedVersionMapper.xml

@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.jeeplus.modules.sg.managementcenter.materialProvided.mapper.MaterialProvidedVersionMapper">
+    
+	<sql id="materialColumns">
+		a.id AS "id",
+		a.create_by As "createBy.id",
+		a.create_date As "createDate",
+		a.versionName AS "versionName",
+		a.versionAlias AS "versionAlias"
+	</sql>
+	<select id="get" resultType="MaterialProvidedVersion" >
+		SELECT 
+			<include refid="materialColumns"/>
+		FROM xm_material_provided_version a
+		WHERE a.id = #{id}
+	</select>
+	
+	<select id="findList" resultType="MaterialProvidedVersion" >
+		SELECT
+			<include refid="materialColumns"/>
+		FROM xm_material_provided_version a
+		<where>
+			a.del_flag = #{DEL_FLAG_NORMAL}
+			${dataScope}
+			<if test="versionName != null  and  versionName != ''" >
+				AND a.versionName LIKE CONCAT(CONCAT('%',#{versionName},'%'))
+			</if>
+			<if test="versionAlias != null and  versionAlias != ''">
+				AND a.versionAlias LIKE CONCAT(CONCAT('%',#{versionAlias},'%'))
+			</if>
+		</where>
+		order by create_date DESC
+	</select>
+	
+	<select id="findAllList" resultType="MaterialProvidedVersion" >
+		SELECT
+			<include refid="materialColumns"/>
+		FROM xm_material_provided_version a
+			<include refid="materialColumns"/>
+		<where>
+			a.del_flag = #{DEL_FLAG_NORMAL}
+			${dataScope}
+		</where>
+		order by create_date DESC
+	</select>
+	
+	<insert id="insert">
+		INSERT INTO xm_material_provided_version(
+			id,
+			create_by,
+			create_date,
+			del_flag,
+			versionName,
+			versionAlias
+		) VALUES (
+			#{id},
+			#{createBy.id},
+			#{createDate},
+			#{delFlag},
+			#{versionName},
+			#{versionAlias}
+		)
+	</insert>
+
+	<!--物理删除-->
+	<update id="delete">
+		DELETE FROM xm_material_provided_version
+		WHERE id = #{id}
+	</update>
+	
+	<!--逻辑删除-->
+	<update id="deleteByLogic">
+		UPDATE xm_material_provided_version SET
+			del_flag = #{DEL_FLAG_DELETE}
+		WHERE id = #{id}
+	</update>
+
+	<!-- 查找最大的版本信息 -->
+	<select id="findMaxVersion" resultType="com.jeeplus.modules.sg.managementcenter.materialProvided.entity.MaterialProvidedVersion">
+		select
+		<include refid="materialColumns"/>
+		from xm_material_provided_version order by create_date desc LIMIT 1
+	</select>
+
+	<select id="findAllVersion" resultType="com.jeeplus.modules.sg.managementcenter.materialProvided.entity.MaterialProvidedVersion">
+		select
+		<include refid="materialColumns"/>
+		from
+		xm_material_provided_version
+		<where>
+			del_flag = '0'
+		</where>
+	   order by create_date DESC
+	</select>
+
+	<select id="findById" resultType="MaterialProvidedVersion" >
+		SELECT
+		<include refid="materialColumns"/>
+		FROM xm_material_provided_version a
+		<where>
+			a.del_flag = '0' and a.versionName = #{versionName}
+		</where>
+	</select>
+</mapper>

src/main/java/com/jeeplus/modules/sg/managementcenter/materialProvided/service/MaterialProvidedService.java

@@ -6,7 +6,9 @@ package com.jeeplus.modules.sg.managementcenter.materialProvided.service;
 import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.service.CrudService;
 import com.jeeplus.modules.sg.managementcenter.materialProvided.entity.MaterialProvided;
+import com.jeeplus.modules.sg.managementcenter.materialProvided.entity.MaterialProvidedVersion;
 import com.jeeplus.modules.sg.managementcenter.materialProvided.mapper.MaterialProvidedMapper;
+import com.jeeplus.modules.sg.managementcenter.materialProvided.mapper.MaterialProvidedVersionMapper;
 import com.jeeplus.modules.test.one.dialog.entity.Leave1;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -20,6 +22,9 @@ public class MaterialProvidedService extends CrudService<MaterialProvidedMapper,
 	@Autowired
 	private MaterialProvidedMapper materialProvidedMapper;
 
+	@Autowired
+	private MaterialProvidedVersionMapper materialProvidedVersionMapper;
+
 	public MaterialProvided get(String id) {
 		return super.get(id);
 	}
@@ -42,23 +47,17 @@ public class MaterialProvidedService extends CrudService<MaterialProvidedMapper,
 		super.delete(materialProvided);
 	}
 
-	public Integer findMaxVersion(){
-		return materialProvidedMapper.findMaxVersion();
-	}
-
 	@Transactional(readOnly = false)
-	public void saveList(List<MaterialProvided> list,Integer version) {
-		if (null==version){
-			version = 0;
-		}
+	public void saveList(List<MaterialProvided> list,MaterialProvidedVersion materialProvidedVersion) {
+		materialProvidedVersion.preInsert();
+		materialProvidedVersionMapper.insert(materialProvidedVersion);//保存版本信息
+		String id = materialProvidedVersion.getId();
+		String name = materialProvidedVersion.getVersionName();
 		for(MaterialProvided materialProvided : list){
 			materialProvided.preInsert();
-			materialProvided.setVersion(version+1);
+			materialProvided.setVersion(id);
+			materialProvided.setVersionName(name);
 		}
 		materialProvidedMapper.insertList(list);
 	}
-
-	public List<MaterialProvided> findAllVersion(MaterialProvided materialProvided){
-		return materialProvidedMapper.findAllVersion(materialProvided);
-	}
 }

src/main/java/com/jeeplus/modules/sg/managementcenter/materialProvided/service/MaterialProvidedVersionService.java

@@ -0,0 +1,58 @@
+/**
+ * Copyright &copy; 2015-2020 <a href="http://www.jeeplus.org/">JeePlus</a> All rights reserved.
+ */
+package com.jeeplus.modules.sg.managementcenter.materialProvided.service;
+
+import com.jeeplus.core.persistence.Page;
+import com.jeeplus.core.service.CrudService;
+import com.jeeplus.modules.sg.managementcenter.materialProvided.entity.MaterialProvided;
+import com.jeeplus.modules.sg.managementcenter.materialProvided.entity.MaterialProvidedVersion;
+import com.jeeplus.modules.sg.managementcenter.materialProvided.mapper.MaterialProvidedMapper;
+import com.jeeplus.modules.sg.managementcenter.materialProvided.mapper.MaterialProvidedVersionMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+@Service
+@Transactional(readOnly = true)
+public class MaterialProvidedVersionService extends CrudService<MaterialProvidedVersionMapper, MaterialProvidedVersion> {
+	@Autowired
+	private MaterialProvidedVersionMapper materialProvidedVersionMapper;
+
+	public MaterialProvidedVersion get(String id) {
+		return super.get(id);
+	}
+	
+	public List<MaterialProvidedVersion> findList(MaterialProvidedVersion materialProvidedVersion) {
+		return super.findList(materialProvidedVersion);
+	}
+	
+	public Page<MaterialProvidedVersion> findPage(Page<MaterialProvidedVersion> page,MaterialProvidedVersion materialProvidedVersion) {
+		return super.findPage(page, materialProvidedVersion);
+	}
+	
+	@Transactional(readOnly = false)
+	public void save(MaterialProvidedVersion materialProvidedVersion) {
+		super.save(materialProvidedVersion);
+	}
+	
+	@Transactional(readOnly = false)
+	public void delete(MaterialProvidedVersion materialProvidedVersion) {
+		super.delete(materialProvidedVersion);
+	}
+
+	//查找最大版本信息
+	public MaterialProvidedVersion findMaxVersion(){
+		return materialProvidedVersionMapper.findMaxVersion();
+	}
+	//查找所有版本信息
+	public List<MaterialProvidedVersion> findAllVersion(){
+		return materialProvidedVersionMapper.findAllVersion();
+	}
+	//根据版本名称查询版本id
+	public MaterialProvidedVersion findById(MaterialProvidedVersion materialProvidedVersion){
+		return materialProvidedVersionMapper.findById(materialProvidedVersion);
+	}
+}

src/main/java/com/jeeplus/modules/sg/managementcenter/materialProvided/web/MaterialProvidedController.java

@@ -10,7 +10,9 @@ import com.jeeplus.common.utils.excel.ExportExcel;
 import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.web.BaseController;
 import com.jeeplus.modules.sg.managementcenter.materialProvided.entity.MaterialProvided;
+import com.jeeplus.modules.sg.managementcenter.materialProvided.entity.MaterialProvidedVersion;
 import com.jeeplus.modules.sg.managementcenter.materialProvided.service.MaterialProvidedService;
+import com.jeeplus.modules.sg.managementcenter.materialProvided.service.MaterialProvidedVersionService;
 import com.jeeplus.modules.sg.managementcenter.materialProvided.util.ImportPro;
 import com.jeeplus.modules.sg.managementcenter.materialProvided.util.ImportUtil;
 import org.apache.shiro.authz.annotation.Logical;
@@ -36,6 +38,8 @@ public class MaterialProvidedController extends BaseController {
 
 	@Autowired
 	private MaterialProvidedService materialProvidedService;
+	@Autowired
+	private MaterialProvidedVersionService materialProvidedVersionService;
 	
 	@ModelAttribute
 	public MaterialProvided get(@RequestParam(required=false) String id) {
@@ -59,6 +63,15 @@ public class MaterialProvidedController extends BaseController {
 		return "modules/sg/managementcenter/materialProvided/materialProvided";
 	}
 
+	/**
+	 * 文件上传
+	 */
+	@RequiresPermissions("user")
+	@RequestMapping(value = "importExcel")
+	public String importExcel() {
+		return "modules/sg/managementcenter/materialProvided/importExcel";
+	}
+
 		/**
 	 * 列表数据
 	 */
@@ -76,7 +89,8 @@ public class MaterialProvidedController extends BaseController {
 	@RequiresPermissions(value={"managementcenter:materialProvided:view","managementcenter:materialProvided:add","managementcenter:materialProvided:edit"},logical=Logical.OR)
 	@RequestMapping(value = "form")
 	public String form(MaterialProvided materialProvided, Model model) {
-		List<MaterialProvided> allVersion = materialProvidedService.findAllVersion(materialProvided);
+		MaterialProvidedVersion materialProvidedVersion = new MaterialProvidedVersion();
+		List<MaterialProvidedVersion> allVersion = materialProvidedVersionService.findList(materialProvidedVersion);
 		model.addAttribute("allVersion",allVersion);
 		model.addAttribute("materialProvided", materialProvided);
 		return "modules/sg/managementcenter/materialProvided/materialProvidedForm";
@@ -88,7 +102,7 @@ public class MaterialProvidedController extends BaseController {
 	@ResponseBody
 	@RequiresPermissions(value={"managementcenter:materialProvided:add","managementcenter:materialProvided:edit"},logical=Logical.OR)
 	@RequestMapping(value = "save")
-	public AjaxJson save(MaterialProvided materialProvided, Model model) throws Exception{
+	public AjaxJson save(MaterialProvided materialProvided,MaterialProvidedVersion materialProvidedVersion1, Model model) throws Exception{
 		AjaxJson j = new AjaxJson();
 		/**
 		 * 后台hibernate-validation插件校验
@@ -99,6 +113,12 @@ public class MaterialProvidedController extends BaseController {
 			j.setMsg(errMsg);
 			return j;
 		}
+		//查询版本id
+		MaterialProvidedVersion materialProvidedVersion = materialProvidedVersionService.findById(materialProvidedVersion1);
+		if (null!=materialProvidedVersion.getId()&&!"".equals(materialProvidedVersion.getId())){
+			materialProvided.setVersion(materialProvidedVersion.getId());
+		}
+
 		//新增或编辑表单保存
 		materialProvidedService.save(materialProvided);//保存
 		j.setSuccess(true);
@@ -163,9 +183,17 @@ public class MaterialProvidedController extends BaseController {
 	@ResponseBody
 	@RequiresPermissions("managementcenter:materialProvided:import")
     @RequestMapping(value = "import")
-   	public AjaxJson importFile(@RequestParam("file")MultipartFile file, HttpServletResponse response, HttpServletRequest request) {
+   	public AjaxJson importFile(@RequestParam("file")MultipartFile file,MaterialProvidedVersion materialProvidedVersion, HttpServletResponse response, HttpServletRequest request) {
 		AjaxJson j = new AjaxJson();
+		MaterialProvidedVersion materialProvidedVersion1 = null;
+		materialProvidedVersion1 = materialProvidedVersionService.findById(materialProvidedVersion);
+		System.out.println(materialProvidedVersion1);
 		try {
+			if (null!=materialProvidedVersion1){
+				j.setSuccess(false);
+				j.setMsg("导入失败：版本名称已经存在;请更换版本名称");
+				return j;
+			}
 			StringBuilder failureMsg = new StringBuilder();
 			ImportUtil importUtil = new ImportUtil(file,1,0);
 			Boolean judgeProvided = ImportPro.getJudgeProvided(importUtil);
@@ -175,8 +203,7 @@ public class MaterialProvidedController extends BaseController {
 				return j;
 			}
 			List<MaterialProvided> materProUtil = ImportPro.getMaterProUtil(importUtil);
-			Integer maxVersion = materialProvidedService.findMaxVersion();
-			materialProvidedService.saveList(materProUtil,maxVersion);
+			materialProvidedService.saveList(materProUtil,materialProvidedVersion);
 			j.setMsg( "已成功导入甲供标准物资记录"+failureMsg);
 		} catch (Exception e) {
 			j.setSuccess(false);

src/main/java/com/jeeplus/modules/sg/managementcenter/materialinfo/entity/MaterialInfo.java

@@ -61,7 +61,7 @@ public class MaterialInfo extends DataEntity<MaterialInfo> {
         this.state = state;
     }
 
-    @ExcelField(title="储备项目名称", align=2, sort=1)
+//    @ExcelField(title="储备项目名称", align=2, sort=1)
     public String getProjectName() {
         return projectName;
     }
@@ -70,7 +70,7 @@ public class MaterialInfo extends DataEntity<MaterialInfo> {
         this.projectName = projectName;
     }
 
-    @ExcelField(title="物料编码", align=2, sort=2)
+    @ExcelField(title="物料编码", align=2, sort=1)
     public String getMaterialCode() {
         return materialCode;
     }
@@ -79,7 +79,7 @@ public class MaterialInfo extends DataEntity<MaterialInfo> {
         this.materialCode = materialCode;
     }
 
-    @ExcelField(title="物料名称", align=2, sort=3)
+    @ExcelField(title="物料名称", align=2, sort=2)
     public String getMaterialName() {
         return materialName;
     }
@@ -88,7 +88,7 @@ public class MaterialInfo extends DataEntity<MaterialInfo> {
         this.materialName = materialName;
     }
 
-    @ExcelField(title="扩展描述", align=2, sort=4)
+    @ExcelField(title="扩展描述", align=2, sort=3)
     public String getExtendDescription() {
         return extendDescription;
     }
@@ -97,7 +97,7 @@ public class MaterialInfo extends DataEntity<MaterialInfo> {
         this.extendDescription = extendDescription;
     }
 
-    @ExcelField(title="单位", align=2, sort=5)
+    @ExcelField(title="单位", align=2, sort=4)
     public String getUnit() {
         return unit;
     }
@@ -106,7 +106,7 @@ public class MaterialInfo extends DataEntity<MaterialInfo> {
         this.unit = unit;
     }
 
-    @ExcelField(title="总量", align=2, sort=6)
+    @ExcelField(title="总量", align=2, sort=5)
     public Double getTotalCount() {
         return totalCount;
     }
@@ -115,7 +115,7 @@ public class MaterialInfo extends DataEntity<MaterialInfo> {
         this.totalCount = totalCount;
     }
 
-    @ExcelField(title="单重/kg", align=2, sort=7)
+    @ExcelField(title="单重/kg", align=2, sort=6)
     public Double getWeightKg() {
         return weightKg;
     }
@@ -124,7 +124,7 @@ public class MaterialInfo extends DataEntity<MaterialInfo> {
         this.weightKg = weightKg;
     }
 
-    @ExcelField(title="总重/吨", align=2, sort=8)
+    @ExcelField(title="总重/吨", align=2, sort=7)
     public Double getWeightTon() {
         return weightTon;
     }
@@ -133,7 +133,7 @@ public class MaterialInfo extends DataEntity<MaterialInfo> {
         this.weightTon = weightTon;
     }
 
-    @ExcelField(title="甲乙供", align=2, sort=9)
+    @ExcelField(title="甲乙供", align=2, sort=8)
     public String getSupplyType() {
         return supplyType;
     }
@@ -142,7 +142,7 @@ public class MaterialInfo extends DataEntity<MaterialInfo> {
         this.supplyType = supplyType;
     }
 
-    @ExcelField(title="备注", align=2, sort=10)
+    @ExcelField(title="备注", align=2, sort=9)
     public String getNote() {
         return note;
     }

src/main/java/com/jeeplus/modules/sg/managementcenter/materialinfo/entity/MaterialInfoBean.java

@@ -0,0 +1,153 @@
+package com.jeeplus.modules.sg.managementcenter.materialinfo.entity;
+
+import com.jeeplus.common.utils.excel.annotation.ExcelField;
+import com.jeeplus.core.persistence.DataEntity;
+
+public class MaterialInfoBean extends DataEntity<MaterialInfoBean> {
+    private String[] projectNames;//项目名称（多个）
+    private String projectName;            //项目名称
+    private String materialCode;           //物料编码
+    private String materialName;         //物料名称
+    private String extendDescription;    //扩展描述
+    private String unit;              //单位
+    private Double totalCount;      //总量
+    private Double weightKg;        //单重/kg
+    private Double weightTon;      //总重/吨
+    private String supplyType;   //甲乙供
+    //搜索条件
+    private String reserveCode;//储备编码
+    private String projectCode;//项目编码
+    private String projectDefine;//项目定义
+    private String note;      //备注
+    private String state;     //状态，与标准比对，1：相同 0：不相同
+
+    public String[] getProjectNames() {
+        return projectNames;
+    }
+
+    public void setProjectNames(String[] projectNames) {
+        this.projectNames = projectNames;
+    }
+
+    public String getReserveCode() {
+        return reserveCode;
+    }
+
+    public void setReserveCode(String reserveCode) {
+        this.reserveCode = reserveCode;
+    }
+
+    public String getProjectCode() {
+        return projectCode;
+    }
+
+    public void setProjectCode(String projectCode) {
+        this.projectCode = projectCode;
+    }
+
+    public String getProjectDefine() {
+        return projectDefine;
+    }
+
+    public void setProjectDefine(String projectDefine) {
+        this.projectDefine = projectDefine;
+    }
+
+    public String getState() {
+        return state;
+    }
+
+    public void setState(String state) {
+        this.state = state;
+    }
+
+    @ExcelField(title="储备项目名称", align=2, sort=1)
+    public String getProjectName() {
+        return projectName;
+    }
+
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
+
+    @ExcelField(title="物料编码", align=2, sort=2)
+    public String getMaterialCode() {
+        return materialCode;
+    }
+
+    public void setMaterialCode(String materialCode) {
+        this.materialCode = materialCode;
+    }
+
+    @ExcelField(title="物料名称", align=2, sort=3)
+    public String getMaterialName() {
+        return materialName;
+    }
+
+    public void setMaterialName(String materialName) {
+        this.materialName = materialName;
+    }
+
+    @ExcelField(title="扩展描述", align=2, sort=4)
+    public String getExtendDescription() {
+        return extendDescription;
+    }
+
+    public void setExtendDescription(String extendDescription) {
+        this.extendDescription = extendDescription;
+    }
+
+    @ExcelField(title="单位", align=2, sort=5)
+    public String getUnit() {
+        return unit;
+    }
+
+    public void setUnit(String unit) {
+        this.unit = unit;
+    }
+
+    @ExcelField(title="总量", align=2, sort=6)
+    public Double getTotalCount() {
+        return totalCount;
+    }
+
+    public void setTotalCount(Double totalCount) {
+        this.totalCount = totalCount;
+    }
+
+    @ExcelField(title="单重/kg", align=2, sort=7)
+    public Double getWeightKg() {
+        return weightKg;
+    }
+
+    public void setWeightKg(Double weightKg) {
+        this.weightKg = weightKg;
+    }
+
+    @ExcelField(title="总重/吨", align=2, sort=8)
+    public Double getWeightTon() {
+        return weightTon;
+    }
+
+    public void setWeightTon(Double weightTon) {
+        this.weightTon = weightTon;
+    }
+
+    @ExcelField(title="甲乙供", align=2, sort=9)
+    public String getSupplyType() {
+        return supplyType;
+    }
+
+    public void setSupplyType(String supplyType) {
+        this.supplyType = supplyType;
+    }
+
+    @ExcelField(title="备注", align=2, sort=10)
+    public String getNote() {
+        return note;
+    }
+
+    public void setNote(String note) {
+        this.note = note;
+    }
+}

src/main/java/com/jeeplus/modules/sg/managementcenter/materialinfo/web/MaterialInfoController.java

@@ -12,6 +12,7 @@ import com.jeeplus.common.utils.excel.ImportExcel;
 import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.web.BaseController;
 import com.jeeplus.modules.sg.managementcenter.materialinfo.entity.MaterialInfo;
+import com.jeeplus.modules.sg.managementcenter.materialinfo.entity.MaterialInfoBean;
 import com.jeeplus.modules.sg.managementcenter.materialinfo.service.MaterialInfoService;
 import com.jeeplus.modules.sg.managementcenter.materialplan.entity.MaterialPlan;
 import com.jeeplus.modules.sg.managementcenter.materialproject.entity.MaterialProject;
@@ -82,6 +83,8 @@ public class MaterialInfoController extends BaseController {
 		@RequiresPermissions("managementcenter:materialinfo:list")
 		@RequestMapping(value = "data")
 		public Map<String, Object> data(MaterialInfo materialInfo, HttpServletRequest request, HttpServletResponse response, Model model) {
+			MaterialInfo materialInfo1 = new MaterialInfo();//存入session数值
+			materialInfo1.setProjectName(materialInfo.getProjectName());
 			MaterialProject materialProject =  new MaterialProject();
 			materialProject.setProjectStatus("");
 			materialProject.setProjectCode(materialInfo.getProjectCode());
@@ -98,12 +101,17 @@ public class MaterialInfoController extends BaseController {
 			}
 			if (null!=list&&list.size()>0){
 				materialInfo.setProjectNames(projectNames);
+				materialInfo1.setProjectNames(projectNames);
 			}else {
 				if (!"".equals(materialInfo.getReserveCode())||!"".equals(materialInfo.getProjectCode())||
 					!"".equals(materialInfo.getProjectDefine())){
 					materialInfo.setProjectName("没有找到:请重新刷新...");
+					materialInfo1.setProjectName("没有找到:请重新刷新...");
 				}
 			}
+
+			HttpSession session = request.getSession();
+			session.setAttribute("materialInfoSelect",materialInfo1);
 			Page<MaterialInfo> page = materialInfoService.findPage(new Page<MaterialInfo>(request, response), materialInfo);
 			return getBootstrapData(page);
 		}
@@ -216,10 +224,12 @@ public class MaterialInfoController extends BaseController {
 	@RequestMapping(value = "export")
 	public AjaxJson exportFile(MaterialInfo materialInfo, HttpServletRequest request, HttpServletResponse response) {
 		AjaxJson j = new AjaxJson();
+		HttpSession session = request.getSession();
+		MaterialInfo materialInfo1 = (MaterialInfo)session.getAttribute("materialInfoSelect");
 		try {
 			String fileName = "物料信息表"+ DateUtils.getDate("yyyyMMddHHmmss")+".xlsx";
-			Page<MaterialInfo> page = materialInfoService.findPage(new Page<MaterialInfo>(request, response, -1), materialInfo);
-			new ExportExcel("物料信息表", MaterialInfo.class).setDataList(page.getList()).write(response, fileName).dispose();
+			Page<MaterialInfo> page = materialInfoService.findPage(new Page<MaterialInfo>(request, response, -1), materialInfo1);
+			new ExportExcel("物料信息表", MaterialInfoBean.class).setDataList(page.getList()).write(response, fileName).dispose();
 			j.setSuccess(true);
 			j.setMsg("导出成功！");
 			return j;

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

@@ -65,6 +65,7 @@ public class Project extends DataEntity<Project> {
     private String constructionStatus;//施工状态
     private String whetherCloseStatus;//是否项目关闭
     private Integer earlyMaterial;//判断项目是否可以提前发起领料
+    private Integer preConstruction;//判断项目是否可以提前施工
 
     public String getStatus() {
         return status;
@@ -600,4 +601,12 @@ public class Project extends DataEntity<Project> {
     public void setItemType(String itemType) {
         this.itemType = itemType;
     }
+
+    public Integer getPreConstruction() {
+        return preConstruction;
+    }
+
+    public void setPreConstruction(Integer preConstruction) {
+        this.preConstruction = preConstruction;
+    }
 }

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

@@ -34,4 +34,6 @@ public interface ProjectMapper extends BaseMapper<Project> {
     List<Project> findListProject(List<Project> projects);
 
     Project findUser(String procInsId);
+
+    Integer updatePreConstruction(Project project);
 }

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

@@ -69,7 +69,8 @@
 		a.acquisition_status AS "acquisitionStatus",
 		a.construction_status AS "constructionStatus",
 		a.whether_close_status AS "whetherCloseStatus",
-		a.earlyMaterial AS "earlyMaterial"
+		a.earlyMaterial AS "earlyMaterial",
+		a.preConstruction AS "preConstruction"
 	</sql>
     
 	<select id="get" resultType="Project" >
@@ -101,9 +102,12 @@
 			<if test="constructionUnitRole != null and  constructionUnitRole != ''">
 				AND a.construction_unit_role = #{constructionUnitRole}
 			</if>
-			<if test="earlyMaterial != null and  earlyMaterial != ''">
+			<if test="earlyMaterial != null">
 				or a.earlyMaterial = #{earlyMaterial}
 			</if>
+			<if test="preConstruction != null">
+				and a.preConstruction = #{preConstruction}
+			</if>
 		</where>
 		<choose>
 			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
@@ -201,7 +205,8 @@
 			acquisition_status,
 			construction_status,
 			whether_close_status,
-			earlyMaterial
+			earlyMaterial,
+			preConstruction
 		) VALUES (
 			#{id},
 			#{createBy.id},
@@ -269,7 +274,8 @@
     		#{acquisitionStatus},
     		#{constructionStatus},
     		#{whetherCloseStatus},
-    		#{earlyMaterial}
+    		#{earlyMaterial},
+    		#{preConstruction}
 		)
 	</insert>
 
@@ -341,7 +347,8 @@
 		acquisition_status,
 		construction_status,
 		whether_close_status,
-		earlyMaterial
+		earlyMaterial,
+		preConstruction
 		) VALUES
 		<foreach collection="list" item="item" index="index" separator="," >
 			(
@@ -411,7 +418,8 @@
 			#{item.acquisitionStatus},
 			#{item.constructionStatus},
 			#{item.whetherCloseStatus},
-			#{item.earlyMaterial}
+			#{item.earlyMaterial},
+			#{item.preConstruction}
 		)
 		</foreach>
 	</insert>
@@ -493,6 +501,11 @@
 		update xm_project_details set status = #{status} where id = #{id};
 	</update>
 
+	<!--修改提前施工状态0未提前施工，1提前施工-->
+	<update id="updatePreConstruction">
+		update xm_project_details set preConstruction = #{preConstruction} where id = #{id};
+	</update>
+
 
 	<select id="findListById" resultType="com.jeeplus.modules.sg.managementcenter.project.entity.Project">
 		SELECT

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

@@ -9,6 +9,7 @@ import java.util.UUID;
 import com.jeeplus.modules.sg.financial.settlement.entity.MaintainData;
 import com.jeeplus.modules.sg.managementcenter.project.entity.Project;
 import com.jeeplus.modules.sg.managementcenter.project.mapper.ProjectMapper;
+import io.swagger.models.auth.In;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -83,6 +84,7 @@ public class ProjectService extends CrudService<ProjectMapper, Project> {
 		String constructionStatus="0";//施工状态
 		String whetherCloseStatus = "0";//项目是否关闭
 		Integer earlyMaterial = 0;//是否可以提前领料
+		Integer preConstruction = 0;//提前施工
 		Project project1 = new Project();
 		List<Project> list = projectMapper.findList(project1);
 		for(Project project:projects){
@@ -97,7 +99,8 @@ public class ProjectService extends CrudService<ProjectMapper, Project> {
 					acquisitionStatus = project2.getAcquisitionStatus();
 					constructionStatus = project2.getConstructionStatus();
 					whetherCloseStatus = project2.getWhetherCloseStatus();
-					earlyMaterial = project2.getEarlyMaterial();
+					earlyMaterial = project2.getEarlyMaterial();//是否可以提前领料
+					preConstruction = project2.getPreConstruction();//提前施工
 					project.setId(project2.getId());//项目id
 					project.setCreateBy(project2.getCreateBy());
 					project.setCreateDate(project2.getCreateDate());
@@ -132,6 +135,7 @@ public class ProjectService extends CrudService<ProjectMapper, Project> {
 			project.setConstructionStatus(constructionStatus);
 			project.setWhetherCloseStatus(whetherCloseStatus);
 			project.setEarlyMaterial(earlyMaterial);
+			project.setPreConstruction(preConstruction);
 		}
 		if (null!=projects&&projects.size()>0){
 			projectMapper.insertList(projects);
@@ -145,4 +149,9 @@ public class ProjectService extends CrudService<ProjectMapper, Project> {
 	public Project findUser(String procInsId) {
 		return projectMapper.findUser(procInsId);
 	}
+
+	//修改提前施工状态0-未提前施工 2-提前施工
+	public void updatePreConstruction(Project project){
+		projectMapper.updatePreConstruction(project);
+	}
 }

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

@@ -108,6 +108,18 @@ public class ProjectController extends BaseController {
 	}
 
 	/**
+	 * 提前施工项目选择
+	 * */
+	@ResponseBody
+	@RequestMapping(value = "dataAdvance")
+	public Map<String, Object> dataAdvance(Project project, HttpServletRequest request, HttpServletResponse response, Model model) {
+		project.setPreConstruction(0);
+		project.setConstructionUnitManage(UserUtils.getUser().getLoginName());//施工项目经理
+		Page<Project> page = projectService.findPage(new Page<Project>(request, response), project);
+		return getBootstrapData(page);
+	}
+
+	/**
 	 * 领料申请项目选择框
 	 * */
 	@ResponseBody

src/main/webapp/webpage/modules/sg/advence/activiti/constructionAdvanceForm.js

@@ -0,0 +1,35 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<script>
+	/**
+	 * 施工单位经理A
+	 * */
+	$(document).ready(function() {
+		jp.ajaxForm("#inputForm",function(data){
+			if(data.success){
+				jp.alert(data.msg);
+				jp.go("${ctx}"+ data.body.targetUrl);
+			}else{
+				jp.alert(data.msg);
+				$("#inputForm").find("button:submit").button("reset");
+			}
+		});
+
+		$('#acceptDate').datetimepicker({
+			format: "YYYY-MM-DD HH:mm:ss"
+		});
+
+		$('#examineDate').datetimepicker({
+			format: "YYYY-MM-DD HH:mm:ss"
+		});
+		//富文本初始化
+		$('#reason').summernote({
+			height: 300,
+			lang: 'zh-CN',
+			callbacks: {
+				onChange: function(contents, $editable) {
+					$("input[name='reason']").val($('#reason').summernote('code'));//取富文本的值
+				}
+			}
+		});
+	})
+</script>

src/main/webapp/webpage/modules/sg/advence/activiti/constructionAdvanceForm.jsp

@@ -0,0 +1,69 @@
+<%@ page pageEncoding="UTF-8"%>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<html>
+<head>
+	<title>施工提交申请</title>
+	<meta name="decorator" content="ani"/>
+	<!-- SUMMERNOTE -->
+	<%@include file="/webpage/include/summernote.jsp" %>
+	<%@include file="constructionAdvanceForm.js"%>
+</head>
+<body>
+
+<div class="wrapper wrapper-content">
+	<div class="row">
+		<div class="col-md-12">
+			<div class="panel panel-primary">
+				<div class="panel-heading">
+					<h3 class="panel-title">
+						<a class="panelButton"  href="#"  onclick="history.go(-1)"><i class="ti-angle-left"></i> 返回</a>
+					</h3>
+				</div>
+				<div class="panel-body">
+					<form:form id="inputForm" modelAttribute="advance" action="${ctx}/advance/project/save"  method="post" class="form-horizontal">
+						<form:hidden path="id"/>
+						<form:hidden path="act.taskId"/>
+						<form:hidden path="act.taskName"/>
+						<form:hidden path="act.taskDefKey"/>
+						<form:hidden path="act.procInsId"/>
+						<form:hidden path="act.procDefId"/>
+						<form:hidden id="flag" path="act.flag" />
+						<div class="form-group text-center">
+							<h3> 提前施工申请</h3>
+						</div>
+						<table class="table table-bordered">
+							<tbody>
+							<tr>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>项目名称：</label></td>
+								<td class="width-35">
+									<sys:itemselect url="${ctx}/sg/managementcenter/project/dataAdvance" id="project" name="projectId" value="${showList.projectName}" labelName="project.requireName" labelValue="${showList.projectName}"
+													title="选择项目号" cssClass="form-control " fieldLabels="${fns:urlEncode('项目需求名称|工程编号|项目名称|项目定义号')}" fieldKeys="requireName|projecId|projectName|projectNumber" searchLabels="${fns:urlEncode('项目需求名称')}" searchKeys="requireName"  isMultiSelected="false"></sys:itemselect>
+								</td>
+							</tr>
+							<tr>
+							</tr>
+							</tbody>
+						</table>
+
+						<div class="form-group">
+							<div class="col-lg-3"></div>
+								<div class="col-lg-6">
+									<div class="form-group text-center">
+										<div>
+											<button class="btn btn-primary btn-block btn-lg btn-parsley" data-loading-text="正在提交...">提 交</button>
+										</div>
+									</div>
+								</div>
+						</div>
+					</form:form>
+					<c:if test="${not empty advance.id}">
+						<act:flowChart procInsId="${advance.act.procInsId}"/>
+						<act:histoicFlow procInsId="${advance.act.procInsId}" />
+					</c:if>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+</body>
+</html>

src/main/webapp/webpage/modules/sg/advence/activiti/constructionManager.jsp

@@ -0,0 +1,201 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<html>
+<head>
+	<title>施工项目经理审核</title>
+	<meta name="decorator" content="ani"/>
+	<!-- SUMMERNOTE -->
+	<%@include file="/webpage/include/summernote.jsp" %>
+	<script type="text/javascript">
+		$(document).ready(function () {
+			$("#agree").click(function () {
+				jp.prompt("该项目可以提前施工", function (message) {
+					jp.post("${ctx}/act/task/contructionManager",
+							{
+								"taskId":"${pickApplication.act.taskId}",
+								"taskName":"${pickApplication.act.taskName}",
+								"taskDefKey":"${pickApplication.act.taskDefKey}",
+								"procInsId":"${pickApplication.act.procInsId}",
+								"procDefId":"${pickApplication.act.procDefId}",
+								"flag":"yes",
+								"comment":window.encodeURI(message)
+							},
+							function (data) {
+								if(data.success){
+									jp.success(data.msg);
+									jp.go("${ctx}/act/task/todo")
+								}
+							})
+				})
+			});
+			$("#no").click(function () {
+				jp.prompt("取消该项目提前施工", function (message) {
+					jp.post("${ctx}/act/task/contructionManager",
+					{
+						"taskId":"${pickApplication.act.taskId}",
+						"taskName":"${pickApplication.act.taskName}",
+						"taskDefKey":"${pickApplication.act.taskDefKey}",
+						"procInsId":"${pickApplication.act.procInsId}",
+						"procDefId":"${pickApplication.act.procDefId}",
+						"flag":"no",
+						"comment":window.encodeURI(message)
+					},
+					function (data) {
+						if(data.success){
+							jp.success(data.msg);
+							jp.go("${ctx}/act/task/todo")
+						}
+					})
+				})
+			});
+		})
+	</script>
+</head>
+<body>
+<div class="wrapper wrapper-content">
+	<div class="row">
+		<div class="col-md-12">
+			<div class="panel panel-primary">
+				<div class="panel-heading">
+					<h3 class="panel-title">
+						<a class="panelButton"  href="#"  onclick="history.go(-1)"><i class="ti-angle-left"></i> 返回</a>
+					</h3>
+				</div>
+				<div class="panel-body">
+					<form:form id="inputForm" modelAttribute="project" action="" method="post" class="form-horizontal">
+						<table class="table table-bordered">
+							<tbody>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">项目号：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(project.projectNumber)}
+								</td>
+								<td class="width-15 active"><label class="pull-right">项目名称：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(project.requireName)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">停电线路：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(project.powerLine)}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>停电范围（中间统一用中文分号）：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(project.powerScope)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">项目类型：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(project.projectType)}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>政处初步判断：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(project.preliminaryJudgment)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">是否含土建（不含钢管杆）：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(project.flagCivilEngineering)}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>钢管杆基础类型：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(project.steelTubePole)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">是否需要规划报批（150米及以上土建）：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(project.flagApprovalPlanning)}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>设备改造类型：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(project.equCreateType)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">改造设备尺寸及间隔数：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(project.equCreateSize)}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否含新设备命名：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(project.flagNewEquName)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">是否含变电站新间隔投运：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(project.includeBdzNews)}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否含非涉电电气施工：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(project.flagNoElectrical)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">图纸标注的带电作业情况：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(project.drawingsWork)}
+							</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否含自动化：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(project.flagAutomation)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">二遥或三遥：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(project.twoAndThreeRemote)}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>通信方式：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(project.phoneStyle)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">柱开集中或就地：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(project.stayOpenArea)}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>环网柜DTU户外或户内：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(project.ringNetworkCabinet)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">站房DTU：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(project.stationDtu)}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否为停电打包项目：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(project.status)}
+								</td>
+							</tr>
+							</tbody>
+						</table>
+					</form:form>
+						<div class="row">
+							<div class="col-sm-3"></div>
+							<div class="col-sm-6">
+								<div class="form-group text-center">
+									<input id="agree" class="btn  btn-primary btn-lg btn-parsley" type="submit" value="确认提前施工" />&nbsp;
+									<input id="no" class="btn  btn-primary btn-lg btn-danger" type="submit" value="取消提前施工" />
+								</div>
+							</div>
+						</div>
+
+					<c:if test="${not empty pickApplication.id}">
+						<act:flowChart procInsId="${pickApplication.act.procInsId}"/>
+						<act:histoicFlow procInsId="${pickApplication.act.procInsId}" />
+					</c:if>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+</body>
+</html>

src/main/webapp/webpage/modules/sg/managementcenter/activiti/humanReview.jsp

@@ -338,6 +338,24 @@
 										${construction.disclose.overallTransformation}
 								</td>
 							</tr>
+
+
+							<tr>
+								<td class="width-15 active"><label class="pull-right">必要性问题说明：</label></td>
+								<td class="width-35">
+										${construction.disclose.explanationOfNecessity}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>图纸现场不一致说明：</label></td>
+								<td class="width-35">
+										${construction.disclose.inconsistentDescription}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">政策处理说明：</label></td>
+								<td class="width-35">
+										${construction.disclose.policyHandlingInstructions}
+								</td>
+							</tr>
 							</tbody>
 						</table>
 					</form:form>

src/main/webapp/webpage/modules/sg/managementcenter/materialProvided/importExcel.jsp

@@ -0,0 +1,53 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<html>
+<head>
+    <title>导入Excel</title>
+    <meta name="decorator" content="ani"/>
+    <script>
+        function importExcel(url, fn) {
+            var versionName = $("#versionName").val();
+            if (null==versionName||versionName==""){
+                jp.error("版本名称不能为空");
+                return false;
+            }
+            var importForm =$("#importForm")[0];
+            jp.loading('  正在导入，请稍等...');
+            jp.uploadFile(importForm, url,function (data) {
+               fn(data);
+            })
+        }
+    </script>
+</head>
+<body class="bg-white">
+<form id="importForm" action="${url}" method="post" enctype="multipart/form-data" class="form-horizontal"
+      style="padding-left:20px;text-align:center;" onsubmit="loading('正在导入，请稍等...');">
+    <%--导入文件不能超过5M，仅允许导入“xls”或“xlsx”格式文件111！　--%>
+    <table class="table table-bordered">
+        <tbody>
+        <tr>
+            <td class="width-15 active"><label class=""><font color="red">*</font>文件导入：</label></td>
+            <td class="width-35">
+                <input id="uploadFile" name="file" type="file" class="form-control"/>
+            </td>
+            <td class="width-15 active"><label class=""><font color="red">*</font>版本名称：</label></td>
+            <td class="width-35">
+                <input id="versionName" name="versionName" type="text" class="form-control required"/>
+            </td>
+        </tr>
+        <tr>
+            <td class="width-15 active"><label class="">版本备注：</label></td>
+            <td class="width-35">
+                <textarea name="versionAlias" htmlEscape="false" rows="4"    class="form-control "></textarea>
+            </td>
+        </tr>
+        </tbody>
+    </table>
+</form>
+    <%--<div class="wrapper wrapper-content">--%>
+        <%--<div id="importBox" >--%>
+            <%----%>
+        <%--</div>--%>
+    <%--</div>--%>
+</body>
+</html>

src/main/webapp/webpage/modules/sg/managementcenter/materialProvided/materialProvided.js

@@ -158,9 +158,9 @@ $(document).ready(function() {
                        title: '参考概算价值'
                    }
                    ,{
-                       field: 'version',
+                       field: 'versionName',
                        width:80,
-                       title: '版本号'
+                       title: '版本名称'
                    }
 		     ]
 		
@@ -182,10 +182,10 @@ $(document).ready(function() {
 		$("#btnImport").click(function(){
 			jp.open({
 			    type: 2,
-                area: [500, 200],
+                area: [800, 300],
                 auto: true,
 			    title:"导入数据",
-			    content: "${ctx}/tag/importExcel" ,
+			    content: "${ctx}/sg/managementcenter/marterialProvided/importExcel" ,
 			    btn: ['确定', '关闭'],
 			    btn1: function(index, layero){
 				        var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();

src/main/webapp/webpage/modules/sg/managementcenter/materialProvided/materialProvided.jsp

@@ -38,8 +38,8 @@
 					<form:input path="extendedDescription" htmlEscape="false" maxlength="64"  class=" form-control"/>
 				</div>
 				<div class="col-xs-12 col-sm-6 col-md-4">
-					<label class="label-item single-overflow pull-left" title="版本号：">版本号：</label>
-					<form:input path="version" htmlEscape="false" maxlength="64"  class=" form-control"/>
+					<label class="label-item single-overflow pull-left" title="版本名称：">版本名称：</label>
+					<form:input path="versionName" htmlEscape="false" maxlength="64"  class=" form-control"/>
 				</div>
 				<div class="col-xs-12 col-sm-6 col-md-4">
 					<div style="margin-top:26px">
@@ -58,16 +58,6 @@
 					<i class="glyphicon glyphicon-plus"></i> 新建
 				</button>
 			</shiro:hasPermission>
-			<%--<shiro:hasPermission name="managementcenter:materialProvided:edit">--%>
-			    <%--<button id="edit" class="btn btn-success" disabled onclick="edit()">--%>
-	            	<%--<i class="glyphicon glyphicon-edit"></i> 修改--%>
-	        	<%--</button>--%>
-			<%--</shiro:hasPermission>--%>
-			<%--<shiro:hasPermission name="managementcenter:materialProvided:del">--%>
-				<%--<button id="remove" class="btn btn-danger" disabled onclick="deleteAll()">--%>
-	            	<%--<i class="glyphicon glyphicon-remove"></i> 删除--%>
-	        	<%--</button>--%>
-			<%--</shiro:hasPermission>--%>
 			<shiro:hasPermission name="managementcenter:materialProvided:import">
 				<button id="btnImport" class="btn btn-info"><i class="fa fa-folder-open-o"></i> 导入</button>
 			</shiro:hasPermission>
@@ -76,11 +66,6 @@
 					<i class="fa fa-file-excel-o"></i> 导出
 				</button>
 			 </shiro:hasPermission>
-			<%--<shiro:hasPermission name="managementcenter:materialProvided:view">--%>
-				<%--<button id="view" class="btn btn-default" disabled onclick="view()">--%>
-					<%--<i class="fa fa-search-plus"></i> 查看--%>
-				<%--</button>--%>
-			<%--</shiro:hasPermission>--%>
 		    </div>
 		
 	<!-- 表格 -->

src/main/webapp/webpage/modules/sg/managementcenter/materialProvided/materialProvidedForm.jsp

@@ -48,7 +48,7 @@
 		<table class="table table-bordered">
 		   	<tbody>
 				<tr>
-					<input type="hidden" id="version" name="version" value=""/>
+					<input type="hidden" id="version" name="versionName" value=""/>
 					<td class="width-15 active"><label class=""><font color="red">*</font>计划批次：</label></td>
 					<td class="width-35">
 						<form:input path="planToBatch" htmlEscape="false"    class="form-control required"/>
@@ -58,7 +58,7 @@
 						<select id="selectVersion" class="form-control required">
 							<option value="" id="option1">请选择版本</option>
 							<c:forEach items="${allVersion}" var="list">
-								<option value="${list.version}">${list.version}</option>
+								<option value="${list.versionName}">${list.versionName}</option>
 							</c:forEach>
 						</select>
 					</td>