添加造价审核和工程咨询功能

src/main/java/com/jeeplus/modules/ruralprojectrecords/entity/RuralProjectRecords.java

@@ -66,6 +66,8 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 
 	private String prrProcessInstanceId; //归档流程号
 
+	private String projectType; //类型 1.工程咨询 2.造价审核
+
 	private String prrId;
 
 	public String getPrrId() {
@@ -626,4 +628,12 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 	public void setProjectReportData(List<ProjectReportData> projectReportData) {
 		this.projectReportData = projectReportData;
 	}
+
+	public String getProjectType() {
+		return projectType;
+	}
+
+	public void setProjectType(String projectType) {
+		this.projectType = projectType;
+	}
 }

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

@@ -93,6 +93,8 @@ public class RuralProjectRecordsController extends BaseController {
         if(UserUtils.isManager()){
             model.addAttribute("flag","1");
         }
+        //添加查询类型(工程咨询)
+		projectRecords.setProjectType("1");
         //获取项目信息
 		Page<RuralProjectRecords> page = projectRecordsService.findPage(new Page<RuralProjectRecords>(request, response), projectRecords);
         //无合同状态下，获取委托方的名称
@@ -162,6 +164,8 @@ public class RuralProjectRecordsController extends BaseController {
                 MyBeanUtils.copyBeanNotNull2Bean(projectRecords, t);//将编辑表单中的非NULL值覆盖数据库记录中的值
                 projectRecordsService.saveProject(t, ProjectStatusEnum.IN_APRL);//保存
             } else {//新增表单保存
+				//添加查询类型(工程咨询)
+				projectRecords.setProjectType("1");
                 projectRecordsService.saveProject(projectRecords, ProjectStatusEnum.IN_APRL);//保存
             }
 			addMessage(redirectAttributes, "保存项目成功");
@@ -187,6 +191,8 @@ public class RuralProjectRecordsController extends BaseController {
                 MyBeanUtils.copyBeanNotNull2Bean(projectRecords, t);//将编辑表单中的非NULL值覆盖数据库记录中的值
                 projectRecordsService.saveProject(t, ProjectStatusEnum.TSTORE);//保存
             } else {//新增表单保存
+            	// 添加查询类型(工程咨询)
+				projectRecords.setProjectType("1");
                 projectRecordsService.saveProject(projectRecords, ProjectStatusEnum.TSTORE);//保存
             }
             addMessage(redirectAttributes, "暂存项目成功");
@@ -260,6 +266,8 @@ public class RuralProjectRecordsController extends BaseController {
     @RequestMapping(value = "export", method=RequestMethod.POST)
     public String exportFile(RuralProjectRecords projectRecords, HttpServletRequest request, HttpServletResponse response, RedirectAttributes redirectAttributes) {
 		try {
+			//添加查询类型(造价审核)
+			projectRecords.setProjectType("1");
             String fileName = "项目"+DateUtils.getDate("yyyyMMddHHmmss")+".xlsx";
             Page<RuralProjectRecords> page = projectRecordsService.findPage(new Page<RuralProjectRecords>(request, response, -1), projectRecords);
     		new ExportExcel("项目", RuralProjectRecords.class).setDataList(page.getList()).write(response, fileName).dispose();

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

@@ -71,6 +71,8 @@ public class RuralProjectRecordsUserController extends BaseController {
 	@RequestMapping(value = {"list", ""})
 	public String list(RuralProjectRecords projectRecords, HttpServletRequest request, HttpServletResponse response, Model model) {
 		projectRecords.setProjectStatus(5);
+		//添加查询类型(工程咨询)
+		projectRecords.setProjectType("1");
 		Page<RuralProjectRecords> page = projectRecordsService.findPageByStatus(new Page<RuralProjectRecords>(request, response), projectRecords);
 		model.addAttribute("page", page);
 		return "modules/ruralprojectrecords/ruralProjectRecordUsersList";

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

@@ -135,6 +135,9 @@
             <if test="endDate !=null">
                 AND a.create_date &lt; #{endDate}
             </if>
+			<if test="projectType !=null and projectType !=''">
+				and project_type= #{projectType}
+			</if>
             AND  a.status != 7 AND a.del_flag = #{DEL_FLAG_NORMAL}
             <if test="sqlMap.dsf !=null and sqlMap.dsf!=''">
                AND ((w1.user_id = #{currentUser.id} AND w1.del_flag='0' AND a.company_id = #{currentUser.company.id} )${sqlMap.dsf} )
@@ -220,6 +223,9 @@
             <if test="endDate !=null">
                 AND a.create_date &lt; #{endDate}
             </if>
+            <if test="projectType !=null and projectType !=''">
+				and project_type= #{projectType}
+            </if>
             AND  a.status != 7 AND a.del_flag = #{DEL_FLAG_NORMAL}
             <if test="sqlMap.dsf !=null and sqlMap.dsf!=''">
                 AND ((w1.user_id = #{currentUser.id} AND w1.del_flag='0' AND a.company_id = #{currentUser.company.id})${sqlMap.dsf} )
@@ -370,7 +376,8 @@
 		    unit_fees,
 		    building_unit_fees,
 		    install_unit_fees,
-		    total_fees
+		    total_fees,
+		    project_type
 		) VALUES (
 			#{id},
 			#{createBy.id},
@@ -408,7 +415,8 @@
 			#{unitFees},
 			#{buildingUnitFees},
 			#{installUnitFees},
-			#{totalFees}
+			#{totalFees},
+			#{projectType}
 		)
 	</insert>