Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralCostProjectRecordsController.java

@@ -174,6 +174,11 @@ public class RuralCostProjectRecordsController extends BaseController {
 				}
 			}
 		}
+		//查询工程类型
+		if (projectRecords.getEngineeringType()!=null){
+			ProjectEngineeringInfo engineeringInfo=engineeringService.get(projectRecords.getEngineeringType());
+			model.addAttribute("engineeringInfo", engineeringInfo);
+		}
 		model.addAttribute("page", page);
 		return "modules/ruralprojectrecords/cost/ruralCostProjectRecordsList";
 	}

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectRecordsController.java

@@ -180,7 +180,11 @@ public class RuralProjectRecordsController extends BaseController {
 				}
 			}
 		}
-
+		//查询工程类型
+		if (projectRecords.getEngineeringType()!=null){
+			ProjectEngineeringInfo engineeringInfo=engineeringService.get(projectRecords.getEngineeringType());
+			model.addAttribute("engineeringInfo", engineeringInfo);
+		}
 		model.addAttribute("page", page);
 		return "modules/ruralprojectrecords/ruralProjectRecordsList";
 	}

src/main/resources/mappings/modules/ruralprojectrecords/RuralProjectMessageDao.xml

@@ -250,6 +250,7 @@
 		FROM rural_project_records a
 		LEFT JOIN sys_area area ON area.id = a.area_id
 		left join rural_project_records_reported rprr on rprr.id = a.id
+		LEFT JOIN project_flingbatch_relation pfp on pfp.project_id=a.id
 
         <if test="leaderNameStr !=null and leaderNameStr !=''">
             LEFT JOIN work_project_user w on a.id = w.project_id
@@ -318,6 +319,25 @@
             <if test="endDate !=null">
                 AND a.create_date &lt; #{endDate}
             </if>
+			<if test="createBy != null and createBy.id !=null and createBy.id !=''">
+				AND a.create_by = #{createBy.id}
+ 			</if>
+			<choose>
+				<when test="filingProjectStatus == 0">
+					AND pfp.status is null
+				</when>
+				<otherwise>
+					<if test="filingProjectStatus!=null and filingProjectStatus !=''">
+						AND pfp.status = #{filingProjectStatus}
+					</if>
+				</otherwise>
+			</choose>
+			<if test="reportData!=null and reportData.number !=null and reportData.number !=''">
+				and prd.number like concat('%',#{reportData.number},'%')
+			</if>
+			<if test="office!=null and office.id!=null and office.id!=''">
+				and  a.office_id = #{office.id}
+			</if>
             <if test="reportedState !=null and reportedState !=''">
 				<choose>
 					<when test="reportedState == 0">
@@ -385,7 +405,9 @@
 		left join project_report_data prd on prd.project_id = a.id
 		left join rural_project_report_record prr on prr.report_id = prd.id
 		left join rural_project_report_record_down prrd on prrd.report_id = prd.id
-        <where>
+		LEFT JOIN project_flingbatch_relation pfp on pfp.project_id= a.id
+
+		<where>
             a.status = 5
             <if test="projectId != null and projectId != ''">
                 AND a.project_id like concat('%',#{projectId},'%')
@@ -441,7 +463,26 @@
             <if test="endDate !=null">
                 AND a.create_date &lt; #{endDate}
             </if>
+			<if test="createBy != null and createBy.id !=null and createBy.id !=''">
+				AND a.create_by = #{createBy.id}
+			</if>
 
+				<choose>
+					<when test="filingProjectStatus == 0">
+						AND pfp.status is null
+					</when>
+					<otherwise>
+						<if test="filingProjectStatus!=null and filingProjectStatus !=''">
+							AND pfp.status = #{filingProjectStatus}
+						</if>
+					</otherwise>
+				</choose>
+			<if test="reportData!=null and reportData.number !=null and reportData.number !=''">
+				and prd.number like concat('%',#{reportData.number},'%')
+			</if>
+			<if test="office!=null and office.id!=null and office.id!=''">
+				and  a.office_id = #{office.id}
+			</if>
 			<if test="projectReportStatus != null and projectReportStatus != ''">
 				AND prd.status = #{projectReportStatus}
 			</if>

src/main/resources/mappings/modules/ruralprojectrecords/RuralProjectRecordsDao.xml

@@ -117,6 +117,7 @@
 		LEFT JOIN project_report_data prd on prd.project_id = a.id
 		LEFT JOIN rural_project_report_record prr on prd.id = prr.report_id
         LEFT JOIN sys_office o ON o.id = a.office_id
+		LEFT JOIN project_flingbatch_relation pfp on pfp.project_id=a.id
 		<where>
 			<if test="projectId != null and projectId != ''">
 				AND a.project_id like concat('%',#{projectId},'%')
@@ -175,7 +176,18 @@
 			<if test="projectType !=null and projectType !=''">
 				and project_type= #{projectType}
 			</if>
-
+			<if test="engineeringType !=null and engineeringType !=''">
+				and a.engineering_type= #{engineeringType}
+			</if>
+			<if test="office!=null and office.id!=null and office.id!=''">
+				and  a.office_id = #{office.id}
+			</if>
+			<if test="reportData!=null and reportData.number !=null and reportData.number !=''">
+				and prd.number like concat('%',#{reportData.number},'%')
+			</if>
+			<if test="filingProjectStatus!=null and filingProjectStatus !=''">
+				and pfp.status =${filingProjectStatus}
+			</if>
             <if test="sqlMap.delFlag !=null and sqlMap.delFlag!=''">
 				${sqlMap.delFlag}
             </if>
@@ -208,7 +220,8 @@
         <if test="workContractInfo!=null and workContractInfo.client !=null and workContractInfo.client.name !=null and workContractInfo.client.name !=''">
             LEFT JOIN work_client_info wct on wci.client_id = wct.id
         </if>
-        <where>
+		LEFT JOIN project_flingbatch_relation pfp on pfp.project_id=a.id
+		<where>
             <if test="projectId != null and projectId != ''">
                 AND a.project_id like concat('%',#{projectId},'%')
             </if>
@@ -266,6 +279,21 @@
             <if test="projectType !=null and projectType !=''">
 				and project_type= #{projectType}
             </if>
+			<if test="engineeringType !=null and engineeringType !=''">
+				and a.engineering_type= #{engineeringType}
+			</if>
+			<if test="office!=null and office.id!=null and office.id!=''">
+				and  a.office_id = #{office.id}
+			</if>
+			<if test="reportData!=null and reportData.number !=null and reportData.number !=''">
+				and prd.number like concat('%',#{reportData.number},'%')
+			</if>
+			<if test="userId!=null and userId !=''">
+				and a.createBy =${userId}
+			</if>
+			<if test="filingProjectStatus!=null and filingProjectStatus !=''">
+				and pfp.status =${filingProjectStatus}
+			</if>
 			<if test="sqlMap.delFlag !=null and sqlMap.delFlag!=''">
 				${sqlMap.delFlag}
 			</if>

src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectRecordsList.jsp

@@ -4,9 +4,32 @@
 <head>
 	<title>项目登记</title>
 	<meta name="decorator" content="default"/>
+	<script type="text/javascript" src="${ctxStatic}/layui/layuidown.js"></script>
+	<link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/layuidown.css"/>
 	<%--<script src="${ctxStatic}/layer-v2.3/laydate/laydate.js"></script>--%>
 	<script type="text/javascript">
         $(document).ready(function() {
+			layui.use(['dropdown', 'util', 'layer'], function () {
+				var form = layui.form;
+				$.ajax({
+					type : "POST",
+					url : "${ctx}/ruralProject/ruralProjectRecords/engineeringTreeMenu",
+					//请求成功
+					success : function(result) {
+						var str=jQuery.parseJSON(result);
+						//工程类型树形菜单
+						layui.dropdown.render({
+							elem: '#demo100'
+							,style: 'width: 320px;'
+							,data:str
+							,click: function(item){
+								$("#demo100").val(item.title)
+								$("#demo101").val(item.id)
+							}
+						});
+					}
+				});
+			})
 
             //搜索框收放
             $('#moresee').click(function(){
@@ -392,6 +415,31 @@
 								</form:select>
 							</div>
 						</div>
+						<div class="layui-item query athird">
+							<label class="layui-form-label">工程类型：</label>
+							<div class="layui-input-block">
+								<input id="demo100" value="${engineeringInfo.engineeringName}" readonly="true" style="background-color: #fff" htmlEscape="false" maxlength="255"  class=" form-control layui-input"/>
+								<form:input id="demo101" path="engineeringType" readonly="true" cssStyle="background-color: #fff;display: none"  htmlEscape="false" maxlength="255"  class=" form-control layui-input"/>
+<%--								<button type="button" class="layui-btn layui-btn-primary" style="width: 100%;text-align: left" id="demo100">--%>
+<%--									<span>${engineeringInfo.engineeringName}</span>--%>
+<%--									<input type="hidden" name="engineeringType" id="engineeringType" value="${engineeringInfo.engineeringName}"/>--%>
+<%--									<i class="layui-icon layui-icon-down layui-font-12" style="float: right"></i>--%>
+<%--								</button>--%>
+							</div>
+						</div>
+						<div class="layui-item query athird ">
+							<label class="layui-form-label">报告号：</label>
+							<div class="layui-input-block">
+								<form:input path="reportData.number" htmlEscape="false" maxlength="255"  class=" form-control layui-input"/>
+							</div>
+						</div>
+						<div class="layui-item query athird">
+							<label class="layui-form-label">部门:</label>
+							<div class="layui-input-block with-icon">
+								<sys:treeselect id="officeId" name="office.id" value="${ruralProjectRecords.office.id}" labelName="office.name" labelValue="${ruralProjectRecords.office.name}"
+												title="部门" url="/sys/office/treeDataAll?type=2" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
+							</div>
+						</div>
 						<div style="clear:both;"></div>
 					</div>
 				</form:form>
@@ -441,7 +489,7 @@
 	<div id="changewidth"></div>
 </div>
 
-<script src="${ctxStatic}/layer-v2.3/layui/layui.all.js" charset="utf-8"></script>
+<%--<script src="${ctxStatic}/layer-v2.3/layui/layui.all.js" charset="utf-8"></script>--%>
 <script>
 
     layui.use('table', function(){

src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsList.jsp

@@ -4,10 +4,32 @@
 <head>
 	<title>项目登记</title>
 	<meta name="decorator" content="default"/>
+	<script type="text/javascript" src="${ctxStatic}/layui/layuidown.js"></script>
+	<link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/layuidown.css"/>
 	<%--<script src="${ctxStatic}/layer-v2.3/laydate/laydate.js"></script>--%>
 	<script type="text/javascript">
         $(document).ready(function() {
-
+			layui.use(['dropdown', 'util', 'layer'], function () {
+				var form = layui.form;
+				$.ajax({
+					type : "POST",
+					url : "${ctx}/ruralProject/ruralProjectRecords/engineeringTreeMenu",
+					//请求成功
+					success : function(result) {
+						var str=jQuery.parseJSON(result);
+						//工程类型树形菜单
+						layui.dropdown.render({
+							elem: '#demo100'
+							,style: 'width: 320px;'
+							,data:str
+							,click: function(item){
+								$("#demo100").val(item.title)
+								$("#demo101").val(item.id)
+							}
+						});
+					}
+				});
+			})
             //搜索框收放
             $('#moresee').click(function(){
                 if($('#moresees').is(':visible'))
@@ -364,6 +386,31 @@
 								</form:select>
 							</div>
 						</div>
+						<div class="layui-item query athird">
+							<label class="layui-form-label">工程类型：</label>
+							<div class="layui-input-block">
+								<input id="demo100" value="${engineeringInfo.engineeringName}" readonly="true" style="background-color: #fff" htmlEscape="false" maxlength="255"  class=" form-control layui-input"/>
+								<form:input id="demo101" path="engineeringType" readonly="true" cssStyle="background-color: #fff;display: none"  htmlEscape="false" maxlength="255"  class=" form-control layui-input"/>
+									<%--								<button type="button" class="layui-btn layui-btn-primary" style="width: 100%;text-align: left" id="demo100">--%>
+									<%--									<span>${engineeringInfo.engineeringName}</span>--%>
+									<%--									<input type="hidden" name="engineeringType" id="engineeringType" value="${engineeringInfo.engineeringName}"/>--%>
+									<%--									<i class="layui-icon layui-icon-down layui-font-12" style="float: right"></i>--%>
+									<%--								</button>--%>
+							</div>
+						</div>
+						<div class="layui-item query athird ">
+							<label class="layui-form-label">报告号：</label>
+							<div class="layui-input-block">
+								<form:input path="reportData.number" htmlEscape="false" maxlength="255"  class=" form-control layui-input"/>
+							</div>
+						</div>
+						<div class="layui-item query athird">
+							<label class="layui-form-label">部门:</label>
+							<div class="layui-input-block with-icon">
+								<sys:treeselect id="officeId" name="office.id" value="${ruralProjectRecords.office.id}" labelName="office.name" labelValue="${ruralProjectRecords.office.name}"
+												title="部门" url="/sys/office/treeDataAll?type=2" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
+							</div>
+						</div>
 						<div style="clear:both;"></div>
 					</div>
 				</form:form>
@@ -408,7 +455,7 @@
 	<div id="changewidth"></div>
 </div>
 
-<script src="${ctxStatic}/layer-v2.3/layui/layui.all.js" charset="utf-8"></script>
+<%--<script src="${ctxStatic}/layer-v2.3/layui/layui.all.js" charset="utf-8"></script>--%>
 <script>
 
     layui.use('table', function(){