Sfoglia il codice sorgente

专家评估模块添加查询条件

user5 5 anni fa
parent
commit
89178c2069

+ 13 - 2
src/main/java/com/jeeplus/modules/projectSpecialistAssess/web/ProjectSpecialistAssessController.java

@@ -5,10 +5,8 @@ import com.jeeplus.common.persistence.Page;
 import com.jeeplus.common.utils.MyBeanUtils;
 import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.common.web.BaseController;
-import com.jeeplus.modules.biddingManagement.entity.BiddingManagementInfo;
 import com.jeeplus.modules.projectSpecialistAssess.entity.ProjectSpecialistAssess;
 import com.jeeplus.modules.projectSpecialistAssess.service.ProjectSpecialistAssessService;
-import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportData;
 import com.jeeplus.modules.projectrecord.entity.ProjectRecords;
 import com.jeeplus.modules.projectrecord.enums.ProjectStatusEnum;
 import com.jeeplus.modules.projectrecord.service.ProjectRecordsService;
@@ -66,6 +64,7 @@ public class ProjectSpecialistAssessController extends BaseController {
         model.addAttribute("projectName", projectSpecialistAssess.getProjectName());
         model.addAttribute("beginDate", projectSpecialistAssess.getBeginDate());
         model.addAttribute("endDate", projectSpecialistAssess.getEndDate());
+        model.addAttribute("status", projectSpecialistAssess.getStatus());
         return "modules/projectSpecialistAssess/projectSpecialistAssessList";
     }
 
@@ -85,6 +84,18 @@ public class ProjectSpecialistAssessController extends BaseController {
         return "modules/projectSpecialistAssess/projectSpecialistAssessForm";
     }
 
+    /**
+     * 查看
+     * @param model
+     * @return
+     */
+    @RequiresPermissions(value={"projectReport:projectSpecialistAssess:view"})
+    @RequestMapping(value = "view")
+    public String view(ProjectSpecialistAssess projectSpecialistAssess, Model model) {
+        model.addAttribute("projectSpecialistAssess", projectSpecialistAssess);
+        return "modules/projectSpecialistAssess/projectSpecialistAssessView";
+    }
+
 
     /**
      * 选择开票项目

+ 10 - 4
src/main/resources/mappings/modules/projectSpecialistAssess/ProjectSpecialistAssessDao.xml

@@ -42,11 +42,14 @@
 				AND pr.project_name like concat('%',#{projectName},'%')
 			</if>
 			<if test="beginDate != null and beginDate != ''">
-				AND a.assess_date &gt;= #{beginDate}
+				AND a.create_date &gt;= #{beginDate}
 			</if>
 			<if test="endDate != null and endDate != ''">
-				AND a.assess_date &lt;= #{endDate}
+				AND a.create_date &lt;= #{endDate}
 			</if>
+            <if test="status != null">
+                AND a.status = #{status}
+            </if>
 		</where>
 		<choose>
 			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
@@ -69,10 +72,13 @@
                 AND pr.project_name like concat('%',#{projectName},'%')
             </if>
             <if test="beginDate != null and beginDate != ''">
-                AND a.assess_date &gt;= #{beginDate}
+                AND a.create_date &gt;= #{beginDate}
             </if>
             <if test="endDate != null and endDate != ''">
-                AND a.assess_date &lt;= #{endDate}
+                AND a.create_date &lt;= #{endDate}
+            </if>
+            <if test="status != null">
+                AND a.status = #{status}
             </if>
         </where>
     </select>

+ 4 - 4
src/main/webapp/webpage/modules/projectSpecialistAssess/projectSpecialistAssessForm.jsp

@@ -104,7 +104,7 @@
             <form:hidden path="id"/>
                 <div class="form-group layui-row first">
                     <div class="form-group-label"><h2>基本信息</h2></div>
-                    <div class="layui-item layui-col-sm6 td1">
+                    <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">
                             <input type="hidden" value="" id ="ids">
@@ -112,19 +112,19 @@
                                                         labelValue="${projectSpecialistAssess.projectName}" cssClass="form-control required layui-input" fieldLabels="项目" fieldKeys="projectName" searchLabel="项目名称" searchKey="projectName" ></sys:gridselectcallprojectt>
                         </div>
                     </div>
-                    <div class="layui-item layui-col-sm6 td1">
+                    <div class="layui-item layui-col-sm6">
                         <label class="layui-form-label"><span class="require-item">*</span>项目编号:</label>
                         <div class="layui-input-block">
                             <form:input id ="pNumber" path="pNumber" htmlEscape="false"  readonly="true" class="form-control layui-input"/>
                         </div>
                     </div>
-                    <div class="layui-item layui-col-sm6 td1">
+                    <div class="layui-item layui-col-sm6">
                         <label class="layui-form-label double-line"><span class="require-item">*</span>项目报告名称:</label>
                         <div class="layui-input-block">
                             <form:input id ="reportName" path="reportName" htmlEscape="false"  readonly="true" class="form-control layui-input"/>
                         </div>
                     </div>
-                    <div class="layui-item layui-col-sm6 td1">
+                    <div class="layui-item layui-col-sm6">
                         <label class="layui-form-label double-line"><span class="require-item">*</span>是否调整报告:</label>
                         <div class="layui-input-block">
                             <select id="status" name="status" class="form-control simple-select required" lay-verify="">

+ 9 - 8
src/main/webapp/webpage/modules/projectSpecialistAssess/projectSpecialistAssessList.jsp

@@ -176,15 +176,16 @@
 						<div style="    clear:both;"></div>
 					</div>
 					<div id="moresees" style="clear:both;display:none;" class="lw6">
-						<%--<div class="layui-item query athird ">
-							<label class="layui-form-label">状态:</label>
+						<div class="layui-item query athird ">
+							<label class="layui-form-label double-line"><span class="require-item">*</span>调整状态:</label>
 							<div class="layui-input-block">
-								<form:select path="projectStatus" class=" form-control  simple-select">
-									<form:option value="" label=""/>
-									<form:options items="${fns:getDictList('audit_state')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
-								</form:select>
+								<select id="status" name="status" class="form-control simple-select required" lay-verify="">
+									<option value="">--是否调整报告--</option>
+									<option value="0" <c:if test="${status eq '0' }">selected</c:if>>无需调整</option>
+									<option value="1" <c:if test="${status eq '1' }">selected</c:if>>调整</option>
+								</select>
 							</div>
-						</div>--%>
+						</div>
 						<div style="clear:both;"></div>
 					</div>
 				</form:form>
@@ -227,7 +228,7 @@
             ,cols: [[
                 {field:'index',align:'center', title: '序号',width:40}
                 ,{field:'projName',align:'center', title: '项目名称',minWidth:150,templet:function(d){
-                        return "<a class=\"attention-info\" title=\"" + d.projName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/project/projectRecords/view?id=" + d.projectId +"','95%', '95%')\">" + d.projName + "</a>";
+                        return "<a class=\"attention-info\" title=\"" + d.projName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/projectReport/projectSpecialistAssess/view?id=" + d.id +"','95%', '95%')\">" + d.projName + "</a>";
                     }}
                 ,{field:'reportName',align:'center', title: '报告名称',minWidth:150,templet:function(d){
                         return "<a class=\"attention-info\" title=\"" + d.reportName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目评估信息', '${ctx}/projectcontentinfo/projectcontentinfo/form?project.id=" + d.projectId +"&view=report&infoId="+d.reportId+"','95%', '95%')\">" + d.reportName + "</a>";

+ 108 - 0
src/main/webapp/webpage/modules/projectSpecialistAssess/projectSpecialistAssessView.jsp

@@ -0,0 +1,108 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<html>
+<head>
+    <title>专家评估</title>
+    <meta name="decorator" content="default"/>
+    <style>
+        label.error{
+            left:0px;
+            top:40px;
+        }
+    </style>
+    <script type="text/javascript">
+        var validateForm;
+        $(document).ready(function() {
+            $("input[name='ext']").on('ifChecked', function(event){
+                var radioVal = $(this).val();
+                if(radioVal == 0){
+                    $(".td1").removeClass("hide");
+                }else{
+                    $(".td1").addClass("hide");
+                }
+            });
+            if("${workReimbursement.ext}" == "1"){
+                $("#ext1").iCheck('check')
+            }else{
+                $("#ext").iCheck('check')
+            }
+            validateForm = $("#inputForm").validate({
+                submitHandler: function(form){
+                    loading('正在提交,请稍等...');
+                    form.submit();
+                },
+                errorContainer: "#messageBox",
+                errorPlacement: function(error, element) {
+                    $("#messageBox").text("输入有误,请先更正。");
+                    if (element.is(":checkbox")||element.is(":radio")||element.parent().is(".input-append")){
+                        error.appendTo(element.parent().parent());
+                    } else {
+                        error.insertAfter(element);
+                    }
+                }
+            });
+            $("#attachment_btn").click(function () {
+                $("#attachment_file").click();
+            });
+        });
+    </script>
+</head>
+<body>
+<div class="single-form">
+    <div class="container">
+        <form:form id="inputForm" modelAttribute="projectSpecialistAssess" action="${ctx}/projectReport/projectSpecialistAssess/save" method="post" class="form-horizontal">
+            <input type="hidden" id="reportId" name="reportId" value="">
+            <input type="hidden" id="projectId" name="projectId" value="">
+            <input type="hidden" id="status" name="status" value="">
+            <form:hidden path="id"/>
+            <div class="form-group layui-row first">
+                <div class="form-group-label"><h2>基本信息</h2></div>
+                <div class="layui-item layui-col-sm6 td1">
+                    <label class="layui-form-label"><span class="require-item">*</span>项目名称:</label>
+                    <div class="layui-input-block">
+                        <form:input id ="projectName" path="projectName" htmlEscape="false"  readonly="true" class="form-control layui-input"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 td1">
+                    <label class="layui-form-label"><span class="require-item">*</span>项目编号:</label>
+                    <div class="layui-input-block">
+                        <form:input id ="pNumber" path="pNumber" htmlEscape="false"  readonly="true" class="form-control layui-input"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 td1">
+                    <label class="layui-form-label double-line"><span class="require-item">*</span>项目报告名称:</label>
+                    <div class="layui-input-block">
+                        <form:input id ="reportName" path="reportName" htmlEscape="false"  readonly="true" class="form-control layui-input"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 td1">
+                    <label class="layui-form-label double-line"><span class="require-item">*</span>是否调整报告:</label>
+                    <div class="layui-input-block">
+                        <c:choose>
+                            <c:when test="${projectSpecialistAssess.status == 0}">
+                                <input type="text" htmlEscape="false"  readonly="true" class="form-control layui-input" value="无需调整">
+                            </c:when>
+                            <c:otherwise>
+                                <input type="text" htmlEscape="false"  readonly="true" class="form-control layui-input" value="调整">
+                            </c:otherwise>
+                        </c:choose>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6">
+                    <label class="layui-form-label double-line"><span class="require-item">*</span>评估日期:</label>
+                    <div class="layui-input-block">
+                        <input readonly="readonly" class="laydate-icondate layui-input form-control layer-date laydate-icon required" id="assessDate" name="assessDate" value="<fmt:formatDate value="${projectSpecialistAssess.assessDate}" pattern="yyyy-MM-dd"/>">
+                    </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="assessContent" readonly="true" htmlEscape="false" rows="3" maxlength="255" class="form-control"/>
+                    </div>
+                </div>
+            </div>
+        </form:form>
+    </div>
+</div>
+</body>
+</html>