Browse Source

techProject

Antiloveg 8 years ago
parent
commit
5ad00d4005
21 changed files with 1538 additions and 16 deletions
  1. 53 0
      schema/2017-03-16.sql
  2. 17 0
      src/main/java/com/goafanti/common/dao/TechProjectLogMapper.java
  3. 17 0
      src/main/java/com/goafanti/common/dao/TechProjectMapper.java
  4. 21 0
      src/main/java/com/goafanti/common/dao/TechWebsiteMapper.java
  5. 1 1
      src/main/java/com/goafanti/common/mapper/OrgTechCenterMapper.xml
  6. 0 6
      src/main/java/com/goafanti/common/mapper/PatentInfoMapper.xml
  7. 117 0
      src/main/java/com/goafanti/common/mapper/TechProjectLogMapper.xml
  8. 329 0
      src/main/java/com/goafanti/common/mapper/TechProjectMapper.xml
  9. 135 0
      src/main/java/com/goafanti/common/mapper/TechWebsiteMapper.xml
  10. 273 0
      src/main/java/com/goafanti/common/model/TechProject.java
  11. 90 0
      src/main/java/com/goafanti/common/model/TechProjectLog.java
  12. 103 0
      src/main/java/com/goafanti/common/model/TechWebsite.java
  13. 3 1
      src/main/java/com/goafanti/patent/controller/PatentApiController.java
  14. 0 1
      src/main/java/com/goafanti/patent/service/PatentInfoService.java
  15. 2 7
      src/main/java/com/goafanti/patent/service/impl/PatentInfoServiceImpl.java
  16. 221 0
      src/main/java/com/goafanti/techproject/bo/TechProjectClientListBo.java
  17. 69 0
      src/main/java/com/goafanti/techproject/controller/TechProjectApiController.java
  18. 10 0
      src/main/java/com/goafanti/techproject/service/TechProjectService.java
  19. 9 0
      src/main/java/com/goafanti/techproject/service/TechWebsiteService.java
  20. 39 0
      src/main/java/com/goafanti/techproject/service/impl/TechProjectServiceImpl.java
  21. 29 0
      src/main/java/com/goafanti/techproject/service/impl/TechWebsiteServiceImpl.java

+ 53 - 0
schema/2017-03-16.sql

@@ -0,0 +1,53 @@
+
+CREATE TABLE IF NOT EXISTS `aft_dev`.`tech_project` (
+  `id` VARCHAR(36) NOT NULL,
+  `uid` VARCHAR(36) NOT NULL,
+  `serial_number` INT(8) NULL COMMENT '编号' AUTO_INCREMENT,
+  `contacts` INT(1) NULL COMMENT '联系人',
+  `department` VARCHAR(45) NULL COMMENT '科技项目申报部门',
+  `dispatch_info` VARCHAR(400) NULL COMMENT '派单信息',
+  `project_name` VARCHAR(45) NULL COMMENT '项目名称',
+  `project_catagory` VARCHAR(45) NULL COMMENT '项目类型',
+  `tech_field` VARCHAR(45) NULL COMMENT '技术领域',
+  `project_des` VARCHAR(400) NULL COMMENT '项目简介',
+  `project_mode` INT(1) NULL COMMENT '是否立项',
+  `project_approval` DECIMAL(8,2) NULL COMMENT '立项金额',
+  `subsidy` INT(1) NULL COMMENT '是否补助',
+  `consultant` VARCHAR(36) NULL COMMENT '咨询师',
+  `approval_url` VARCHAR(255) NULL COMMENT '项目材料URL',
+  `state` INT(1) NULL COMMENT '申报状态',
+  `create_time` DATETIME NULL COMMENT '派单日',
+  `accept_date` DATETIME NULL COMMENT '受理日',
+  `approved_date` DATETIME NULL COMMENT '项目批复日期',
+  `record_time` DATETIME NULL COMMENT '记录创建日期',
+  `deleted_sign` INT(1) NULL COMMENT '删除标记',
+  PRIMARY KEY (`id`),
+  INDEX `serialNumber` (`serial_number` ASC))
+ENGINE = InnoDB AUTO_INCREMENT= 600000
+COMMENT = '科技项目申请表'
+
+
+CREATE TABLE IF NOT EXISTS `aft_dev`.`tech_project_log` (
+  `id` VARCHAR(36) NOT NULL,
+  `pid` VARCHAR(36) NOT NULL,
+  `record_time` DATETIME NULL COMMENT '状态变更录入时间',
+  `state` INT(1) NULL COMMENT '状态',
+  `principal` VARCHAR(36) NULL COMMENT '负责人',
+  `operator` VARCHAR(36) NULL COMMENT '操作人',
+  `comment` VARCHAR(45) NULL COMMENT '备注',
+  PRIMARY KEY (`id`))
+ENGINE = InnoDB
+COMMENT = '科技项目申报log';
+
+CREATE TABLE IF NOT EXISTS `aft_dev`.`tech_website` (
+  `id` VARCHAR(36) NOT NULL,
+  `uid` VARCHAR(36) NULL,
+  `department` VARCHAR(45) NULL COMMENT '科技部门名称',
+  `website` VARCHAR(255) NULL COMMENT '网址',
+  `account_number` VARCHAR(45) NULL COMMENT '帐号',
+  `password` VARCHAR(32) NULL COMMENT '密码',
+  `create_time` DATETIME NULL COMMENT '创建日期',
+  `deleted_sign` INT(1) NULL COMMENT '删除标记',
+  PRIMARY KEY (`id`))
+ENGINE = InnoDB
+COMMENT = '科技项目申报网址'

+ 17 - 0
src/main/java/com/goafanti/common/dao/TechProjectLogMapper.java

@@ -0,0 +1,17 @@
+package com.goafanti.common.dao;
+
+import com.goafanti.common.model.TechProjectLog;
+
+public interface TechProjectLogMapper {
+    int deleteByPrimaryKey(String id);
+
+    int insert(TechProjectLog record);
+
+    int insertSelective(TechProjectLog record);
+
+    TechProjectLog selectByPrimaryKey(String id);
+
+    int updateByPrimaryKeySelective(TechProjectLog record);
+
+    int updateByPrimaryKey(TechProjectLog record);
+}

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

@@ -0,0 +1,17 @@
+package com.goafanti.common.dao;
+
+import com.goafanti.common.model.TechProject;
+
+public interface TechProjectMapper {
+    int deleteByPrimaryKey(String id);
+
+    int insert(TechProject record);
+
+    int insertSelective(TechProject record);
+
+    TechProject selectByPrimaryKey(String id);
+
+    int updateByPrimaryKeySelective(TechProject record);
+
+    int updateByPrimaryKey(TechProject record);
+}

+ 21 - 0
src/main/java/com/goafanti/common/dao/TechWebsiteMapper.java

@@ -0,0 +1,21 @@
+package com.goafanti.common.dao;
+
+import java.util.List;
+
+import com.goafanti.common.model.TechWebsite;
+
+public interface TechWebsiteMapper {
+    int deleteByPrimaryKey(String id);
+
+    int insert(TechWebsite record);
+
+    int insertSelective(TechWebsite record);
+
+    TechWebsite selectByPrimaryKey(String id);
+
+    int updateByPrimaryKeySelective(TechWebsite record);
+
+    int updateByPrimaryKey(TechWebsite record);
+
+	List<TechWebsite> selectTechWebsiteByUid(String uid);
+}

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

@@ -34,7 +34,7 @@
   </delete>
   <insert id="insert" parameterType="com.goafanti.common.model.OrgTechCenter" >
     insert into org_tech_center (id, uid, center_name, founding_time, 
-      principal, system_url, deleted_sign, 
+      principal, comment, system_url, deleted_sign, 
       system_catalog)
     values (#{id,jdbcType=VARCHAR}, #{uid,jdbcType=VARCHAR}, #{centerName,jdbcType=VARCHAR}, #{foundingTime,jdbcType=TIMESTAMP}, 
       #{principal,jdbcType=VARCHAR}, #{comment,jdbcType=VARCHAR}, #{systemUrl,jdbcType=VARCHAR}, #{deletedSign,jdbcType=INTEGER}, 

+ 0 - 6
src/main/java/com/goafanti/common/mapper/PatentInfoMapper.xml

@@ -416,12 +416,6 @@
     where id = #{id,jdbcType=VARCHAR}
   </update>
   
-   <select id="selectPatentInfoByUserId" parameterType="java.lang.String" resultMap="BaseResultMap">
-    select 
-      <include refid="Base_Column_List" />
-      from patent_info
-    where uid = #{uid,jdbcType=VARCHAR} and deleted_sign = 0
-  </select>
   
    <select id="findClientApplyListByPage" resultMap="BaseResultMap" parameterType="String">
  	select

+ 117 - 0
src/main/java/com/goafanti/common/mapper/TechProjectLogMapper.xml

@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.goafanti.common.dao.TechProjectLogMapper" >
+  <resultMap id="BaseResultMap" type="com.goafanti.common.model.TechProjectLog" >
+    <id column="id" property="id" jdbcType="VARCHAR" />
+    <result column="pid" property="pid" jdbcType="VARCHAR" />
+    <result column="record_time" property="recordTime" jdbcType="TIMESTAMP" />
+    <result column="state" property="state" jdbcType="INTEGER" />
+    <result column="principal" property="principal" jdbcType="VARCHAR" />
+    <result column="operator" property="operator" jdbcType="VARCHAR" />
+    <result column="comment" property="comment" jdbcType="VARCHAR" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, pid, record_time, state, principal, operator, comment
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select 
+    <include refid="Base_Column_List" />
+    from tech_project_log
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
+    delete from tech_project_log
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <insert id="insert" parameterType="com.goafanti.common.model.TechProjectLog" >
+    insert into tech_project_log (id, pid, record_time, 
+      state, principal, operator, 
+      comment)
+    values (#{id,jdbcType=VARCHAR}, #{pid,jdbcType=VARCHAR}, #{recordTime,jdbcType=TIMESTAMP}, 
+      #{state,jdbcType=INTEGER}, #{principal,jdbcType=VARCHAR}, #{operator,jdbcType=VARCHAR}, 
+      #{comment,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.goafanti.common.model.TechProjectLog" >
+    insert into tech_project_log
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="pid != null" >
+        pid,
+      </if>
+      <if test="recordTime != null" >
+        record_time,
+      </if>
+      <if test="state != null" >
+        state,
+      </if>
+      <if test="principal != null" >
+        principal,
+      </if>
+      <if test="operator != null" >
+        operator,
+      </if>
+      <if test="comment != null" >
+        comment,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="pid != null" >
+        #{pid,jdbcType=VARCHAR},
+      </if>
+      <if test="recordTime != null" >
+        #{recordTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="state != null" >
+        #{state,jdbcType=INTEGER},
+      </if>
+      <if test="principal != null" >
+        #{principal,jdbcType=VARCHAR},
+      </if>
+      <if test="operator != null" >
+        #{operator,jdbcType=VARCHAR},
+      </if>
+      <if test="comment != null" >
+        #{comment,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.TechProjectLog" >
+    update tech_project_log
+    <set >
+      <if test="pid != null" >
+        pid = #{pid,jdbcType=VARCHAR},
+      </if>
+      <if test="recordTime != null" >
+        record_time = #{recordTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="state != null" >
+        state = #{state,jdbcType=INTEGER},
+      </if>
+      <if test="principal != null" >
+        principal = #{principal,jdbcType=VARCHAR},
+      </if>
+      <if test="operator != null" >
+        operator = #{operator,jdbcType=VARCHAR},
+      </if>
+      <if test="comment != null" >
+        comment = #{comment,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.TechProjectLog" >
+    update tech_project_log
+    set pid = #{pid,jdbcType=VARCHAR},
+      record_time = #{recordTime,jdbcType=TIMESTAMP},
+      state = #{state,jdbcType=INTEGER},
+      principal = #{principal,jdbcType=VARCHAR},
+      operator = #{operator,jdbcType=VARCHAR},
+      comment = #{comment,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+</mapper>

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

@@ -0,0 +1,329 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.goafanti.common.dao.TechProjectMapper">
+	<resultMap id="BaseResultMap" type="com.goafanti.common.model.TechProject">
+		<id column="id" property="id" jdbcType="VARCHAR" />
+		<result column="uid" property="uid" jdbcType="VARCHAR" />
+		<result column="serial_number" property="serialNumber"
+			jdbcType="INTEGER" />
+		<result column="contacts" property="contacts" jdbcType="INTEGER" />
+		<result column="department" property="department" jdbcType="VARCHAR" />
+		<result column="dispatch_info" property="dispatchInfo"
+			jdbcType="VARCHAR" />
+		<result column="project_name" property="projectName" jdbcType="VARCHAR" />
+		<result column="project_catagory" property="projectCatagory"
+			jdbcType="VARCHAR" />
+		<result column="tech_field" property="techField" jdbcType="VARCHAR" />
+		<result column="project_des" property="projectDes" jdbcType="VARCHAR" />
+		<result column="project_mode" property="projectMode" jdbcType="INTEGER" />
+		<result column="project_approval" property="projectApproval"
+			jdbcType="DECIMAL" />
+		<result column="subsidy" property="subsidy" jdbcType="INTEGER" />
+		<result column="consultant" property="consultant" jdbcType="VARCHAR" />
+		<result column="approval_url" property="approvalUrl" jdbcType="VARCHAR" />
+		<result column="state" property="state" jdbcType="INTEGER" />
+		<result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
+		<result column="accept_date" property="acceptDate" jdbcType="TIMESTAMP" />
+		<result column="approved_date" property="approvedDate"
+			jdbcType="TIMESTAMP" />
+		<result column="record_time" property="recordTime" jdbcType="TIMESTAMP" />
+		<result column="deleted_sign" property="deletedSign" jdbcType="INTEGER" />
+	</resultMap>
+	<sql id="Base_Column_List">
+		id, uid, serial_number, contacts, department, dispatch_info,
+		project_name, project_catagory,
+		tech_field, project_des, project_mode, project_approval, subsidy, consultant,
+		approval_url,
+		state, create_time, accept_date, approved_date, record_time, deleted_sign
+	</sql>
+	<select id="selectByPrimaryKey" resultMap="BaseResultMap"
+		parameterType="java.lang.String">
+		select
+		<include refid="Base_Column_List" />
+		from tech_project
+		where id = #{id,jdbcType=VARCHAR}
+	</select>
+	<delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+		delete from tech_project
+		where id = #{id,jdbcType=VARCHAR}
+	</delete>
+	<insert id="insert" parameterType="com.goafanti.common.model.TechProject">
+		insert into tech_project (id, uid, serial_number,
+		contacts, department, dispatch_info,
+		project_name, project_catagory, tech_field,
+		project_des, project_mode, project_approval,
+		subsidy, consultant, approval_url,
+		state, create_time, accept_date,
+		approved_date, record_time, deleted_sign
+		)
+		values (#{id,jdbcType=VARCHAR}, #{uid,jdbcType=VARCHAR},
+		#{serialNumber,jdbcType=INTEGER},
+		#{contacts,jdbcType=INTEGER}, #{department,jdbcType=VARCHAR}, #{dispatchInfo,jdbcType=VARCHAR},
+		#{projectName,jdbcType=VARCHAR}, #{projectCatagory,jdbcType=VARCHAR},
+		#{techField,jdbcType=VARCHAR},
+		#{projectDes,jdbcType=VARCHAR}, #{projectMode,jdbcType=INTEGER}, #{projectApproval,jdbcType=DECIMAL},
+		#{subsidy,jdbcType=INTEGER}, #{consultant,jdbcType=VARCHAR},
+		#{approvalUrl,jdbcType=VARCHAR},
+		#{state,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{acceptDate,jdbcType=TIMESTAMP},
+		#{approvedDate,jdbcType=TIMESTAMP}, #{recordTime,jdbcType=TIMESTAMP},
+		#{deletedSign,jdbcType=INTEGER}
+		)
+	</insert>
+	<insert id="insertSelective" parameterType="com.goafanti.common.model.TechProject">
+		insert into tech_project
+		<trim prefix="(" suffix=")" suffixOverrides=",">
+			<if test="id != null">
+				id,
+			</if>
+			<if test="uid != null">
+				uid,
+			</if>
+			<if test="serialNumber != null">
+				serial_number,
+			</if>
+			<if test="contacts != null">
+				contacts,
+			</if>
+			<if test="department != null">
+				department,
+			</if>
+			<if test="dispatchInfo != null">
+				dispatch_info,
+			</if>
+			<if test="projectName != null">
+				project_name,
+			</if>
+			<if test="projectCatagory != null">
+				project_catagory,
+			</if>
+			<if test="techField != null">
+				tech_field,
+			</if>
+			<if test="projectDes != null">
+				project_des,
+			</if>
+			<if test="projectMode != null">
+				project_mode,
+			</if>
+			<if test="projectApproval != null">
+				project_approval,
+			</if>
+			<if test="subsidy != null">
+				subsidy,
+			</if>
+			<if test="consultant != null">
+				consultant,
+			</if>
+			<if test="approvalUrl != null">
+				approval_url,
+			</if>
+			<if test="state != null">
+				state,
+			</if>
+			<if test="createTime != null">
+				create_time,
+			</if>
+			<if test="acceptDate != null">
+				accept_date,
+			</if>
+			<if test="approvedDate != null">
+				approved_date,
+			</if>
+			<if test="recordTime != null">
+				record_time,
+			</if>
+			<if test="deletedSign != null">
+				deleted_sign,
+			</if>
+		</trim>
+		<trim prefix="values (" suffix=")" suffixOverrides=",">
+			<if test="id != null">
+				#{id,jdbcType=VARCHAR},
+			</if>
+			<if test="uid != null">
+				#{uid,jdbcType=VARCHAR},
+			</if>
+			<if test="serialNumber != null">
+				#{serialNumber,jdbcType=INTEGER},
+			</if>
+			<if test="contacts != null">
+				#{contacts,jdbcType=INTEGER},
+			</if>
+			<if test="department != null">
+				#{department,jdbcType=VARCHAR},
+			</if>
+			<if test="dispatchInfo != null">
+				#{dispatchInfo,jdbcType=VARCHAR},
+			</if>
+			<if test="projectName != null">
+				#{projectName,jdbcType=VARCHAR},
+			</if>
+			<if test="projectCatagory != null">
+				#{projectCatagory,jdbcType=VARCHAR},
+			</if>
+			<if test="techField != null">
+				#{techField,jdbcType=VARCHAR},
+			</if>
+			<if test="projectDes != null">
+				#{projectDes,jdbcType=VARCHAR},
+			</if>
+			<if test="projectMode != null">
+				#{projectMode,jdbcType=INTEGER},
+			</if>
+			<if test="projectApproval != null">
+				#{projectApproval,jdbcType=DECIMAL},
+			</if>
+			<if test="subsidy != null">
+				#{subsidy,jdbcType=INTEGER},
+			</if>
+			<if test="consultant != null">
+				#{consultant,jdbcType=VARCHAR},
+			</if>
+			<if test="approvalUrl != null">
+				#{approvalUrl,jdbcType=VARCHAR},
+			</if>
+			<if test="state != null">
+				#{state,jdbcType=INTEGER},
+			</if>
+			<if test="createTime != null">
+				#{createTime,jdbcType=TIMESTAMP},
+			</if>
+			<if test="acceptDate != null">
+				#{acceptDate,jdbcType=TIMESTAMP},
+			</if>
+			<if test="approvedDate != null">
+				#{approvedDate,jdbcType=TIMESTAMP},
+			</if>
+			<if test="recordTime != null">
+				#{recordTime,jdbcType=TIMESTAMP},
+			</if>
+			<if test="deletedSign != null">
+				#{deletedSign,jdbcType=INTEGER},
+			</if>
+		</trim>
+	</insert>
+	<update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.TechProject">
+		update tech_project
+		<set>
+			<if test="uid != null">
+				uid = #{uid,jdbcType=VARCHAR},
+			</if>
+			<if test="serialNumber != null">
+				serial_number = #{serialNumber,jdbcType=INTEGER},
+			</if>
+			<if test="contacts != null">
+				contacts = #{contacts,jdbcType=INTEGER},
+			</if>
+			<if test="department != null">
+				department = #{department,jdbcType=VARCHAR},
+			</if>
+			<if test="dispatchInfo != null">
+				dispatch_info = #{dispatchInfo,jdbcType=VARCHAR},
+			</if>
+			<if test="projectName != null">
+				project_name = #{projectName,jdbcType=VARCHAR},
+			</if>
+			<if test="projectCatagory != null">
+				project_catagory = #{projectCatagory,jdbcType=VARCHAR},
+			</if>
+			<if test="techField != null">
+				tech_field = #{techField,jdbcType=VARCHAR},
+			</if>
+			<if test="projectDes != null">
+				project_des = #{projectDes,jdbcType=VARCHAR},
+			</if>
+			<if test="projectMode != null">
+				project_mode = #{projectMode,jdbcType=INTEGER},
+			</if>
+			<if test="projectApproval != null">
+				project_approval = #{projectApproval,jdbcType=DECIMAL},
+			</if>
+			<if test="subsidy != null">
+				subsidy = #{subsidy,jdbcType=INTEGER},
+			</if>
+			<if test="consultant != null">
+				consultant = #{consultant,jdbcType=VARCHAR},
+			</if>
+			<if test="approvalUrl != null">
+				approval_url = #{approvalUrl,jdbcType=VARCHAR},
+			</if>
+			<if test="state != null">
+				state = #{state,jdbcType=INTEGER},
+			</if>
+			<if test="createTime != null">
+				create_time = #{createTime,jdbcType=TIMESTAMP},
+			</if>
+			<if test="acceptDate != null">
+				accept_date = #{acceptDate,jdbcType=TIMESTAMP},
+			</if>
+			<if test="approvedDate != null">
+				approved_date = #{approvedDate,jdbcType=TIMESTAMP},
+			</if>
+			<if test="recordTime != null">
+				record_time = #{recordTime,jdbcType=TIMESTAMP},
+			</if>
+			<if test="deletedSign != null">
+				deleted_sign = #{deletedSign,jdbcType=INTEGER},
+			</if>
+		</set>
+		where id = #{id,jdbcType=VARCHAR}
+	</update>
+	<update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.TechProject">
+		update tech_project
+		set uid = #{uid,jdbcType=VARCHAR},
+		serial_number = #{serialNumber,jdbcType=INTEGER},
+		contacts = #{contacts,jdbcType=INTEGER},
+		department = #{department,jdbcType=VARCHAR},
+		dispatch_info = #{dispatchInfo,jdbcType=VARCHAR},
+		project_name = #{projectName,jdbcType=VARCHAR},
+		project_catagory = #{projectCatagory,jdbcType=VARCHAR},
+		tech_field = #{techField,jdbcType=VARCHAR},
+		project_des = #{projectDes,jdbcType=VARCHAR},
+		project_mode = #{projectMode,jdbcType=INTEGER},
+		project_approval = #{projectApproval,jdbcType=DECIMAL},
+		subsidy = #{subsidy,jdbcType=INTEGER},
+		consultant = #{consultant,jdbcType=VARCHAR},
+		approval_url = #{approvalUrl,jdbcType=VARCHAR},
+		state = #{state,jdbcType=INTEGER},
+		create_time = #{createTime,jdbcType=TIMESTAMP},
+		accept_date = #{acceptDate,jdbcType=TIMESTAMP},
+		approved_date = #{approvedDate,jdbcType=TIMESTAMP},
+		record_time = #{recordTime,jdbcType=TIMESTAMP},
+		deleted_sign = #{deletedSign,jdbcType=INTEGER}
+		where id = #{id,jdbcType=VARCHAR}
+	</update>
+
+	<select id="findTechProjectClientListByPage" parameterType="java.lang.String"
+		resultType="com.goafanti.techproject.bo.TechProjectClientListBo">
+	    select p.id, p.uid, i.location_province as province, 
+	        i.unit_name as unitName,  
+		    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, 
+		    p.serial_number as serialNumber, p.create_time as createTime, p.approved_date as approvedDate, 
+		    p.accept_date as acceptDate, a.name as consultant, p.contacts,
+		    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 
+		<if test ="uid != null">
+	        and p.uid = #{uid,jdbcType=VARCHAR}
+	    </if>
+	    order by p.serial_number desc
+	    <if test="page_sql!=null">
+			${page_sql}
+		</if>
+	</select>
+	
+	<select id="findTechProjectClientCount" resultType="java.lang.Integer" parameterType="String">
+ 	select count(1)
+    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 
+    <if test ="uid != null">
+        and p.uid = #{uid,jdbcType=VARCHAR}
+    </if>
+  </select>
+</mapper>

+ 135 - 0
src/main/java/com/goafanti/common/mapper/TechWebsiteMapper.xml

@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.goafanti.common.dao.TechWebsiteMapper" >
+  <resultMap id="BaseResultMap" type="com.goafanti.common.model.TechWebsite" >
+    <id column="id" property="id" jdbcType="VARCHAR" />
+    <result column="uid" property="uid" jdbcType="VARCHAR" />
+    <result column="department" property="department" jdbcType="VARCHAR" />
+    <result column="website" property="website" jdbcType="VARCHAR" />
+    <result column="account_number" property="accountNumber" jdbcType="VARCHAR" />
+    <result column="password" property="password" jdbcType="VARCHAR" />
+    <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
+    <result column="deleted_sign" property="deletedSign" jdbcType="INTEGER" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, uid, department, website, account_number, password, create_time, deleted_sign
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select 
+    <include refid="Base_Column_List" />
+    from tech_website
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
+    delete from tech_website
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <insert id="insert" parameterType="com.goafanti.common.model.TechWebsite" >
+    insert into tech_website (id, uid, department, 
+      website, account_number, password, 
+      create_time, deleted_sign)
+    values (#{id,jdbcType=VARCHAR}, #{uid,jdbcType=VARCHAR}, #{department,jdbcType=VARCHAR}, 
+      #{website,jdbcType=VARCHAR}, #{accountNumber,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR}, 
+      #{createTime,jdbcType=TIMESTAMP}, #{deletedSign,jdbcType=INTEGER})
+  </insert>
+  <insert id="insertSelective" parameterType="com.goafanti.common.model.TechWebsite" >
+    insert into tech_website
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="uid != null" >
+        uid,
+      </if>
+      <if test="department != null" >
+        department,
+      </if>
+      <if test="website != null" >
+        website,
+      </if>
+      <if test="accountNumber != null" >
+        account_number,
+      </if>
+      <if test="password != null" >
+        password,
+      </if>
+      <if test="createTime != null" >
+        create_time,
+      </if>
+      <if test="deletedSign != null" >
+        deleted_sign,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="uid != null" >
+        #{uid,jdbcType=VARCHAR},
+      </if>
+      <if test="department != null" >
+        #{department,jdbcType=VARCHAR},
+      </if>
+      <if test="website != null" >
+        #{website,jdbcType=VARCHAR},
+      </if>
+      <if test="accountNumber != null" >
+        #{accountNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="password != null" >
+        #{password,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null" >
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="deletedSign != null" >
+        #{deletedSign,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.TechWebsite" >
+    update tech_website
+    <set >
+      <if test="uid != null" >
+        uid = #{uid,jdbcType=VARCHAR},
+      </if>
+      <if test="department != null" >
+        department = #{department,jdbcType=VARCHAR},
+      </if>
+      <if test="website != null" >
+        website = #{website,jdbcType=VARCHAR},
+      </if>
+      <if test="accountNumber != null" >
+        account_number = #{accountNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="password != null" >
+        password = #{password,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null" >
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="deletedSign != null" >
+        deleted_sign = #{deletedSign,jdbcType=INTEGER},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.TechWebsite" >
+    update tech_website
+    set uid = #{uid,jdbcType=VARCHAR},
+      department = #{department,jdbcType=VARCHAR},
+      website = #{website,jdbcType=VARCHAR},
+      account_number = #{accountNumber,jdbcType=VARCHAR},
+      password = #{password,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      deleted_sign = #{deletedSign,jdbcType=INTEGER}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  
+  <select id="selectTechWebsiteByUid" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select 
+    <include refid="Base_Column_List" />
+    from tech_website
+    where uid = #{uid,jdbcType=VARCHAR} and deleted_sign = 0
+  </select>
+</mapper>

+ 273 - 0
src/main/java/com/goafanti/common/model/TechProject.java

@@ -0,0 +1,273 @@
+package com.goafanti.common.model;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class TechProject {
+    private String id;
+
+    private String uid;
+
+    /**
+    * 编号
+    */
+    private Integer serialNumber;
+
+    /**
+    * 联系人
+    */
+    private Integer contacts;
+
+    /**
+    * 科技项目申报部门
+    */
+    private String department;
+
+    /**
+    * 派单信息
+    */
+    private String dispatchInfo;
+
+    /**
+    * 项目名称
+    */
+    private String projectName;
+
+    /**
+    * 项目类型
+    */
+    private String projectCatagory;
+
+    /**
+    * 技术领域
+    */
+    private String techField;
+
+    /**
+    * 项目简介
+    */
+    private String projectDes;
+
+    /**
+    * 是否立项
+    */
+    private Integer projectMode;
+
+    /**
+    * 立项金额
+    */
+    private BigDecimal projectApproval;
+
+    /**
+    * 是否补助
+    */
+    private Integer subsidy;
+
+    /**
+    * 咨询师
+    */
+    private String consultant;
+
+    /**
+    * 项目材料URL
+    */
+    private String approvalUrl;
+
+    /**
+    * 申报状态
+    */
+    private Integer state;
+
+    /**
+    * 派单日
+    */
+    private Date createTime;
+
+    /**
+    * 受理日
+    */
+    private Date acceptDate;
+
+    /**
+    * 项目批复日期
+    */
+    private Date approvedDate;
+
+    /**
+    * 记录创建日期
+    */
+    private Date recordTime;
+
+    /**
+    * 删除标记
+    */
+    private Integer deletedSign;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getUid() {
+        return uid;
+    }
+
+    public void setUid(String uid) {
+        this.uid = uid;
+    }
+
+    public Integer getSerialNumber() {
+        return serialNumber;
+    }
+
+    public void setSerialNumber(Integer serialNumber) {
+        this.serialNumber = serialNumber;
+    }
+
+    public Integer getContacts() {
+        return contacts;
+    }
+
+    public void setContacts(Integer contacts) {
+        this.contacts = contacts;
+    }
+
+    public String getDepartment() {
+        return department;
+    }
+
+    public void setDepartment(String department) {
+        this.department = department;
+    }
+
+    public String getDispatchInfo() {
+        return dispatchInfo;
+    }
+
+    public void setDispatchInfo(String dispatchInfo) {
+        this.dispatchInfo = dispatchInfo;
+    }
+
+    public String getProjectName() {
+        return projectName;
+    }
+
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
+
+    public String getProjectCatagory() {
+        return projectCatagory;
+    }
+
+    public void setProjectCatagory(String projectCatagory) {
+        this.projectCatagory = projectCatagory;
+    }
+
+    public String getTechField() {
+        return techField;
+    }
+
+    public void setTechField(String techField) {
+        this.techField = techField;
+    }
+
+    public String getProjectDes() {
+        return projectDes;
+    }
+
+    public void setProjectDes(String projectDes) {
+        this.projectDes = projectDes;
+    }
+
+    public Integer getProjectMode() {
+        return projectMode;
+    }
+
+    public void setProjectMode(Integer projectMode) {
+        this.projectMode = projectMode;
+    }
+
+    public BigDecimal getProjectApproval() {
+        return projectApproval;
+    }
+
+    public void setProjectApproval(BigDecimal projectApproval) {
+        this.projectApproval = projectApproval;
+    }
+
+    public Integer getSubsidy() {
+        return subsidy;
+    }
+
+    public void setSubsidy(Integer subsidy) {
+        this.subsidy = subsidy;
+    }
+
+    public String getConsultant() {
+        return consultant;
+    }
+
+    public void setConsultant(String consultant) {
+        this.consultant = consultant;
+    }
+
+    public String getApprovalUrl() {
+        return approvalUrl;
+    }
+
+    public void setApprovalUrl(String approvalUrl) {
+        this.approvalUrl = approvalUrl;
+    }
+
+    public Integer getState() {
+        return state;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getAcceptDate() {
+        return acceptDate;
+    }
+
+    public void setAcceptDate(Date acceptDate) {
+        this.acceptDate = acceptDate;
+    }
+
+    public Date getApprovedDate() {
+        return approvedDate;
+    }
+
+    public void setApprovedDate(Date approvedDate) {
+        this.approvedDate = approvedDate;
+    }
+
+    public Date getRecordTime() {
+        return recordTime;
+    }
+
+    public void setRecordTime(Date recordTime) {
+        this.recordTime = recordTime;
+    }
+
+    public Integer getDeletedSign() {
+        return deletedSign;
+    }
+
+    public void setDeletedSign(Integer deletedSign) {
+        this.deletedSign = deletedSign;
+    }
+}

+ 90 - 0
src/main/java/com/goafanti/common/model/TechProjectLog.java

@@ -0,0 +1,90 @@
+package com.goafanti.common.model;
+
+import java.util.Date;
+
+public class TechProjectLog {
+    private String id;
+
+    private String pid;
+
+    /**
+    * 状态变更录入时间
+    */
+    private Date recordTime;
+
+    /**
+    * 状态
+    */
+    private Integer state;
+
+    /**
+    * 负责人
+    */
+    private String principal;
+
+    /**
+    * 操作人
+    */
+    private String operator;
+
+    /**
+    * 备注
+    */
+    private String comment;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getPid() {
+        return pid;
+    }
+
+    public void setPid(String pid) {
+        this.pid = pid;
+    }
+
+    public Date getRecordTime() {
+        return recordTime;
+    }
+
+    public void setRecordTime(Date recordTime) {
+        this.recordTime = recordTime;
+    }
+
+    public Integer getState() {
+        return state;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+
+    public String getPrincipal() {
+        return principal;
+    }
+
+    public void setPrincipal(String principal) {
+        this.principal = principal;
+    }
+
+    public String getOperator() {
+        return operator;
+    }
+
+    public void setOperator(String operator) {
+        this.operator = operator;
+    }
+
+    public String getComment() {
+        return comment;
+    }
+
+    public void setComment(String comment) {
+        this.comment = comment;
+    }
+}

+ 103 - 0
src/main/java/com/goafanti/common/model/TechWebsite.java

@@ -0,0 +1,103 @@
+package com.goafanti.common.model;
+
+import java.util.Date;
+
+public class TechWebsite {
+    private String id;
+
+    private String uid;
+
+    /**
+    * 科技部门名称
+    */
+    private String department;
+
+    /**
+    * 网址
+    */
+    private String website;
+
+    /**
+    * 帐号
+    */
+    private String accountNumber;
+
+    /**
+    * 密码
+    */
+    private String password;
+
+    /**
+    * 创建日期
+    */
+    private Date createTime;
+
+    /**
+    * 删除标记
+    */
+    private Integer deletedSign;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getUid() {
+        return uid;
+    }
+
+    public void setUid(String uid) {
+        this.uid = uid;
+    }
+
+    public String getDepartment() {
+        return department;
+    }
+
+    public void setDepartment(String department) {
+        this.department = department;
+    }
+
+    public String getWebsite() {
+        return website;
+    }
+
+    public void setWebsite(String website) {
+        this.website = website;
+    }
+
+    public String getAccountNumber() {
+        return accountNumber;
+    }
+
+    public void setAccountNumber(String accountNumber) {
+        this.accountNumber = accountNumber;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Integer getDeletedSign() {
+        return deletedSign;
+    }
+
+    public void setDeletedSign(Integer deletedSign) {
+        this.deletedSign = deletedSign;
+    }
+}

+ 3 - 1
src/main/java/com/goafanti/patent/controller/PatentApiController.java

@@ -231,10 +231,12 @@ public class PatentApiController extends BaseApiController {
 	@RequestMapping(value = "/managePatentInfo", method = RequestMethod.POST)
 	public Result managePatentInfo(String patentNumber, String patentName, String patentCatagory, String patentField,
 			String patentDes, String patentWritingUrl, String authorizationNoticeUrl, String patentCertificateUrl,
-			String xid, PatentLog patentLog, String recordTimeFormattedDate) throws ParseException {
+			String xid, PatentLog patentLog, String recordTimeFormattedDate, Integer pState) throws ParseException {
 		Result res = new Result();
 		PatentInfo patentInfo = new PatentInfo();
 		patentInfo.setId(xid);
+		patentInfo.setPatentState(pState);
+		patentInfo.setPatentName(patentName);
 		patentInfo.setPatentNumber(patentNumber);
 		patentInfo.setPatentCatagory(StringUtils.isNumeric(patentCatagory) ? Integer.parseInt(patentCatagory) : null);
 		patentInfo.setPatentField(StringUtils.isNumeric(patentField) ? Integer.parseInt(patentField) : null);

+ 0 - 1
src/main/java/com/goafanti/patent/service/PatentInfoService.java

@@ -14,7 +14,6 @@ import com.goafanti.patent.bo.PatentPendingBo;
 
 public interface PatentInfoService {
 
-	PatentInfo selectPatentInfoByUserId(String userId);
 
 	PatentInfo insert(PatentInfo patentInfo);
 

+ 2 - 7
src/main/java/com/goafanti/patent/service/impl/PatentInfoServiceImpl.java

@@ -24,7 +24,6 @@ import com.goafanti.common.model.PatentInfo;
 import com.goafanti.common.model.PatentLog;
 import com.goafanti.common.model.PatentRegistration;
 import com.goafanti.common.utils.DateUtils;
-import com.goafanti.common.utils.StringUtils;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
@@ -48,10 +47,6 @@ public class PatentInfoServiceImpl extends BaseMybatisDao<PatentInfoMapper> impl
 	@Autowired
 	OrgIntellectualPropertyMapper	orgIntellectualPropertyMapper;
 
-	@Override
-	public PatentInfo selectPatentInfoByUserId(String uid) {
-		return patentInfoMapper.selectPatentInfoByUserId(uid);
-	}
 
 	@Override
 	public PatentInfo insert(PatentInfo patentInfo) {
@@ -316,7 +311,7 @@ public class PatentInfoServiceImpl extends BaseMybatisDao<PatentInfoMapper> impl
 
 	@Override
 	public void updatePatentInfo(PatentInfo patentInfo, PatentLog patentLog, Date recordTime) {
-		if (!StringUtils.isBlank(patentLog.getPrincipal())) {
+		if (null != patentLog.getState()) {
 			switch (patentLog.getState()) {
 			case 2:
 				patentInfo.setCreateTime(recordTime);
@@ -329,7 +324,7 @@ public class PatentInfoServiceImpl extends BaseMybatisDao<PatentInfoMapper> impl
 				break;
 			}
 			patentInfo.setPatentState(patentLog.getState());
-			patentInfo.setPrincipal(patentLog.getPrincipal());
+			patentInfo.setPrincipal(null == patentLog.getPrincipal() ? "" : patentLog.getPrincipal());
 			patentLog.setPid(patentInfo.getId());
 			patentLog.setId(UUID.randomUUID().toString());
 			patentLog.setRecordTime(recordTime);

+ 221 - 0
src/main/java/com/goafanti/techproject/bo/TechProjectClientListBo.java

@@ -0,0 +1,221 @@
+package com.goafanti.techproject.bo;
+
+import java.util.Date;
+
+import org.apache.commons.lang3.time.DateFormatUtils;
+/**
+ * 用户科技申报项目列表
+ */
+public class TechProjectClientListBo {
+	private String id;
+	
+	private String uid;
+	
+	private Integer serialNumber;
+	
+	private String province;
+	
+	private Integer contacts;
+	
+	private String unitName;
+	
+	private String projectName;
+	
+	private String projectCatagory;
+	
+	private String techField;
+	
+	private Integer state;
+	
+	private Date createTime;
+	
+	private String consultant;
+	
+	private Date acceptDate;
+	
+	private Date approvedDate;
+	
+	private String firstContacts;
+	
+	private String secondContacts;
+	
+	private String thirdContacts;
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public String getUid() {
+		return uid;
+	}
+
+	public void setUid(String uid) {
+		this.uid = uid;
+	}
+
+
+	public Integer getSerialNumber() {
+		return serialNumber;
+	}
+
+	public void setSerialNumber(Integer serialNumber) {
+		this.serialNumber = serialNumber;
+	}
+
+	public String getProvince() {
+		return province;
+	}
+
+	public void setProvince(String province) {
+		this.province = province;
+	}
+
+	public Integer getContacts() {
+		return contacts;
+	}
+
+	public void setContacts(Integer contacts) {
+		this.contacts = contacts;
+	}
+
+	public String getUnitName() {
+		return unitName;
+	}
+
+	public void setUnitName(String unitName) {
+		this.unitName = unitName;
+	}
+
+	public String getProjectName() {
+		return projectName;
+	}
+
+	public void setProjectName(String projectName) {
+		this.projectName = projectName;
+	}
+
+	public String getProjectCatagory() {
+		return projectCatagory;
+	}
+
+	public void setProjectCatagory(String projectCatagory) {
+		this.projectCatagory = projectCatagory;
+	}
+
+	public String getTechField() {
+		return techField;
+	}
+
+	public void setTechField(String techField) {
+		this.techField = techField;
+	}
+
+	public Integer getState() {
+		return state;
+	}
+
+	public void setState(Integer state) {
+		this.state = state;
+	}
+
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+
+    
+	public String getConsultant() {
+		return consultant;
+	}
+
+	public void setConsultant(String consultant) {
+		this.consultant = consultant;
+	}
+
+	public Date getAcceptDate() {
+		return acceptDate;
+	}
+
+	public void setAcceptDate(Date acceptDate) {
+		this.acceptDate = acceptDate;
+	}
+
+	public Date getApprovedDate() {
+		return approvedDate;
+	}
+
+	public void setApprovedDate(Date approvedDate) {
+		this.approvedDate = approvedDate;
+	}
+	
+	
+	
+	public String getFirstContacts() {
+		return firstContacts;
+	}
+
+	public void setFirstContacts(String firstContacts) {
+		this.firstContacts = firstContacts;
+	}
+
+	public String getSecondContacts() {
+		return secondContacts;
+	}
+
+	public void setSecondContacts(String secondContacts) {
+		this.secondContacts = secondContacts;
+	}
+
+	public String getThirdContacts() {
+		return thirdContacts;
+	}
+
+	public void setThirdContacts(String thirdContacts) {
+		this.thirdContacts = thirdContacts;
+	}
+
+	public String getCreateTimeFormattedDate(){
+		if (this.createTime == null) {
+			return null;
+		} else {
+			return DateFormatUtils.format(this.getCreateTime(), "yyyy-MM-dd");
+		}
+	}
+	
+	public void setCreateTimeFormattedDate(String createTimeFormattedDate){
+		
+	}
+	
+	public String getAcceptDateFormattedDate(){
+		if (this.acceptDate == null) {
+			return null;
+		} else {
+			return DateFormatUtils.format(this.getAcceptDate(), "yyyy-MM-dd");
+		}
+	}
+	
+	public void setAcceptDateFormattedDate(String acceptDateFormattedDate){
+		
+	}
+	
+	public String getApprovedDateFormattedDate(){
+		if (this.approvedDate == null) {
+			return null;
+		} else {
+			return DateFormatUtils.format(this.getApprovedDate(), "yyyy-MM-dd");
+		}
+	}
+	
+	public void setApprovedDateFormattedDate(String approvedDateFormattedDate){
+		
+	}
+
+
+}

+ 69 - 0
src/main/java/com/goafanti/techproject/controller/TechProjectApiController.java

@@ -0,0 +1,69 @@
+package com.goafanti.techproject.controller;
+
+
+import javax.annotation.Resource;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import com.goafanti.common.bo.Result;
+import com.goafanti.common.controller.BaseApiController;
+import com.goafanti.common.utils.StringUtils;
+import com.goafanti.core.shiro.token.TokenManager;
+import com.goafanti.techproject.service.TechProjectService;
+import com.goafanti.techproject.service.TechWebsiteService;
+
+@Controller
+@RequestMapping(value = "/api/techproject")
+public class TechProjectApiController extends BaseApiController{
+	@Resource
+	private TechProjectService techProjectService;
+	@Resource
+	private TechWebsiteService techWebsiteService;
+	
+	/**
+	 * 科技项目申报列表
+	 * @param pageNo
+	 * @param pageSize
+	 * @return
+	 */
+	@RequestMapping(value = "/listClientTechProject", method = RequestMethod.POST)
+	public Result listClientTechProject(String pageNo, String pageSize){
+		Result res = new Result();
+		Integer pNo = 1;
+		Integer pSize = 10;
+		if (StringUtils.isNumeric(pageSize)) {
+			pSize = Integer.parseInt(pageSize);
+		}
+		if (StringUtils.isNumeric(pageNo)) {
+			pNo = Integer.parseInt(pageNo);
+		}
+		res.setData(techProjectService.listClientTechProject(TokenManager.getUserId(), pNo, pSize));
+		return res;
+	}
+	
+	/**
+	 * 获取科技部门
+	 * @return
+	 */
+	@RequestMapping(value = "/getDepartment", method = RequestMethod.POST)
+	public Result getDepartment(){
+		Result res = new Result();
+		 res.setData(techWebsiteService.getDepartment(TokenManager.getUserId()));
+		 return res;
+	}
+	
+	/**
+	 * 科技项目申报详情
+	 * @return
+	 */
+	@RequestMapping(value = "/techProjectDetial", method = RequestMethod.POST)
+	public Result techProjectDetial(){
+		Result res = new Result();
+		return res;
+	}
+	
+	
+
+}

+ 10 - 0
src/main/java/com/goafanti/techproject/service/TechProjectService.java

@@ -0,0 +1,10 @@
+package com.goafanti.techproject.service;
+
+import com.goafanti.core.mybatis.page.Pagination;
+import com.goafanti.techproject.bo.TechProjectClientListBo;
+
+public interface TechProjectService {
+
+	Pagination<TechProjectClientListBo> listClientTechProject(String userId, Integer pNo, Integer pSize);
+
+}

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

@@ -0,0 +1,9 @@
+package com.goafanti.techproject.service;
+
+import java.util.Map;
+
+public interface TechWebsiteService {
+
+	Map<String, String> getDepartment(String uid);
+
+}

+ 39 - 0
src/main/java/com/goafanti/techproject/service/impl/TechProjectServiceImpl.java

@@ -0,0 +1,39 @@
+package com.goafanti.techproject.service.impl;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.goafanti.common.dao.TechProjectMapper;
+import com.goafanti.common.model.OrgRatepay;
+import com.goafanti.core.mybatis.BaseMybatisDao;
+import com.goafanti.core.mybatis.page.Pagination;
+import com.goafanti.techproject.bo.TechProjectClientListBo;
+import com.goafanti.techproject.service.TechProjectService;
+@Service
+public class TechProjectServiceImpl extends BaseMybatisDao<TechProjectMapper> implements TechProjectService {
+	@Autowired
+	private TechProjectMapper techProjectMapper;
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public Pagination<TechProjectClientListBo> listClientTechProject(String uid, Integer pageNo, Integer pageSize) {
+		Map<String, Object> params = new HashMap<>();
+		
+		params.put("uid", uid);
+
+		if (pageNo == null || pageNo < 0) {
+			pageNo = 1;
+		}
+
+		if (pageSize == null || pageSize < 0) {
+			pageSize = 10;
+		}
+		return (Pagination<TechProjectClientListBo>)findPage("findTechProjectClientListByPage",
+				"findTechProjectClientCount", params, pageNo, pageSize);
+	}
+
+}

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

@@ -0,0 +1,29 @@
+package com.goafanti.techproject.service.impl;
+
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.goafanti.common.dao.TechWebsiteMapper;
+import com.goafanti.common.model.TechWebsite;
+import com.goafanti.techproject.service.TechWebsiteService;
+@Service
+public class TechWebsiteServiceImpl implements TechWebsiteService {
+	@Autowired
+	private TechWebsiteMapper techWebsiteMapper;
+
+	@Override
+	public Map<String, String> getDepartment(String uid) {
+		Map<String, String> map = new TreeMap<String, String>();
+		List<TechWebsite> list = techWebsiteMapper.selectTechWebsiteByUid(uid);
+		if (null != list && 0 != list.size()){
+			for (TechWebsite t : list) {
+				map.put(t.getId(), t.getDepartment());
+			}
+		}
+		return map;
+	}
+}