Antiloveg 8 years ago
parent
commit
c613b14ef3

+ 77 - 11
src/main/java/com/goafanti/achievement/bo/AchievementPartnerListBo.java

@@ -1,5 +1,6 @@
 package com.goafanti.achievement.bo;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 import org.apache.commons.lang3.time.DateFormatUtils;
@@ -9,42 +10,107 @@ import com.fasterxml.jackson.annotation.JsonFormat.Shape;
 import com.goafanti.common.constant.AFTConstants;
 
 public class AchievementPartnerListBo {
-	private String	id;
+	private String		id;
 
 	/**
 	 * 编号
 	 */
-	private Integer	serialNumber;
+	private Integer		serialNumber;
 
 	/**
 	 * 数据类别 (0--成果, 1--技术, 2--项目)
 	 */
-	private Integer	dataCategory;
+	private Integer		dataCategory;
 
 	/**
 	 * 名称
 	 */
-	private String	name;
+	private String		name;
 
 	/**
 	 * 关键词
 	 */
-	private String	keyword;
+	private String		keyword;
 
 	/**
 	 * 类型(0--专利, 2--软著, 3--项目, 4--版权, 5--工业设计, 6--配方, 7--非标)
 	 */
-	private Integer	category;
+	private Integer		category;
 
 	/**
 	 * 所有人类型(0-个人,1-组织)
 	 */
-	private Integer	ownerType;
+	private Integer		ownerType;
 
 	/**
 	 * 发布时间
 	 */
-	private Date	releaseDate;
+	private Date		releaseDate;
+
+	/**
+	 * 应用领域1
+	 */
+	private Integer		fieldA;
+
+	/**
+	 * 应用领域2
+	 */
+	private Integer		fieldB;
+
+	/**
+	 * 成熟度
+	 */
+	private Integer		maturity;
+
+	/**
+	 * 议价方式
+	 */
+	private Integer		bargainingMode;
+
+	/**
+	 * 标价
+	 */
+	private BigDecimal	transferPrice;
+
+	public Integer getFieldA() {
+		return fieldA;
+	}
+
+	public void setFieldA(Integer fieldA) {
+		this.fieldA = fieldA;
+	}
+
+	public Integer getFieldB() {
+		return fieldB;
+	}
+
+	public void setFieldB(Integer fieldB) {
+		this.fieldB = fieldB;
+	}
+
+	public Integer getMaturity() {
+		return maturity;
+	}
+
+	public void setMaturity(Integer maturity) {
+		this.maturity = maturity;
+	}
+
+	public Integer getBargainingMode() {
+		return bargainingMode;
+	}
+
+	public void setBargainingMode(Integer bargainingMode) {
+		this.bargainingMode = bargainingMode;
+	}
+
+	public BigDecimal getTransferPrice() {
+		return transferPrice;
+	}
+
+	public void setTransferPrice(BigDecimal transferPrice) {
+		this.transferPrice = transferPrice;
+	}
 
 	public String getId() {
 		return id;
@@ -61,7 +127,7 @@ public class AchievementPartnerListBo {
 	public void setSerialNumber(Integer serialNumber) {
 		this.serialNumber = serialNumber;
 	}
-	
+
 	@JsonFormat(shape = Shape.STRING)
 	public Integer getDataCategory() {
 		return dataCategory;
@@ -86,7 +152,7 @@ public class AchievementPartnerListBo {
 	public void setKeyword(String keyword) {
 		this.keyword = keyword;
 	}
-	
+
 	@JsonFormat(shape = Shape.STRING)
 	public Integer getCategory() {
 		return category;
@@ -95,7 +161,7 @@ public class AchievementPartnerListBo {
 	public void setCategory(Integer category) {
 		this.category = category;
 	}
-	
+
 	@JsonFormat(shape = Shape.STRING)
 	public Integer getOwnerType() {
 		return ownerType;

+ 25 - 11
src/main/java/com/goafanti/admin/controller/AdminContractApiController.java

@@ -57,12 +57,12 @@ public class AdminContractApiController extends CertifyApiController {
 	private CopyrightInfoService	copyrightInfoService;
 	@Resource
 	private TechProjectService		techProjectService;
-	
+
 	/**
 	 * 批量删除合同
 	 */
 	@RequestMapping(value = "/delete", method = RequestMethod.POST)
-	public Result delete(@RequestParam(name = "ids[]", required = false) String[] ids){
+	public Result delete(@RequestParam(name = "ids[]", required = false) String[] ids) {
 		Result res = new Result();
 		if (ids == null || ids.length < 1) {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", ""));
@@ -71,12 +71,12 @@ public class AdminContractApiController extends CertifyApiController {
 		}
 		return res;
 	}
-	
+
 	/**
 	 * 合同编号下拉
 	 */
-	@RequestMapping(value= "/serialNumber", method = RequestMethod.GET)
-	public Result contractSerialNumber(){
+	@RequestMapping(value = "/serialNumber", method = RequestMethod.GET)
+	public Result contractSerialNumber() {
 		Result res = new Result();
 		res.setData(contractService.selectContractSerialNumber());
 		return res;
@@ -271,8 +271,9 @@ public class AdminContractApiController extends CertifyApiController {
 	 * 合同列表
 	 */
 	@RequestMapping(value = "/list", method = RequestMethod.GET)
-	public Result listContract(String contractId, Integer serialNumber, Integer type, Integer status, String startDateFormattedDate,
-			String endDateFormattedDate, Integer province, String unitName, String uid, String pageNo, String pageSize) {
+	public Result listContract(String contractId, Integer serialNumber, Integer type, Integer status,
+			String startDateFormattedDate, String endDateFormattedDate, Integer province, String unitName, String uid,
+			String pageNo, String pageSize) {
 		Result res = new Result();
 		Integer pNo = 1;
 		Integer pSize = 10;
@@ -319,7 +320,13 @@ public class AdminContractApiController extends CertifyApiController {
 		if (StringUtils.isBlank(contract.getId())) {
 			res.setData(contractService.saveManageContract(c));
 		} else {
-			res.setData(contractService.updateByPrimaryKeySelective(c));
+			Contract ct = contractService.selectByPrimaryKey(c.getId());
+			if (null != ct && !ContractStatus.COMPLETE.getCode().equals(ct.getStatus())) {
+				res.setData(contractService.updateByPrimaryKeySelective(c));
+			} else {
+				res.getError().add(buildError("", "当前合同已完成(结款),无法操作!"));
+				return res;
+			}
 		}
 		return res;
 	}
@@ -362,7 +369,13 @@ public class AdminContractApiController extends CertifyApiController {
 		if (StringUtils.isBlank(ic.getId())) {
 			contractService.insertManageSubmit(c, principals, signDateFormattedDate);
 		} else {
-			contractService.updateSubmit(c, principals, signDateFormattedDate);
+			Contract ct = contractService.selectByPrimaryKey(c.getId());
+			if (null != ct && !ContractStatus.COMPLETE.getCode().equals(ct.getStatus())) {
+				contractService.updateSubmit(c, principals, signDateFormattedDate);
+			} else {
+				res.getError().add(buildError("", "当前合同已完成(结款),无法操作!"));
+				return res;
+			}
 		}
 		return res;
 	}
@@ -457,15 +470,16 @@ public class AdminContractApiController extends CertifyApiController {
 		if (TokenManager.hasRole(AFTConstants.SUPERADMIN)) {
 			for (ContractStatus p : ContractStatus.values()) {
 				status.put(p.getCode().toString(), p.getDesc());
+				status.remove(ContractStatus.CREATE.getCode().toString());
 				status.remove(ContractStatus.OTHER.getCode().toString());
 			}
 		} else {
-			if (TokenManager.hasPermission("ContractStatus" + ContractStatus.CREATE.getCode())) {
+			/*if (TokenManager.hasPermission("ContractStatus" + ContractStatus.CREATE.getCode())) {
 				status.put(ContractStatus.CREATE.getCode().toString(), ContractStatus.CREATE.getDesc());
 			}
 			if (TokenManager.hasPermission("ContractStatus" + ContractStatus.SIGN.getCode())) {
 				status.put(ContractStatus.SIGN.getCode().toString(), ContractStatus.SIGN.getDesc());
-			}
+			}*/
 			if (TokenManager.hasPermission("ContractStatus" + ContractStatus.CIRCULATION.getCode())) {
 				status.put(ContractStatus.CIRCULATION.getCode().toString(), ContractStatus.CIRCULATION.getDesc());
 			}

+ 2 - 1
src/main/java/com/goafanti/cognizance/service/impl/OrgCognizanceServiceImpl.java

@@ -39,6 +39,7 @@ import com.goafanti.common.enums.NoticeReadStatus;
 import com.goafanti.common.enums.NoticeStatus;
 import com.goafanti.common.enums.OrgCognizanceStatus;
 import com.goafanti.common.enums.ProportionStatus;
+import com.goafanti.common.model.Admin;
 import com.goafanti.common.model.Contract;
 import com.goafanti.common.model.Notice;
 import com.goafanti.common.model.OrgCognizance;
@@ -85,7 +86,7 @@ public class OrgCognizanceServiceImpl extends BaseMybatisDao<OrgCognizanceMapper
 			Integer pageSize) {
 		Map<String, Object> params = new HashMap<>();
 
-		if (!TokenManager.hasRole(AFTConstants.SUPERADMIN)) {
+		if (TokenManager.getToken() instanceof Admin && !TokenManager.hasRole(AFTConstants.SUPERADMIN)) {
 			params.put("principal", TokenManager.getAdminId());
 		}
 		

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

@@ -1118,7 +1118,12 @@
 		keyword,
 		category,
 		owner_type as ownerType,
-		release_date AS releaseDate	
+		release_date AS releaseDate,
+		field_a as fieldA,
+		field_b as fieldB,
+		maturity,
+		bargaining_mode as bargainingMode,
+		transfer_price as transferPrice
 	FROM
 		achievement
 	WHERE

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

@@ -427,7 +427,7 @@
    </if>
    where c.deleted_sign = 0
    <if test="_parameter !=null">	
-   and cl.principal = #{_parameter,jdbcType=VARCHAR}
+   	and cl.principal = #{_parameter,jdbcType=VARCHAR}
    </if>
     <if test="_parameter != null">
 	group by c.id

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

@@ -1015,7 +1015,11 @@
 		keyword,
 		release_date AS releaseDate,
 		demand_type AS demandType,
-		validity_period AS validityPeriod
+		validity_period AS validityPeriod,
+		problem_des as problemDes,
+		industry_category_a as industryCategoryA,
+		industry_category_b as industryCategoryB,
+		budget_cost as budgetCost
 	FROM
 		demand
 	WHERE

+ 63 - 10
src/main/java/com/goafanti/demand/bo/DemandPartnerListBo.java

@@ -1,5 +1,6 @@
 package com.goafanti.demand.bo;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 import org.apache.commons.lang3.time.DateFormatUtils;
@@ -9,39 +10,91 @@ import com.fasterxml.jackson.annotation.JsonFormat.Shape;
 import com.goafanti.common.constant.AFTConstants;
 
 public class DemandPartnerListBo {
-	private String	id;
+	private String		id;
 
 	/**
 	 * 编号
 	 */
-	private Integer	serialNumber;
+	private Integer		serialNumber;
 
 	/**
 	 * 数据类别(0-个人需求,1-单位需求)
 	 */
-	private Integer	dataCategory;
+	private Integer		dataCategory;
 
 	/**
 	 * 名称
 	 */
-	private String	name;
+	private String		name;
 
 	/**
 	 * 关键词
 	 */
-	private String	keyword;
+	private String		keyword;
 
 	/**
 	 * 发布时间
 	 */
-	private Date	releaseDate;
+	private Date		releaseDate;
 
 	/**
 	 * 需求类型
 	 */
-	private Integer	demandType;
+	private Integer		demandType;
 
-	private Date	validityPeriod;
+	private Date		validityPeriod;
+
+	/**
+	 * 需求问题说明
+	 */
+	private String		problemDes;
+
+	/**
+	 * 行业类别下拉A
+	 */
+	private Integer		industryCategoryA;
+
+	/**
+	 * 行业类别下拉B
+	 */
+	private Integer		industryCategoryB;
+
+	/**
+	 * 预算费用
+	 */
+	private BigDecimal	budgetCost;
+
+	public String getProblemDes() {
+		return problemDes;
+	}
+
+	public void setProblemDes(String problemDes) {
+		this.problemDes = problemDes;
+	}
+
+	public Integer getIndustryCategoryA() {
+		return industryCategoryA;
+	}
+
+	public void setIndustryCategoryA(Integer industryCategoryA) {
+		this.industryCategoryA = industryCategoryA;
+	}
+
+	public Integer getIndustryCategoryB() {
+		return industryCategoryB;
+	}
+
+	public void setIndustryCategoryB(Integer industryCategoryB) {
+		this.industryCategoryB = industryCategoryB;
+	}
+
+	public BigDecimal getBudgetCost() {
+		return budgetCost;
+	}
+
+	public void setBudgetCost(BigDecimal budgetCost) {
+		this.budgetCost = budgetCost;
+	}
 
 	public String getId() {
 		return id;
@@ -58,7 +111,7 @@ public class DemandPartnerListBo {
 	public void setSerialNumber(Integer serialNumber) {
 		this.serialNumber = serialNumber;
 	}
-	
+
 	@JsonFormat(shape = Shape.STRING)
 	public Integer getDataCategory() {
 		return dataCategory;
@@ -91,7 +144,7 @@ public class DemandPartnerListBo {
 	public void setReleaseDate(Date releaseDate) {
 		this.releaseDate = releaseDate;
 	}
-	
+
 	@JsonFormat(shape = Shape.STRING)
 	public Integer getDemandType() {
 		return demandType;

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

@@ -376,7 +376,7 @@ public class PatentInfoServiceImpl extends BaseMybatisDao<PatentInfoMapper> impl
 			organizationIdentityMapper.updateByPrimaryKeySelective(oi);
 		}
 
-		if (null != log.getState() && recordTime != null && null != log.getPrincipal()) {
+		if (null != log.getState() && recordTime != null && StringUtils.isNotBlank(log.getPrincipal())) {
 			log.setId(UUID.randomUUID().toString());
 			log.setPid(p.getId());
 			log.setRecordTime(recordTime);