Antiloveg 8 lat temu
rodzic
commit
e0c8e14639
22 zmienionych plików z 460 dodań i 18 usunięć
  1. 4 1
      schema/2017-05-10.sql
  2. 55 2
      src/main/java/com/goafanti/admin/controller/AdminContractApiController.java
  3. 92 0
      src/main/java/com/goafanti/cognizance/bo/CognizanceContractBo.java
  4. 3 0
      src/main/java/com/goafanti/cognizance/service/OrgCognizanceService.java
  5. 6 0
      src/main/java/com/goafanti/cognizance/service/impl/OrgCognizanceServiceImpl.java
  6. 3 0
      src/main/java/com/goafanti/common/dao/CopyrightInfoMapper.java
  7. 3 0
      src/main/java/com/goafanti/common/dao/OrgCognizanceMapper.java
  8. 3 0
      src/main/java/com/goafanti/common/dao/TechProjectMapper.java
  9. 10 0
      src/main/java/com/goafanti/common/mapper/CopyrightInfoMapper.xml
  10. 10 0
      src/main/java/com/goafanti/common/mapper/OrgCognizanceMapper.xml
  11. 1 1
      src/main/java/com/goafanti/common/mapper/PatentInfoMapper.xml
  12. 26 4
      src/main/java/com/goafanti/common/mapper/TechProjectMapper.xml
  13. 15 1
      src/main/java/com/goafanti/common/model/TechProject.java
  14. 1 1
      src/main/java/com/goafanti/contract/service/ContractLogService.java
  15. 15 4
      src/main/java/com/goafanti/contract/service/impl/ContractLogServiceImpl.java
  16. 89 0
      src/main/java/com/goafanti/copyright/bo/CopyrightContractListBo.java
  17. 3 0
      src/main/java/com/goafanti/copyright/service/CopyrightInfoService.java
  18. 6 0
      src/main/java/com/goafanti/copyright/service/impl/CopyrightInfoServiceImpl.java
  19. 16 4
      src/main/java/com/goafanti/patent/bo/PatentContractListBo.java
  20. 90 0
      src/main/java/com/goafanti/techproject/bo/TechProjectContractListBo.java
  21. 3 0
      src/main/java/com/goafanti/techproject/service/TechProjectService.java
  22. 6 0
      src/main/java/com/goafanti/techproject/service/impl/TechProjectServiceImpl.java

+ 4 - 1
schema/2017-05-10.sql

@@ -8,4 +8,7 @@ alter table `org_cognizance`
 add column `contract_id` VARCHAR(36) null comment '合同ID' after `uid`; 
 
 alter table `tech_project` 
-add column `contract_id` VARCHAR(36) null comment '合同ID' after `uid`; 
+add column `contract_id` VARCHAR(36) null comment '合同ID' after `uid`; 
+
+alter table `tech_project` 
+add column `principal` VARCHAR(36) null comment '负责人' after `founder`; 

+ 55 - 2
src/main/java/com/goafanti/admin/controller/AdminContractApiController.java

@@ -30,7 +30,9 @@ import com.goafanti.contract.bo.InputContract;
 import com.goafanti.contract.bo.InputSaveContract;
 import com.goafanti.contract.service.ContractLogService;
 import com.goafanti.contract.service.ContractService;
+import com.goafanti.copyright.service.CopyrightInfoService;
 import com.goafanti.patent.service.PatentInfoService;
+import com.goafanti.techproject.service.TechProjectService;
 import com.goafanti.user.service.UserService;
 
 @RestController
@@ -48,6 +50,52 @@ public class AdminContractApiController extends CertifyApiController {
 	private AdminService			adminService;
 	@Resource
 	private PatentInfoService		patentInfoService;
+	@Resource
+	private CopyrightInfoService	copyrightInfoService;
+	@Resource
+	private TechProjectService		techProjectService;
+
+	/**
+	 * 合同详情-科技项目列表
+	 */
+	@RequestMapping(value = "/techProject", method = RequestMethod.GET)
+	public Result listTechProject(String contractId) {
+		Result res = new Result();
+		if (StringUtils.isBlank(contractId)) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到合同ID", "合同ID"));
+			return res;
+		}
+		res.setData(techProjectService.listContractTechProjectByContractId(contractId));
+		return res;
+	}
+
+	/**
+	 * 合同详情-高企记录
+	 */
+	@RequestMapping(value = "/cognizance", method = RequestMethod.GET)
+	public Result cognizance(String contractId) {
+		Result res = new Result();
+		if (StringUtils.isBlank(contractId)) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到合同ID", "合同ID"));
+			return res;
+		}
+		res.setData(orgCognizanceService.selectContractCognizanceByContractId(contractId));
+		return res;
+	}
+
+	/**
+	 * 合同详情-软著列表
+	 */
+	@RequestMapping(value = "/copyright", method = RequestMethod.GET)
+	public Result listCopyright(String contractId) {
+		Result res = new Result();
+		if (StringUtils.isBlank(contractId)) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到合同ID", "合同ID"));
+			return res;
+		}
+		res.setData(copyrightInfoService.listContractCopyrightByContractId(contractId));
+		return res;
+	}
 
 	/**
 	 * 合同详情-专利列表
@@ -197,7 +245,7 @@ public class AdminContractApiController extends CertifyApiController {
 	 * 流转分发
 	 */
 	@RequestMapping(value = "/circulation", method = RequestMethod.POST)
-	public Result circulation(@Valid InputContactLog icl, BindingResult bindingResult,
+	public Result circulation(@Valid InputContactLog icl, BindingResult bindingResult, String recordTimeFormattedDate,
 			@RequestParam(name = "principals[]", required = false) String[] principals) {
 		Result res = new Result();
 		if (bindingResult.hasErrors()) {
@@ -205,6 +253,11 @@ public class AdminContractApiController extends CertifyApiController {
 					ContractLogFields.getFieldDesc(bindingResult.getFieldError().getField())));
 			return res;
 		}
+		
+		if (StringUtils.isBlank(recordTimeFormattedDate)){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到流转分发时间", "流转分发时间"));
+			return res;
+		}
 
 		if (principals.length < 1 || null == principals) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到流转分发用户", "流转分发用户"));
@@ -221,7 +274,7 @@ public class AdminContractApiController extends CertifyApiController {
 			return res;
 		}
 
-		contractLogService.insertCirculation(icl, principals);
+		contractLogService.insertCirculation(icl, principals, recordTimeFormattedDate);
 		return res;
 	}
 

+ 92 - 0
src/main/java/com/goafanti/cognizance/bo/CognizanceContractBo.java

@@ -0,0 +1,92 @@
+package com.goafanti.cognizance.bo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonFormat.Shape;
+
+public class CognizanceContractBo {
+	
+	private String id;
+	
+	private String uid;
+	
+	private String contractId;
+	
+	private Integer year;
+	
+	private Integer serialNumber;
+	
+	private Integer state;
+	
+	private String certificateNumber;
+	
+	private String techPrincipal;
+
+	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 getContractId() {
+		return contractId;
+	}
+
+	public void setContractId(String contractId) {
+		this.contractId = contractId;
+	}
+
+	public Integer getYear() {
+		return year;
+	}
+
+	public void setYear(Integer year) {
+		this.year = year;
+	}
+
+	public Integer getSerialNumber() {
+		return serialNumber;
+	}
+
+	public void setSerialNumber(Integer serialNumber) {
+		this.serialNumber = serialNumber;
+	}
+	
+	@JsonFormat(shape = Shape.STRING)
+	public Integer getState() {
+		return state;
+	}
+
+	public void setState(Integer state) {
+		this.state = state;
+	}
+
+	public String getCertificateNumber() {
+		return certificateNumber;
+	}
+
+	public void setCertificateNumber(String certificateNumber) {
+		this.certificateNumber = certificateNumber;
+	}
+
+	public String getTechPrincipal() {
+		return techPrincipal;
+	}
+
+	public void setTechPrincipal(String techPrincipal) {
+		this.techPrincipal = techPrincipal;
+	}
+	
+	
+	
+
+}

+ 3 - 0
src/main/java/com/goafanti/cognizance/service/OrgCognizanceService.java

@@ -7,6 +7,7 @@ import java.util.List;
 import com.goafanti.cognizance.bo.BusinessCountBo;
 import com.goafanti.cognizance.bo.CognizanceBo;
 import com.goafanti.cognizance.bo.CognizanceCatagoryBo;
+import com.goafanti.cognizance.bo.CognizanceContractBo;
 import com.goafanti.cognizance.bo.CognizanceDetailBo;
 import com.goafanti.cognizance.bo.CognizanceManageCostBo;
 import com.goafanti.cognizance.bo.CognizanceOrgInfoBo;
@@ -55,5 +56,7 @@ public interface OrgCognizanceService {
 
 	OrgCognizance saveCognizance(OrgCognizance oc, String salesman);
 
+	List<CognizanceContractBo> selectContractCognizanceByContractId(String contractId);
+
 
 }

+ 6 - 0
src/main/java/com/goafanti/cognizance/service/impl/OrgCognizanceServiceImpl.java

@@ -15,6 +15,7 @@ import org.springframework.stereotype.Service;
 import com.goafanti.cognizance.bo.BusinessCountBo;
 import com.goafanti.cognizance.bo.CognizanceBo;
 import com.goafanti.cognizance.bo.CognizanceCatagoryBo;
+import com.goafanti.cognizance.bo.CognizanceContractBo;
 import com.goafanti.cognizance.bo.CognizanceDetailBo;
 import com.goafanti.cognizance.bo.CognizanceManageCostBo;
 import com.goafanti.cognizance.bo.CognizanceOrgInfoBo;
@@ -410,4 +411,9 @@ public class OrgCognizanceServiceImpl extends BaseMybatisDao<OrgCognizanceMapper
 
 	}
 
+	@Override
+	public List<CognizanceContractBo> selectContractCognizanceByContractId(String contractId) {
+		return orgCognizanceMapper.selectContractCognizanceByContractId(contractId);
+	}
+
 }

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

@@ -4,6 +4,7 @@ import java.util.List;
 import java.util.Map;
 
 import com.goafanti.common.model.CopyrightInfo;
+import com.goafanti.copyright.bo.CopyrightContractListBo;
 import com.goafanti.copyright.bo.CopyrightInfoDetail;
 import com.goafanti.copyright.bo.CopyrightInfoSummary;
 
@@ -31,4 +32,6 @@ public interface CopyrightInfoMapper {
 	List<CopyrightInfo> selectByPrimaryKeys(List<String> asList);
 
 	Integer countCopyrightDone(String uid);
+
+	List<CopyrightContractListBo> listContractCopyrightByContractId(String contractId);
 }

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

@@ -4,6 +4,7 @@ import java.math.BigDecimal;
 import java.util.List;
 
 import com.goafanti.cognizance.bo.CognizanceCatagoryBo;
+import com.goafanti.cognizance.bo.CognizanceContractBo;
 import com.goafanti.cognizance.bo.CognizanceManageCostBo;
 import com.goafanti.cognizance.bo.CognizanceOrgInfoBo;
 import com.goafanti.cognizance.bo.CognizanceResearchCostBo;
@@ -39,4 +40,6 @@ public interface OrgCognizanceMapper {
 
 	LatelyCogRecord selectLatelyRecord(String uid);
 
+	List<CognizanceContractBo> selectContractCognizanceByContractId(String contractId);
+
 }

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

@@ -3,6 +3,7 @@ package com.goafanti.common.dao;
 import java.util.List;
 
 import com.goafanti.common.model.TechProject;
+import com.goafanti.techproject.bo.TechProjectContractListBo;
 import com.goafanti.techproject.bo.TechProjectDetailBo;
 import com.goafanti.user.bo.OrgUnitNames;
 
@@ -28,4 +29,6 @@ public interface TechProjectMapper {
 	Integer countTechProjectUndone(String uid);
 
 	List<OrgUnitNames> selectWebsiteUnitNames(String principal);
+
+	List<TechProjectContractListBo> listContractTechProjectByContractId(String contractId);
 }

+ 10 - 0
src/main/java/com/goafanti/common/mapper/CopyrightInfoMapper.xml

@@ -440,4 +440,14 @@
    and delete_sign = 0 and status <![CDATA[ < ]]> 8 
   </select>
   
+  <select id="listContractCopyrightByContractId" parameterType="java.lang.String" resultType="com.goafanti.copyright.bo.CopyrightContractListBo">
+  	select 
+  			ci.id, ci.uid, ci.contract_id as contractId, 
+  			ci.serial_number as serialNumber, ci.copyright_name as copyrightName, ci.status,
+  			ci.in_urgent as inUrgent, a.name as principal
+  	from copyright_info ci 
+  	left join admin a on a.id = ci.principal
+  	where ci.contract_id = #{contractId,jdbcType=VARCHAR}
+  </select>
+  
 </mapper>

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

@@ -518,4 +518,14 @@
 		   from org_cognizance c LEFT JOIN org_cognizance_log l on 
 		   c.id = l.cid  where c.uid = #{uid,jdbcType=VARCHAR} and c.deleted_sign = 0
   </select>
+  
+  <select id="selectContractCognizanceByContractId" resultType="com.goafanti.cognizance.bo.CognizanceContractBo" parameterType="java.lang.String" >
+  	select 
+  		oc.id, oc.uid, oc.contract_id as contractId,
+  		oc.year, oc.serial_number as serialNumber, oc.state, 
+  		oc.certificate_Number as certificate_number, a.name as techPrincipal
+  	from org_cognizance oc 
+  	left join admin a on a.id = oc.tech_principal 
+  	where oc.contract_id = #{contractId,jdbcType=VARCHAR}
+  </select>
 </mapper>

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

@@ -995,7 +995,7 @@
   
   <select id="listContractPatentByContractId" parameterType="java.lang.String" resultType="com.goafanti.patent.bo.PatentContractListBo">
   	select 
-  		pi.id, pi.uid, pi.contract_id as contractId, 
+  		pi.id, pi.uid, pi.contract_id as contractId, pi.serial_number as serialNumber,
   		pi.patent_name as patentName, patent_number as patentNumber, a.name as principal, 
   		pi.patent_state as patentState, pi.patent_catagory as patentCatagory
   	from patent_info pi

+ 26 - 4
src/main/java/com/goafanti/common/mapper/TechProjectMapper.xml

@@ -30,6 +30,7 @@
 		<result column="deleted_sign" property="deletedSign" jdbcType="INTEGER" />
 		<result column="founder" property="founder" jdbcType="VARCHAR" />
 		<result column="contract_id" property="contractId" jdbcType="VARCHAR" />
+		<result column="principal" property="principal" jdbcType="VARCHAR" />
 	</resultMap>
 	<sql id="Base_Column_List">
 		id, uid, serial_number, contacts, department, dispatch_info,
@@ -37,7 +38,7 @@
 		tech_field, project_des, project_mode, project_approval, subsidy, consultant,
 		approval_url,
 		state, create_time, accept_date, approved_date, record_time, deleted_sign,
-		founder, contract_id
+		founder, contract_id, principal
 	</sql>
 	<select id="selectByPrimaryKey" resultMap="BaseResultMap"
 		parameterType="java.lang.String">
@@ -57,7 +58,7 @@
 		project_des, project_mode, project_approval,
 		subsidy, consultant, approval_url,
 		state, create_time, accept_date,
-		approved_date, record_time, deleted_sign, founder, contract_id
+		approved_date, record_time, deleted_sign, founder, contract_id, principal
 		)
 		values (#{id,jdbcType=VARCHAR}, #{uid,jdbcType=VARCHAR},
 		#{serialNumber,jdbcType=INTEGER},
@@ -69,7 +70,8 @@
 		#{approvalUrl,jdbcType=VARCHAR},
 		#{state,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{acceptDate,jdbcType=TIMESTAMP},
 		#{approvedDate,jdbcType=TIMESTAMP}, #{recordTime,jdbcType=TIMESTAMP},
-		#{deletedSign,jdbcType=INTEGER}, #{founder,jdbcType=VARCHAR}, #{contractId,jdbcType=VARCHAR}
+		#{deletedSign,jdbcType=INTEGER}, #{founder,jdbcType=VARCHAR}, #{contractId,jdbcType=VARCHAR},
+		#{principal,jdbcType=VARCHAR}
 		)
 	</insert>
 	<insert id="insertSelective" parameterType="com.goafanti.common.model.TechProject">
@@ -144,6 +146,9 @@
 			<if test="contractId != null">
 				contract_id,
 			</if>
+			<if test="principal != null">
+				principal,
+			</if>
 		</trim>
 		<trim prefix="values (" suffix=")" suffixOverrides=",">
 			<if test="id != null">
@@ -215,6 +220,9 @@
 			<if test="contractId != null">
 				#{contractId,jdbcType=VARCHAR},
 			</if>
+			<if test="principal != null">
+				#{principal,jdbcType=VARCHAR},
+			</if>
 		</trim>
 	</insert>
 	<update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.TechProject">
@@ -286,6 +294,9 @@
 			<if test="contractId != null">
 				contract_id = #{contractId,jdbcType=VARCHAR},
 			</if>
+			<if test="principal != null">
+				principal = #{principal,jdbcType=VARCHAR},
+			</if>
 		</set>
 		where id = #{id,jdbcType=VARCHAR}
 	</update>
@@ -312,7 +323,8 @@
 		record_time = #{recordTime,jdbcType=TIMESTAMP},
 		deleted_sign = #{deletedSign,jdbcType=INTEGER},
 		founder = #{founder,jdbcType=VARCHAR},
-		contract_id = #{contractId,jdbcType=VARCHAR}
+		contract_id = #{contractId,jdbcType=VARCHAR},
+		principal = #{principal,jdbcType=VARCHAR}
 		where id = #{id,jdbcType=VARCHAR}
 	</update>
 
@@ -478,4 +490,14 @@
 		group by tp.id
 	</if> 
   </select>
+  
+  <select id="listContractTechProjectByContractId" parameterType="java.lang.String" resultType="com.goafanti.techproject.bo.TechProjectContractListBo">
+		select 
+			tp.id, tp.uid, tp.contract_id as contractId, 
+			tp.project_name, tp.project_catagory, tp.state, 
+			tp.tech_field as techField, a.name as principle
+		from tech_project tp 
+		left join admin a on a.id = tp.principal
+		where tp.contract_id = #{contractId,jdbcType=VARCHAR}
+	</select>
 </mapper>

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

@@ -14,7 +14,7 @@ public class TechProject {
 	private String		id;
 
 	private String		uid;
-	
+
 	/**
 	 * 合同ID
 	 */
@@ -120,6 +120,20 @@ public class TechProject {
 	 */
 	private String		founder;
 
+	/**
+	 * 负责人
+	 */
+	private String		principal;
+	
+
+	public String getPrincipal() {
+		return principal;
+	}
+
+	public void setPrincipal(String principal) {
+		this.principal = principal;
+	}
+
 	public String getFounder() {
 		return founder;
 	}

+ 1 - 1
src/main/java/com/goafanti/contract/service/ContractLogService.java

@@ -7,7 +7,7 @@ import com.goafanti.contract.bo.InputContactLog;
 
 public interface ContractLogService {
 
-	void insertCirculation(InputContactLog cl, String[] principals);
+	void insertCirculation(InputContactLog cl, String[] principals, String recordTimeFormattedDate);
 
 	List<ContractLog> selectContractLogByCid(String cid);
 

+ 15 - 4
src/main/java/com/goafanti/contract/service/impl/ContractLogServiceImpl.java

@@ -1,14 +1,18 @@
 package com.goafanti.contract.service.impl;
 
+import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.Calendar;
+import java.util.Date;
 import java.util.List;
 import java.util.UUID;
 
+import org.apache.commons.lang3.time.DateUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.dao.ContractLogMapper;
 import com.goafanti.common.dao.ContractMapper;
 import com.goafanti.common.dao.NoticeMapper;
@@ -20,6 +24,7 @@ import com.goafanti.common.model.Contract;
 import com.goafanti.common.model.ContractLog;
 import com.goafanti.common.model.Notice;
 import com.goafanti.common.model.User;
+import com.goafanti.common.utils.StringUtils;
 import com.goafanti.contract.bo.InputContactLog;
 import com.goafanti.contract.service.ContractLogService;
 import com.goafanti.core.shiro.token.TokenManager;
@@ -41,10 +46,18 @@ public class ContractLogServiceImpl implements ContractLogService {
 	}
 
 	@Override
-	public void insertCirculation(InputContactLog icl, String[] principals) {
+	public void insertCirculation(InputContactLog icl, String[] principals, String recordTimeFormattedDate) {
+		Date recordTime = null;
+		if (!StringUtils.isBlank(recordTimeFormattedDate)) {
+			try {
+				recordTime = DateUtils.parseDate(recordTimeFormattedDate, AFTConstants.YYYYMMDDHHMMSS);
+			} catch (ParseException e) {
+			}
+		}
 		if (ContractStatus.COMPLETE.getCode() == icl.getStatus()) {
 			Contract c = contractMapper.selectByPrimaryKey(icl.getCid());
 			c.setStatus(icl.getStatus());
+			c.setCompleteDate(recordTime);
 			contractMapper.updateByPrimaryKeySelective(c);
 		}
 		List<ContractLog> logs = new ArrayList<>();
@@ -55,9 +68,7 @@ public class ContractLogServiceImpl implements ContractLogService {
 			cl.setId(UUID.randomUUID().toString());
 			cl.setOperator(TokenManager.getAdminId());
 			cl.setPrincipal(principals[i]);
-			Calendar now = Calendar.getInstance();
-			now.set(Calendar.MILLISECOND, 0);
-			cl.setRecordTime(now.getTime());
+			cl.setRecordTime(recordTime);
 			logs.add(cl);
 			notice.add(createNotice(cl));
 		}

+ 89 - 0
src/main/java/com/goafanti/copyright/bo/CopyrightContractListBo.java

@@ -0,0 +1,89 @@
+package com.goafanti.copyright.bo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonFormat.Shape;
+
+public class CopyrightContractListBo {
+	private String	id;
+
+	private String	uid;
+
+	private String	contractId;
+
+	private Integer	serialNumber;
+
+	private String	copyrightName;
+
+	private Integer	status;
+
+	private Integer	inUrgent;
+
+	private String	principal;
+
+	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 getContractId() {
+		return contractId;
+	}
+
+	public void setContractId(String contractId) {
+		this.contractId = contractId;
+	}
+
+	public Integer getSerialNumber() {
+		return serialNumber;
+	}
+
+	public void setSerialNumber(Integer serialNumber) {
+		this.serialNumber = serialNumber;
+	}
+
+	public String getCopyrightName() {
+		return copyrightName;
+	}
+
+	public void setCopyrightName(String copyrightName) {
+		this.copyrightName = copyrightName;
+	}
+
+	@JsonFormat(shape = Shape.STRING)
+	public Integer getStatus() {
+		return status;
+	}
+
+	public void setStatus(Integer status) {
+		this.status = status;
+	}
+	
+	@JsonFormat(shape = Shape.STRING)
+	public Integer getInUrgent() {
+		return inUrgent;
+	}
+
+	public void setInUrgent(Integer inUrgent) {
+		this.inUrgent = inUrgent;
+	}
+
+	public String getPrincipal() {
+		return principal;
+	}
+
+	public void setPrincipal(String principal) {
+		this.principal = principal;
+	}
+
+}

+ 3 - 0
src/main/java/com/goafanti/copyright/service/CopyrightInfoService.java

@@ -5,6 +5,7 @@ import java.util.List;
 import com.goafanti.common.enums.CopyrightStatus;
 import com.goafanti.common.model.CopyrightInfo;
 import com.goafanti.common.model.CopyrightLog;
+import com.goafanti.copyright.bo.CopyrightContractListBo;
 import com.goafanti.copyright.bo.CopyrightInfoDetail;
 import com.goafanti.copyright.bo.CopyrightInfoSummary;
 import com.goafanti.copyright.bo.CopyrightLogBo;
@@ -38,4 +39,6 @@ public interface CopyrightInfoService {
 
 	CopyrightInfo saveCopyright(CopyrightInfo ci, String salesman);
 
+	List<CopyrightContractListBo> listContractCopyrightByContractId(String contractId);
+
 }

+ 6 - 0
src/main/java/com/goafanti/copyright/service/impl/CopyrightInfoServiceImpl.java

@@ -31,6 +31,7 @@ import com.goafanti.common.model.CopyrightLog;
 import com.goafanti.common.model.Notice;
 import com.goafanti.common.model.OrgIntellectualProperty;
 import com.goafanti.common.model.User;
+import com.goafanti.copyright.bo.CopyrightContractListBo;
 import com.goafanti.copyright.bo.CopyrightInfoDetail;
 import com.goafanti.copyright.bo.CopyrightInfoSummary;
 import com.goafanti.copyright.bo.CopyrightLogBo;
@@ -299,4 +300,9 @@ public class CopyrightInfoServiceImpl extends BaseMybatisDao<CopyrightInfoMapper
 		return copyrightInfo;
 	}
 
+	@Override
+	public List<CopyrightContractListBo> listContractCopyrightByContractId(String contractId) {
+		return copyrightInfoMapper.listContractCopyrightByContractId(contractId);
+	}
+
 }

+ 16 - 4
src/main/java/com/goafanti/patent/bo/PatentContractListBo.java

@@ -8,11 +8,13 @@ public class PatentContractListBo {
 	
 	private String uid;
 	
+	private Integer serialNumber;
+	
 	private String contractId;
 	
 	private String patentName;
 	
-	private String patentNumber;
+	private Integer patentNumber;
 	
 	private Integer patentState;
 	
@@ -35,6 +37,15 @@ public class PatentContractListBo {
 	public void setUid(String uid) {
 		this.uid = uid;
 	}
+	
+
+	public Integer getSerialNumber() {
+		return serialNumber;
+	}
+
+	public void setSerialNumber(Integer serialNumber) {
+		this.serialNumber = serialNumber;
+	}
 
 	public String getContractId() {
 		return contractId;
@@ -52,14 +63,15 @@ public class PatentContractListBo {
 		this.patentName = patentName;
 	}
 
-	public String getPatentNumber() {
+	
+	public Integer getPatentNumber() {
 		return patentNumber;
 	}
 
-	public void setPatentNumber(String patentNumber) {
+	public void setPatentNumber(Integer patentNumber) {
 		this.patentNumber = patentNumber;
 	}
-	
+
 	@JsonFormat(shape = Shape.STRING)
 	public Integer getPatentState() {
 		return patentState;

+ 90 - 0
src/main/java/com/goafanti/techproject/bo/TechProjectContractListBo.java

@@ -0,0 +1,90 @@
+package com.goafanti.techproject.bo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonFormat.Shape;
+
+public class TechProjectContractListBo {
+	private String id;
+	
+	private String uid;
+	
+	private String contractId;
+	
+	private String projectName;
+	
+	private String projectCatagory;
+	
+	private Integer state;
+	
+	private String techField;
+	
+	private String principle;
+
+	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 getContractId() {
+		return contractId;
+	}
+
+	public void setContractId(String contractId) {
+		this.contractId = contractId;
+	}
+
+	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;
+	}
+
+	@JsonFormat(shape = Shape.STRING)
+	public Integer getState() {
+		return state;
+	}
+
+	public void setState(Integer state) {
+		this.state = state;
+	}
+
+	public String getTechField() {
+		return techField;
+	}
+
+	public void setTechField(String techField) {
+		this.techField = techField;
+	}
+
+	public String getPrinciple() {
+		return principle;
+	}
+
+	public void setPrinciple(String principle) {
+		this.principle = principle;
+	}
+	
+	
+
+}

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

@@ -7,6 +7,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.TechProjectContractListBo;
 import com.goafanti.techproject.bo.TechProjectDetailBo;
 import com.goafanti.techproject.bo.TechProjectManageListBo;
 import com.goafanti.user.bo.OrgUnitNames;
@@ -31,4 +32,6 @@ public interface TechProjectService {
 
 	TechProject insertTechProject(TechProject tp, String aid);
 
+	List<TechProjectContractListBo> listContractTechProjectByContractId(String contractId);
+
 }

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

@@ -29,6 +29,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.TechProjectContractListBo;
 import com.goafanti.techproject.bo.TechProjectDetailBo;
 import com.goafanti.techproject.bo.TechProjectManageListBo;
 import com.goafanti.techproject.service.TechProjectService;
@@ -233,4 +234,9 @@ public class TechProjectServiceImpl extends BaseMybatisDao<TechProjectMapper> im
 		return techProject;
 	}
 
+	@Override
+	public List<TechProjectContractListBo> listContractTechProjectByContractId(String contractId) {
+		return techProjectMapper.listContractTechProjectByContractId(contractId);
+	}
+
 }