Antiloveg 8 years ago
parent
commit
15517e98e1

+ 3 - 2
src/main/java/com/goafanti/admin/controller/AdminTechProjectController.java

@@ -64,7 +64,7 @@ public class AdminTechProjectController extends BaseApiController{
 	public Result applyTechProject(TechProject techProject, String uid){
 		Result res = new Result();
 		String aid = userService.selectByPrimaryKey(uid).getAid();
-		techProjectService.applyTechProject(techProject, uid, aid);
+		techProjectService.saveTechProject(techProject, uid, aid);
 		return res;
 		
 	}
@@ -76,6 +76,7 @@ public class AdminTechProjectController extends BaseApiController{
 	@RequestMapping(value = "/techProjectDetial", method = RequestMethod.POST)
 	public Result techProjectDetial(String pid){
 		Result res = new Result();
+		res.setData(techProjectService.selectProjectDetail(pid));
 		return res;
 	}
 	
@@ -136,7 +137,7 @@ public class AdminTechProjectController extends BaseApiController{
 	@RequestMapping(value = "/disposeTechWebsite", method = RequestMethod.POST)
 	public Result disposeTechWebsite(TechWebsite t){
 		Result res = new Result();
-		res.setData(techWebsiteService.disposeTechWebsite(t));
+		res.setData(techWebsiteService.saveWebsite(t));
 		return res;
 	}
 }

+ 3 - 0
src/main/java/com/goafanti/common/dao/TechProjectMapper.java

@@ -1,6 +1,7 @@
 package com.goafanti.common.dao;
 
 import com.goafanti.common.model.TechProject;
+import com.goafanti.techproject.bo.TechProjectDetailBo;
 
 public interface TechProjectMapper {
     int deleteByPrimaryKey(String id);
@@ -14,4 +15,6 @@ public interface TechProjectMapper {
     int updateByPrimaryKeySelective(TechProject record);
 
     int updateByPrimaryKey(TechProject record);
+
+	TechProjectDetailBo selectProjectDetail(String pid);
 }

+ 14 - 0
src/main/java/com/goafanti/common/mapper/TechProjectMapper.xml

@@ -369,4 +369,18 @@
     	and p.uid = #{uid,jdbcType=VARCHAR}
     </if>
   </select>
+  
+  <select id="selectProjectDetail" resultType="com.goafanti.techproject.bo.TechProjectDetailBo" parameterType="java.lang.String">
+  		 select 
+  		 p.id, p.uid, i.location_province as province, i.location_city as city, i.location_area as area,
+	        i.unit_name as unitName,  i.org_code as orgCode,
+		    p.serial_number as serialNumber,  
+		     a.name as consultant, p.contacts, p.project_des as projectDes, p.subsidy, p.dispatch_info as dispatchInfo,
+        p.project_mode as projectMode, p.project_approval as projectApproval, p.approval_url as approvalUrl , p.department,
+		    p.project_name as projectName, p.project_catagory as projectCatagory, p.tech_field as techField, p.state       
+	  FROM  tech_project p
+		LEFT JOIN organization_identity i on i.uid = p.uid
+		LEFT JOIN admin a on p.consultant = a.id 
+		where p.deleted_sign = 0  and p.id = #{uid,jdbcType=VARCHAR}
+  </select>
 </mapper>

+ 4 - 1
src/main/java/com/goafanti/common/model/TechProject.java

@@ -3,6 +3,8 @@ package com.goafanti.common.model;
 import java.math.BigDecimal;
 import java.util.Date;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
 public class TechProject {
     private String id;
 
@@ -262,7 +264,8 @@ public class TechProject {
     public void setRecordTime(Date recordTime) {
         this.recordTime = recordTime;
     }
-
+    
+    @JsonIgnore
     public Integer getDeletedSign() {
         return deletedSign;
     }

+ 60 - 0
src/main/java/com/goafanti/techproject/bo/TechProjectDetailBo.java

@@ -0,0 +1,60 @@
+package com.goafanti.techproject.bo;
+
+import com.goafanti.common.model.TechProject;
+/**
+ * 科技项目详情
+ */
+public class TechProjectDetailBo extends TechProject {
+	private String orgName;
+	
+	private String orgCode;
+	
+	private String province;
+	
+	private String city;
+	
+	private String area;
+
+	public String getOrgName() {
+		return orgName;
+	}
+
+	public void setOrgName(String orgName) {
+		this.orgName = orgName;
+	}
+
+	public String getOrgCode() {
+		return orgCode;
+	}
+
+	public void setOrgCode(String orgCode) {
+		this.orgCode = orgCode;
+	}
+
+	public String getProvince() {
+		return province;
+	}
+
+	public void setProvince(String province) {
+		this.province = province;
+	}
+
+	public String getCity() {
+		return city;
+	}
+
+	public void setCity(String city) {
+		this.city = city;
+	}
+
+	public String getArea() {
+		return area;
+	}
+
+	public void setArea(String area) {
+		this.area = area;
+	}
+	
+	
+
+}

+ 5 - 1
src/main/java/com/goafanti/techproject/controller/TechProjectApiController.java

@@ -62,7 +62,7 @@ public class TechProjectApiController extends BaseApiController{
 	@RequestMapping(value = "/applyTechProject", method = RequestMethod.POST)
 	public Result applyTechProject(TechProject techProject){
 		Result res = new Result();
-		techProjectService.applyTechProject(techProject, TokenManager.getUserId(), TokenManager.getToken().getAid());
+		techProjectService.saveTechProject(techProject, TokenManager.getUserId(), TokenManager.getToken().getAid());
 		return res;
 		
 	}
@@ -74,9 +74,11 @@ public class TechProjectApiController extends BaseApiController{
 	@RequestMapping(value = "/techProjectDetial", method = RequestMethod.POST)
 	public Result techProjectDetial(String pid){
 		Result res = new Result();
+		res.setData(techProjectService.selectProjectDetail(pid));
 		return res;
 	}
 	
+	
 	/**
 	 * 科技项目状态流转
 	 * @param pid
@@ -109,5 +111,7 @@ public class TechProjectApiController extends BaseApiController{
 	}
 	
 	
+	
+	
 
 }

+ 4 - 1
src/main/java/com/goafanti/techproject/service/TechProjectService.java

@@ -6,6 +6,7 @@ import com.goafanti.common.model.TechProject;
 import com.goafanti.common.model.TechProjectLog;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.techproject.bo.TechProjectClientListBo;
+import com.goafanti.techproject.bo.TechProjectDetailBo;
 import com.goafanti.techproject.bo.TechProjectManageListBo;
 
 public interface TechProjectService {
@@ -14,8 +15,10 @@ public interface TechProjectService {
 
 	int updateTechProject(TechProject t, TechProjectLog l, Date recordTime);
 
-	void applyTechProject(TechProject techProject, String uid, String aid);
+	void saveTechProject(TechProject techProject, String uid, String aid);
 
 	Pagination<TechProjectManageListBo> listManageTechProject(String province, String uid, Integer pNo, Integer pSize);
 
+	TechProjectDetailBo selectProjectDetail(String pid);
+
 }

+ 1 - 1
src/main/java/com/goafanti/techproject/service/TechWebsiteService.java

@@ -11,6 +11,6 @@ public interface TechWebsiteService {
 
 	Pagination<TechWebsite> listTechWebsite(String province, String uid, Integer pNo, Integer pSize);
 
-	int disposeTechWebsite(TechWebsite t);
+	int saveWebsite(TechWebsite t);
 
 }

+ 7 - 1
src/main/java/com/goafanti/techproject/service/impl/TechProjectServiceImpl.java

@@ -19,6 +19,7 @@ import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.techproject.bo.TechProjectClientListBo;
+import com.goafanti.techproject.bo.TechProjectDetailBo;
 import com.goafanti.techproject.bo.TechProjectManageListBo;
 import com.goafanti.techproject.service.TechProjectService;
 @Service
@@ -71,7 +72,7 @@ public class TechProjectServiceImpl extends BaseMybatisDao<TechProjectMapper> im
 	}
 
 	@Override
-	public void applyTechProject(TechProject techProject, String uid, String aid) {
+	public void saveTechProject(TechProject techProject, String uid, String aid) {
 		techProject.setId(UUID.randomUUID().toString());
 		Calendar now = Calendar.getInstance();
 		now.set(Calendar.MILLISECOND, 0);
@@ -116,4 +117,9 @@ public class TechProjectServiceImpl extends BaseMybatisDao<TechProjectMapper> im
 				"findTechProjectManageCount", params, pageNo, pageSize);
 	}
 
+	@Override
+	public TechProjectDetailBo selectProjectDetail(String pid) {
+		return techProjectMapper.selectProjectDetail(pid);
+	}
+
 }

+ 1 - 1
src/main/java/com/goafanti/techproject/service/impl/TechWebsiteServiceImpl.java

@@ -57,7 +57,7 @@ public class TechWebsiteServiceImpl extends BaseMybatisDao<TechWebsiteMapper> im
 	}
 
 	@Override
-	public int disposeTechWebsite(TechWebsite t) {
+	public int saveWebsite(TechWebsite t) {
 		if (StringUtils.isBlank(t.getId())) {
 			t.setId(UUID.randomUUID().toString());
 			t.setDeletedSign(0);

+ 3 - 3
src/main/java/com/goafanti/user/controller/UserApiController.java

@@ -912,9 +912,9 @@ public class UserApiController extends BaseApiController {
 		} else {
 			o.setId(org.getId());
 			res.setData(organizationIdentityService.updateByPrimaryKeySelective(o));
-			if (5 == o.getAuditStatus()){
+			if (null != o.getAuditStatus() && 5 == o.getAuditStatus()){
 				User u = new User();
-				u.setId(organizationIdentityService.selectOrgIdentityByUserId(TokenManager.getUserId()).getUid());
+				u.setId(TokenManager.getUserId());
 				u.setLvl(1);;
 				userService.updateByPrimaryKeySelective(u);
 			}
@@ -936,7 +936,7 @@ public class UserApiController extends BaseApiController {
 			if (5 == userIdentity.getAuditStatus()){
 				User u = new User();
 				u.setId(userIdentityService.selectUserIdentityByUserId(TokenManager.getUserId()).getUid());
-				u.setLvl(1);;
+				u.setLvl(1);
 				userService.updateByPrimaryKeySelective(u);
 			}
 		}