Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/workcontent/dao/WorkContentVisamanageDao.java

@@ -11,7 +11,7 @@ import com.jeeplus.modules.workcontent.entity.WorkContentVisamanage;
 import java.util.List;
 
 /**
- * 变更管理DAO接口
+ * 签证管理DAO接口
  * @author ssrh
  * @version 2018-06-06
  */

src/main/java/com/jeeplus/modules/workcontent/service/WorkContentVisamanageService.java

@@ -16,7 +16,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.util.List;
 
 /**
- * 变更管理Service
+ * 签证管理Service
  * @author ssrh
  * @version 2018-06-06
  */

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

@@ -72,21 +72,21 @@ public class WorkContentVisamanageController extends BaseController {
 	@RequestMapping(value = "form")
 	public String form(WorkContentVisamanage workContentVisamanage, String view, Model model) {
 		WorkContentVisamanage oldRecord = null;
-        if(StringUtils.isNotBlank(workContentVisamanage.getContentId())){
-            List<WorkContentVisamanage> list = workContentVisamanageService.findList(workContentVisamanage);
-            if(list!=null&&!list.isEmpty()){
-                oldRecord = list.get(0);
-            }
-        }
-        if(oldRecord!=null){
-            model.addAttribute("workContentVisamanage", oldRecord);
-        }else {
-            model.addAttribute("workContentVisamanage", workContentVisamanage);
-        }
-        String viewPath = "modules/workcontent/workContentVisamanage";
-        if("view".equals(view)){
-            viewPath+="View";
-        }
+		if(StringUtils.isNotBlank(workContentVisamanage.getContentId())){
+			List<WorkContentVisamanage> list = workContentVisamanageService.findList(workContentVisamanage);
+			if(list!=null&&!list.isEmpty()){
+				oldRecord = list.get(0);
+			}
+		}
+		if(oldRecord!=null){
+			model.addAttribute("workContentVisamanage", oldRecord);
+		}else {
+			model.addAttribute("workContentVisamanage", workContentVisamanage);
+		}
+		String viewPath = "modules/workcontent/workContentVisamanage";
+		if("view".equals(view)){
+			viewPath+="View";
+		}
 		return viewPath;
 	}
 

src/main/resources/mappings/modules/workcontent/WorkContentCompleteAccountDao.xml

@@ -0,0 +1,205 @@
+<?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.workcontent.dao.WorkContentCompleteAccountDao">
+    
+	<sql id="workContentCompleteAccountColumns">
+		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.project_id AS "projectId",
+		a.content_id AS "contentId",
+		a.complete_name AS "completeName",
+		a.complete_contract AS "completeContract",
+		a.complete_submit AS "completeSubmit",
+		a.complete_examine AS "completeExamine",
+		a.complete_add AS "completeAdd",
+		a.complete_reduce AS "completeReduce",
+		a.complete_rate AS "completeRate",
+		a.type AS "type"
+	</sql>
+	
+    
+	<select id="get" resultType="WorkContentCompleteAccount" >
+		SELECT 
+			<include refid="workContentCompleteAccountColumns"/>
+		FROM work_content_complete_account a
+		WHERE a.id = #{id}
+	</select>
+	
+	<select id="findList" resultType="WorkContentCompleteAccount" >
+		SELECT 
+			<include refid="workContentCompleteAccountColumns"/>
+		FROM work_content_complete_account a
+		<where>
+            <if test="projectId!=null and projectId !=''">
+                AND a.project_id = #{projectId}
+            </if>
+            <if test="contentId!=null and contentId !=''">
+                AND a.content_id = #{contentId}
+            </if>
+			AND a.del_flag = #{DEL_FLAG_NORMAL}
+		</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>
+	
+	<select id="findAllList" resultType="WorkContentCompleteAccount" >
+		SELECT 
+			<include refid="workContentCompleteAccountColumns"/>
+		FROM work_content_complete_account a
+		<where>
+			a.del_flag = #{DEL_FLAG_NORMAL}
+		</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>
+	
+	<insert id="insert">
+		INSERT INTO work_content_complete_account(
+			id,
+			create_by,
+			create_date,
+			update_by,
+			update_date,
+			remarks,
+			del_flag,
+			project_id,
+			content_id,
+			complete_name,
+			complete_contract,
+			complete_submit,
+			complete_examine,
+			complete_add,
+			complete_reduce,
+			complete_rate,
+			type
+		) VALUES (
+			#{id},
+			#{createBy.id},
+			#{createDate},
+			#{updateBy.id},
+			#{updateDate},
+			#{remarks},
+			#{delFlag},
+			#{projectId},
+			#{contentId},
+            #{completeName},
+            #{completeContract},
+            #{completeSubmit},
+            #{completeExamine},
+            #{completeAdd},
+            #{completeReduce},
+            #{completeRate},
+            #{type}
+		)
+	</insert>
+
+    <insert id="batchInsert" parameterType="java.util.List">
+		INSERT INTO work_content_complete_account(
+			id,
+			create_by,
+			create_date,
+			update_by,
+			update_date,
+			remarks,
+			del_flag,
+			project_id,
+			content_id,
+			complete_name,
+			complete_contract,
+			complete_submit,
+			complete_examine,
+			complete_add,
+			complete_reduce,
+			complete_rate,
+			type
+		) VALUES
+		<foreach collection="list" item="item" separator=",">
+            ( #{item.id},
+            #{item.createBy.id},
+            #{item.createDate},
+            #{item.updateBy.id},
+            #{item.updateDate},
+            #{item.remarks},
+            #{item.delFlag},
+            #{item.projectId},
+            #{item.contentId},
+			#{completeName},
+			#{completeContract},
+			#{completeSubmit},
+			#{completeExamine},
+			#{completeAdd},
+			#{completeReduce},
+			#{completeRate},
+			#{type}
+            )
+        </foreach>
+	</insert>
+	
+	<update id="update">
+		UPDATE work_content_complete_account SET
+			update_by = #{updateBy.id},
+			update_date = #{updateDate},
+			remarks = #{remarks},
+			project_id = #{projectId},
+			content_id = #{contentId},
+			complete_name = #{completeName},
+			complete_contract  = #{completeContract},
+			complete_submit = #{completeSubmit},
+			complete_examine = #{completeExamine},
+			complete_add = #{completeAdd},
+			complete_reduce = #{completeReduce},
+			complete_rate = #{completeRate},
+			type = #{type}
+		WHERE id = #{id}
+	</update>
+	
+	
+	<!--物理删除-->
+	<update id="delete">
+		DELETE FROM work_content_complete_account
+		WHERE id = #{id}
+	</update>
+	
+	<!--逻辑删除-->
+	<update id="deleteByLogic">
+		UPDATE work_content_complete_account SET
+			del_flag = #{DEL_FLAG_DELETE}
+		WHERE id = #{id}
+	</update>
+
+	<delete id="deleteByContentId">
+		DELETE FROM work_content_complete_account
+		WHERE content_id = #{id}
+	</delete>
+	
+	
+	<!-- 根据实体名称和字段名称和字段值获取唯一记录 -->
+	<select id="findUniqueByProperty" resultType="WorkContentCompleteAccount" statementType="STATEMENT">
+		select * FROM work_content_complete_account  where ${propertyName} = '${value}'
+	</select>
+
+	<select id="getTableType" resultType="java.lang.String">
+		select a.type from(
+		select DISTINCT(wwpic.type) as type from work_content_complete_account wwpic where wwpic.del_flag = 0 and wwpic.content_id = #{contentId}
+		) a
+	</select>
+
+	
+</mapper>

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

@@ -1,93 +1,93 @@
 <%@ page contentType="text/html;charset=UTF-8" %>
 <%@ include file="/webpage/include/taglib.jsp"%>
 
-		<form:form id="subForm" modelAttribute="workContentVisamanage" action="#" method="post" class="form-horizontal">
-		<form:hidden path="id"/>
-            <div class="form-group layui-row lw12">
-            <div class="layui-item layui-col-sm6">
-                <label class="layui-form-label"><span class="require-item">*</span>合同名称：</label>
-                <div class="layui-input-block with-icon">
-                    <sys:gridselectProjcontent url="${ctx}/projectcontentinfo/projectContentData/selectcontent" id="contId" name="contract.id"  value="${workContentVisamanage.contract.id}"  title="选择合同" labelName="contract.name"
-                                               labelValue="${workContentVisamanage.contract.name}" cssClass="form-control layui-input required" projectId="${workContentVisamanage.projectId}" type="41" fieldLabels="" fieldKeys="" searchLabel="${fns:urlEncode('合同名称')}" searchKey="" ></sys:gridselectProjcontent>
-                </div>
+<form:form id="subForm" modelAttribute="workContentVisamanage" action="#" method="post" class="form-horizontal">
+    <form:hidden path="id"/>
+    <div class="form-group layui-row lw12">
+        <div class="layui-item layui-col-sm6">
+            <label class="layui-form-label"><span class="require-item">*</span>合同名称：</label>
+            <div class="layui-input-block with-icon">
+                <sys:gridselectProjcontent url="${ctx}/projectcontentinfo/projectContentData/selectcontent" id="contId" name="contract.id"  value="${workContentVisamanage.contract.id}"  title="选择合同" labelName="contract.name"
+                                           labelValue="${workContentVisamanage.contract.name}" cssClass="form-control layui-input required" projectId="${workContentVisamanage.projectId}" type="41" fieldLabels="" fieldKeys="" searchLabel="${fns:urlEncode('合同名称')}" searchKey="" ></sys:gridselectProjcontent>
             </div>
-            <div class="layui-item layui-col-sm6">
-                <label class="layui-form-label"><span class="require-item">*</span>签证类型：</label>
-                <div class="layui-input-block">
-                    <form:select path="visaType" class="form-control layui-input required">
-                        <form:option value="" label=""/>
-                        <form:options items="${fns:getMainDictList('content_alter_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
-                    </form:select>
-                </div>
+        </div>
+        <div class="layui-item layui-col-sm6">
+            <label class="layui-form-label"><span class="require-item">*</span>签证类型：</label>
+            <div class="layui-input-block">
+                <form:select path="visaType" class="form-control layui-input required">
+                    <form:option value="" label=""/>
+                    <form:options items="${fns:getMainDictList('content_visa_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+                </form:select>
             </div>
-            <div class="layui-item layui-col-sm6">
-                <label class="layui-form-label"><span class="require-item">*</span>签证日期：</label>
-                <div class="layui-input-block">
-                    <input class="laydate-icondate form-control layui-input layer-date laydate-icon required" id="visaDate" name="visaDate" value="<fmt:formatDate value="${workContentVisamanage.visaDate}" pattern="yyyy-MM-dd"/>">
-                </div>
+        </div>
+        <div class="layui-item layui-col-sm6">
+            <label class="layui-form-label"><span class="require-item">*</span>签证日期：</label>
+            <div class="layui-input-block">
+                <input class="laydate-icondate form-control layui-input layer-date laydate-icon required" id="visaDate" name="visaDate" value="<fmt:formatDate value="${workContentVisamanage.visaDate}" pattern="yyyy-MM-dd"/>">
             </div>
-            <div class="layui-item layui-col-sm12 with-textarea">
-                <label class="layui-form-label">签证主要内容：</label>
-                <div class="layui-input-block">
-                    <form:textarea path="visaCtnt" htmlEscape="false" rows="3"    class="form-control layui-area"/>
-                </div>
+        </div>
+        <div class="layui-item layui-col-sm12 with-textarea">
+            <label class="layui-form-label">签证主要内容：</label>
+            <div class="layui-input-block">
+                <form:textarea path="visaCtnt" htmlEscape="false" rows="3"    class="form-control layui-area"/>
             </div>
         </div>
+    </div>
 
-        <div class="form-group layui-row lw12">
-            <div class="form-group-label"><h2>详情信息</h2></div>
-            <div class="layui-item layui-col-sm6">
-                <label class="layui-form-label"><span class="require-item">*</span>送审金额：</label>
-                <div class="layui-input-block">
-                    <input name="reviewAmt" htmlEscape="false"  value="<fmt:formatNumber value="${workContentVisamanage.reviewAmt}" pattern="#,##0.00#"/>" onchange="formatNum(this);" class="form-control layui-input required number"/>
-                </div>
+    <div class="form-group layui-row lw12">
+        <div class="form-group-label"><h2>详情信息</h2></div>
+        <div class="layui-item layui-col-sm6">
+            <label class="layui-form-label"><span class="require-item">*</span>送审金额：</label>
+            <div class="layui-input-block">
+                <input name="reviewAmt" htmlEscape="false"  value="<fmt:formatNumber value="${workContentVisamanage.reviewAmt}" pattern="#,##0.00#"/>" onchange="formatNum(this);" class="form-control layui-input required number"/>
             </div>
-            <div class="layui-item layui-col-sm6">
-                <label class="layui-form-label"><span class="require-item">*</span>审定金额：</label>
-                <div class="layui-input-block">
-                    <input name="setAmt" htmlEscape="false"  value="<fmt:formatNumber value="${workContentVisamanage.setAmt}" pattern="#,##0.00#"/>" onchange="formatNum(this);" class="form-control layui-input required number"/>
-                </div>
+        </div>
+        <div class="layui-item layui-col-sm6">
+            <label class="layui-form-label"><span class="require-item">*</span>审定金额：</label>
+            <div class="layui-input-block">
+                <input name="setAmt" htmlEscape="false"  value="<fmt:formatNumber value="${workContentVisamanage.setAmt}" pattern="#,##0.00#"/>" onchange="formatNum(this);" class="form-control layui-input required number"/>
             </div>
-            <div class="layui-item layui-col-sm6">
-                <label class="layui-form-label"><span class="require-item">*</span>报送日期：</label>
-                <div class="layui-input-block">
-                    <input id="subDate" name="subDate" type="text" maxlength="20" class="laydate-icondate form-control layui-input layer-date laydate-icon required"
-                           value="<fmt:formatDate value="${workContentVisamanage.subDate}" pattern="yyyy-MM-dd"/>"/>
-                </div>
+        </div>
+        <div class="layui-item layui-col-sm6">
+            <label class="layui-form-label"><span class="require-item">*</span>报送日期：</label>
+            <div class="layui-input-block">
+                <input id="subDate" name="subDate" type="text" maxlength="20" class="laydate-icondate form-control layui-input layer-date laydate-icon required"
+                       value="<fmt:formatDate value="${workContentVisamanage.subDate}" pattern="yyyy-MM-dd"/>"/>
             </div>
-            <div class="layui-item layui-col-sm6">
-                <label class="layui-form-label"><span class="require-item">*</span>审定日期：</label>
-                <div class="layui-input-block">
-                    <input id="setDate" name="setDate" type="text" maxlength="20" class="laydate-icondate form-control layui-input layer-date laydate-icon required"
-                           value="<fmt:formatDate value="${workContentVisamanage.setDate}" pattern="yyyy-MM-dd"/>"/>
-                </div>
+        </div>
+        <div class="layui-item layui-col-sm6">
+            <label class="layui-form-label"><span class="require-item">*</span>审定日期：</label>
+            <div class="layui-input-block">
+                <input id="setDate" name="setDate" type="text" maxlength="20" class="laydate-icondate form-control layui-input layer-date laydate-icon required"
+                       value="<fmt:formatDate value="${workContentVisamanage.setDate}" pattern="yyyy-MM-dd"/>"/>
             </div>
-            <div class="layui-item layui-col-sm6">
-                <label class="layui-form-label"><span class="require-item">*</span>计入台账：</label>
-                <div class="layui-input-block">
-                    <form:select path="inAccount" class="form-control layui-input required">
-                        <form:option value="" label=""/>
-                        <form:options items="${fns:getDictList('yes_no')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
-                    </form:select>
-                </div>
+        </div>
+        <div class="layui-item layui-col-sm6">
+            <label class="layui-form-label"><span class="require-item">*</span>计入台账：</label>
+            <div class="layui-input-block">
+                <form:select path="inAccount" class="form-control layui-input required">
+                    <form:option value="" label=""/>
+                    <form:options items="${fns:getDictList('yes_no')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+                </form:select>
             </div>
-            <div class="layui-item layui-col-sm6">
-                <label class="layui-form-label"><span class="require-item">*</span>计入支付：</label>
-                <div class="layui-input-block">
-                    <form:select path="inPayment" class="form-control layui-input required">
-                        <form:option value="" label=""/>
-                        <form:options items="${fns:getDictList('yes_no')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
-                    </form:select>
-                </div>
+        </div>
+        <div class="layui-item layui-col-sm6">
+            <label class="layui-form-label"><span class="require-item">*</span>计入支付：</label>
+            <div class="layui-input-block">
+                <form:select path="inPayment" class="form-control layui-input required">
+                    <form:option value="" label=""/>
+                    <form:options items="${fns:getDictList('yes_no')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+                </form:select>
             </div>
-            <div class="layui-item layui-col-sm12 with-textarea">
-                <label class="layui-form-label">备注信息：</label>
-                <div class="layui-input-block">
-                    <form:textarea path="remarks" htmlEscape="false" rows="3"    class="form-control layui-area"/>
-                </div>
+        </div>
+        <div class="layui-item layui-col-sm12 with-textarea">
+            <label class="layui-form-label">备注信息：</label>
+            <div class="layui-input-block">
+                <form:textarea path="remarks" htmlEscape="false" rows="3"    class="form-control layui-area"/>
             </div>
         </div>
-	</form:form>
+    </div>
+</form:form>
 <script type="text/javascript">
     var validateForm;
     $(document).ready(function() {

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

@@ -16,7 +16,7 @@
                 <div class="layui-input-block">
                     <form:select path="visaType" class="form-control layui-input required">
                         <form:option value="" label=""/>
-                        <form:options items="${fns:getMainDictList('content_alter_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+                        <form:options items="${fns:getMainDictList('content_visa_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
                     </form:select>
                 </div>
             </div>