项目上报字典调整改动demo

src/main/java/com/jeeplus/modules/projectrecord/entity/ProjectRecords.java

@@ -17,6 +17,7 @@ import com.jeeplus.modules.workcontractinfo.entity.WorkContractInfo;
 import org.hibernate.validator.constraints.NotBlank;
 
 import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -125,6 +126,7 @@ public class ProjectRecords extends ActEntity<ProjectRecords> {
 	private String constructionLinkman; //施工方联系人
 	private String attachmentProjectSort;   //项目类别
 	private List<User> bzshbUserList;  //总审用户信息
+	private BigDecimal submitScale;	//送审规模
 	private List<WorkClientAttachment> workAttachments = Lists.newArrayList();
 
 	private List<ProjectReportData> projectReportData = Lists.newArrayList();
@@ -146,7 +148,7 @@ public class ProjectRecords extends ActEntity<ProjectRecords> {
 	public void setWorkContractInfo(WorkContractInfo contract) {
 		this.workContractInfo = contract;
 	}
-	
+
 	@ExcelField(title="项目编号", align=2, sort=1)
 	public String getProjectId() {
 		return projectId;
@@ -155,7 +157,7 @@ public class ProjectRecords extends ActEntity<ProjectRecords> {
 	public void setProjectId(String projectId) {
 		this.projectId = projectId;
 	}
-	
+
 	@ExcelField(title="项目名称", align=2, sort=2)
 	public String getProjectName() {
 		return projectName;
@@ -164,7 +166,7 @@ public class ProjectRecords extends ActEntity<ProjectRecords> {
 	public void setProjectName(String projectName) {
 		this.projectName = projectName;
 	}
-	
+
 	@ExcelField(title="规模类型", align=2, sort=9)
 	public String getScaleType() {
 		return scaleType;
@@ -173,7 +175,7 @@ public class ProjectRecords extends ActEntity<ProjectRecords> {
 	public void setScaleType(String scaleType) {
 		this.scaleType = scaleType;
 	}
-	
+
 	@ExcelField(title="规模单位", align=2, sort=10)
 	public String getScaleUnit() {
 		return scaleUnit;
@@ -182,7 +184,7 @@ public class ProjectRecords extends ActEntity<ProjectRecords> {
 	public void setScaleUnit(String scaleUnit) {
 		this.scaleUnit = scaleUnit;
 	}
-	
+
 	@ExcelField(title="规模数量", align=2, sort=11)
 	public Double getScaleQuantity() {
 		return scaleQuantity;
@@ -191,7 +193,7 @@ public class ProjectRecords extends ActEntity<ProjectRecords> {
 	public void setScaleQuantity(Double scaleQuantity) {
 		this.scaleQuantity = scaleQuantity;
 	}
-	
+
 	@ExcelField(title="项目所在地", align=2, sort=12)
 	public Area getArea() {
 		return area;
@@ -200,7 +202,7 @@ public class ProjectRecords extends ActEntity<ProjectRecords> {
 	public void setArea(Area area) {
 		this.area = area;
 	}
-	
+
 	@ExcelField(title="建设地点", align=2, sort=13)
 	public String getProjectSite() {
 		return projectSite;
@@ -764,4 +766,12 @@ public class ProjectRecords extends ActEntity<ProjectRecords> {
 	public void setBzshbUserList(List<User> bzshbUserList) {
 		this.bzshbUserList = bzshbUserList;
 	}
-}
+
+	public BigDecimal getSubmitScale() {
+		return submitScale;
+	}
+
+	public void setSubmitScale(BigDecimal submitScale) {
+		this.submitScale = submitScale;
+	}
+}

src/main/java/com/jeeplus/modules/reported/dao/ProjectReportedTypeDao.java

@@ -4,6 +4,8 @@ import com.jeeplus.common.persistence.CrudDao;
 import com.jeeplus.common.persistence.annotation.MyBatisDao;
 import com.jeeplus.modules.reported.entity.ProjectReportedType;
 
+import java.util.List;
+
 /**
  * @author: 徐滕
  * @create: 2021-06-17 11:01
@@ -15,4 +17,7 @@ public interface ProjectReportedTypeDao extends CrudDao<ProjectReportedType> {
     ProjectReportedType getReportedType(String tpye);
 
     ProjectReportedType getReportedByType(ProjectReportedType projectReportedType);
+
+
+    List<ProjectReportedType> getReportedByTypeList(ProjectReportedType projectReportedType);
 }

src/main/java/com/jeeplus/modules/reported/service/ProjectReportedTypeService.java

@@ -1,5 +1,6 @@
 package com.jeeplus.modules.reported.service;
 
+import com.google.common.collect.Lists;
 import com.jeeplus.common.persistence.Page;
 import com.jeeplus.common.service.CrudService;
 import com.jeeplus.common.utils.StringUtils;
@@ -100,6 +101,61 @@ public class ProjectReportedTypeService extends CrudService<ProjectReportedTypeD
     }
 
 
+
+    /**
+     * 项目计划查询数据信息
+     * @param page
+     * @param projectReportedType
+     * @return
+     */
+    public Page<ProjectReportedType> findPages(Page<ProjectReportedType> page, ProjectReportedType projectReportedType) {
+        int count = dao.queryCount(projectReportedType);
+        page.setCount(count);
+        page.setCountFlag(false);
+        projectReportedType.setPage(page);
+        List<MainDictDetail> reportedTypeList = this.getTemplateList("project_reported_type");
+
+        List<ProjectReportedType> recordsList = Lists.newArrayList();
+        for (MainDictDetail detail: reportedTypeList) {
+            ProjectReportedType info = new ProjectReportedType();
+            info.setProjectTypeName(detail.getLabel());
+            info.setProjectType(detail.getValue());
+            recordsList.add(info);
+        }
+        /*for (ProjectReportedType info: recordsList) {
+            if(StringUtils.isNotBlank(info.getProjectKey())){
+                if("engineeringType".equals(info.getProjectType())){
+                    List<ProjectEngineeringInfo> parentInfoList = engineeringService.getParentInfo();
+                    for (ProjectEngineeringInfo detail: parentInfoList) {
+                        if(info.getProjectKey().equals(detail.getId())){
+                            info.setProjectKeyName(detail.getEngineeringName());
+                            break;
+                        }
+                    }
+                }else{
+                    List<MainDictDetail> projectTypeList = this.getTemplateList(info.getProjectType());
+                    for (MainDictDetail detail: projectTypeList) {
+                        if(info.getProjectKey().equals(detail.getValue())){
+                            info.setProjectKeyName(detail.getLabel());
+                            break;
+                        }
+                    }
+                }
+
+                List<MainDictDetail> reportedTypeList = this.getTemplateList(info.getReportedType());
+                for (MainDictDetail detail: reportedTypeList) {
+                    if(info.getReportedKey().equals(detail.getValue())){
+                        info.setReportedKeyName(detail.getLabel());
+                        break;
+                    }
+                }
+            }
+        }*/
+        page.setList(recordsList);
+        return page;
+    }
+
+
     /**
      * 新增
      * @param projectReportedType
@@ -117,4 +173,9 @@ public class ProjectReportedTypeService extends CrudService<ProjectReportedTypeD
     public ProjectReportedType getReportedByType(ProjectReportedType projectReportedType){
         return  dao.getReportedByType(projectReportedType);
     }
+
+
+    public List<ProjectReportedType> getReportedByTypeList(ProjectReportedType projectReportedType){
+        return  dao.getReportedByTypeList(projectReportedType);
+    }
 }

src/main/java/com/jeeplus/modules/reported/web/ProjectReportedTypeController.java

@@ -77,6 +77,23 @@ public class ProjectReportedTypeController extends BaseController {
 
 
     /**
+     * 查询列表页面
+     */
+    /*@RequiresPermissions("projectReportedType:projectReportedType:list")
+    @RequestMapping(value = {"list", ""})
+    public String list(ProjectReportedType projectReportedType, HttpServletRequest request, HttpServletResponse response, Model model) {
+        if(UserUtils.isManager()){
+            model.addAttribute("flag","1");
+        }
+        //获取项目信息
+        Page<ProjectReportedType> page = projectReportedTypeService.findPages(new Page<ProjectReportedType>(request, response), projectReportedType);
+
+        model.addAttribute("page", page);
+        return "modules/reported/projectReportedTypeLists";
+    }*/
+
+
+    /**
      * 查看，增加，编辑工程类型表单页面
      * @param projectReportedType
      * @param model
@@ -92,7 +109,40 @@ public class ProjectReportedTypeController extends BaseController {
         return "modules/reported/projectReportedTypeForm";
     }
 
+    /**
+     * 查看，增加，编辑工程类型表单页面
+     * @param projectReportedType
+     * @param model
+     * @return
+     */
+    /*@RequiresPermissions(value={"projectReportedType:projectReportedType:save","projectReportedType:projectReportedType:modify"},logical= Logical.OR)
+    @RequestMapping(value = "forms")
+    public String forms(ProjectReportedType projectReportedType, Model model) {
+        //根据项目类型查询对应上报字段类型
+        ProjectReportedType info = projectReportedTypeService.getReportedType(projectReportedType.getProjectType());
+        //获取字典值
+        List<ProjectReportedType> reportedByTypeList = Lists.newArrayList();
+        reportedByTypeList = projectReportedTypeService.getReportedByTypeList(projectReportedType);
+
+        if("engineeringType".equals(projectReportedType.getProjectType())){
+            List<ProjectEngineeringInfo> parentInfoList = engineeringService.getParentInfo();
+            for (ProjectEngineeringInfo engineering: parentInfoList) {
+                ProjectReportedType addInfo = new ProjectReportedType();
+                addInfo.setProjectType("engineeringType");
+                addInfo.setProjectKey(engineering.getId());
+                addInfo.setProjectTypeName(engineering.getEngineeringName());
+                reportedByTypeList.add(addInfo);
+            }
+        }
 
+
+        List<MainDictDetail> parentInfos= projectReportedTypeService.getTemplateList(projectReportedType.getProjectType());
+        List<MainDictDetail> parentInfoss= projectReportedTypeService.getTemplateList(info.getReportedType());
+        model.addAttribute("parentInfos", parentInfos);
+        model.addAttribute("projectReportedType", projectReportedType);
+        return "modules/reported/projectReportedTypeForm";
+    }
+*/
     @RequestMapping("getProjectReportedType")
     @ResponseBody
     public Map getProjectReportedType(String projectType){

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

@@ -17,6 +17,7 @@ import com.jeeplus.modules.workcontractinfo.entity.WorkContractInfo;
 import org.hibernate.validator.constraints.NotBlank;
 
 import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -195,6 +196,7 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 
 
 	private Integer planCount;	//项目计划数量
+	private BigDecimal submitScale;	//送审规模
 
 
 	private List<String> civilProjectList = Lists.newArrayList();
@@ -1379,4 +1381,12 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 	public void setAdventDateDate(Date adventDateDate) {
 		this.adventDateDate = adventDateDate;
 	}
+
+	public BigDecimal getSubmitScale() {
+		return submitScale;
+	}
+
+	public void setSubmitScale(BigDecimal submitScale) {
+		this.submitScale = submitScale;
+	}
 }

src/main/resources/mappings/modules/reported/ProjectReportedTypeDao.xml

@@ -121,4 +121,12 @@
 		where project_type = #{projectType} and project_key = #{projectKey}
 	</select>
 
+	<select id="getReportedByTypeList" resultType="com.jeeplus.modules.reported.entity.ProjectReportedType">
+		select
+			<include refid="projectRecordsColumns"/>
+		from
+		project_records_reported_type_info a
+		where project_type = #{projectType}
+	</select>
+
 </mapper>