项目根据项目类别查询

src/main/java/com/jeeplus/modules/projectrecord/service/ProjectReportedImportService.java

@@ -359,11 +359,11 @@ public class ProjectReportedImportService extends CrudService<ProjectReportedImp
         //正式接口
         String url = REPORTEDURL;
         //发送请求
-        /*String returnResult = HttpPostTool.doPost(url, encryptByAes);
+        String returnResult = HttpPostTool.doPost(url, encryptByAes);
         HashMap hashMap = JSON.parseObject(returnResult, HashMap.class);
         if(!"1".equals(hashMap.get("code"))){
             return "上报失败：" + hashMap.get("msg").toString();
-        }*/
+        }
         //修改项目上报表中状态
         reported.setReportStatus(String.valueOf(ProjectStatusEnum.SIGNED.getValue()));
         reported.preUpdate();

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

@@ -479,6 +479,9 @@
             <if test="endDate !=null">
                 AND a.create_date &lt; #{endDate}
             </if>
+			<if test="attachmentProjectSort !=null and attachmentProjectSort != ''">
+				AND a.attachment_project_sort = #{attachmentProjectSort}
+			</if>
             <if test="emergencyProject !=null and emergencyProject != ''">
 				<choose>
 					<when test="emergencyProject == 0">
@@ -705,6 +708,9 @@
             <if test="endDate !=null">
                 AND a.create_date &lt; #{endDate}
             </if>
+			<if test="attachmentProjectSort !=null and attachmentProjectSort != ''">
+				AND a.attachment_project_sort = #{attachmentProjectSort}
+			</if>
 			<if test="emergencyProject !=null and emergencyProject != ''">
 				<choose>
 					<when test="emergencyProject == 0">

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

@@ -446,6 +446,9 @@
             <if test="endDate !=null">
                 AND a.create_date &lt; #{endDate}
             </if>
+            <if test="attachmentProjectSort !=null and attachmentProjectSort != ''">
+                AND a.attachment_project_sort = #{attachmentProjectSort}
+            </if>
 			<if test="projectType !=null and projectType !=''">
 				and project_type= #{projectType}
 			</if>
@@ -646,6 +649,9 @@
             <if test="beginDate !=null">
                 AND a.create_date >= #{beginDate}
             </if>
+			<if test="attachmentProjectSort !=null and attachmentProjectSort != ''">
+				AND a.attachment_project_sort = #{attachmentProjectSort}
+			</if>
             <if test="endDate !=null">
                 AND a.create_date &lt; #{endDate}
             </if>
@@ -776,6 +782,9 @@
             <if test="endDate !=null">
                 AND a.create_date &lt; #{endDate}
             </if>
+			<if test="attachmentProjectSort !=null and attachmentProjectSort != ''">
+				AND a.attachment_project_sort = #{attachmentProjectSort}
+			</if>
             <if test="projectType !=null and projectType !=''">
 				and project_type= #{projectType}
             </if>

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

@@ -1152,6 +1152,15 @@
 								<input id="workContractInfoClientName" name="workContractInfo.client.name" value="${workContractInfoClientName}" 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 readOnlyFFF">
+								<form:select placeholder="请选择" path="attachmentProjectSort" class="form-control editable-select layui-input" id="attachmentProjectSort" value="${attachmentProjectSort}">
+									<form:option value=""/>
+									<form:options items="${fns:getMainDictList('attachment_project_sort_cost')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+								</form:select>
+							</div>
+						</div>
 						<div class="layui-item query athird ">
 							<label class="layui-form-label">创建时间：</label>
 							<div class="layui-input-block readOnlyFFF">

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

@@ -488,6 +488,15 @@
 							</div>
 						</div>
 						<div class="layui-item query athird">
+							<label class="layui-form-label">项目类别：</label>
+							<div class="layui-input-block with-icon">
+								<form:select placeholder="请选择" path="attachmentProjectSort" class="form-control editable-select layui-input" id="attachmentProjectSort" value="${attachmentProjectSort}">
+									<form:option value=""/>
+									<form:options items="${fns:getMainDictList('attachment_project_sort_cost')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+								</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"/>

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

@@ -360,6 +360,15 @@
 							</div>
 						</div>
 						<div class="layui-item query athird">
+							<label class="layui-form-label">项目类别：</label>
+							<div class="layui-input-block with-icon">
+								<form:select placeholder="请选择" path="attachmentProjectSort" class="form-control editable-select layui-input" id="attachmentProjectSort" value="${attachmentProjectSort}">
+									<form:option value=""/>
+									<form:options items="${fns:getMainDictList('attachment_project_sort')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+								</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"/>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/ruralProjectMessageList.jsp

@@ -763,6 +763,15 @@
 								<input id="workContractInfoClientName" name="workContractInfo.client.name" value="${workContractInfoClientName}" 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 readOnlyFFF">
+								<form:select placeholder="请选择" path="attachmentProjectSort" class="form-control editable-select layui-input" id="attachmentProjectSort" value="${attachmentProjectSort}">
+									<form:option value=""/>
+									<form:options items="${fns:getMainDictList('attachment_project_sort')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+								</form:select>
+							</div>
+						</div>
 						<div class="layui-item query athird ">
 							<label class="layui-form-label">创建时间：</label>
 							<div class="layui-input-block readOnlyFFF">