Antiloveg 8 years ago
parent
commit
db96a2a771

+ 19 - 0
schema/2017-04-26.sql

@@ -0,0 +1,19 @@
+
+alter table `admin`
+ADD COLUMN  `position` VARCHAR(32) NULL COMMENT '职位';
+
+alter table `organization_identity` 
+change  `consultant`  `tech_principal` VARCHAR(36) NULL COMMENT '高企技术负责人';
+
+
+
+
+
+
+
+
+
+
+
+
+

+ 13 - 0
src/main/java/com/goafanti/admin/bo/InputAdmin.java

@@ -22,6 +22,9 @@ public class InputAdmin {
 
 	@Size(min = 0, max = 12, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String	province;
+	
+	@Size(min = 0, max = 32, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String	position;
 
 	public String getId() {
 		return id;
@@ -71,4 +74,14 @@ public class InputAdmin {
 		this.province = province;
 	}
 
+	public String getPosition() {
+		return position;
+	}
+
+	public void setPosition(String position) {
+		this.position = position;
+	}
+	
+	
+
 }

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

@@ -2981,7 +2981,7 @@ public class AdminApiController extends CertifyApiController {
 		List<Admin> list = adminService.selectCognizancePrincipal();
 		Map<String, String> map = new TreeMap<String, String>();
 		for (Admin o : list) {
-			map.put(o.getId(), o.getName());
+			map.put(o.getId(), o.getName()+ " " + o.getPosition());
 		}
 		res.setData(map);
 		return res;

+ 1 - 1
src/main/java/com/goafanti/admin/controller/AdminCopyrightApiController.java

@@ -334,7 +334,7 @@ public class AdminCopyrightApiController extends CertifyApiController {
 		List<Admin> list = adminService.selectCopyrightPrincipal();
 		Map<String, String> map = new TreeMap<String, String>();
 		for (Admin o : list) {
-			map.put(o.getId(), o.getName());
+			map.put(o.getId(), o.getName()+ " " + o.getPosition());
 		}
 		res.setData(map);
 		return res;

+ 1 - 1
src/main/java/com/goafanti/admin/controller/AdminPatentApiController.java

@@ -898,7 +898,7 @@ public class AdminPatentApiController extends CertifyApiController {
 		List<Admin> list = adminService.selectPatentPrincipal();
 		Map<String, String> map = new TreeMap<String, String>();
 		for (Admin o : list) {
-			map.put(o.getId(), o.getName());
+			map.put(o.getId(), o.getName()+ " " + o.getPosition());
 		}
 		res.setData(map);
 		return res;

+ 1 - 1
src/main/java/com/goafanti/admin/controller/AdminTechProjectApiController.java

@@ -93,7 +93,7 @@ public class AdminTechProjectApiController extends CertifyApiController {
 		List<Admin> list = adminService.selectTechprojectPrincipal();
 		Map<String, String> map = new TreeMap<String, String>();
 		for (Admin o : list) {
-			map.put(o.getId(), o.getName());
+			map.put(o.getId(), o.getName()+ " " + o.getPosition());
 		}
 		res.setData(map);
 		return res;

+ 12 - 0
src/main/java/com/goafanti/cognizance/bo/CultivationListBo.java

@@ -29,6 +29,8 @@ public class CultivationListBo {
 	private String secondContacts;
 	
 	private String thirdContacts;
+	
+	private String techPrincipal;
 
 	public String getUid() {
 		return uid;
@@ -111,6 +113,16 @@ public class CultivationListBo {
 		this.thirdContacts = thirdContacts;
 	}
 	
+	
+	
+	public String getTechPrincipal() {
+		return techPrincipal;
+	}
+
+	public void setTechPrincipal(String techPrincipal) {
+		this.techPrincipal = techPrincipal;
+	}
+
 	//高企认定时间
 	public String getIssuingDateFormattedDate(){
 		if (this.issuingDate == null) {

+ 4 - 5
src/main/java/com/goafanti/cognizance/service/impl/OrgCognizanceServiceImpl.java

@@ -214,21 +214,20 @@ public class OrgCognizanceServiceImpl extends BaseMybatisDao<OrgCognizanceMapper
 	public void updateCognizance(OrgCognizance cog, OrgCognizanceLog log, Date recordTime, String aid) {
 		if (null != log.getState() && null != recordTime && null != cog.getUid() && null != log.getPrincipal()) {
 			log.setRecordTime(recordTime);
-
+			cog.setTechPrincipal(log.getPrincipal());
+			OrganizationIdentity o = organizationIdentityMapper.selectOrgIdentityByUserId(cog.getUid());
+			o.setTechPrincipal(null == cog.getTechPrincipal() ? "" : cog.getTechPrincipal());
 			if (OrgCognizanceStatus.getStatus(cog.getState()) == OrgCognizanceStatus.DELIVERD) {
 				cog.setCreateTime(recordTime);
 			} else if (OrgCognizanceStatus.getStatus(cog.getState()) == OrgCognizanceStatus.ACCEPT) {
 				cog.setAcceptDate(recordTime);
 			} else if (OrgCognizanceStatus.getStatus(cog.getState()) == OrgCognizanceStatus.ISSUING) {
 				cog.setIssuingDate(recordTime);
-				OrganizationIdentity o = organizationIdentityMapper.selectOrgIdentityByUserId(cog.getUid());
 				o.setCertificateNumber(null == cog.getCertificateNumber() ? "" : cog.getCertificateNumber());
 				o.setIssuingDate(recordTime);
-				o.setConsultant(null == cog.getConsultant() ? "" : cog.getConsultant());
 				o.setCogContacts(null == cog.getContacts() ? null : cog.getContacts());
-				organizationIdentityMapper.updateByPrimaryKeySelective(o);
 			}
-
+			organizationIdentityMapper.updateByPrimaryKeySelective(o);
 			if (OrgCognizanceStatus.getStatus(cog.getState()) == OrgCognizanceStatus.CIRCULATION) {
 				cog.setState(OrgCognizanceStatus.DELIVERD.getCode());
 			}

+ 5 - 0
src/main/java/com/goafanti/common/controller/WebpageController.java

@@ -115,6 +115,11 @@ public class WebpageController extends BaseController {
 		return adminToLogin(request,modelview,"/admin/servicesManage/highTech");
 	}
 	
+	@RequestMapping(value = "/admin/servicesManage/highTechInfo", method = RequestMethod.GET)
+	public ModelAndView adminServicesManageHighTechInfo(HttpServletRequest request, ModelAndView modelview) {
+		return adminToLogin(request,modelview,"/admin/servicesManage/highTechInfo");
+	}
+	
 	@RequestMapping(value = "/admin/servicesManage/copyright", method = RequestMethod.GET)
 	public ModelAndView adminServicesManageCopyright(HttpServletRequest request, ModelAndView modelview) {
 		return adminToLogin(request,modelview,"/admin/servicesManage/copyright");

+ 16 - 4
src/main/java/com/goafanti/common/mapper/AdminMapper.xml

@@ -10,9 +10,10 @@
     <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
     <result column="number" property="number" jdbcType="INTEGER" />
     <result column="province" property="province" jdbcType="VARCHAR" />
+    <result column="position" property="position" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Base_Column_List" >
-    id, mobile, name, password, email, create_time, number, province
+    id, mobile, name, password, email, create_time, number, province, position
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
     select 
@@ -27,10 +28,11 @@
   <insert id="insert" parameterType="com.goafanti.common.model.Admin" >
     insert into admin (id, mobile, name, 
       password, email, create_time, 
-      number, province)
+      number, province, position)
     values (#{id,jdbcType=VARCHAR}, #{mobile,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, 
       #{password,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{number,jdbcType=INTEGER}, #{province,jdbcType=VARCHAR})
+      #{number,jdbcType=INTEGER}, #{province,jdbcType=VARCHAR}, #{position,jdbcType=VARCHAR}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.Admin" >
     insert into admin
@@ -59,6 +61,9 @@
        <if test="province != null" >
         province,
       </if>
+      <if test="position != null" >
+        position,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -85,6 +90,9 @@
       <if test="province != null" >
         #{province,jdbcType=VARCHAR},
       </if>
+      <if test="position != null" >
+        #{position,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.Admin" >
@@ -111,6 +119,9 @@
        <if test="province != null" >
         province = #{province,jdbcType=VARCHAR},
       </if>
+      <if test="position != null" >
+        position = #{position,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -122,7 +133,8 @@
       email = #{email,jdbcType=VARCHAR},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       number = #{number,jdbcType=INTEGER},
-      province = #{province,jdbcType=VARCHAR}
+      province = #{province,jdbcType=VARCHAR},
+      position = #{position,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
   

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

@@ -463,7 +463,7 @@
   
   <select id="findCultivationListByPage" parameterType="java.lang.String" resultType="com.goafanti.cognizance.bo.CultivationListBo">
   	select u.id as uid,  i.licence_province as province, i.unit_name as unitName, i.cog_contacts as cogContacts,
-		i.certificate_number as certificateNumber, i.issuing_date as issuingDate, a.name as consultant,
+		i.certificate_number as certificateNumber, i.issuing_date as issuingDate, a.name as consultant, i.tech_principal,
 		CONCAT(i.first_contacts,'  ', i.first_mobile) as firstContacts,
 	    CONCAT(i.second_contacts,'  ', i.second_mobile) as secondContacts,
 	    CONCAT(i.third_contacts,'  ', i.third_mobile) as thirdContacts

+ 11 - 11
src/main/java/com/goafanti/common/mapper/OrganizationIdentityMapper.xml

@@ -69,7 +69,7 @@
 			jdbcType="VARCHAR" />
 		<result column="issuing_date" property="issuingDate" jdbcType="TIMESTAMP" />
 		<result column="cog_contacts" property="cogContacts" jdbcType="INTEGER" />
-		<result column="consultant" property="consultant" jdbcType="VARCHAR" />
+		<result column="tech_principal" property="techPrincipal" jdbcType="VARCHAR" />
 		<result column="contacts_fixed_tel" property="contactsFixedTel"
 			jdbcType="VARCHAR" />
 		<result column="contacts_fax" property="contactsFax" jdbcType="VARCHAR" />
@@ -117,7 +117,7 @@
 		second_mobile,
 		third_contacts, third_mobile, listed, listed_date, listed_type, stock_code,
 		certificate_number,
-		issuing_date, cog_contacts, consultant, contacts_fixed_tel, contacts_fax,
+		issuing_date, cog_contacts, tech_principal, contacts_fixed_tel, contacts_fax,
 		legal_person_tel,
 		legal_person_fax, legal_person_email, registration_time, ratepay_code, industry,
 		enterprise_scale, register_type, foreign_investment, field,
@@ -151,7 +151,7 @@
 		second_contacts, second_mobile, third_contacts,
 		third_mobile, listed, listed_date,
 		listed_type, stock_code, certificate_number,
-		issuing_date, cog_contacts, consultant,
+		issuing_date, cog_contacts, tech_principal,
 		contacts_fixed_tel, contacts_fax, legal_person_tel,
 		legal_person_fax, legal_person_email, registration_time,
 		ratepay_code, industry, enterprise_scale,
@@ -187,7 +187,7 @@
 		#{listedType,jdbcType=INTEGER}, #{stockCode,jdbcType=VARCHAR},
 		#{certificateNumber,jdbcType=VARCHAR},
 		#{issuingDate,jdbcType=TIMESTAMP}, #{cogContacts,jdbcType=INTEGER},
-		#{consultant,jdbcType=VARCHAR},
+		#{techPrincipal,jdbcType=VARCHAR},
 		#{contactsFixedTel,jdbcType=VARCHAR}, #{contactsFax,jdbcType=VARCHAR}, #{legalPersonTel,jdbcType=VARCHAR},
 		#{legalPersonFax,jdbcType=VARCHAR},
 		#{legalPersonEmail,jdbcType=VARCHAR},
@@ -343,8 +343,8 @@
 			<if test="cogContacts != null">
 				cog_contacts,
 			</if>
-			<if test="consultant != null">
-				consultant,
+			<if test="techPrincipal != null">
+				tech_principal,
 			</if>
 			<if test="contactsFixedTel != null">
 				contacts_fixed_tel,
@@ -543,8 +543,8 @@
 			<if test="cogContacts != null">
 				#{cogContacts,jdbcType=INTEGER},
 			</if>
-			<if test="consultant != null">
-				#{consultant,jdbcType=VARCHAR},
+			<if test="techPrincipal != null">
+				#{techPrincipal,jdbcType=VARCHAR},
 			</if>
 			<if test="contactsFixedTel != null">
 				#{contactsFixedTel,jdbcType=VARCHAR},
@@ -743,8 +743,8 @@
 			<if test="cogContacts != null">
 				cog_contacts = #{cogContacts,jdbcType=INTEGER},
 			</if>
-			<if test="consultant != null">
-				consultant = #{consultant,jdbcType=VARCHAR},
+			<if test="techPrincipal != null">
+				tech_principal = #{techPrincipal,jdbcType=VARCHAR},
 			</if>
 			<if test="contactsFixedTel != null">
 				contacts_fixed_tel = #{contactsFixedTel,jdbcType=VARCHAR},
@@ -851,7 +851,7 @@
 		certificate_number = #{certificateNumber,jdbcType=VARCHAR},
 		issuing_date = #{issuingDate,jdbcType=TIMESTAMP},
 		cog_contacts = #{cogContacts,jdbcType=INTEGER},
-		consultant = #{consultant,jdbcType=VARCHAR},
+		techPrincipal = #{techPrincipal,jdbcType=VARCHAR},
 		contacts_fixed_tel = #{contactsFixedTel,jdbcType=VARCHAR},
 		contacts_fax = #{contactsFax,jdbcType=VARCHAR},
 		legal_person_tel = #{legalPersonTel,jdbcType=VARCHAR},

+ 14 - 1
src/main/java/com/goafanti/common/model/Admin.java

@@ -46,6 +46,19 @@ public class Admin extends BaseModel implements AftUser {
 	 * 所在省份
 	 */
 	private String				province;
+	/**
+	 * 职位
+	 */
+	private String				position;
+	
+
+	public String getPosition() {
+		return position;
+	}
+
+	public void setPosition(String position) {
+		this.position = position;
+	}
 
 	public String getId() {
 		return id;
@@ -124,7 +137,7 @@ public class Admin extends BaseModel implements AftUser {
 	public void setCreateTimeFormattedDate(String createTimeFormattedDate) {
 
 	}
-    
+
 	@JsonIgnore
 	@Override
 	public String getAid() {

+ 6 - 8
src/main/java/com/goafanti/common/model/OrganizationIdentity.java

@@ -240,9 +240,9 @@ public class OrganizationIdentity {
     private Integer cogContacts;
     
     /**
-     * 高企认定咨询师
+     * 高企认定技术员
      */
-    private String consultant;
+    private String techPrincipal;
     
     /**
 	 * 联系人电话
@@ -726,15 +726,13 @@ public class OrganizationIdentity {
 		this.cogContacts = cogContacts;
 	}
 
-	public String getConsultant() {
-		return consultant;
+	public String getTechPrincipal() {
+		return techPrincipal;
 	}
 
-	public void setConsultant(String consultant) {
-		this.consultant = consultant;
+	public void setTechPrincipal(String techPrincipal) {
+		this.techPrincipal = techPrincipal;
 	}
-	
-	
 
 	public String getContactsFixedTel() {
 		return contactsFixedTel;

+ 11 - 0
src/main/webapp/WEB-INF/views/admin/servicesManage/highTechInfo.jsp

@@ -0,0 +1,11 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core_rt"%>
+<%@ include file="../../header.jsp"%>
+<title>高企信息汇总页面</title>
+<link href="${staticHost}/admin/servicesManage/highTechInfo.css" rel="stylesheet">
+</head>
+<body>
+	<div id="root"></div>
+	<script type="text/javascript" src="${staticHost}/admin/servicesManage/highTechInfo.js"></script>
+</body>
+</html>

+ 16 - 8
src/main/webapp/WEB-INF/views/header.jsp

@@ -62,31 +62,39 @@
 	window.showOrgList = true;
 	window.showUserList = true;
 	window.showOrgList = true;
+	window.showPermissionList = true;
+	window.showRoleList = true;
 	</shiro:hasRole>
 
 	<shiro:hasPermission name="admin/userManage">
-	window.showUserManage = true;
+		window.showUserManage = true;
 	</shiro:hasPermission>
 	<shiro:hasPermission name="admin/services">
-	window.showServices = true;
+		window.showServices = true;
 	</shiro:hasPermission>
 	<shiro:hasPermission name="admin/achievement">
-	window.showAchievement = true;
+		window.showAchievement = true;
 	</shiro:hasPermission>
 	<shiro:hasPermission name="admin/demand">
-	window.showDemand = true;
+		window.showDemand = true;
 	</shiro:hasPermission>
 	<shiro:hasPermission name="admin/idea">
-	window.showIdea = true;
+		window.showIdea = true;
 	</shiro:hasPermission>
 	<shiro:hasPermission name="admin/customer">
-	window.showCustomer = true;
+		window.showCustomer = true;
 	</shiro:hasPermission>
 	<shiro:hasPermission name="api/admin/userList">
-	window.showUserList = true;
+		window.showUserList = true;
 	</shiro:hasPermission>
 	<shiro:hasPermission name="api/admin/orgList">
-	window.showOrgList = true;
+		window.showOrgList = true;
+	</shiro:hasPermission>
+	<shiro:hasPermission name="api/admin/permissionList">
+		window.showPermissionList = true;
+	</shiro:hasPermission>
+	<shiro:hasPermission name="api/admin/roleList">
+		window.showRoleList = true;
 	</shiro:hasPermission>
 	
 </script>