Browse Source

专利供应商模块修改

anderx 4 years ago
parent
commit
1a7dc74e3c

+ 24 - 0
.idea/free-mybatis-generator-config.xml

@@ -26,6 +26,30 @@
             </Config>
           </value>
         </entry>
+        <entry key="business_project">
+          <value>
+            <Config>
+              <option name="comment" value="true" />
+              <option name="daoMvnPath" value="src/main/java" />
+              <option name="daoName" value="BusinessProjectMapper" />
+              <option name="daoPackage" value="com.goafanti.common.dao" />
+              <option name="daoPostfix" value="Mapper" />
+              <option name="modelMvnPath" value="src/main/java" />
+              <option name="modelName" value="BusinessProject" />
+              <option name="modelPackage" value="com.goafanti.common.model" />
+              <option name="name" value="business_project" />
+              <option name="needToStringHashcodeEquals" value="true" />
+              <option name="overrideJava" value="true" />
+              <option name="overrideXML" value="true" />
+              <option name="primaryKey" value="" />
+              <option name="projectFolder" value="$PROJECT_DIR$" />
+              <option name="tableName" value="business_project" />
+              <option name="useSchemaPrefix" value="true" />
+              <option name="xmlMvnPath" value="src/main/java" />
+              <option name="xmlPackage" value="com.goafanti.common.mapper" />
+            </Config>
+          </value>
+        </entry>
         <entry key="organization_identity">
           <value>
             <Config>

+ 7 - 635
src/main/java/com/goafanti/business/bo/BusinessProjectBo.java

@@ -3,593 +3,16 @@ package com.goafanti.business.bo;
 import java.math.BigDecimal;
 import java.util.Date;
 
+import com.goafanti.common.model.BusinessProject;
 import org.apache.commons.lang3.time.DateFormatUtils;
 
 import com.goafanti.common.constant.AFTConstants;
 
-public class BusinessProjectBo {
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.id
-	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
-	 */
-	private String id;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.create_id
-	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
-	 */
-	private String createId;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.create_time
-	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
-	 */
-	private Date createTime;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.update_time
-	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
-	 */
-	private Date updateTime;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.delete_sign
-	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
-	 */
-	private Integer deleteSign;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.bname
-	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
-	 */
-	private String bname;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.cid
-	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
-	 */
-	private String cid;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.price
-	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
-	 */
-	private BigDecimal price;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.offset
-	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
-	 */
-	private BigDecimal offset;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.activity_price
-	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
-	 */
-	private BigDecimal activityPrice;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.activity_flag
-	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
-	 */
-	private String activityFlag;
-	
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.member_price
-	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
-	 */
-	private BigDecimal memberPrice;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.introduce
-	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
-	 */
-	private String introduce;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.status
-	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
-	 */
-	private String status;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.country
-	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
-	 */
-	private String country;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.province
-	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
-	 */
-	private String province;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.city
-	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
-	 */
-	private String city;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.district
-	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
-	 */
-	private String district;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.principal_id
-	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
-	 */
-	private String principalId;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.Value_effect
-	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
-	 */
-	private String valueEffect;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.client_size
-	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
-	 */
-	private String clientSize;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.max_logo
-	 * @mbg.generated  Tue Dec 12 11:46:55 CST 2017
-	 */
-	private String maxLogo;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.min_logo
-	 * @mbg.generated  Tue Dec 12 11:46:55 CST 2017
-	 */
-	private String minLogo;
-	
-	
-	private String projectUrl;
-	
-	/**
-	 * 分类名称
-	 */
-	private String cname;
-	/**
-	 * 创建人名称
-	 */
+public class BusinessProjectBo  extends BusinessProject {
 	private String createName;
-	/**
-	 * 是否精品
-	 */
-	private Integer boutique;
-	
-	/**
-	 * 首付金额
-	 */
-	private BigDecimal firstPayment;
-	
-	
-	private Integer type;
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_project.max_logo
-	 * @return  the value of business_project.max_logo
-	 * @mbg.generated  Tue Dec 12 11:46:55 CST 2017
-	 */
-	public String getMaxLogo() {
-		return maxLogo;
-	}
-
-
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.max_logo
-	 * @param maxLogo  the value for business_project.max_logo
-	 * @mbg.generated  Tue Dec 12 11:46:55 CST 2017
-	 */
-	public void setMaxLogo(String maxLogo) {
-		this.maxLogo = maxLogo;
-	}
-
-
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_project.min_logo
-	 * @return  the value of business_project.min_logo
-	 * @mbg.generated  Tue Dec 12 11:46:55 CST 2017
-	 */
-	public String getMinLogo() {
-		return minLogo;
-	}
-
-
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.min_logo
-	 * @param minLogo  the value for business_project.min_logo
-	 * @mbg.generated  Tue Dec 12 11:46:55 CST 2017
-	 */
-	
-	public void setMinLogo(String minLogo) {
-		this.minLogo = minLogo;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_project.id
-	 * @return  the value of business_project.id
-	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.id
-	 * @param id  the value for business_project.id
-	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
-	 */
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_project.create_id
-	 * @return  the value of business_project.create_id
-	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
-	 */
-	public String getCreateId() {
-		return createId;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.create_id
-	 * @param createId  the value for business_project.create_id
-	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
-	 */
-	public void setCreateId(String createId) {
-		this.createId = createId;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_project.create_time
-	 * @return  the value of business_project.create_time
-	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
-	 */
-	public Date getCreateTime() {
-		return createTime;
-	}
-	public String getCreateTimeFormattedDate() {
-		if (this.createTime == null) {
-			return null;
-		} else {
-			return DateFormatUtils.format(this.getCreateTime(), AFTConstants.YYYYMMDDHHMMSS);
-		}
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.create_time
-	 * @param createTime  the value for business_project.create_time
-	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
-	 */
-	public void setCreateTime(Date createTime) {
-		this.createTime = createTime;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_project.update_time
-	 * @return  the value of business_project.update_time
-	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
-	 */
-	public Date getUpdateTime() {
-		return updateTime;
-	}
-	public String getUpdateTimeFormattedDate() {
-		if (this.updateTime == null) {
-			return null;
-		} else {
-			return DateFormatUtils.format(this.getUpdateTime(), AFTConstants.YYYYMMDDHHMMSS);
-		}
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.update_time
-	 * @param updateTime  the value for business_project.update_time
-	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
-	 */
-	public void setUpdateTime(Date updateTime) {
-		this.updateTime = updateTime;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_project.delete_sign
-	 * @return  the value of business_project.delete_sign
-	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
-	 */
-	public Integer getDeleteSign() {
-		return deleteSign;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.delete_sign
-	 * @param deleteSign  the value for business_project.delete_sign
-	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
-	 */
-	public void setDeleteSign(Integer deleteSign) {
-		this.deleteSign = deleteSign;
-	}
 
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_project.bname
-	 * @return  the value of business_project.bname
-	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
-	 */
-	public String getBname() {
-		return bname;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.bname
-	 * @param bname  the value for business_project.bname
-	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
-	 */
-	public void setBname(String bname) {
-		this.bname = bname;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_project.cid
-	 * @return  the value of business_project.cid
-	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
-	 */
-	public String getCid() {
-		return cid;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.cid
-	 * @param cid  the value for business_project.cid
-	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
-	 */
-	public void setCid(String cid) {
-		this.cid = cid;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_project.price
-	 * @return  the value of business_project.price
-	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
-	 */
-	public BigDecimal getPrice() {
-		return price;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.price
-	 * @param price  the value for business_project.price
-	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
-	 */
-	public void setPrice(BigDecimal price) {
-		this.price = price;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_project.offset
-	 * @return  the value of business_project.offset
-	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
-	 */
-	public BigDecimal getOffset() {
-		return offset;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.offset
-	 * @param offset  the value for business_project.offset
-	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
-	 */
-	public void setOffset(BigDecimal offset) {
-		this.offset = offset;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_project.activity_price
-	 * @return  the value of business_project.activity_price
-	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
-	 */
-	public BigDecimal getActivityPrice() {
-		return activityPrice;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.activity_price
-	 * @param activityPrice  the value for business_project.activity_price
-	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
-	 */
-	public void setActivityPrice(BigDecimal activityPrice) {
-		this.activityPrice = activityPrice;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_project.activity_flag
-	 * @return  the value of business_project.activity_flag
-	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
-	 */
-	public String getActivityFlag() {
-		return activityFlag;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.activity_flag
-	 * @param activityFlag  the value for business_project.activity_flag
-	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
-	 */
-	public void setActivityFlag(String activityFlag) {
-		this.activityFlag = activityFlag;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_project.member_price
-	 * @return  the value of business_project.member_price
-	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
-	 */
-	public BigDecimal getMemberPrice() {
-		return memberPrice;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.member_price
-	 * @param memberPrice  the value for business_project.member_price
-	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
-	 */
-	public void setMemberPrice(BigDecimal memberPrice) {
-		this.memberPrice = memberPrice;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_project.introduce
-	 * @return  the value of business_project.introduce
-	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
-	 */
-	public String getIntroduce() {
-		return introduce;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.introduce
-	 * @param introduce  the value for business_project.introduce
-	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
-	 */
-	public void setIntroduce(String introduce) {
-		this.introduce = introduce;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_project.status
-	 * @return  the value of business_project.status
-	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
-	 */
-	public String getStatus() {
-		return status;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.status
-	 * @param status  the value for business_project.status
-	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
-	 */
-	public void setStatus(String status) {
-		this.status = status;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_project.country
-	 * @return  the value of business_project.country
-	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
-	 */
-	public String getCountry() {
-		return country;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.country
-	 * @param country  the value for business_project.country
-	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
-	 */
-	public void setCountry(String country) {
-		this.country = country;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_project.province
-	 * @return  the value of business_project.province
-	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
-	 */
-	public String getProvince() {
-		return province;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.province
-	 * @param province  the value for business_project.province
-	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
-	 */
-	public void setProvince(String province) {
-		this.province = province;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_project.city
-	 * @return  the value of business_project.city
-	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
-	 */
-	public String getCity() {
-		return city;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.city
-	 * @param city  the value for business_project.city
-	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
-	 */
-	public void setCity(String city) {
-		this.city = city;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_project.district
-	 * @return  the value of business_project.district
-	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
-	 */
-	public String getDistrict() {
-		return district;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.district
-	 * @param district  the value for business_project.district
-	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
-	 */
-	public void setDistrict(String district) {
-		this.district = district;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_project.principal_id
-	 * @return  the value of business_project.principal_id
-	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
-	 */
-	public String getPrincipalId() {
-		return principalId;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.principal_id
-	 * @param principalId  the value for business_project.principal_id
-	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
-	 */
-	public void setPrincipalId(String principalId) {
-		this.principalId = principalId;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_project.Value_effect
-	 * @return  the value of business_project.Value_effect
-	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
-	 */
-	public String getValueEffect() {
-		return valueEffect;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.Value_effect
-	 * @param valueEffect  the value for business_project.Value_effect
-	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
-	 */
-	public void setValueEffect(String valueEffect) {
-		this.valueEffect = valueEffect;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_project.client_size
-	 * @return  the value of business_project.client_size
-	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
-	 */
-	public String getClientSize() {
-		return clientSize;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.client_size
-	 * @param clientSize  the value for business_project.client_size
-	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
-	 */
-	public void setClientSize(String clientSize) {
-		this.clientSize = clientSize;
-	}
-
-	public String getCname() {
-		return cname;
-	}
+	private String cname;
 
-	public void setCname(String cname) {
-		this.cname = cname;
-	}
 
 	public String getCreateName() {
 		return createName;
@@ -599,62 +22,11 @@ public class BusinessProjectBo {
 		this.createName = createName;
 	}
 
-	@Override
-	public String toString() {
-		return "BusinessProjectBo [id=" + id + ", createId=" + createId + ", createTime=" + createTime + ", updateTime="
-				+ updateTime + ", deleteSign=" + deleteSign + ", bname=" + bname + ", cid=" + cid + ", price=" + price
-				+ ", offset=" + offset + ", activityPrice=" + activityPrice + ", activityFlag=" + activityFlag
-				+ ", memberPrice=" + memberPrice + ", introduce=" + introduce + ", status=" + status + ", country="
-				+ country + ", province=" + province + ", city=" + city + ", district=" + district + ", principalId="
-				+ principalId + ", valueEffect=" + valueEffect + ", clientSize=" + clientSize + ", cname=" + cname
-				+ ", createName=" + createName + "]";
-	}
-
-
-
-	public Integer getBoutique() {
-		return boutique;
-	}
-
-
-
-	public void setBoutique(Integer boutique) {
-		this.boutique = boutique;
-	}
-
-
-
-	public String getProjectUrl() {
-		return projectUrl;
-	}
-
-
-
-	public void setProjectUrl(String projectUrl) {
-		this.projectUrl = projectUrl;
-	}
-
-
-
-	public BigDecimal getFirstPayment() {
-		return firstPayment;
-	}
-
-
-
-	public void setFirstPayment(BigDecimal firstPayment) {
-		this.firstPayment = firstPayment;
-	}
-
-
-
-	public Integer getType() {
-		return type;
+	public String getCname() {
+		return cname;
 	}
 
-
-
-	public void setType(Integer type) {
-		this.type = type;
+	public void setCname(String cname) {
+		this.cname = cname;
 	}
 }

+ 0 - 2
src/main/java/com/goafanti/business/service/BusinessProjectService.java

@@ -49,8 +49,6 @@ public interface BusinessProjectService {
 	boolean judgeStatus(BusinessProjectModel ps);
 	
 	boolean judgeBeing(BusinessProject s);
-
-	List<ProjectBo> portalRecommend();
 	
 	Pagination<ProjectBo> getBusinessProject(String id,Integer pNo,Integer pSize);
 

+ 3 - 5
src/main/java/com/goafanti/business/service/impl/BusinessProjectServiceImpl.java

@@ -255,6 +255,7 @@ public class BusinessProjectServiceImpl extends BaseMybatisDao<BusinessProjectMa
 		bp.setProjectUrl(s.getProjectUrl());
 		bp.setFirstPayment(s.getFirstPayment());
 		bp.setType(s.getType());
+		bp.setPatentTransfer(s.getPatentTransfer());
 		if (null!=(s.getStatus())) {
 			bp.setStatus(s.getStatus());
 		}
@@ -447,11 +448,8 @@ public class BusinessProjectServiceImpl extends BaseMybatisDao<BusinessProjectMa
 	
 	}
 	
-	@Override
-	public List<ProjectBo> portalRecommend() {
-		return businessProjectMapper.selectServiceProjectDetail();
-	}
-	
+
+
 	@Override
 	public List<BusinessProject> selectBusinessProjectByName(String businessName,String cid) {
 		return businessProjectMapper.selectBusinessProjectByName(businessName,cid);

+ 9 - 63
src/main/java/com/goafanti/common/dao/BusinessProjectMapper.java

@@ -11,67 +11,15 @@ import java.util.List;
 import org.apache.ibatis.annotations.Param;
 
 public interface BusinessProjectMapper {
+    int deleteByPrimaryKey(String id);
 
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table business_project
-	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
-	 */
-	long countByExample(BusinessProjectExample example);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table business_project
-	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
-	 */
-	int deleteByExample(BusinessProjectExample example);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table business_project
-	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
-	 */
-	int deleteByPrimaryKey(String id);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table business_project
-	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
-	 */
-	int insert(BusinessProject record);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table business_project
-	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
-	 */
-	int insertSelective(BusinessProject record);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table business_project
-	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
-	 */
-	List<BusinessProject> selectByExample(BusinessProjectExample example);
+    int insert(BusinessProject record);
 
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table business_project
-	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
-	 */
-	BusinessProject selectByPrimaryKey(String id);
+    int insertSelective(BusinessProject record);
 
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table business_project
-	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
-	 */
-	int updateByExampleSelective(@Param("record") BusinessProject record,
-			@Param("example") BusinessProjectExample example);
+    BusinessProject selectByPrimaryKey(String id);
 
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table business_project
-	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
-	 */
-	int updateByExample(@Param("record") BusinessProject record, @Param("example") BusinessProjectExample example);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table business_project
-	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
-	 */
-	int updateByPrimaryKeySelective(BusinessProject record);
+    int updateByPrimaryKeySelective(BusinessProject record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table business_project
@@ -80,9 +28,9 @@ public interface BusinessProjectMapper {
 	int updateByPrimaryKey(BusinessProject record);
 
 	int getBnamecount(String bname);
-	
+
 	String getCreateName(String id);
-	
+
 	BusinessProject selectByPrimaryBname(String bname);
 
 	List<ProjectBo> getBusinessProject(String id);
@@ -92,12 +40,10 @@ public interface BusinessProjectMapper {
 	int checkProject(String id);
 
 	List<BusinessProject> selectBusinessProjectByName(@Param("businessName")String businessName,@Param("cid")String cid);
-	
-	List<ProjectBo> selectServiceProjectDetail();
+
 
 	 List<BusinessCategory> selectBusinessProjectCatalog();
 
-	List<Outproject> queryItems(String name);
 
-	
+
 }

+ 74 - 343
src/main/java/com/goafanti/common/mapper/BusinessProjectMapper.xml

@@ -2,11 +2,6 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.goafanti.common.dao.BusinessProjectMapper">
   <resultMap id="BaseResultMap" type="com.goafanti.common.model.BusinessProject">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Dec 05 10:07:00 CST 2019.
-    -->
     <id column="id" jdbcType="VARCHAR" property="id" />
     <result column="create_id" jdbcType="VARCHAR" property="createId" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
@@ -34,152 +29,35 @@
     <result column="boutique" jdbcType="INTEGER" property="boutique" />
     <result column="first_payment" jdbcType="DECIMAL" property="firstPayment" />
     <result column="type" jdbcType="INTEGER" property="type" />
+    <result column="patent_transfer" jdbcType="INTEGER" property="patentTransfer" />
   </resultMap>
-  <sql id="Example_Where_Clause">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Dec 05 10:07:00 CST 2019.
-    -->
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Dec 05 10:07:00 CST 2019.
-    -->
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
   <sql id="Base_Column_List">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Dec 05 10:07:00 CST 2019.
-    -->
-    id, create_id, create_time, update_time, delete_sign, bname, cid, price, offset, 
-    activity_price, activity_flag, member_price, introduce, status, country, province, 
+    id, create_id, create_time, update_time, delete_sign, bname, cid, price, `offset`, 
+    activity_price, activity_flag, member_price, introduce, `status`, country, province, 
     city, district, principal_id, Value_effect, client_size, min_logo, max_logo, project_url, 
-    boutique, first_payment, type
+    boutique, first_payment, `type`, patent_transfer
   </sql>
-  <select id="selectByExample" parameterType="com.goafanti.common.model.BusinessProjectExample" resultMap="BaseResultMap">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Dec 05 10:07:00 CST 2019.
-    -->
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from business_project
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
   <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Dec 05 10:07:00 CST 2019.
-    -->
     select 
     <include refid="Base_Column_List" />
     from business_project
     where id = #{id,jdbcType=VARCHAR}
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Dec 05 10:07:00 CST 2019.
-    -->
     delete from business_project
     where id = #{id,jdbcType=VARCHAR}
   </delete>
-  <delete id="deleteByExample" parameterType="com.goafanti.common.model.BusinessProjectExample">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Dec 05 10:07:00 CST 2019.
-    -->
-    delete from business_project
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
   <insert id="insert" parameterType="com.goafanti.common.model.BusinessProject">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Dec 05 10:07:00 CST 2019.
-    -->
     insert into business_project (id, create_id, create_time, 
       update_time, delete_sign, bname, 
-      cid, price, offset, 
+      cid, price, `offset`, 
       activity_price, activity_flag, member_price, 
-      introduce, status, country, 
+      introduce, `status`, country, 
       province, city, district, 
       principal_id, Value_effect, client_size, 
       min_logo, max_logo, project_url, 
-      boutique, first_payment, type
-      )
+      boutique, first_payment, `type`, 
+      patent_transfer)
     values (#{id,jdbcType=VARCHAR}, #{createId,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
       #{updateTime,jdbcType=TIMESTAMP}, #{deleteSign,jdbcType=INTEGER}, #{bname,jdbcType=VARCHAR}, 
       #{cid,jdbcType=VARCHAR}, #{price,jdbcType=DECIMAL}, #{offset,jdbcType=DECIMAL}, 
@@ -188,15 +66,10 @@
       #{province,jdbcType=VARCHAR}, #{city,jdbcType=VARCHAR}, #{district,jdbcType=VARCHAR}, 
       #{principalId,jdbcType=VARCHAR}, #{valueEffect,jdbcType=VARCHAR}, #{clientSize,jdbcType=VARCHAR}, 
       #{minLogo,jdbcType=VARCHAR}, #{maxLogo,jdbcType=VARCHAR}, #{projectUrl,jdbcType=VARCHAR}, 
-      #{boutique,jdbcType=INTEGER}, #{firstPayment,jdbcType=DECIMAL}, #{type,jdbcType=INTEGER}
-      )
+      #{boutique,jdbcType=INTEGER}, #{firstPayment,jdbcType=DECIMAL}, #{type,jdbcType=INTEGER}, 
+      #{patentTransfer,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.BusinessProject">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Dec 05 10:07:00 CST 2019.
-    -->
     insert into business_project
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -224,7 +97,7 @@
         price,
       </if>
       <if test="offset != null">
-        offset,
+        `offset`,
       </if>
       <if test="activityPrice != null">
         activity_price,
@@ -239,7 +112,7 @@
         introduce,
       </if>
       <if test="status != null">
-        status,
+        `status`,
       </if>
       <if test="country != null">
         country,
@@ -278,7 +151,10 @@
         first_payment,
       </if>
       <if test="type != null">
-        type,
+        `type`,
+      </if>
+      <if test="patentTransfer != null">
+        patent_transfer,
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -363,157 +239,12 @@
       <if test="type != null">
         #{type,jdbcType=INTEGER},
       </if>
+      <if test="patentTransfer != null">
+        #{patentTransfer,jdbcType=INTEGER},
+      </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.goafanti.common.model.BusinessProjectExample" resultType="java.lang.Long">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Dec 05 10:07:00 CST 2019.
-    -->
-    select count(*) from business_project
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Dec 05 10:07:00 CST 2019.
-    -->
-    update business_project
-    <set>
-      <if test="record.id != null">
-        id = #{record.id,jdbcType=VARCHAR},
-      </if>
-      <if test="record.createId != null">
-        create_id = #{record.createId,jdbcType=VARCHAR},
-      </if>
-      <if test="record.createTime != null">
-        create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.updateTime != null">
-        update_time = #{record.updateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.deleteSign != null">
-        delete_sign = #{record.deleteSign,jdbcType=INTEGER},
-      </if>
-      <if test="record.bname != null">
-        bname = #{record.bname,jdbcType=VARCHAR},
-      </if>
-      <if test="record.cid != null">
-        cid = #{record.cid,jdbcType=VARCHAR},
-      </if>
-      <if test="record.price != null">
-        price = #{record.price,jdbcType=DECIMAL},
-      </if>
-      <if test="record.offset != null">
-        offset = #{record.offset,jdbcType=DECIMAL},
-      </if>
-      <if test="record.activityPrice != null">
-        activity_price = #{record.activityPrice,jdbcType=DECIMAL},
-      </if>
-      <if test="record.activityFlag != null">
-        activity_flag = #{record.activityFlag,jdbcType=VARCHAR},
-      </if>
-      <if test="record.memberPrice != null">
-        member_price = #{record.memberPrice,jdbcType=DECIMAL},
-      </if>
-      <if test="record.introduce != null">
-        introduce = #{record.introduce,jdbcType=VARCHAR},
-      </if>
-      <if test="record.status != null">
-        status = #{record.status,jdbcType=VARCHAR},
-      </if>
-      <if test="record.country != null">
-        country = #{record.country,jdbcType=VARCHAR},
-      </if>
-      <if test="record.province != null">
-        province = #{record.province,jdbcType=VARCHAR},
-      </if>
-      <if test="record.city != null">
-        city = #{record.city,jdbcType=VARCHAR},
-      </if>
-      <if test="record.district != null">
-        district = #{record.district,jdbcType=VARCHAR},
-      </if>
-      <if test="record.principalId != null">
-        principal_id = #{record.principalId,jdbcType=VARCHAR},
-      </if>
-      <if test="record.valueEffect != null">
-        Value_effect = #{record.valueEffect,jdbcType=VARCHAR},
-      </if>
-      <if test="record.clientSize != null">
-        client_size = #{record.clientSize,jdbcType=VARCHAR},
-      </if>
-      <if test="record.minLogo != null">
-        min_logo = #{record.minLogo,jdbcType=VARCHAR},
-      </if>
-      <if test="record.maxLogo != null">
-        max_logo = #{record.maxLogo,jdbcType=VARCHAR},
-      </if>
-      <if test="record.projectUrl != null">
-        project_url = #{record.projectUrl,jdbcType=VARCHAR},
-      </if>
-      <if test="record.boutique != null">
-        boutique = #{record.boutique,jdbcType=INTEGER},
-      </if>
-      <if test="record.firstPayment != null">
-        first_payment = #{record.firstPayment,jdbcType=DECIMAL},
-      </if>
-      <if test="record.type != null">
-        type = #{record.type,jdbcType=INTEGER},
-      </if>
-    </set>
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Dec 05 10:07:00 CST 2019.
-    -->
-    update business_project
-    set id = #{record.id,jdbcType=VARCHAR},
-      create_id = #{record.createId,jdbcType=VARCHAR},
-      create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      update_time = #{record.updateTime,jdbcType=TIMESTAMP},
-      delete_sign = #{record.deleteSign,jdbcType=INTEGER},
-      bname = #{record.bname,jdbcType=VARCHAR},
-      cid = #{record.cid,jdbcType=VARCHAR},
-      price = #{record.price,jdbcType=DECIMAL},
-      offset = #{record.offset,jdbcType=DECIMAL},
-      activity_price = #{record.activityPrice,jdbcType=DECIMAL},
-      activity_flag = #{record.activityFlag,jdbcType=VARCHAR},
-      member_price = #{record.memberPrice,jdbcType=DECIMAL},
-      introduce = #{record.introduce,jdbcType=VARCHAR},
-      status = #{record.status,jdbcType=VARCHAR},
-      country = #{record.country,jdbcType=VARCHAR},
-      province = #{record.province,jdbcType=VARCHAR},
-      city = #{record.city,jdbcType=VARCHAR},
-      district = #{record.district,jdbcType=VARCHAR},
-      principal_id = #{record.principalId,jdbcType=VARCHAR},
-      Value_effect = #{record.valueEffect,jdbcType=VARCHAR},
-      client_size = #{record.clientSize,jdbcType=VARCHAR},
-      min_logo = #{record.minLogo,jdbcType=VARCHAR},
-      max_logo = #{record.maxLogo,jdbcType=VARCHAR},
-      project_url = #{record.projectUrl,jdbcType=VARCHAR},
-      boutique = #{record.boutique,jdbcType=INTEGER},
-      first_payment = #{record.firstPayment,jdbcType=DECIMAL},
-      type = #{record.type,jdbcType=INTEGER}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.BusinessProject">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Dec 05 10:07:00 CST 2019.
-    -->
     update business_project
     <set>
       <if test="createId != null">
@@ -538,7 +269,7 @@
         price = #{price,jdbcType=DECIMAL},
       </if>
       <if test="offset != null">
-        offset = #{offset,jdbcType=DECIMAL},
+        `offset` = #{offset,jdbcType=DECIMAL},
       </if>
       <if test="activityPrice != null">
         activity_price = #{activityPrice,jdbcType=DECIMAL},
@@ -553,7 +284,7 @@
         introduce = #{introduce,jdbcType=VARCHAR},
       </if>
       <if test="status != null">
-        status = #{status,jdbcType=VARCHAR},
+        `status` = #{status,jdbcType=VARCHAR},
       </if>
       <if test="country != null">
         country = #{country,jdbcType=VARCHAR},
@@ -592,17 +323,15 @@
         first_payment = #{firstPayment,jdbcType=DECIMAL},
       </if>
       <if test="type != null">
-        type = #{type,jdbcType=INTEGER},
+        `type` = #{type,jdbcType=INTEGER},
+      </if>
+      <if test="patentTransfer != null">
+        patent_transfer = #{patentTransfer,jdbcType=INTEGER},
       </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.BusinessProject">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Dec 05 10:07:00 CST 2019.
-    -->
     update business_project
     set create_id = #{createId,jdbcType=VARCHAR},
       create_time = #{createTime,jdbcType=TIMESTAMP},
@@ -611,12 +340,12 @@
       bname = #{bname,jdbcType=VARCHAR},
       cid = #{cid,jdbcType=VARCHAR},
       price = #{price,jdbcType=DECIMAL},
-      offset = #{offset,jdbcType=DECIMAL},
+      `offset` = #{offset,jdbcType=DECIMAL},
       activity_price = #{activityPrice,jdbcType=DECIMAL},
       activity_flag = #{activityFlag,jdbcType=VARCHAR},
       member_price = #{memberPrice,jdbcType=DECIMAL},
       introduce = #{introduce,jdbcType=VARCHAR},
-      status = #{status,jdbcType=VARCHAR},
+      `status` = #{status,jdbcType=VARCHAR},
       country = #{country,jdbcType=VARCHAR},
       province = #{province,jdbcType=VARCHAR},
       city = #{city,jdbcType=VARCHAR},
@@ -629,18 +358,19 @@
       project_url = #{projectUrl,jdbcType=VARCHAR},
       boutique = #{boutique,jdbcType=INTEGER},
       first_payment = #{firstPayment,jdbcType=DECIMAL},
-      type = #{type,jdbcType=INTEGER}
+      `type` = #{type,jdbcType=INTEGER},
+      patent_transfer = #{patentTransfer,jdbcType=INTEGER}
     where id = #{id,jdbcType=VARCHAR}
   </update>
 
   	<select id="findProjectListByPage" resultType="com.goafanti.business.bo.BusinessProjectBo">
  		select b.id, b.create_id as createId, b.create_time as createTime, b.update_time as updateTime,  b.delete_sign deleteSign, b.bname,
- 		  b.cid,  b.price,  b.offset,  b.activity_price as activityPrice,  b.activity_flag as activityFlag,  b.member_price as memberPrice, 
+ 		  b.cid,  b.price,  b.offset,  b.activity_price as activityPrice,  b.activity_flag as activityFlag,  b.member_price as memberPrice,
  		  b.introduce,  b.status,  b.country,  b.province,  b.city,  b.district, b.type,
-          b.principal_id as principalId,  b.Value_effect as ValueEffect,  b.client_size as  clientSize,b2.cname 
+          b.principal_id as principalId,  b.Value_effect as ValueEffect,  b.client_size as  clientSize,b2.cname
   		from business_project b
   		left join business_category b2 on b.cid = b2.id
-  		where b.delete_sign=0 
+  		where b.delete_sign=0
   		<if test="bname != null">
 		and b.bname like concat('%',#{bname},'%')
 		</if>
@@ -673,11 +403,11 @@
 	</if>
   </select>
   <select id="findProjectListCount" resultType="Integer">
- 		select 
+ 		select
   			count(0)
   		from business_project b
   		 left join business_category b2 on b.cid = b2.id
-  		where b.delete_sign=0 
+  		where b.delete_sign=0
   		<if test="bname != null">
 		and b.bname = #{bname,jdbcType=VARCHAR}
 		</if>
@@ -706,46 +436,46 @@
 		and b.type = #{type,jdbcType=VARCHAR}
 		</if>
   </select>
-  
+
   <select id="getBnamecount" resultType="Integer">
-  select 
+  select
   			count(0)
   		from business_project
   where  delete_sign=0
  	and bname = #{bname,jdbcType=VARCHAR}
   </select>
-  
+
   <select id="getCreateName" resultType="string">
-  select 
+  select
   			name
   		from admin
   where  id = #{id,jdbcType=VARCHAR}
-  
+
   </select>
-  
+
   <select id="findProjectSizeListByPage" resultType="com.goafanti.business.bo.ProjectSizeBo">
-  select 
-  	 p.id, p.create_id as createId, p.create_time as createTime, p.update_time as updateTime, p.pid, p.pname, p.price, p.offset, p.activity_price as activityPrice, 
+  select
+  	 p.id, p.create_id as createId, p.create_time as createTime, p.update_time as updateTime, p.pid, p.pname, p.price, p.offset, p.activity_price as activityPrice,
     p.activity_flag as activityFlag, p.member_price as memberPrice, p.status,b.bname
     from business_project_model p
-    left join business_project b on  p.pid =b.id 
+    left join business_project b on  p.pid =b.id
     where p.pid = #{pid,jdbcType=VARCHAR}
     <if test="page_sql!=null">
 			${page_sql}
 	</if>
   </select>
-  
+
   <select id="findProjectSizeListCount" resultType="Integer">
-  select 
+  select
   	count(0)
     from business_project_model p
-    left join business_project b on  p.pid =b.id 
+    left join business_project b on  p.pid =b.id
     where p.pid = #{pid,jdbcType=VARCHAR}
   </select>
-  
+
   <select id="selectByPrimaryBname" parameterType="java.lang.String" resultMap="BaseResultMap">
-    
-    select 
+
+    select
     <include refid="Base_Column_List" />
     from business_project
     where delete_sign=0 and status=0
@@ -754,9 +484,9 @@
   <select id="getBusinessProject" resultType="com.goafanti.app.bo.ProjectBo">
   	select id,bname as name,min_logo as minLogoUrl,introduce,project_url as projectUrl
    from business_project
-	where delete_sign=0 
+	where delete_sign=0
 	and status=0
-	<if test="id != null"> 
+	<if test="id != null">
 	and cid=#{id,jdbcType=VARCHAR}
   	</if>
   	<if test="page_sql!=null">
@@ -764,24 +494,24 @@
 		</if>
   </select>
    <select id="getBusinessProjectCount" resultType="Integer">
- 		select 
+ 		select
   			count(0)
   		from business_project
-  		where delete_sign=0 
+  		where delete_sign=0
   		and status=0
-  		<if test="id != null"> 
+  		<if test="id != null">
 	and cid=#{id,jdbcType=VARCHAR}
   	</if>
   </select>
-  
-  
+
+
   <select id="findRecommendProjectListByPage" resultType="com.goafanti.app.bo.ProjectBo">
  		select b.id,b.bname as name,b.min_logo as minLogoUrl,b.introduce,b.boutique,
  				ifnull(t.interestCount,0) as interestCount,project_url as projectUrl
   		from business_project b
-  		left join (select count(0)  as interestCount ,project_id from project_interest 
+  		left join (select count(0)  as interestCount ,project_id from project_interest
 				group by project_id) t on b.id=t.project_id
-  		where b.delete_sign=0 
+  		where b.delete_sign=0
   		and b.status=0
   		and boutique=1
   		order by b.boutique desc
@@ -790,47 +520,48 @@
 		</if>
   </select>
   <select id="findRecommendProjectListCount" resultType="Integer">
- 		select 
+ 		select
   			count(0)
   		from business_project  b
-  		left join (select count(0)  as interestCount ,project_id from project_interest 
+  		left join (select count(0)  as interestCount ,project_id from project_interest
 				group by project_id) t on b.id=t.project_id
-  		where b.delete_sign=0 
+  		where b.delete_sign=0
   		and b.status=0
   </select>
-  
+
   <select id="selectAppProjectDetail" resultType="com.goafanti.app.bo.ProjectDetailBo">
   	select p.id,p.bname as name,p.introduce ,p.Value_effect as valueEffect ,p.client_size as clientSize,
 		   p.max_logo as maxLogo,ifnull(count(p.id),0) as countInterest
 	from business_project p
-	left join project_interest pt on pt.project_id=p.id 
+	left join project_interest pt on pt.project_id=p.id
 	where p.id=#{id,jdbcType=VARCHAR}
   </select>
-  
+
   <select id="checkProject" resultType="Integer">
   select count(0) from business_project
  where  cid=#{id,jdbcType=VARCHAR}
  </select>
- 
+
  <select id="selectBusinessProjectByName" parameterType="java.lang.String" resultMap="BaseResultMap">
- 	select  id,bname,ifnull(price,0) as price,ifnull(first_payment,0) as firstPayment,type from business_project 
+ 	select  id,bname,ifnull(price,0) as price,ifnull(first_payment,0) as firstPayment,type ,patent_transfer patentTransfer
+ 	from business_project
  	where 1=1
  	<if test="cid != null">
  		and cid = #{cid,jdbcType=VARCHAR}
  	</if>
  	and bname like concat('%',#{businessName},'%') and delete_sign=0 and status=0
  </select>
- 
-  
+
+
   <select id="getPortalBusinessProject" resultType="com.goafanti.app.bo.ProjectBo">
-  select id ,min_logo as minLogoUrl,bname as name 
+  select id ,min_logo as minLogoUrl,bname as name
    from business_project
-	where delete_sign=0 
+	where delete_sign=0
 	and status=0
-	and boutique=1	
-	LIMIT 0, 3	
+	and boutique=1
+	LIMIT 0, 3
   </select>
-  
+
   <select id="selectBusinessProjectCatalog" resultType="com.goafanti.common.model.BusinessCategory">
   	select id,cname from business_category where delete_sign=0
   </select>

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

@@ -1395,23 +1395,23 @@ date_format(e.create_time ,'%Y-%m-%d')creteTime
   	</if>
   </select>
   <select id="getOrderTaskDetail" resultType="com.goafanti.order.bo.TOrderTaskDetailBo">
-  	 select  
-	a.id,a.commodity_name as taskName,a.order_no as orderNo,c.sort ,c.cname,d.name as receiverName,a.task_comment as taskComment,a.project_status as projectStatus,
-	a.task_status as taskStatus,e.contacts,a.attachment_url as attachmentUrl,a.outsource_name outsourceName, f.nickname as userName,a.set_up_amount as setUpAmount,
-	g.name as salesmanName,date_format(a.task_start_time,'%Y-%m-%d') as startDate,a.retrieve_content as retrieveContent, a.arrival_money as arrivalMoney,
-	a.certificate_number as certificateNumber, a.status,a.form_retrieve as formRetrieve, a.task_refund as taskRefund,a.task_receiver taskReceiver,
-	a.refund_content as refundContent, a.declare_user as  declareUser, a.declare_pwd as declarePwd,e.contract_no as contractNo,e.contacts ,b.`type` bpType,
-	date_format(a.task_end_time,'%Y-%m-%d') as endDate,date_format(a.accept_time,'%Y-%m-%d') as acceptDate,h.name as depName,e.contact_mobile as contactMobile ,
-	date_format(a.review_time,'%Y-%m-%d') as reviewDate,date_format(a.publicity_time,'%Y-%m-%d') as publicityDate,a.outsource_price outsourcePrice,
-	date_format(a.licence_time,'%Y-%m-%d') as licenceDate,date_format(a.task_distribution_time,'%Y-%m-%d %H:%i:%S') as taskDate,e.legal_person as legalPerson,
-	e.legal_person_tel as legalPersonTel, a.split_status splitStatus, a.split_super splitSuper, a.split_id splitId,a.declaration_batch declarationBatch,a.patent_type patentType, 
-	a.if_certification_fee ifCertificationFee , a.certification_corporate certificationCorporate ,a.certification_fee certificationFee ,a.time_record timeRecord,
-	a.cost_reduction costReduction,  a.official_cost officialCost,a.set_up_status setUpStatus ,date_format(a.set_up_time,'%Y-%m-%d') setUpTime ,a.high_tech_status highTechStatus ,
-	a.spot_check_status spotCheckStatus , a.special_comment specialComment ,ttm.certificates_count certificatesCount ,ttm.reject_count rejectCount ,a.check_status checkStatus, 
-	ttm.authorize_count authorizeCount ,ttm.end_count endCount,ttm.accept_count acceptCount,a.commodity_price  commodityPrice,a.commodity_quantity commodityQuantity
-	from t_order_task a left join business_project b on a.commodity_id=b.id left join business_category c on b.cid=c.id
+    select
+      a.id,a.commodity_name as taskName,a.order_no as orderNo,c.sort ,c.cname,d.name as receiverName,a.task_comment as taskComment,a.project_status as projectStatus,
+      a.task_status as taskStatus,e.contacts,a.attachment_url as attachmentUrl,a.outsource_name outsourceName, f.nickname as userName,a.set_up_amount as setUpAmount,
+      g.name as salesmanName,date_format(a.task_start_time,'%Y-%m-%d') as startDate,a.retrieve_content as retrieveContent, a.arrival_money as arrivalMoney,
+      a.certificate_number as certificateNumber, a.status,a.form_retrieve as formRetrieve, a.task_refund as taskRefund,a.task_receiver taskReceiver,b.patent_transfer patentTransfer,
+      a.refund_content as refundContent, a.declare_user as  declareUser, a.declare_pwd as declarePwd,e.contract_no as contractNo,e.contacts ,b.`type` bpType,
+      date_format(a.task_end_time,'%Y-%m-%d') as endDate,date_format(a.accept_time,'%Y-%m-%d') as acceptDate,h.name as depName,e.contact_mobile as contactMobile ,
+      date_format(a.review_time,'%Y-%m-%d') as reviewDate,date_format(a.publicity_time,'%Y-%m-%d') as publicityDate,a.outsource_price outsourcePrice,
+      date_format(a.licence_time,'%Y-%m-%d') as licenceDate,date_format(a.task_distribution_time,'%Y-%m-%d %H:%i:%S') as taskDate,e.legal_person as legalPerson,
+      e.legal_person_tel as legalPersonTel, a.split_status splitStatus, a.split_super splitSuper, a.split_id splitId,a.declaration_batch declarationBatch,a.patent_type patentType,
+      a.if_certification_fee ifCertificationFee , a.certification_corporate certificationCorporate ,a.certification_fee certificationFee ,a.time_record timeRecord,
+      a.cost_reduction costReduction,  a.official_cost officialCost,a.set_up_status setUpStatus ,date_format(a.set_up_time,'%Y-%m-%d') setUpTime ,a.high_tech_status highTechStatus ,
+      a.spot_check_status spotCheckStatus , a.special_comment specialComment ,ttm.certificates_count certificatesCount ,ttm.reject_count rejectCount ,a.check_status checkStatus,
+      ttm.authorize_count authorizeCount ,ttm.end_count endCount,ttm.accept_count acceptCount,a.commodity_price  commodityPrice,a.commodity_quantity commodityQuantity
+    from t_order_task a left join business_project b on a.commodity_id=b.id left join business_category c on b.cid=c.id
     left join admin d on a.task_receiver=d.id left join t_order_new e on a.order_no=e.order_no
-    left join department h on e.order_dep=h.id left join user f on e.buyer_id=f.id LEFT JOIN t_task_mid ttm ON a.id=ttm.tid 
+    left join department h on e.order_dep=h.id left join user f on e.buyer_id=f.id LEFT JOIN t_task_mid ttm ON a.id=ttm.tid
     left join admin g on e.salesman_id=g.id
     where a.id= #{id,jdbcType=VARCHAR}
   </select>

File diff suppressed because it is too large
+ 486 - 634
src/main/java/com/goafanti/common/model/BusinessProject.java


+ 1 - 0
src/main/java/com/goafanti/customer/controller/AdminCustomerApiController.java

@@ -62,6 +62,7 @@ public class AdminCustomerApiController extends BaseApiController{
 	
 	@Value(value = "${aesSecretKey}")
 	private String							secretKey	= null;
+
 	/** 私有个人客户列表 **/
 	@RequestMapping(value = "/listPrivatePersonalCustomer" , method = RequestMethod.POST)
 	public Result listPrivatePersonalCustomer(CustomerListIn cli,Integer pageNo, Integer pageSize){

+ 11 - 2
src/main/java/com/goafanti/order/bo/TOrderTaskDetailBo.java

@@ -119,8 +119,17 @@ public class TOrderTaskDetailBo {
 	
 	@SuppressWarnings("unused")
 	private String patentTypeName;
-	
-	
+
+	private Integer patentTransfer;
+
+	public Integer getPatentTransfer() {
+		return patentTransfer;
+	}
+
+	public void setPatentTransfer(Integer patentTransfer) {
+		this.patentTransfer = patentTransfer;
+	}
+
 	public Integer getCertificatesCount() {
 		return certificatesCount;
 	}

+ 1 - 1
src/main/java/com/goafanti/order/controller/OutsourceOrgApiController.java

@@ -137,7 +137,7 @@ public class OutsourceOrgApiController extends CertifyApiController {
 			return res;
 		}
 		if(orderNewService.checkOfficialType(o)){
-			res.getError().add(buildError(ErrorConstants.DATA_EMPTY_ERROR, "官费分类","官费分类"));
+			res.getError().add(buildError(ErrorConstants.DATA_EMPTY_ERROR, "后台官费分类","后台官费分类"));
 			return res;
 		}
 		return res.data(orderNewService.pushOutsourceProjectAudit(o));

+ 6 - 4
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -1458,10 +1458,12 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	@Override
 	public boolean checkOfficialType(TOrderOutsource o) {
 		TOrderTaskDetailBo t=tOrderTaskMapper.getOrderTaskDetail(o.getTid().toString());
-		if(o.getStartType()==1&&t.getBpType()==1) {
-			OfficialFeePrice of=officialFeePriceMapper.selectBytype(o.getPatentNameType(), t.getPatentType());
-			if (of==null) {
-				return true;
+		if(t.getPatentTransfer()==0){
+			if(t.getBpType()==1) {
+				OfficialFeePrice of=officialFeePriceMapper.selectBytype(o.getPatentNameType(), t.getPatentType());
+				if (of==null) {
+					return true;
+				}
 			}
 		}
 		return false;

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

@@ -1,11 +1,11 @@
 dev.name=local
 jdbc.driverClassName=com.mysql.jdbc.Driver
-#jdbc.url=jdbc\:mysql://localhost:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
-#jdbc.username=root
-#jdbc.password=123456
-jdbc.url=jdbc:mysql://101.37.32.31:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+jdbc.url=jdbc\:mysql://localhost:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
 jdbc.username=root
-jdbc.password=aftdev
+jdbc.password=123456
+#jdbc.url=jdbc:mysql://101.37.32.31:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+#jdbc.username=root
+#jdbc.password=aftdev
 jdbc.validationQuery=SELECT 'x'
 jdbc.initialSize=3
 jdbc.maxActive=20