Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/projectType/dao/ProjectResultsFileTemplateDao.java

@@ -49,6 +49,10 @@ public interface ProjectResultsFileTemplateDao  extends CrudDao<ProjectTemplateT
      * 初始化加载获取项目类型到下拉框
      */
     List<ProjectTemplateType> getProjectType();
+    /**
+     * 根据typeId获取信息
+     */
+    List<ProjectTemplateType> getProjectTypeByTypeIdList(String typeId);
 
     /**
      * 根据项目所属区域类型获取对应得二级级别信息

src/main/java/com/jeeplus/modules/projectType/service/ProjectResultsFileTemplateService.java

@@ -130,6 +130,12 @@ public class ProjectResultsFileTemplateService  extends CrudService<ProjectResul
     public List<ProjectTemplateType> getProjectType() {
         return dao.getProjectType();
     }
+    /**
+     * 初始化加载获取项目类型到下拉框
+     */
+    public List<ProjectTemplateType> getProjectTypeByTypeIdList(String typeId) {
+        return dao.getProjectTypeByTypeIdList(typeId);
+    }
 
 
     @Transactional(readOnly = false)

src/main/java/com/jeeplus/modules/projectType/web/ProjectResultsFileTemplateController.java

@@ -1,12 +1,14 @@
 package com.jeeplus.modules.projectType.web;
 
 import com.jeeplus.common.config.Global;
+import com.jeeplus.common.json.AjaxJson;
 import com.jeeplus.common.utils.MyBeanUtils;
 import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.common.web.BaseController;
 import com.jeeplus.modules.projectType.entity.ProjectTemplateType;
 import com.jeeplus.modules.projectType.service.ProjectResultsFileTemplateService;
 import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportTreeData;
+import com.jeeplus.modules.sys.entity.MainDictDetail;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -163,4 +165,25 @@ public class ProjectResultsFileTemplateController extends BaseController {
         }
         return map;
     }
+
+    /**
+     * 根据工作内容查询成果类型
+     * @param typeId
+     * @return
+     */
+    @RequestMapping("getProjectTypeByTypeIdList")
+    @ResponseBody
+    public AjaxJson getProjectTypeByTypeIdList(String typeId){
+        AjaxJson ajaxJson = new AjaxJson();
+        try {
+            List<ProjectTemplateType> getAchievementTypeList = projectResultsFileTemplateService.getProjectTypeByTypeIdList(typeId);
+            ajaxJson.getBody().put("list",getAchievementTypeList);
+            ajaxJson.setMsg("获取数据成功");
+        }catch (Exception e){
+            logger.error("获取数据异常!",e);
+            ajaxJson.setSuccess(false);
+            ajaxJson.setMsg("获取数据异常");
+        }
+        return  ajaxJson;
+    }
 }

src/main/java/com/jeeplus/modules/projectcontentinfo/entity/ProjectReportData.java

@@ -96,6 +96,7 @@ public class ProjectReportData extends ActEntity<ProjectReportData> {
 	private Double buildingFee;   //土建额
 	private Double installFee;    //安装额
 	private String recordNum;     //归档申请编号
+	private String templateTypeName;
 
 
 	public String getUpId() {
@@ -571,4 +572,12 @@ public class ProjectReportData extends ActEntity<ProjectReportData> {
 	public void setRecordNum(String recordNum) {
 		this.recordNum = recordNum;
 	}
+
+	public String getTemplateTypeName() {
+		return templateTypeName;
+	}
+
+	public void setTemplateTypeName(String templateTypeName) {
+		this.templateTypeName = templateTypeName;
+	}
 }

src/main/java/com/jeeplus/modules/projectcontentinfo/web/ProjectcontentinfoController.java

@@ -13,6 +13,8 @@ import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.common.web.BaseController;
 import com.jeeplus.modules.act.entity.Act;
 import com.jeeplus.modules.act.service.ActTaskService;
+import com.jeeplus.modules.projectType.entity.ProjectTemplateType;
+import com.jeeplus.modules.projectType.service.ProjectResultsFileTemplateService;
 import com.jeeplus.modules.projectType.service.ProjectTypeService;
 import com.jeeplus.modules.projectcontentinfo.entity.*;
 import com.jeeplus.modules.projectcontentinfo.service.*;
@@ -88,6 +90,8 @@ public class ProjectcontentinfoController extends BaseController {
 	private DictService dictService;
 	@Autowired
 	private ProjectEarlyReviewService projectEarlyReviewService;
+	@Autowired
+	private ProjectResultsFileTemplateService projectResultsFileTemplateService;
 	@ModelAttribute("projectcontentinfo")
 	public Projectcontentinfo get(@RequestParam(required=false) String id) {
 		Projectcontentinfo entity = null;
@@ -735,7 +739,6 @@ public class ProjectcontentinfoController extends BaseController {
 					projectReportData.setNumber("");
 				}
 			}
-
 			if("according".equals(projectcontentinfo.getCondition()) || "completion".equals(projectcontentinfo.getCondition())){
 				/**
 				 * 查询配置的宜居性资料并添加到展示view中
@@ -773,6 +776,12 @@ public class ProjectcontentinfoController extends BaseController {
 			model.addAttribute("reviewStandard", projectReportData.getReviewStandard());
 			model.addAttribute("projectId", records.getId());
 			if("according".equals(projectcontentinfo.getCondition()) || "completion".equals(projectcontentinfo.getCondition())){
+				if(StringUtils.isNotBlank(projectReportData.getAchievementType())){
+					ProjectTemplateType projectTemplateType = projectResultsFileTemplateService.get(projectReportData.getAchievementType());
+					if(null != projectTemplateType){
+						projectReportData.setTemplateTypeName(projectTemplateType.getTypeName());
+					}
+				}
 				if ("edit".equals(projectcontentinfo.getFlag())) {
 					return "modules/projectrecord/workContentFromAndView/reportForm";
 				} else {

src/main/resources/mappings/modules/projectType/ProjectResultsFileTemplateDao.xml

@@ -168,6 +168,12 @@
 		select type_id as "typeId",type_name as "typeName" from project_template_type where parent_id="0"
 	</select>
 
+	<select id="getProjectTypeByTypeIdList" resultType="com.jeeplus.modules.projectType.entity.ProjectTemplateType">
+		select id as id,type_name as "typeName"
+		from project_template_type
+		where parent_id=#{typeId}
+	</select>
+
 	<select id="getProjectTypeByParentId" resultType="java.lang.String">
 		select type_id typeId from project_template_type
 		where parent_id = #{parentId}

src/main/webapp/webpage/modules/projectrecord/workContentFromAndView/reportForm.jsp

@@ -1103,8 +1103,8 @@
 			var achievementParentId = $("#achievementParentIdHidden").val();
 			$.ajax({
 				type:"post",
-				url:'${ctx}/projectcontentinfo/projectcontentinfo/getAchievementTypeList',
-				data:{"achievementParentId":achievementParentId,type:1},
+				url:'${ctx}/project/projectResultsFileTemplate/getProjectTypeByTypeIdList',
+				data:{"typeId":achievementParentId},
 				dataType:"json",
 				success:function(data){
 					if(data.success) {
@@ -1112,7 +1112,7 @@
 						var list = eval(data.body.list);
 						dataList=list;
 						for(var i in list){
-							$('#achievementType').append(new Option(dataList[i].label, dataList[i].value));
+							$('#achievementType').append(new Option(dataList[i].typeName, dataList[i].id));
 						}
 
 						layui.form.render("select");

src/main/webapp/webpage/modules/projectrecord/workContentFromAndView/reportView.jsp

@@ -45,7 +45,7 @@
 			<div class="layui-item layui-col-sm6">
 				<label class="layui-form-label">成果类型：</label>
 				<div class="layui-input-block">
-					<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${fns:getMainDictLabel(projectcontentinfo.projectReportData.achievementType, 'achievement_type', '')}"/>
+					<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectcontentinfo.projectReportData.templateTypeName}"/>
 				</div>
 			</div>
 			<div class="layui-item layui-col-sm6">