Antiloveg 8 years ago
parent
commit
def3563ef5

+ 17 - 0
src/main/java/com/goafanti/admin/controller/AdminApiController.java

@@ -1574,6 +1574,23 @@ public class AdminApiController extends CertifyApiController {
 				endDateFormattedDate, pNo, pSize, uid));
 		return res;
 	}
+	
+	/**
+	 * 研发活动详情
+	 * @param id
+	 * @return
+	 */
+	@RequestMapping(value = "/activityDetail", method = RequestMethod.GET)
+	public Result activityDetail(String id){
+		Result res = new Result();
+		if (StringUtils.isBlank(id)){
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "研发活动id"));
+			return res;
+		}
+		res.setData(orgActivityService.selectDetailById(id));
+		return res;
+		
+	}
 
 	/**
 	 * 企业研究开发活动情况新增、修改

+ 2 - 0
src/main/java/com/goafanti/cognizance/service/OrgActivityService.java

@@ -24,5 +24,7 @@ public interface OrgActivityService {
 
 	void updateOrgActivity(OrgActivity orgActivity);
 
+	OrgActivity selectDetailById(String id);
+
 
 }

+ 5 - 0
src/main/java/com/goafanti/cognizance/service/impl/OrgActivityServiceImpl.java

@@ -120,4 +120,9 @@ public class OrgActivityServiceImpl extends BaseMybatisDao<OrgActivityMapper> im
 		}
 		
 	}
+
+	@Override
+	public OrgActivity selectDetailById(String id) {
+		return orgActivityCostMapper.selectDetailById(id);
+	}
 }

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

@@ -2,6 +2,7 @@ package com.goafanti.common.dao;
 
 import java.util.List;
 
+import com.goafanti.common.model.OrgActivity;
 import com.goafanti.common.model.OrgActivityCost;
 
 public interface OrgActivityCostMapper {
@@ -26,4 +27,6 @@ public interface OrgActivityCostMapper {
 	OrgActivityCost selectOrgActivityCostByUidAndAid(String aid, String uid);
 
 	OrgActivityCost selectOrgActivityCostByAidAndYear(String aid, Integer year);
+
+	OrgActivity selectDetailById(String id);
 }

+ 8 - 1
src/main/java/com/goafanti/common/mapper/OrgActivityMapper.xml

@@ -307,7 +307,10 @@
   
   <select id="findOrgActivityListByPage" parameterType="java.lang.String" resultMap="BaseResultMap">
   	 select 
-    <include refid="Base_Column_List" />
+    id, uid, activity_number as activityNumber, activity_name as activityName, 
+    technical_field1 as technicalField1, technical_field2 as technicalField2, technical_field3 as technicalField3,
+    technical_source as technicalSource, intellectual_property_number as intellectualPropertyNumber,
+    start_date as startDate, end_date as endDate
     from org_activity
     where deleted_sign = 0
     <if test="uid != null">
@@ -366,4 +369,8 @@
   	  from org_activity 
   	  where uid = #{uid,jdbcType=VARCHAR} and deleted_sign = 0
   </select>
+  
+ <!--  <select id="selectDetailById" parameterType="java.lang.String" resultMap="BaseResultMap">
+  	
+  </select> -->
 </mapper>

+ 1 - 1
src/main/resources/props/config_dev.properties

@@ -51,7 +51,7 @@ session.validate.timespan=18000000
 
 app.name=AFT
 
-static.host=//afts.hnzhiming.com/1.0.19
+static.host=//afts.hnzhiming.com/1.0.20
 
 upload.path=/data/wwwroot/aft/upload
 upload.private.path=/data/upload

+ 1 - 1
src/main/resources/props/config_local.properties

@@ -53,7 +53,7 @@ session.validate.timespan=18000000
 
 app.name=AFT
 
-static.host=//afts.hnzhiming.com/1.0.19
+static.host=//afts.hnzhiming.com/1.0.20
 
 upload.path=/Users/xiaolong/Sites/upload
 upload.private.path=/Users/xiaolong/Sites/doc

+ 1 - 1
src/main/resources/props/config_prod.properties

@@ -51,4 +51,4 @@ session.validate.timespan=18000000
 
 app.name=AFT
 
-static.host=//afts.hnzhiming.com/1.0.19
+static.host=//afts.hnzhiming.com/1.0.20

+ 1 - 1
src/main/resources/props/config_test.properties

@@ -53,7 +53,7 @@ session.validate.timespan=18000000
 
 app.name=AFT
 
-static.host=//aftts.hnzhiming.com/1.0.19
+static.host=//aftts.hnzhiming.com/1.0.20
 
 upload.path=/data/aft/public/upload
 upload.private.path=/data/aft/private/upload

+ 1 - 0
src/main/resources/shiro_base_auth.ini

@@ -10,6 +10,7 @@
 /static/**=anon
 /api/admin/**=admin,permission
 /api/user/**=login
+/admin/servicesManage/**=admin
 /admin/**=admin,permission
 /role/**=admin,permission
 /permission/**=admin,permission