Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/utils/MyImportUtils.java

@@ -179,10 +179,10 @@ public class MyImportUtils {
     //人工审核：回显
     public static void getTheEcho(Construction construction, Model model){
         //前置条件
-        if (null!=construction.getDisclose().getPrecondition()&&!"".equals(construction.getDisclose().getPrecondition())){
+        if ((null!=construction.getDisclose().getPrecondition()&&!"".equals(construction.getDisclose().getPrecondition()))
+                ||(null!=construction.getDisclose().getChannel()&&!"".equals(construction.getDisclose().getChannel())&&!"无".equals(construction.getDisclose().getChannel()))){
             model.addAttribute("pass_construction6","0");
         }else {
-            //项目关闭
             if ("有".equals(construction.getDisclose().getHiddenDanger())||
                     "是".equals(construction.getDisclose().getInfluenceConstruction())||
                     "是".equals(construction.getDisclose().getProjectRepetition())||

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

@@ -87,11 +87,11 @@
 		select
 		<include refid="materialColumns"/>
 		from
-		xm_material_provided_version
+		xm_material_provided_version a
 		<where>
-			del_flag = '0'
+			a.del_flag = '0'
 		</where>
-	   order by create_date DESC
+	   order by a.create_date DESC
 	</select>
 
 	<select id="findById" resultType="MaterialProvidedVersion" >

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

@@ -29,6 +29,8 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.ConstraintViolationException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
 import java.util.List;
 import java.util.Map;
 
@@ -197,7 +199,6 @@ public class MaterialProvidedController extends BaseController {
 		AjaxJson j = new AjaxJson();
 		MaterialProvidedVersion materialProvidedVersion1 = null;
 		materialProvidedVersion1 = materialProvidedVersionService.findById(materialProvidedVersion);
-		System.out.println(materialProvidedVersion1);
 		try {
 			if (null!=materialProvidedVersion1){
 				j.setSuccess(false);

src/main/java/com/jeeplus/modules/sg/managementcenter/moduleacquisition/entity/ModuleBlock.java

@@ -15,7 +15,16 @@ public class ModuleBlock extends DataEntity<ModuleBlock>{
     private Integer mdBigSort;
     private Integer mdTheSort;
     private Integer mdSmallSort;
-    private String mdVersion;
+    private String mdVersion;//版本号
+    private String mdVersionName;//版本名称
+
+    public String getMdVersionName() {
+        return mdVersionName;
+    }
+
+    public void setMdVersionName(String mdVersionName) {
+        this.mdVersionName = mdVersionName;
+    }
 
     public String getMdBigClass() {
         return mdBigClass;

src/main/java/com/jeeplus/modules/sg/managementcenter/moduleacquisition/mapper/ModuleBlockMapper.java

@@ -16,8 +16,4 @@ import java.util.List;
 public interface ModuleBlockMapper extends BaseMapper<ModuleBlock> {
 
     Integer insertList(@Param("list") List<ModuleBlock> list);
-
-    String findMaxVersion();
-
-    List<ModuleVersion> findAllVersion(ModuleVersion moduleVersion);
 }

src/main/java/com/jeeplus/modules/sg/managementcenter/moduleacquisition/mapper/ModuleBlockVersionMapper.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.moduleacquisition.mapper;
+
+import com.jeeplus.core.persistence.BaseMapper;
+import com.jeeplus.core.persistence.annotation.MyBatisMapper;
+import com.jeeplus.modules.sg.managementcenter.moduleacquisition.entity.ModuleBlockVersion;
+
+import java.util.List;
+
+@MyBatisMapper
+public interface ModuleBlockVersionMapper extends BaseMapper<ModuleBlockVersion> {
+    ModuleBlockVersion findMaxVersion();
+    List<ModuleBlockVersion> findAllVersion();
+
+    ModuleBlockVersion findById(ModuleBlockVersion moduleBlockVersion);
+
+    ModuleBlockVersion findByName(ModuleBlockVersion moduleBlockVersion);
+}

src/main/java/com/jeeplus/modules/sg/managementcenter/moduleacquisition/mapper/xml/ModuleBlockMapper.xml

@@ -18,7 +18,8 @@
 		a.md_big_sort AS "mdBigSort",
 		a.md_the_sort AS "mdTheSort",
 		a.md_small_sort AS "mdSmallSort",
-		a.md_version AS "mdVersion"
+		a.md_version AS "mdVersion",
+		a.md_versionName AS "mdVersionName"
 	</sql>
 
     
@@ -48,13 +49,16 @@
 			<if test="mdSmallClass != null and mdSmallClass != ''">
 				AND a.md_small_class LIKE CONCAT(CONCAT('%',#{mdSmallClass},'%'))
 			</if>
-			<if test="mdVersion != null and mdVersion  != ''">
-				AND a.md_version =  #{mdVersion}
+			<if test="mdVersionName != null and mdVersionName  != ''">
+				AND a.md_versionName = #{mdVersionName}
+			</if>
+			<if test="mdVersion != null and mdVersion != ''">
+				AND a.md_version = #{mdVersion}
 			</if>
 		</where>
-		order by md_version+0 desc ,md_big_sort,md_the_sort,md_small_sort
+		order by a.create_date desc,md_big_sort,md_the_sort,md_small_sort
 	</select>
-	
+
 	<select id="findAllList" resultType="MaterialProject" >
 		SELECT 
 			<include refid="infoColumns"/>
@@ -90,7 +94,8 @@
 			md_big_sort,
 			md_the_sort,
 			md_small_sort,
-			md_version
+			md_version,
+			md_versionName
 		) VALUES (
 				#{id},
 				#{createBy.id},
@@ -107,7 +112,8 @@
 				#{mdBigSort},
 				#{mdTheSort},
 				#{mdSmallSort},
-				#{mdVersion}
+				#{mdVersion},
+				#{mdVersionName}
 
 		)
 	</insert>
@@ -129,7 +135,8 @@
 			md_big_sort,
 			md_the_sort,
 			md_small_sort,
-			md_version
+			md_version,
+			md_versionName
 		) VALUES
 		<foreach collection="list" item="item" index="index" separator=",">
 		  (
@@ -148,7 +155,8 @@
 				#{item.mdBigSort},
 				#{item.mdTheSort},
 				#{item.mdSmallSort},
-				#{item.mdVersion}
+				#{item.mdVersion},
+				#{item.mdVersionName}
 			)
 		</foreach>
 	</insert>
@@ -186,16 +194,4 @@
 	<select id="findUniqueByProperty" resultType="TestNote" statementType="STATEMENT">
 		select * FROM md_module_block  where ${propertyName} = '${value}'
 	</select>
-
-	<select id="findMaxVersion" resultType="java.lang.String">
-		select md_version from md_module_block group by md_version order by md_version+0 desc LIMIT 1
-	</select>
-
-	<select id="findAllVersion" resultType="ModuleVersion">
-		select md_version AS version from md_module_block
-		<where>
-			del_flag = '0'
-		</where>
-		group by md_version order by md_version+0 DESC
-	</select>
 </mapper>

src/main/java/com/jeeplus/modules/sg/managementcenter/moduleacquisition/mapper/xml/ModuleBlockVersionMapper.xml

@@ -0,0 +1,113 @@
+<?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.moduleacquisition.mapper.ModuleBlockVersionMapper">
+    
+	<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="com.jeeplus.modules.sg.managementcenter.moduleacquisition.mapper.ModuleBlockVersionMapper" >
+		SELECT 
+			<include refid="materialColumns"/>
+		FROM md_module_block_version a
+		WHERE a.id = #{id}
+	</select>
+	
+	<select id="findList" resultType="com.jeeplus.modules.sg.managementcenter.moduleacquisition.entity.ModuleBlockVersion" >
+		SELECT
+			<include refid="materialColumns"/>
+		FROM md_module_block_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="com.jeeplus.modules.sg.managementcenter.moduleacquisition.mapper.ModuleBlockVersionMapper" >
+		SELECT
+			<include refid="materialColumns"/>
+		FROM md_module_block_version a
+		<where>
+			a.del_flag = #{DEL_FLAG_NORMAL}
+			${dataScope}
+		</where>
+		order by create_date DESC
+	</select>
+	
+	<insert id="insert">
+		INSERT INTO md_module_block_version(
+			id,
+			create_by,
+			create_date,
+			del_flag,
+			versionName,
+			versionAlias
+		) VALUES (
+			#{id},
+			#{createBy.id},
+			#{createDate},
+			#{delFlag},
+			#{versionName},
+			#{versionAlias}
+		)
+	</insert>
+
+	<!--物理删除-->
+	<update id="delete">
+		DELETE FROM md_module_block_version
+		WHERE id = #{id}
+	</update>
+	
+	<!--逻辑删除-->
+	<update id="deleteByLogic">
+		UPDATE md_module_block_version SET
+			del_flag = #{DEL_FLAG_DELETE}
+		WHERE id = #{id}
+	</update>
+
+	<!-- 查找最大的版本信息 -->
+	<select id="findMaxVersion" resultType="com.jeeplus.modules.sg.managementcenter.moduleacquisition.entity.ModuleBlockVersion">
+		select
+		<include refid="materialColumns"/>
+		from md_module_block_version order by create_date desc LIMIT 1
+	</select>
+
+	<select id="findAllVersion" resultType="com.jeeplus.modules.sg.managementcenter.moduleacquisition.entity.ModuleBlockVersion">
+		select
+		<include refid="materialColumns"/>
+		from
+		md_module_block_version a
+		<where>
+			a.del_flag = '0'
+		</where>
+	   order by a.create_date DESC
+	</select>
+
+	<select id="findById" resultType="com.jeeplus.modules.sg.managementcenter.moduleacquisition.entity.ModuleBlockVersion" >
+		SELECT
+		<include refid="materialColumns"/>
+		FROM md_module_block_version a
+		<where>
+			a.del_flag = '0' and a.versionName = #{versionName}
+		</where>
+	</select>
+
+	<select id="findByName" resultType="com.jeeplus.modules.sg.managementcenter.moduleacquisition.entity.ModuleBlockVersion" >
+		SELECT
+		<include refid="materialColumns"/>
+		FROM md_module_block_version a
+		<where>
+			a.del_flag = '0' and a.id = #{id}
+		</where>
+	</select>
+</mapper>

src/main/java/com/jeeplus/modules/sg/managementcenter/moduleacquisition/service/ModuleBlockService.java

@@ -5,18 +5,17 @@ package com.jeeplus.modules.sg.managementcenter.moduleacquisition.service;
 
 import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.service.CrudService;
+import com.jeeplus.modules.sg.managementcenter.moduleacquisition.entity.ModuleBlockVersion;
 import com.jeeplus.modules.sg.managementcenter.moduleacquisition.entity.ModuleBlock;
 import com.jeeplus.modules.sg.managementcenter.moduleacquisition.entity.ModuleListing;
 import com.jeeplus.modules.sg.managementcenter.moduleacquisition.entity.ModuleVersion;
 import com.jeeplus.modules.sg.managementcenter.moduleacquisition.mapper.ModuleBlockMapper;
-import com.jeeplus.modules.sg.managementcenter.moduleacquisition.mapper.ModuleListingMapper;
+import com.jeeplus.modules.sg.managementcenter.moduleacquisition.mapper.ModuleBlockVersionMapper;
 import com.jeeplus.modules.sg.managementcenter.moduleacquisition.util.ModuleUtil;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
 import java.util.List;
 
 
@@ -29,6 +28,9 @@ public class ModuleBlockService extends CrudService<ModuleBlockMapper,ModuleBloc
 	@Autowired
 	private ModuleListingService moduleListingService;
 
+	@Autowired
+	private ModuleBlockVersionMapper moduleBlockVersionMapper;
+
 
 	public ModuleBlock get(String id) {
 		return super.get(id);
@@ -49,38 +51,20 @@ public class ModuleBlockService extends CrudService<ModuleBlockMapper,ModuleBloc
 
 	//文件导入
 	@Transactional(readOnly = false)
-	public void savaList(List<ModuleBlock> blocks, List<ModuleListing> listings,String version){
-		Integer integer = 1;//版本号默认为1
-		if (null!=version&&!version.equals("")){
-			integer = new Integer(version)+1;
-		}
+	public void savaList(List<ModuleBlock> blocks, List<ModuleListing> listings, ModuleBlockVersion moduleBlockVersion){
+		moduleBlockVersion.preInsert();
+		String version = moduleBlockVersion.getId();
+		String versionName = moduleBlockVersion.getVersionName();
+		moduleBlockVersionMapper.insert(moduleBlockVersion);
 		for (ModuleBlock moduleBlock:blocks){
 			moduleBlock.preInsert();
-			moduleBlock.setMdVersion(String.valueOf(integer));
+			moduleBlock.setMdVersion(version);
+			moduleBlock.setMdVersionName(versionName);
 		}
 		List<ModuleListing> moduleListings = ModuleUtil.getModuleListing(listings, blocks);
 		moduleBlockMapper.insertList(blocks);
 		moduleListingService.savaList(moduleListings);
 	}
 
-	/*
-		获得最新版本号
-	 */
-	public String findVersion(){
-		return moduleBlockMapper.findMaxVersion();
-	}
 
-	/*
-		获得所有版本号
-	 */
-	public Page<ModuleVersion> findPage(Page<ModuleVersion> page, ModuleVersion moduleVersion) {
-		List<ModuleVersion> allVersion = moduleBlockMapper.findAllVersion(moduleVersion);
-		for (ModuleVersion moduleVersion1:allVersion){
-			moduleVersion1.setVersionName("版本"+moduleVersion1.getVersion());
-		}
-		dataRuleFilter(moduleVersion);
-		moduleVersion.setPage(page);
-		page.setList(allVersion);
-		return page;
-	}
 }

src/main/java/com/jeeplus/modules/sg/managementcenter/moduleacquisition/service/ModuleBlockVersionService.java

@@ -0,0 +1,63 @@
+/**
+ * Copyright &copy; 2015-2020 <a href="http://www.jeeplus.org/">JeePlus</a> All rights reserved.
+ */
+package com.jeeplus.modules.sg.managementcenter.moduleacquisition.service;
+
+import com.jeeplus.core.persistence.Page;
+import com.jeeplus.core.service.CrudService;
+import com.jeeplus.modules.sg.managementcenter.moduleacquisition.entity.ModuleBlockVersion;
+import com.jeeplus.modules.sg.managementcenter.moduleacquisition.mapper.ModuleBlockVersionMapper;
+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 ModuleBlockVersionService extends CrudService<ModuleBlockVersionMapper, ModuleBlockVersion> {
+	@Autowired
+	private ModuleBlockVersionMapper moduleBlockVersionMapper;
+
+	public ModuleBlockVersion get(String id) {
+		return super.get(id);
+	}
+	
+	public List<ModuleBlockVersion> findList(ModuleBlockVersion materialBlockVersion) {
+		return super.findList(materialBlockVersion);
+	}
+	
+	public Page<ModuleBlockVersion> findPage(Page<ModuleBlockVersion> page, ModuleBlockVersion materialBlockVersion) {
+		return super.findPage(page, materialBlockVersion);
+	}
+	
+	@Transactional(readOnly = false)
+	public void save(ModuleBlockVersion materialBlockVersion) {
+		super.save(materialBlockVersion);
+	}
+	
+	@Transactional(readOnly = false)
+	public void delete(ModuleBlockVersion materialBlockVersion) {
+		super.delete(materialBlockVersion);
+	}
+
+	//查找最近一次版本信息
+	public ModuleBlockVersion findMaxVersion(){
+		return moduleBlockVersionMapper.findMaxVersion();
+	}
+
+	//查找所有版本信息
+	public List<ModuleBlockVersion> findAllVersion(){
+		return moduleBlockVersionMapper.findAllVersion();
+	}
+
+	//根据版本名称查询版本id
+	public ModuleBlockVersion findById(ModuleBlockVersion materialBlockVersion){
+		return moduleBlockVersionMapper.findById(materialBlockVersion);
+	}
+
+	//根据版本id查找版本名称
+	public ModuleBlockVersion findByName(ModuleBlockVersion moduleBlockVersion){
+		return moduleBlockVersionMapper.findByName(moduleBlockVersion);
+	}
+}

src/main/java/com/jeeplus/modules/sg/managementcenter/moduleacquisition/web/ModuleBlockWeb.java

@@ -8,17 +8,21 @@ import com.jeeplus.common.config.Global;
 import com.jeeplus.common.json.AjaxJson;
 import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.common.utils.excel.ImportExcel;
+import com.jeeplus.common.utils.text.EncodeUtil;
 import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.web.BaseController;
 import com.jeeplus.modules.sg.managementcenter.activiti.utils.MyActiviUtils;
+import com.jeeplus.modules.sg.managementcenter.moduleacquisition.entity.ModuleBlockVersion;
 import com.jeeplus.modules.sg.managementcenter.moduleacquisition.entity.ModuleBlock;
 import com.jeeplus.modules.sg.managementcenter.moduleacquisition.entity.ModuleListing;
 import com.jeeplus.modules.sg.managementcenter.moduleacquisition.entity.ModuleVersion;
 import com.jeeplus.modules.sg.managementcenter.moduleacquisition.service.ModuleBlockService;
+import com.jeeplus.modules.sg.managementcenter.moduleacquisition.service.ModuleBlockVersionService;
 import com.jeeplus.modules.sg.managementcenter.moduleacquisition.service.ModuleListingService;
 import com.jeeplus.modules.sg.managementcenter.moduleacquisition.util.ModuleUtil;
 import com.jeeplus.modules.sg.picking.activiti.service.PickIngService;
 import com.jeeplus.modules.sys.entity.DictValue;
+import org.apache.http.client.utils.URLEncodedUtils;
 import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
 import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -35,6 +39,8 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 import java.io.IOException;
+import java.net.URLDecoder;
+import java.net.URLEncoder;
 import java.util.List;
 import java.util.Map;
 
@@ -49,6 +55,8 @@ public class ModuleBlockWeb extends BaseController {
 	private ModuleListingService moduleListingService;
 	@Autowired
 	private PickIngService pickIngService;
+	@Autowired
+	private ModuleBlockVersionService moduleBlockVersionService;
 	
 	@ModelAttribute
 	public ModuleBlock get(@RequestParam(required=false) String id) {
@@ -61,7 +69,15 @@ public class ModuleBlockWeb extends BaseController {
 		}
 		return entity;
 	}
-	
+	/**
+	 * 文件上传
+	 */
+	@RequiresPermissions("user")
+	@RequestMapping(value = "importExcel")
+	public String importExcel() {
+		return "modules/sg/managementcenter/moduleacquisition/importExcel";
+	}
+
 	/**
 	 * 项目列表页面
 	 */
@@ -98,9 +114,8 @@ public class ModuleBlockWeb extends BaseController {
 	@RequestMapping(value = "newData")
 	public Map<String, Object> newData(ModuleBlock moduleBlock, HttpServletRequest request, HttpServletResponse response, Model model) {
 		HttpSession session = request.getSession();
-		String md_version = (String) session.getAttribute("md_version");
-		Integer version = new Integer(md_version) + 1;
-		moduleBlock.setMdVersion(String.valueOf(version));
+		String versionName = (String) session.getAttribute("versionName");
+		moduleBlock.setMdVersionName(versionName);
 		Page<ModuleBlock> page = moduleBlockService.findPage(new Page<ModuleBlock>(request, response), moduleBlock);
 		//当判定系统为linux的时候
 		if (Global.SYS_TYPE.equals("2")) {
@@ -142,8 +157,15 @@ public class ModuleBlockWeb extends BaseController {
 	@RequiresPermissions(value={"managementcenter:moduleacquisition:add","managementcenter:moduleacquisition:edit"},logical=Logical.OR)
 	@RequestMapping(value = "save")
 	public AjaxJson save(ModuleBlock moduleBlock, Model model,HttpServletRequest request) throws Exception{
-		HttpSession session = request.getSession();
-		String md_version = (String) session.getAttribute("md_version");
+		if (moduleBlock.getIsNewRecord()){
+			HttpSession session = request.getSession();
+			String versionName = (String) session.getAttribute("versionName");
+			ModuleBlockVersion moduleBlockVersion = new ModuleBlockVersion();
+			moduleBlockVersion.setVersionName(versionName);
+			ModuleBlockVersion versionServiceById = moduleBlockVersionService.findById(moduleBlockVersion);//查询版本信息
+			moduleBlock.setMdVersion(versionServiceById.getId());
+			moduleBlock.setMdVersionName(versionName);
+		}
 		AjaxJson j = new AjaxJson();
 		/**
 		 * 后台hibernate-validation插件校验
@@ -155,8 +177,6 @@ public class ModuleBlockWeb extends BaseController {
 			return j;
 		}
 		//新增或编辑表单保存
-		Integer version = new Integer(md_version) + 1;
-		moduleBlock.setMdVersion(String.valueOf(version));
 		moduleBlockService.save(moduleBlock);//保存
 		j.setSuccess(true);
 		j.setMsg("保存模块成功");
@@ -225,15 +245,21 @@ public class ModuleBlockWeb extends BaseController {
 	@ResponseBody
 	@RequiresPermissions("managementcenter:moduleacquisition:import")
 	@RequestMapping(value = "import")
-	public AjaxJson importFile(@RequestParam("file")MultipartFile file, HttpServletResponse response, HttpServletRequest request) throws IOException, InvalidFormatException {
+	public AjaxJson importFile(@RequestParam("file")MultipartFile file, ModuleBlockVersion moduleBlockVersion, HttpServletResponse response, HttpServletRequest request){
 		AjaxJson j = new AjaxJson();
 		try {
+			ModuleBlockVersion moduleBlockVersion1 = null;
+			moduleBlockVersion1 = moduleBlockVersionService.findById(moduleBlockVersion);
+			if (null!=moduleBlockVersion1){
+				j.setSuccess(false);
+				j.setMsg("导入失败：版本名称已经存在，请更换版本名称再进行操作");
+				return j;
+			}
 			ImportExcel importBlock = new ImportExcel(file, 0, "模块表");
 			ImportExcel importListing = new ImportExcel(file, 0, "模块清单");
 			List<ModuleBlock> moduleBlockUtil = ModuleUtil.getModuleBlockUtil(importBlock);
 			List<ModuleListing> moduleListingUtil = ModuleUtil.getModuleListingUtil(importListing);
-			String maxVersion = moduleBlockService.findVersion();//获得版本号
-			moduleBlockService.savaList(moduleBlockUtil,moduleListingUtil,maxVersion);
+			moduleBlockService.savaList(moduleBlockUtil,moduleListingUtil,moduleBlockVersion);
 			j.setMsg( "已成功导入 "+moduleBlockUtil.size()+" 条记录");
 		} catch (Exception e) {
 			j.setSuccess(false);
@@ -245,22 +271,36 @@ public class ModuleBlockWeb extends BaseController {
 		生成新版本
 	 */
 	@RequestMapping(value = "insertVersion")
-	public String saveVersion(String mdVersion,ModuleBlock moduleBlock,Model model,HttpServletRequest request) {
-		String version = moduleBlockService.findVersion();
+	public String saveVersion(ModuleBlock moduleBlock,String versionId,ModuleBlockVersion moduleBlockVersion,Model model,HttpServletRequest request) {
+		String versionName = moduleBlockVersion.getVersionName();
+		String versionAlias = moduleBlockVersion.getVersionAlias();
+		try {
+			moduleBlockVersion.setVersionName(URLDecoder.decode(versionName, "UTF-8"));
+			moduleBlockVersion.setVersionAlias(URLDecoder.decode(versionAlias,"UTF-8"));
+		}catch (Exception e){
+			e.printStackTrace();
+		}
+		ModuleBlockVersion moduleBlockVersion1 = null;
+		moduleBlockVersion1 = moduleBlockVersionService.findById(moduleBlockVersion);
+		if (null!=moduleBlockVersion1){
+			String str = moduleBlockVersion.getVersionName();
+			moduleBlockVersion.setVersionName(str+"新版");
+		}
 		HttpSession session = request.getSession();
-		session.setAttribute("md_version",version);
-		moduleBlock.setMdVersion(mdVersion);
+		session.setAttribute("versionName",moduleBlockVersion.getVersionName());
+		moduleBlock.setMdVersion(versionId);
 		List<ModuleBlock> moduleBlocks = moduleBlockService.findList(moduleBlock);
 		List<ModuleListing> moduleListings = moduleListingService.findByList(moduleBlocks);
-		moduleBlockService.savaList(moduleBlocks,moduleListings,version);
+		//生成新版本:保存数据
+		moduleBlockService.savaList(moduleBlocks,moduleListings,moduleBlockVersion);
 		model.addAttribute("ModuleBlock",moduleBlock);
 		return "modules/sg/managementcenter/moduleacquisition/moduleBlockNewList";
 	}
 
 	@ResponseBody
 	@RequestMapping(value = "dataVersion")
-	public Map<String, Object> dataVersion(ModuleVersion version, HttpServletRequest request, HttpServletResponse response, Model model) {
-		Page<ModuleVersion> page = moduleBlockService.findPage(new Page<ModuleVersion>(request, response), version);
+	public Map<String, Object> dataVersion(ModuleBlockVersion moduleBlockVersion, HttpServletRequest request, HttpServletResponse response, Model model) {
+		Page<ModuleBlockVersion> page = moduleBlockVersionService.findPage(new Page<ModuleBlockVersion>(request, response), moduleBlockVersion);
 		return getBootstrapData(page);
 	}
 
@@ -269,8 +309,8 @@ public class ModuleBlockWeb extends BaseController {
 	 */
 	@RequiresPermissions("managementcenter:moduleacquisition:insertVersion")
 	@RequestMapping(value ="listVersion")
-	public String listVersion(ModuleVersion moduleVersion, Model model,HttpServletRequest request) {
-		model.addAttribute("ModuleVersion",moduleVersion);
+	public String listVersion(ModuleBlockVersion moduleBlockVersion, Model model,HttpServletRequest request) {
+		model.addAttribute("moduleBlockVersion",moduleBlockVersion);
 		return "modules/sg/managementcenter/moduleacquisition/moduleVersionList";
 	}
 

src/main/java/com/jeeplus/modules/sg/picking/activiti/mapper/xml/PickIngMapper.xml

@@ -96,7 +96,7 @@
 	</update>
 
 	<select id="allVersion" resultType="string">
-		select md_version from md_module_block group by md_version desc;
+		select versionName from md_module_block_version group by create_date desc;
 	</select>
 
 	<update id="updateSelectNumber">

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

@@ -68,7 +68,7 @@
 							<tr>
 								<td class="width-15 active"><label class="pull-right">项目号：</label></td>
 								<td class="width-35">
-										${fns:unescapeHtml(project.projectNumber)}
+										${fns:unescapeHtml(project.id)}
 								</td>
 								<td class="width-15 active"><label class="pull-right">项目名称：</label></td>
 								<td class="width-35">

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

@@ -55,7 +55,8 @@
 					</td>
 					<td class="width-15 active"><label class="pull-right"><font color="red">*</font>选择版本：</label></td>
 					<td class="width-35">
-						<select id="selectVersion" class="form-control required">
+						<%--<form:select path="versionName" items="${allVersion}" itemLabel="${list.versionName}" itemValue="${list.versionName}"></form:select>--%>
+						<select id="selectVersion"  class="form-control required">
 							<option value="" id="option1">请选择版本</option>
 							<c:forEach items="${allVersion}" var="list">
 								<option value="${list.versionName}">${list.versionName}</option>

src/main/webapp/webpage/modules/sg/managementcenter/moduleacquisition/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/moduleacquisition/moduleBlockList.js

@@ -131,8 +131,8 @@ $(document).ready(function() {
                        }
                    }
                    ,{
-                       field: 'mdVersion',
-                       title: '版本号'
+                       field: 'mdVersionName',
+                       title: '版本名称'
                    }
 		     ]
 		
@@ -154,10 +154,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}/managementcenter/moduleacquisition/importExcel" ,
 			    btn: ['确定', '关闭'],
 			    	btn1: function(index, layero){
 				        var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
@@ -189,13 +189,20 @@ $(document).ready(function() {
             btn: ['确定', '关闭'],
             yes: function(index, layero){
                 var iframeWin = layero.find('iframe')[0]; //得到弹出的窗口对象，执行窗口内iframe页的方法：iframeWin.method();
-                iframeWin.contentWindow.save();//调用保存事件，在 弹出页内，需要定义save方法。处理保存事件。
-				var i = iframeWin.contentWindow.getIdSelections();
-				if (null!=i&&i!=""){
-                    jp.downloadFile("${ctx}/managementcenter/moduleacquisition/insertVersion?mdVersion="+i);
-				}else {
-					jp.error("您还没选择版本");
+				var versionId = iframeWin.contentWindow.getIdSelections();
+				var versionName = iframeWin.contentWindow.getVersionName();
+				var versionAlias = iframeWin.contentWindow.getVersionAlias();
+				// alert(versionId+"----------"+versionName+"-----------"+versionAlias);
+				if (null == versionName||versionName==""){
+					jp.error("请填写版本名称");
+					return false;
 				}
+				if (null == versionId || versionId == "") {
+                    jp.error("请选择旧版本，在进行新增版本操作");
+                    return false;
+                }
+                iframeWin.contentWindow.save();//调用保存事件，在 弹出页内，需要定义save方法。处理保存事件。
+				jp.downloadFile("${ctx}/managementcenter/moduleacquisition/insertVersion?versionId="+versionId+"&versionName="+encodeURI(encodeURI(versionName))+"&versionAlias="+encodeURI(encodeURI(versionAlias)));
 
             },
             cancel: function(index){

src/main/webapp/webpage/modules/sg/managementcenter/moduleacquisition/moduleBlockList.jsp

@@ -33,8 +33,8 @@
 						<form:input path="mdTheClass" htmlEscape="false" maxlength="100"  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="mdVersion" htmlEscape="false" maxlength="100"  class=" form-control"/>
+						<label class="label-item single-overflow pull-left" title="版本名称：">版本名称：</label>
+						<form:input path="mdVersionName" htmlEscape="false" maxlength="100"  class=" form-control"/>
 					</div>
 					<div class="col-xs-12 col-sm-6 col-md-4">
 						<div style="margin-top:26px">

src/main/webapp/webpage/modules/sg/managementcenter/moduleacquisition/moduleBlockNewList.js

@@ -130,8 +130,8 @@ $(document).ready(function() {
                        }
                    }
                    ,{
-                       field: 'mdVersion',
-                       title: '版本号'
+                       field: 'mdVersionName',
+                       title: '版本名称'
                    }
 		     ]
 		

src/main/webapp/webpage/modules/sg/managementcenter/moduleacquisition/moduleVersionList.js

@@ -54,13 +54,13 @@ $(document).ready(function() {
 		       
 		    }
 			,{
-		        field: 'version',
-		        title: '版本号',
+		        field: 'versionName',
+		        title: '版本名称',
             }
 
                    ,{
-                       field: 'versionName',
-                       title: '版本名称',
+                       field: 'versionAlias',
+                       title: '版本备注',
                    }
 
 		     ]
@@ -105,10 +105,15 @@ $(document).ready(function() {
 
   function getIdSelections() {
         return $.map($("#moduleVersionTable").bootstrapTable('getSelections'), function (row) {
-            return row.version
+            return row.id
         });
     }
-
+	function getVersionName() {
+		return $("#versionName").val();
+    }
+	function getVersionAlias() {
+		return $("#versionAlias").val();
+	}
   function deleteAll(){
 
 		jp.confirm('确认要删除该项目管理表单记录吗？', function(){

src/main/webapp/webpage/modules/sg/managementcenter/moduleacquisition/moduleVersionList.jsp

@@ -27,9 +27,21 @@
 </head>
 <body>
 	<div class="wrapper wrapper-content">
-	<div class="panel panel-primary">
-		<table id="moduleVersionTable"  data-toolbar="#toolbar"></table>
-	</div>
+		<div class="panel panel-primary">
+			<div id="searchForm" class="form form-horizontal well clearfix">
+				<div class="accordion-inner">
+				<div class="col-xs-12 col-sm-6 col-md-4">
+					<label class="label-item single-overflow pull-left" title="版本名称：">新版本名称：</label>
+					<input id="versionName" 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>
+					<input id="versionAlias"  class="form-control"/>
+				</div>
+				</div>
+			</div>
+			<table id="moduleVersionTable" style="margin-top: 2px"  data-toolbar="#toolbar"></table>
+		</div>
 	</div>
 </body>
 </html>