Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/sg/managementcenter/materialplan/mapper/xml/MaterialPlanMapper.xml

@@ -30,14 +30,14 @@
 	<select id="get" resultType="MaterialPlan" >
 		SELECT 
 			<include refid="planColumns"/>
-		FROM sm_material_plan a
+		FROM xm_material_plan a
 		WHERE a.unique_code = #{id}
 	</select>
 	
 	<select id="findList" resultType="MaterialPlan" >
 		SELECT
 			<include refid="planColumns"/>
-		FROM sm_material_plan a
+		FROM xm_material_plan a
 		<where>
 			a.del_flag = #{DEL_FLAG_NORMAL}
 			${dataScope}
@@ -58,7 +58,7 @@
 	<select id="findAllList" resultType="MaterialPlan" >
 		SELECT
 		<include refid="planColumns"/>
-		FROM sm_material_plan a
+		FROM xm_material_plan a
 		<where>
 			a.del_flag = #{DEL_FLAG_NORMAL}
 			${dataScope}
@@ -74,7 +74,7 @@
 	</select>
 	
 	<insert id="insert">
-		  INSERT INTO sm_material_plan(
+		  INSERT INTO xm_material_plan(
 			create_by,
 			create_date,
 			update_by,
@@ -125,7 +125,7 @@
 	</insert>
 
 	<insert id="insertList">
-		replace INTO sm_material_plan(
+		replace INTO xm_material_plan(
 		create_by,
 		create_date,
 		update_by,
@@ -178,7 +178,7 @@
 	</insert>
 
 	<update id="update">
-		UPDATE sm_material_plan SET
+		UPDATE xm_material_plan SET
 			update_by = #{updateBy.id},
 			update_date = #{updateDate},
 			require_coding = #{requireCoding},
@@ -199,7 +199,7 @@
 		WHERE unique_code = #{uniqueCode}
 	</update>
 	<update id="updateTime">
-		UPDATE sm_material_plan SET
+		UPDATE xm_material_plan SET
 			update_by = #{updateBy.id},
 			update_date = #{updateDate},
 			delivery_schedule =#{deliverySchedule}
@@ -208,18 +208,18 @@
 	
 	<!--物理删除-->
 	<update id="delete">
-		DELETE FROM sm_material_plan
+		DELETE FROM xm_material_plan
 		WHERE unique_code = #{id}
 	</update>
 
 	<update id="deleteData">
-		DELETE FROM sm_material_plan
+		DELETE FROM xm_material_plan
 		WHERE unique_code= #{unique_code}
 	</update>
 
 	<!--逻辑删除-->
 	<update id="deleteByLogic">
-		UPDATE sm_material_plan SET
+		UPDATE xm_material_plan SET
 			del_flag = #{DEL_FLAG_DELETE}
 		WHERE unique_code = #{id}
 	</update>
@@ -227,7 +227,7 @@
 	
 	<!-- 根据实体名称和字段名称和字段值获取唯一记录 -->
 	<select id="findUniqueByProperty" resultType="Project" statementType="STATEMENT">
-		select * FROM sm_material_plan  where ${unique_code} = '${value}'
+		select * FROM xm_material_plan  where ${unique_code} = '${value}'
 	</select>
 
 </mapper>

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

@@ -56,14 +56,14 @@
 	<select id="get" resultType="Project" >
 		SELECT 
 			<include refid="projectColumns"/>
-		FROM sm_project_detail a
+		FROM xm_project_details a
 		WHERE a.id = #{id}
 	</select>
 	
 	<select id="findList" resultType="Project" >
 		SELECT 
 			<include refid="projectColumns"/>
-		FROM sm_project_detail a
+		FROM xm_project_details a
 		<where>
 			a.del_flag = #{DEL_FLAG_NORMAL}
 			${dataScope}
@@ -90,7 +90,7 @@
 	<select id="findAllList" resultType="Project" >
 		SELECT
 		<include refid="projectColumns"/>
-		FROM sm_project_detail a
+		FROM xm_project_details a
 		<where>
 			a.del_flag = #{DEL_FLAG_NORMAL}
 			${dataScope}
@@ -106,7 +106,7 @@
 	</select>
 	
 	<insert id="insert">
-		INSERT INTO sm_project_detail(
+		INSERT INTO xm_project_details(
 			id,
 			create_by,
 			create_date,
@@ -208,7 +208,7 @@
 	</insert>
 	
 	<update id="update">
-		UPDATE sm_project_detail SET
+		UPDATE xm_project_details SET
 			update_by = #{updateBy.id},
 			update_date = #{updateDate},
 			remarks = #{remarks},
@@ -233,13 +233,13 @@
 	
 	<!--物理删除-->
 	<update id="delete">
-		DELETE FROM sm_project_detail
+		DELETE FROM xm_project_details
 		WHERE id = #{id}
 	</update>
 	
 	<!--逻辑删除-->
 	<update id="deleteByLogic">
-		UPDATE sm_project_detail SET
+		UPDATE xm_project_details SET
 			del_flag = #{DEL_FLAG_DELETE}
 		WHERE id = #{id}
 	</update>
@@ -247,10 +247,10 @@
 	
 	<!-- 根据实体名称和字段名称和字段值获取唯一记录 -->
 	<select id="findUniqueByProperty" resultType="Project" statementType="STATEMENT">
-		select * FROM sm_project_detail  where ${id} = '${value}'
+		select * FROM xm_project_details  where ${id} = '${value}'
 	</select>
 
 	<update id="updateStatus">
-		update sm_project_detail set status = #{status} where require_name = #{requireName};
+		update xm_project_details set status = #{status} where id = #{id};
 	</update>
 </mapper>

src/main/webapp/WEB-INF/tags/sys/itemselect.tag

@@ -12,7 +12,7 @@
 <%@ attribute name="title" type="java.lang.String" required="true" description="选择框标题"%>
 <%@ attribute name="url" type="java.lang.String" required="true" description="数据地址"%>
 <%@ attribute name="cssClass" type="java.lang.String" required="false" description="css样式"%>
-<%@ attribute name="isMultiSelected" type="java.lang.Boolean" required="false" description="是否允许多选"%>
+<%@ attribute name="isMultiSelected" type="java.lang.Boolean" required="true" description="是否允许多选"%>
 <%@ attribute name="disabled" type="java.lang.String" required="false" description="是否限制选择，如果限制，设置为disabled"%>
 	<input id="${id}Id" name="${name}"  type="hidden" value="${value}"/>
 	<div class="input-group" style="width: 100%">
@@ -23,7 +23,6 @@
 	             </button> 
 	               <button type="button" id="${id}DelButton" class="close" data-dismiss="alert" style="position: absolute; top: 5px; right: 53px; z-index: 999; display: block;">×</button>
        		 </span>
-       		
     </div>
 	 <label id="${id}Name-error" class="error" for="${id}Name" style="display:none"></label>
 <script type="text/javascript">

src/main/webapp/webpage/modules/common/gridselect.jsp

@@ -26,7 +26,7 @@ $(document).ready(function() {
                //每页的记录行数（*）   
                pageSize: 10,  
                //可供选择的每页的行数（*）    
-               pageList: [10, 25, 50, 'ALL'],
+               pageList: [5,10, 25, 50, 'ALL'],
                //这个接口需要处理bootstrap table传递的固定参数,并返回特定格式的json数据  
                url: "${url}",
                //默认值为 'limit',传给服务端的参数为：limit, offset, search, sort, order Else

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

@@ -53,8 +53,8 @@
 								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>项目名称：</label></td>
 								<td class="width-35">
 									<%--<input type='text'  name="projectName" class="form-control required"  value="${construction.projectName}"/>--%>
-									<sys:itemselect url="${ctx}/sg/managementcenter/project/dataSys" id="project" name="project.id" value="${construction.projectName}" labelName="project.requireName" labelValue="${construction.projectName}"
-													title="选择项目号" cssClass="form-control " fieldLabels="${fns:urlEncode('项目需求名称|需求提出单位|变电站名称|线路名称|设备基本情况|运行班')}" fieldKeys="requireName|demandUnit|bdzName|lineName|asicEquipment|runTheClass" searchLabels="${fns:urlEncode('项目需求名称')}" searchKeys="requireName" ></sys:itemselect>
+									<sys:itemselect url="${ctx}/sg/managementcenter/project/dataSys" id="project" name="projectId" value="${construction.projectName}" labelName="project.requireName" labelValue="${construction.projectName}"
+													title="选择项目号" cssClass="form-control " fieldLabels="${fns:urlEncode('需求编号|项目需求名称|需求提出单位|变电站名称|线路名称|设备基本情况|运行班')}" fieldKeys="id|requireName|demandUnit|bdzName|lineName|asicEquipment|runTheClass" searchLabels="${fns:urlEncode('项目需求名称')}" searchKeys="requireName"  isMultiSelected="true"></sys:itemselect>
 								</td>
 								<td class="width-15 active"><label class="pull-right">接收图纸时间：</label></td>
 								<td class="width-35">