Просмотр исходного кода

Merge branch 'test' of jishutao/aft into prod

gitadmin лет назад: 7
Родитель
Сommit
29cb08be46
27 измененных файлов с 214 добавлено и 109 удалено
  1. 2 0
      src/main/java/com/goafanti/common/constant/AFTConstants.java
  2. 8 0
      src/main/java/com/goafanti/common/dao/OrganizationManagementMapper.java
  3. 2 2
      src/main/java/com/goafanti/common/mapper/AdminMapper.xml
  4. 2 0
      src/main/java/com/goafanti/common/mapper/ContractMapper.xml
  5. 8 7
      src/main/java/com/goafanti/common/mapper/ContractTaskMapper.xml
  6. 1 1
      src/main/java/com/goafanti/common/mapper/DemandFollowMapper.xml
  7. 15 10
      src/main/java/com/goafanti/common/mapper/DemandMapper.xml
  8. 10 1
      src/main/java/com/goafanti/common/mapper/OrganizationManagementMapper.xml
  9. 29 25
      src/main/java/com/goafanti/common/mapper/TechProjectMapper.xml
  10. 2 2
      src/main/java/com/goafanti/common/mapper/UserMapper.xml
  11. 1 1
      src/main/java/com/goafanti/common/mapper/UserMapperExt.xml
  12. 16 7
      src/main/java/com/goafanti/common/model/Demand.java
  13. 5 1
      src/main/java/com/goafanti/common/model/DemandFollowDetail.java
  14. 2 0
      src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java
  15. 1 1
      src/main/java/com/goafanti/demand/bo/DemandFollowDetailListBo.java
  16. 14 16
      src/main/java/com/goafanti/demand/bo/DemandFollowListBo.java
  17. 19 0
      src/main/java/com/goafanti/demand/bo/DemandListBo.java
  18. 9 3
      src/main/java/com/goafanti/demand/bo/DemandManageDetailBo.java
  19. 15 6
      src/main/java/com/goafanti/demand/bo/InputDemand.java
  20. 3 7
      src/main/java/com/goafanti/demand/controller/AdminDemandApiController.java
  21. 7 1
      src/main/java/com/goafanti/demand/service/impl/DemandFollowServiceImpl.java
  22. 6 0
      src/main/java/com/goafanti/demand/service/impl/DemandServiceImpl.java
  23. 4 0
      src/main/java/com/goafanti/order/service/impl/OrderServiceImpl.java
  24. 7 7
      src/main/java/com/goafanti/organization/controller/AdminOrganizationController.java
  25. 9 11
      src/main/java/com/goafanti/organization/service/impl/OrganizationServiceImpl.java
  26. 9 0
      src/main/java/com/goafanti/techproject/bo/ProjectDetailBo.java
  27. 8 0
      src/main/java/com/goafanti/techproject/bo/TaskDetailBo.java

+ 2 - 0
src/main/java/com/goafanti/common/constant/AFTConstants.java

@@ -107,4 +107,6 @@ public class AFTConstants {
 	public static final String	MONTHLY								= "monthly";
 	public static final String	QUARTERLY							= "quarterly";
 	public static final String	ANNUALLY							= "annually";
+
+	public static final Integer USER_STATUS = 1;
 }

+ 8 - 0
src/main/java/com/goafanti/common/dao/OrganizationManagementMapper.java

@@ -72,6 +72,14 @@ public interface OrganizationManagementMapper {
 	 * 根据组织名称查组织编号
 	 */
 	String selectDepNoByName(String name);
+	
+	/**
+	 * 根据上级组织查组织编号
+	 */
+	String  selectDepNo(String id);
+	/**
+	
+	
 	/**
 	 * 查询相同上级下编号数量
 	 */

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

@@ -409,7 +409,7 @@
     where a.id <![CDATA[ <> ]]> '1'
     and (a.status !='注销' or a.status is null)
     <if test = "name != null"> 
-    	and a.name = #{name,jdbcType=VARCHAR}
+    	and a.name like concat('%',#{name,jdbcType=VARCHAR},'%')
     </if>
     <if test = "departmentId != null">
     	and a.department_id = #{departmentId,jdbcType=VARCHAR}
@@ -445,7 +445,7 @@
     where a.id <![CDATA[ <> ]]> '1'
     and (a.status != '注销' or a.status is null)
     <if test = "name != null"> 
-    	and a.name = #{name,jdbcType=VARCHAR}
+    	and a.name like concat('%',#{name,jdbcType=VARCHAR},'%')
     </if>
     <if test = "departmentId != null">
     	and a.department_id = #{departmentId,jdbcType=VARCHAR}

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

@@ -745,6 +745,7 @@
 			commodity_type,
 			commodity_quantity,
 			task_status,
+			task_comment,
 			create_time
 		)
 	values
@@ -758,6 +759,7 @@
 		#{item.commodityType,jdbcType=INTEGER},
 		#{item.commodityQuantity,jdbcType=INTEGER},
 		#{item.taskStatus,jdbcType=INTEGER},
+		#{item.taskComment,jdbcType=VARCHAR},
 		#{item.createTime,jdbcType=TIMESTAMP}
 	  )
     </foreach>

+ 8 - 7
src/main/java/com/goafanti/common/mapper/ContractTaskMapper.xml

@@ -558,17 +558,18 @@
 			c.id as categoryId,
 			d.serial_number as projectNo,
 			d.deleted_sign as deletedSign,
+			d.order_no as orderNo,
 			e.name as taskAllocatorName,
 			f.name as taskReceiverName,
 			g.nickname as buyerName
 		from
-			contract_task a left join business_project b on
-			a.commodity_id = b.id left join business_varieties c on
-			b.cid = c.id left join contract d on
-			a.contract_id = d.id left join admin e on 
-			a.task_allocator = e.id left join admin f on 
-			a.task_receiver = f.id left join user g on
-			d.uid = g.id
+			contract_task a 
+			left join business_project b on a.commodity_id = b.id 
+			left join business_varieties c on b.cid = c.id 
+			left join contract d on a.contract_id = d.id 
+			left join admin e on a.task_allocator = e.id 
+			left join admin f on a.task_receiver = f.id 
+			left join user g on d.uid = g.id
 		where 
 			a.id = #{taskId,jdbcType=VARCHAR}
   </select>

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

@@ -353,7 +353,7 @@
       select df.id ,df.demand_id as demandId,df.organization,df.contacts,df.contact_mobile contactMobile,df.remark,
   df.`result`,df.last_follow_time as lastFollowTime,d.name,d.employer_name as employerName,df.sources,
   d.employer_contacts_mobile as employerContactsMobile,d.employer_contacts_mailbox as employerContactsMailbox,
-  d.create_time as createTime, a.name as adminName 
+  d.create_time as createTime, a.name as adminName ,df.sources
     from  demand_follow df
     left join demand d on df.demand_id=d.id
     left join admin a on d.tech_broker_id=a.id 

+ 15 - 10
src/main/java/com/goafanti/common/mapper/DemandMapper.xml

@@ -30,7 +30,7 @@
     <result column="employer_contacts" property="employerContacts" jdbcType="VARCHAR" />
     <result column="employer_contacts_mobile" property="employerContactsMobile" jdbcType="VARCHAR" />
     <result column="employer_contacts_mailbox" property="employerContactsMailbox" jdbcType="VARCHAR" />
-    <result column="contacts" property="contacts" jdbcType="INTEGER" />
+    <result column="contacts" property="contacts" jdbcType="VARCHAR" />
     <result column="status" property="status" jdbcType="INTEGER" />
     <result column="release_status" property="releaseStatus" jdbcType="INTEGER" />
     <result column="release_date" property="releaseDate" jdbcType="TIMESTAMP" />
@@ -68,7 +68,7 @@
     d.employer_address AS employerAddress, d.employer_contacts AS employerContacts, d.employer_contacts_mobile AS employerContactsMobile, d.employer_contacts_mailbox AS employerContactsMailbox, 
     d.contacts, d.status, d.release_status AS releaseStatus, d.release_date AS releaseDate , d.create_time AS createTime, d.principal_id AS principalId, d.deleted_sign AS deletedSign,
     d.audit_status AS auditStatus, d.tech_broker_id AS techBrokerId,d.boutique,d.urgent_money AS urgentMoney,d.urgent_days as urgentDays
-    ,ifnull(t.x,0) as orderIntentionCount,ifnull(t2.x,0) as orderCount,j.easemob_name as easemobName
+    ,ifnull(t.x,0) as orderIntentionCount,ifnull(t2.x,0) as orderCount,j.easemob_name as easemobName,d.contacts,d.contact_mobile as contactMobile
     from demand d
     left join jpush_easemob_account j on d.employer_id=j.uid
     left join (select count(0) as x,tl.commodity_id from t_order tr
@@ -97,7 +97,7 @@
       employer_address, employer_contacts, employer_contacts_mobile, 
       employer_contacts_mailbox, contacts, status, 
       release_status, release_date, create_time, 
-      principal_id, deleted_sign, audit_status, tech_broker_id,boutique,remark,urgent_days,urgent_money)
+      principal_id, deleted_sign, audit_status, tech_broker_id,boutique,remark,urgent_days,urgent_money,contact_mobile)
     values (#{id,jdbcType=VARCHAR}, #{serialNumber,jdbcType=INTEGER}, #{dataCategory,jdbcType=INTEGER}, 
       #{name,jdbcType=VARCHAR}, #{keyword,jdbcType=VARCHAR}, #{infoSources,jdbcType=INTEGER}, 
       #{industryCategoryA,jdbcType=INTEGER}, #{industryCategoryB,jdbcType=INTEGER}, #{industryCategoryC,jdbcType=INTEGER}, 
@@ -107,10 +107,10 @@
       #{fixedScheme,jdbcType=VARCHAR}, #{costEscrow,jdbcType=DECIMAL}, #{budgetCost,jdbcType=DECIMAL}, 
       #{validityPeriod,jdbcType=TIMESTAMP}, #{employerId,jdbcType=VARCHAR}, #{employerName,jdbcType=VARCHAR}, 
       #{employerAddress,jdbcType=VARCHAR}, #{employerContacts,jdbcType=VARCHAR}, #{employerContactsMobile,jdbcType=VARCHAR}, 
-      #{employerContactsMailbox,jdbcType=VARCHAR}, #{contacts,jdbcType=INTEGER}, #{status,jdbcType=INTEGER}, 
+      #{employerContactsMailbox,jdbcType=VARCHAR}, #{contacts,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, 
       #{releaseStatus,jdbcType=INTEGER}, #{releaseDate,jdbcType=TIMESTAMP}, #{createTime,jdbcType=TIMESTAMP}, 
       #{principalId,jdbcType=VARCHAR}, #{deletedSign,jdbcType=INTEGER}, #{auditStatus,jdbcType=INTEGER},
-      #{techBrokerId,jdbcType=VARCHAR},#{boutique,jdbcType=INTEGER},#{remark,jdbcType=VARCHAR},#{urgentDays,jdbcType=VARCHAR},#{urgentMoney,jdbcType=VARCHAR})
+      #{techBrokerId,jdbcType=VARCHAR},#{boutique,jdbcType=INTEGER},#{remark,jdbcType=VARCHAR},#{urgentDays,jdbcType=VARCHAR},#{urgentMoney,jdbcType=VARCHAR},#{contactMobile,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.Demand" >
     insert into demand
@@ -438,7 +438,11 @@
         employer_contacts_mailbox = #{employerContactsMailbox,jdbcType=VARCHAR},
       </if>
       <if test="contacts != null" >
-        contacts = #{contacts,jdbcType=INTEGER},
+        contacts = #{contacts,jdbcType=VARCHAR},
+      </if>
+      
+      <if test="contactMobile  != null" >
+        contact_mobile  = #{contactMobile ,jdbcType=VARCHAR},
       </if>
       <if test="status != null" >
         status = #{status,jdbcType=INTEGER},
@@ -474,7 +478,7 @@
         urgent_days = #{urgentDays,jdbcType=VARCHAR},
       </if>
       <if test="urgentMoney != null" >
-        urgent_money = #{urgentMoney,jdbcType=VARCHAR},
+        urgent_money = #{urgentMoney,jdbcType=VARCHAR}, 
       </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
@@ -894,7 +898,7 @@
   		d.employer_address as employerAddress, d.employer_contacts_mobile as employerContactsMobile,
   		d.employer_contacts_mailbox as employerContactsMailbox, d.employer_name as employerName,
   		d.tech_broker_id as techBrokerId,  u.mobile as contactsName,d.urgent_days as urgentDays,d.urgent_money as urgentMoney,
-  		d.boutique,ifnull(mm.effective,0) as hot,mm.cover_img as coverImg,d.remark
+  		d.boutique,ifnull(mm.effective,0) as hot,mm.cover_img as coverImg,d.remark,d.contacts,d.contact_mobile as contactMobile
   	from demand d 
   	left join user_identity ui on ui.uid = d.employer_id
   	left join user u on u.id = d.employer_id
@@ -904,7 +908,8 @@
   
   
    <select id="selectOrgDemandDetail" parameterType="java.lang.String" resultType="com.goafanti.demand.bo.DemandManageDetailBo">
-  	select 
+  				
+select 
   		d.id, d.serial_number as serialNumber, d.data_category as dataCategory,
   		d.name, d.keyword, d.info_sources as infoSources,
   		oi.unit_name as username, d.demand_type as demandType, d.validity_period as validityPeriod,
@@ -918,7 +923,7 @@
   		d.tech_broker_id as techBrokerId,d.remark,d.urgent_days as urgentDays,d.urgent_money as urgentMoney, 
   		d.employer_address as employerAddress, d.employer_contacts_mobile as employerContactsMobile,
   		d.employer_contacts_mailbox as employerContactsMailbox, d.employer_name as employerName,
-  		d.boutique,ifnull(mm.effective,0) as hot,mm.cover_img as coverImg
+  		d.boutique,ifnull(mm.effective,0) as hot,mm.cover_img as coverImg,d.contacts,d.contact_mobile as contactMobile
   	from demand d 
   	left join organization_identity oi on oi.uid = d.employer_id
   	left join user u on u.id = d.employer_id

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

@@ -467,6 +467,15 @@
 		#{depNo,jdbcType=VARCHAR},#{superId,jdbcType=VARCHAR},
 		#{desc,jdbcType=VARCHAR},#{status,jdbcType=VARCHAR})	
 	</insert>
+	<!-- 得到上级 -->
+	<select id="selectDepNo" resultType="String">
+	select
+	dep_no as depNo
+		from department_management
+		where
+		id=#{superId,jdbcType=VARCHAR}
+	</select>
+	
 	<select id="selectDepNoByName" resultType="String">
 		select
 		dep_no as depNo
@@ -537,7 +546,7 @@
 		remarks,status
   		from department_management 		
   		where
-  		super_id=#{superId,jdbcType=VARCHAR}
+  		super_id=#{id,jdbcType=VARCHAR}
   		order by dep_no
   	</select>
   	<update id="updateByNumber" parameterType="com.goafanti.organization.bo.OrganizationListOut">

+ 29 - 25
src/main/java/com/goafanti/common/mapper/TechProjectMapper.xml

@@ -687,32 +687,34 @@
   <select id="selectTechProjectDetail" resultType="com.goafanti.techproject.bo.ProjectDetailBo">
 	  <choose>
 	  	<when test="buyerType == 0">
-	  		 select
-				a.id,
-				a.serial_number as serialNumber,
-				date_format(a.sign_date,'%Y-%m-%d %H:%i:%S') as signDate,
-				a.sign_comment as signComment,
-				date_format(a.complete_date,'%Y-%m-%d %H:%i:%S') as completeDate,
-				a.complete_comment as completeComment,
-				a.uid,
-				a.status as projectStatus,
-				a.deleted_sign as deletedSign,
-				a.order_no as orderNo,
-				b.nickname as buyerName,
-				d.name as principalName,
-				f.name as buyerProvince,
-				g.cname as projectType
-			from
-				contract a left join user b on
-				a.uid = b.id left join admin d on
-				a.principal = d.id left join user_identity e on
-				a.uid = e.uid left join district_glossory f on
-				e.province  = f.id left join business_varieties g on
-				a.type = g.id
+	  		  select
+	a.id,
+	a.serial_number as serialNumber,
+	date_format( a.sign_date, '%Y-%m-%d %H:%i:%S' ) as signDate,
+	a.sign_comment as signComment,
+	date_format( a.complete_date, '%Y-%m-%d %H:%i:%S' ) as completeDate,
+	a.complete_comment as completeComment,
+	a.uid,
+	a.status as projectStatus,
+	a.deleted_sign as deletedSign,
+	a.order_no as orderNo,
+	b.nickname as buyerName,
+	d.name as principalName,
+	f.name as buyerProvince,
+	g.cname as projectType,
+	t.contract_no as contractNo
+from
+	contract a left join user b on
+	a.uid = b.id left join admin d on
+	a.principal = d.id left join user_identity e on
+	a.uid = e.uid left join district_glossory f on
+	e.province = f.id left join business_varieties g on
+	a.type = g.id left join t_order t on
+	a.order_no=t.order_no
 			where a.id = #{contractId,jdbcType=VARCHAR}
 	  	</when>
 	  		<when test="buyerType == 1">
-	  		 select
+	  		select
 				a.id,
 				a.serial_number as serialNumber,
 				date_format(a.sign_date,'%Y-%m-%d %H:%i:%S') as signDate,
@@ -726,14 +728,16 @@
 				b.nickname as buyerName,
 				d.name as principalName,
 				f.name as buyerProvince,
-				g.cname as projectType
+				g.cname as projectType,
+				t.contract_no as contractNo
 			from
 				contract a left join user b on
 				a.uid = b.id left join admin d on
 				a.principal = d.id left join organization_identity e on
 				a.uid = e.uid left join district_glossory f on
 				e.location_province  = f.id left join business_varieties g on
-				a.type = g.id
+				a.type = g.id  left join t_order t on
+				a.order_no=t.order_no
 			where a.id = #{contractId,jdbcType=VARCHAR}
 	  	</when>
 	  </choose>

+ 2 - 2
src/main/java/com/goafanti/common/mapper/UserMapper.xml

@@ -177,7 +177,7 @@
       society_tag, introduction, last_member_order_id, 
       current_member_status, value_added_tag, organization_id, 
       share_type, identify_name, is_member, 
-      business_audit)
+      business_audit,audit_status)
     values (#{id,jdbcType=VARCHAR}, #{mobile,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR}, 
       #{nickname,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
       #{number,jdbcType=BIGINT}, #{lvl,jdbcType=INTEGER}, #{type,jdbcType=INTEGER}, #{aid,jdbcType=VARCHAR}, 
@@ -186,7 +186,7 @@
       #{societyTag,jdbcType=VARCHAR}, #{introduction,jdbcType=VARCHAR}, #{lastMemberOrderId,jdbcType=VARCHAR}, 
       #{currentMemberStatus,jdbcType=INTEGER}, #{valueAddedTag,jdbcType=VARCHAR}, #{organizationId,jdbcType=VARCHAR}, 
       #{shareType,jdbcType=INTEGER}, #{identifyName,jdbcType=VARCHAR}, #{isMember,jdbcType=INTEGER}, 
-      #{businessAudit,jdbcType=INTEGER})
+      #{businessAudit,jdbcType=INTEGER},#{auditStatus,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.User">
     <!--

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

@@ -1293,7 +1293,7 @@
       	nickname = #{nickname,jdbcType=VARCHAR},
       	mobile = #{mobile,jdbcType=VARCHAR},
       	society_tag = #{societyTag,jdbcType=VARCHAR},
-      	audit_status=0
+      	audit_status=1
     	where id = #{id,jdbcType=VARCHAR}
     </update>
 </mapper>

+ 16 - 7
src/main/java/com/goafanti/common/model/Demand.java

@@ -155,10 +155,7 @@ public class Demand {
     */
     private String employerContactsMailbox;
 
-    /**
-    * 联系人&联系方式
-    */
-    private Integer contacts;
+    
 
     /**
     * 需求状态(0-进行中,1-未解决,2-已解决)
@@ -215,6 +212,10 @@ public class Demand {
 	
     private String orderCount;
 	private String orderIntentionCount; 
+	
+	private String contacts; 
+	
+	private String contactMobile;
 
     public String getOrderCount() {
 		return orderCount;
@@ -475,12 +476,12 @@ public class Demand {
         this.employerContactsMailbox = employerContactsMailbox;
     }
 
-    @JsonFormat(shape = Shape.STRING)
-    public Integer getContacts() {
+    
+    public String getContacts() {
         return contacts;
     }
 
-    public void setContacts(Integer contacts) {
+    public void setContacts(String  contacts) {
         this.contacts = contacts;
     }
     
@@ -618,5 +619,13 @@ public class Demand {
 		this.urgentMoney =  Integer.valueOf(urgentMoney);
 	}
 
+	public String getContactMobile() {
+		return contactMobile;
+	}
+
+	public void setContactMobile(String contactMobile) {
+		this.contactMobile = contactMobile;
+	}
+
 	
 }

+ 5 - 1
src/main/java/com/goafanti/common/model/DemandFollowDetail.java

@@ -34,10 +34,13 @@ public class DemandFollowDetail {
 	 */
 	private Date createTime;
 
+	
+	
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column demand_follow_detail.id
 	 * @return  the value of demand_follow_detail.id
 	 * @mbg.generated  Thu Mar 22 14:44:52 CST 2018
+	 *
 	 */
 	public String getId() {
 		return id;
@@ -124,7 +127,6 @@ public class DemandFollowDetail {
 		this.createTime = createTime;
 	}
 	
-
 	public String getCreateTimeFormattedDate(){
 		if (null==getCreateTime()) {
 			return null;
@@ -133,5 +135,7 @@ public class DemandFollowDetail {
 		}
 		
 	}
+
+	
 	
 }

+ 2 - 0
src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java

@@ -230,6 +230,7 @@ public class CustomerServiceImpl  extends BaseMybatisDao<UserMapper> implements
 		user.setUpdateTime(now);
 		user.setMobile(contactMobile);
 		user.setPassword(AFTConstants.INITIALPASSWORD);
+		user.setAuditStatus(AFTConstants.USER_STATUS);
 		user.setIsMember(AFTConstants.NO);
 		user.setBusinessAudit(AFTConstants.NO);
 		passwordUtil.encryptPassword(user);
@@ -626,6 +627,7 @@ public class CustomerServiceImpl  extends BaseMybatisDao<UserMapper> implements
 		user.setSource(AFTConstants.USER_SOURCE_CREATE);
 		user.setNickname(bo.getIdentifyName());
 		user.setStatus(AFTConstants.USER_STATUS_NORMAL);
+		user.setAuditStatus(AFTConstants.USER_STATUS);
 		user.setShareType(AFTConstants.USER_SHARE_PRIVATE);
 		user.setAid(TokenManager.getAdminId());
 		user.setType(Integer.parseInt(bo.getCustomerType()));

+ 1 - 1
src/main/java/com/goafanti/demand/bo/DemandFollowDetailListBo.java

@@ -15,7 +15,7 @@ public class DemandFollowDetailListBo  extends DemandFollowDetail{
 		if (null==getCreateTime()) {
 			return null;
 		}else {
-			return DateFormatUtils.format(getCreateTime(), AFTConstants.YYYYMMDDHHMMSS);
+			return DateFormatUtils.format(getCreateTime(), AFTConstants.YYYYMMDD);
 		}
 		
 	}

+ 14 - 16
src/main/java/com/goafanti/demand/bo/DemandFollowListBo.java

@@ -1,6 +1,7 @@
 package com.goafanti.demand.bo;
 
-import java.util.Date;
+
+import java.util.List;
 
 import org.apache.commons.lang3.time.DateFormatUtils;
 
@@ -12,8 +13,9 @@ public class DemandFollowListBo extends DemandFollow{
 	private String employerName;
 	private String employerContactsMobile;
 	private String employerContactsMailbox;
-	private Date createTime;
-	private String adminName; 
+	private String adminName;
+	private List<?> demandFollowDetail;
+	
 	
 	public String getName() {
 		return name;
@@ -39,9 +41,7 @@ public class DemandFollowListBo extends DemandFollow{
 	public void setEmployerContactsMailbox(String employerContactsMailbox) {
 		this.employerContactsMailbox = employerContactsMailbox;
 	}
-	public Date getCreateTime() {
-		return createTime;
-	}
+	
 	public String getLastFollowTimeFormattedDate() {
 		if (getLastFollowTime() == null) {
 			return null;
@@ -49,20 +49,18 @@ public class DemandFollowListBo extends DemandFollow{
 			return DateFormatUtils.format(getLastFollowTime(), AFTConstants.YYYYMMDD);
 		}
 	}
-	public String getCreateTimeFormattedDate() {
-		if (this.createTime == null) {
-			return null;
-		} else {
-			return DateFormatUtils.format(getCreateTime(), AFTConstants.YYYYMMDDHHMMSS);
-		}
-	}
-	public void setCreateTime(Date createTime) {
-		this.createTime = createTime;
-	}
+	
+	
 	public String getAdminName() {
 		return adminName;
 	}
 	public void setAdminName(String adminName) {
 		this.adminName = adminName;
 	}
+	public List<?> getDemandFollowDetail() {
+		return demandFollowDetail;
+	}
+	public void setDemandFollowDetail(List<?> demandFollowDetail) {
+		this.demandFollowDetail = demandFollowDetail;
+	}
 }

+ 19 - 0
src/main/java/com/goafanti/demand/bo/DemandListBo.java

@@ -117,6 +117,9 @@ public class DemandListBo {
 	
 	private String		industryCategoryAS;
 	
+	private String contacts;
+	private String contactMobile;
+	
 
 	@JsonFormat(shape = Shape.STRING)
 	public String getIndustryCategory1() {
@@ -447,4 +450,20 @@ public class DemandListBo {
 		this.industryCategoryAS = industryCategoryAS;
 	}
 
+	public String getContacts() {
+		return contacts;
+	}
+
+	public void setContacts(String contacts) {
+		this.contacts = contacts;
+	}
+
+	public String getContactMobile() {
+		return contactMobile;
+	}
+
+	public void setContactMobile(String contactMobile) {
+		this.contactMobile = contactMobile;
+	}
+
 }

+ 9 - 3
src/main/java/com/goafanti/demand/bo/DemandManageDetailBo.java

@@ -1,9 +1,11 @@
 package com.goafanti.demand.bo;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonFormat.Shape;
+import com.goafanti.common.model.DemandFollowDetail;
 
 public class DemandManageDetailBo extends DemandManageListBo {
 
@@ -41,7 +43,7 @@ public class DemandManageDetailBo extends DemandManageListBo {
 
 	private String		mailbox;
 
-	private Integer		contacts;
+	private String		contacts;
 
 	private String		employerAddress;
 
@@ -51,6 +53,9 @@ public class DemandManageDetailBo extends DemandManageListBo {
 
 	private String      coverImg;
 	
+	
+	
+
 	public String getEmployerAddress() {
 		return employerAddress;
 	}
@@ -76,11 +81,11 @@ public class DemandManageDetailBo extends DemandManageListBo {
 	}
 
 	@JsonFormat(shape = Shape.STRING)
-	public Integer getContacts() {
+	public String getContacts() {
 		return contacts;
 	}
 
-	public void setContacts(Integer contacts) {
+	public void setContacts(String contacts) {
 		this.contacts = contacts;
 	}
 
@@ -227,4 +232,5 @@ public class DemandManageDetailBo extends DemandManageListBo {
 	public void setCoverImg(String coverImg) {
 		this.coverImg = coverImg;
 	}
+
 }

+ 15 - 6
src/main/java/com/goafanti/demand/bo/InputDemand.java

@@ -105,10 +105,6 @@ public class InputDemand {
 	@Size(min = 0, max = 255, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		employerContactsMailbox;
 
-	@Max(value = 3, message = "{" + ErrorConstants.PARAM_ERROR + "}")
-	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
-	private Integer		contacts;
-
 	@Max(value = 2, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private Integer		status;
@@ -142,6 +138,19 @@ public class InputDemand {
 	@Size(min = 0, max = 16, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String urgentMoney;
 	
+	@Size(min = 0, max = 256, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String contacts; 
+	@Size(min = 0, max = 36, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String contactMobile;
+	
+	public String getContactMobile() {
+		return contactMobile;
+	}
+
+	public void setContactMobile(String contactMobile) {
+		this.contactMobile = contactMobile;
+	}
+
 	public String getRemark() {
 		return remark;
 	}
@@ -366,11 +375,11 @@ public class InputDemand {
 		this.employerContactsMailbox = employerContactsMailbox;
 	}
 
-	public Integer getContacts() {
+	public String getContacts() {
 		return contacts;
 	}
 
-	public void setContacts(Integer contacts) {
+	public void setContacts(String contacts) {
 		this.contacts = contacts;
 	}
 

+ 3 - 7
src/main/java/com/goafanti/demand/controller/AdminDemandApiController.java

@@ -6,12 +6,10 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.UUID;
-
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
-
 import org.springframework.beans.BeanUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -19,7 +17,6 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
-
 import com.alibaba.fastjson.JSON;
 import com.goafanti.admin.service.AftFileService;
 import com.goafanti.common.bo.Result;
@@ -33,7 +30,6 @@ import com.goafanti.common.enums.DemandAuditStatus;
 import com.goafanti.common.enums.DemandFields;
 import com.goafanti.common.enums.DemandImportFields;
 import com.goafanti.common.enums.DemandOrderStatus;
-import com.goafanti.common.enums.DemandReleaseStatus;
 import com.goafanti.common.enums.DemandSwitchSign;
 import com.goafanti.common.enums.MarketingPage;
 import com.goafanti.common.model.AftFile;
@@ -270,6 +266,7 @@ public class AdminDemandApiController extends CertifyApiController {
 			return res;
 		}
 		Demand d = new Demand();
+		
 		BeanUtils.copyProperties(demand, d);
 		if (StringUtils.isNotBlank(demand.getUrgentDays())) {
 			d.setUrgentDays(demand.getUrgentDays());
@@ -318,7 +315,7 @@ public class AdminDemandApiController extends CertifyApiController {
 	 * 组织用户详情(个人组织合并)
 	 */
 	@RequestMapping(value = "/orgDemandDetail", method = RequestMethod.GET)
-	public Result orgDemandDetail(String id,int dataCategory) {
+	public Result orgDemandDetail(String id,Integer dataCategory) {
 		Result res = new Result();
 
 		if (StringUtils.isBlank(id)) {
@@ -428,7 +425,7 @@ public class AdminDemandApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "开关标记"));
 			return res;
 		}
-
+		
 		if (!DemandAuditStatus.CREATE.getCode().equals(demand.getAuditStatus())
 				&& !DemandAuditStatus.SUBMIT.getCode().equals(demand.getAuditStatus())
 				&& !DemandAuditStatus.UNAUDITED.getCode().equals(demand.getAuditStatus())) {
@@ -443,7 +440,6 @@ public class AdminDemandApiController extends CertifyApiController {
 
 		Demand d = new Demand();
 		BeanUtils.copyProperties(demand, d);
-		BeanUtils.copyProperties(demand, d);
 		if (StringUtils.isNotBlank(demand.getUrgentDays())) {
 			d.setUrgentDays(demand.getUrgentDays());
 		}

+ 7 - 1
src/main/java/com/goafanti/demand/service/impl/DemandFollowServiceImpl.java

@@ -79,7 +79,13 @@ public class DemandFollowServiceImpl extends BaseMybatisDao<DemandFollowMapper>
 		}
 		Map<String, Object> params=new HashMap<String, Object>();
 		params.put("id", id);
-		return (Pagination<DemandFollowListBo>) findPage("findDemandFollowListByPage", "findDemandFollowCount", params, pNo, pSize);
+		Pagination<DemandFollowListBo> p=(Pagination<DemandFollowListBo>) findPage("findDemandFollowListByPage", "findDemandFollowCount", params, pNo, pSize);
+		List<DemandFollowListBo> list =(List<DemandFollowListBo>) p.getList();
+		for (DemandFollowListBo d : list) {
+			d.setDemandFollowDetail(demandFollowDetailMapper.selectDemandFollowDetail(d.getId()));
+			
+		}
+		return p;
 	}
 
 	@Override

+ 6 - 0
src/main/java/com/goafanti/demand/service/impl/DemandServiceImpl.java

@@ -24,6 +24,7 @@ import com.goafanti.common.dao.AchievementDemandMapper;
 
 import com.goafanti.common.dao.AchievementKeywordMapper;
 import com.goafanti.common.dao.AchievementMapper;
+import com.goafanti.common.dao.DemandFollowDetailMapper;
 import com.goafanti.common.dao.DemandInterestMapper;
 import com.goafanti.common.dao.DemandKeywordMapper;
 import com.goafanti.common.dao.DemandMapper;
@@ -52,6 +53,7 @@ import com.goafanti.common.enums.UserType;
 import com.goafanti.common.model.AchievementDemand;
 import com.goafanti.common.model.AchievementDemandCount;
 import com.goafanti.common.model.Demand;
+import com.goafanti.common.model.DemandFollowDetail;
 import com.goafanti.common.model.DemandKeyword;
 import com.goafanti.common.model.Notice;
 import com.goafanti.common.model.OrganizationIdentity;
@@ -113,6 +115,9 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 	private UserInterestMapper	userInterestMapper;
 	@Autowired
 	ProjectInterestMapper	projectInterestMapper; 
+	
+	
+	DemandFollowDetailMapper	demandFollowDetailMapper;
 
 	@SuppressWarnings("unchecked")
 	@Override
@@ -301,6 +306,7 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 
 	@Override
 	public DemandManageDetailBo selectOrgDemandDetail(String id) {
+		
 		return demandMapper.selectOrgDemandDetail(id);
 	}
 

+ 4 - 0
src/main/java/com/goafanti/order/service/impl/OrderServiceImpl.java

@@ -22,6 +22,7 @@ import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.dao.AdminMapper;
 import com.goafanti.common.dao.ContractMapper;
+import com.goafanti.common.dao.ContractTaskMapper;
 import com.goafanti.common.dao.NoticeMapper;
 import com.goafanti.common.dao.OrganizationManagementMapper;
 import com.goafanti.common.dao.TOrderBillMapper;
@@ -94,6 +95,8 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 	private OrganizationManagementMapper organizationManagementMapper;
 	@Autowired
 	private ContractMapper contractMapper;
+	@Autowired 
+	private ContractTaskMapper contractTaskMapper;
 	@Autowired
 	private TOrderChangeMapper tOrderChangeMapper;
 	@Autowired
@@ -1488,6 +1491,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 				task.setCommodityMode(orderDetail.getCommodityMode());
 				task.setCommodityName(orderDetail.getCommodityName());
 				task.setCommodityType(orderDetail.getCommodityType());
+				task.setTaskComment(orderDetail.getRemarks());
 				task.setCommodityQuantity(1);
 				task.setCreateTime(createTime);
 				task.setContractId(contractId);

+ 7 - 7
src/main/java/com/goafanti/organization/controller/AdminOrganizationController.java

@@ -16,7 +16,7 @@ import com.goafanti.organization.bo.OrganizationListOut;
 import com.goafanti.organization.service.OrganizationService;
 
 @RestController
-@RequestMapping("api/admin/organization")
+@RequestMapping("/api/admin/organization")
 public class AdminOrganizationController extends BaseApiController{
 	@Resource
 	private OrganizationService organizationService;
@@ -41,8 +41,7 @@ public class AdminOrganizationController extends BaseApiController{
 	@RequestMapping(value = "/addOrganization" , method = RequestMethod.POST)
 	public Result addOrganization(String name, String managerId, String type, String superId, String remarks) throws Exception{
 		Result res = new Result();
-		if(StringUtils.isBlank(name) || StringUtils.isBlank(type) 
-				|| StringUtils.isBlank(superId)){
+		if(StringUtils.isBlank(name) || StringUtils.isBlank(type) || StringUtils.isBlank(superId)){
 			res.getError().add(buildError("","组织名称、组织类型、上级组织不能为空"));
 			return res;
 		}
@@ -51,7 +50,7 @@ public class AdminOrganizationController extends BaseApiController{
 			res.getError().add(buildError("","部门已存在"));
 			return res;
 		}		
-		String sdepNo=organizationManagementMapper.selectDepNoByName(superId);
+		String sdepNo=organizationManagementMapper.selectDepNo(superId);
 		int Count=organizationManagementMapper.selectDepNoCount(superId);
 		if((Count+1)>99){
 			res.getError().add(buildError("","每层最多存在99个子类"));
@@ -108,9 +107,10 @@ public class AdminOrganizationController extends BaseApiController{
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR,""));
 			return res;
 		}		
-		String sdepNo=organizationManagementMapper.selectDepNoByName(superId);
-		superId=organizationManagementMapper.selectIdByName(superId);
-		int Count=organizationManagementMapper.selectDepNoCount(superId);
+		String sdepNo=organizationManagementMapper.selectDepNo(superId);//No
+	/*	String sdepNo=organizationManagementMapper.selectDepNoByName(superId);*/
+     /*superId=organizationManagementMapper.selectIdByName(superId);*/
+		int Count=organizationManagementMapper.selectDepNoCount(superId);//14
 		if((Count+1)>99){
 			res.getError().add(buildError("","每层最多存在99个子类"));
 			return res;

+ 9 - 11
src/main/java/com/goafanti/organization/service/impl/OrganizationServiceImpl.java

@@ -42,7 +42,7 @@ public class OrganizationServiceImpl extends BaseMybatisDao<OrganizationManageme
 		if(StringUtils.isNotBlank(olo.getType())) params.put("type", olo.getType());
 		if(StringUtils.isNotBlank(olo.getManagerId())) params.put("managerId", olo.getManagerId());
 		if(StringUtils.isNotBlank(olo.getDepNo())) params.put("depNo", olo.getDepNo());
-		if(StringUtils.isNotBlank(olo.getSuperId())) params.put("superId", organizationManagementMapper.selectIdByName(olo.getSuperId()));
+		if(StringUtils.isNotBlank(olo.getSuperId())) params.put("superId", olo.getSuperId());
 		if(StringUtils.isNotBlank(olo.getRemarks())) params.put("remarks", olo.getRemarks());
 		if(StringUtils.isNotBlank(olo.getStatus())) params.put("status", olo.getStatus());
 		return params;
@@ -58,7 +58,7 @@ public class OrganizationServiceImpl extends BaseMybatisDao<OrganizationManageme
 	 *
 	 */
 	@Override
-	public int addOrganization(String name, String managerId, String type, String superId, String remarks,String dep) {
+	public int addOrganization( String name, String managerId, String type, String superId, String remarks,String dep) {
 		String id = UUID.randomUUID().toString();
 		Date now = new Date();
 		OrganizationManagement om=new OrganizationManagement(); 
@@ -72,7 +72,7 @@ public class OrganizationServiceImpl extends BaseMybatisDao<OrganizationManageme
 		om.setType(type);
 		om.setManagerId(managerId);
 		om.setDepNo(dep);
-		superId=organizationManagementMapper.selectIdByName(superId);
+	//	superId=organizationManagementMapper.selectIdByName(superId);
 		om.setSuperId(superId);
 		om.setRemarks(remarks);
 		om.setStatus("0");
@@ -96,23 +96,22 @@ public class OrganizationServiceImpl extends BaseMybatisDao<OrganizationManageme
 		return 1;
 	}
 	@Override
-	public int updateOrganization(String name, String type, String managerId, String superId, String status,
-			String remarks,String id,String depn) {
+	public int updateOrganization(String name, String type, String managerId, String superId, String status,String remarks,String id,String depn) {
 		Date now=new Date();
 		OrganizationManagement om=new OrganizationManagement();
 		om.setName(name);
-		om.setType(type);
+		om.setType(type);  
 		om.setUpdateTime(now);
 		om.setManagerId(managerId);
 		om.setDepNo(depn);
 		om.setSuperId(superId);
 		om.setStatus(status);
-		om.setRemarks(remarks);
+		om.setRemarks(remarks); 
 		om.setId(id);
 		organizationManagementMapper.updateByPrimaryKeySelective(om);
 		//*******下级编号修改
 		int n=0;
-		List<OrganizationListOut> Nos =organizationManagementMapper.selectIDNBySuperId(id);
+		List<OrganizationListOut> Nos =organizationManagementMapper.selectIDNBySuperId(om.getId());
 		for(OrganizationListOut i:Nos){			
 			String sdepNo=organizationManagementMapper.selectDepNoById(i.getSuperId());
 			if(n<10){
@@ -129,13 +128,13 @@ public class OrganizationServiceImpl extends BaseMybatisDao<OrganizationManageme
 				dep=sdepNo+n;	
 				i.setDepNo(dep);
 			}
-			organizationManagementMapper.updateByNumber(i);
+		organizationManagementMapper.updateByNumber(i);
 			n++;
 			
 			//*******下下级编号修改
 			int m=0;
 			List<OrganizationListOut> Noss =organizationManagementMapper.selectIDNBySuperId(i.getId());
-			System.out.println("noss="+Noss);
+			//System.out.println("noss="+Noss);
 			for(OrganizationListOut o:Noss){			
 				sdepNo=organizationManagementMapper.selectDepNoById(o.getSuperId());
 				if(m<10){
@@ -176,7 +175,6 @@ public class OrganizationServiceImpl extends BaseMybatisDao<OrganizationManageme
 					}
 					organizationManagementMapper.updateByNumber(p);
 					z++;
-					
 				}
 			}
 		}

+ 9 - 0
src/main/java/com/goafanti/techproject/bo/ProjectDetailBo.java

@@ -6,6 +6,7 @@ public class ProjectDetailBo extends ProjectListBo{
 	private String completeComment;
 	private String uid;
 	private String buyerProvince;
+	private String contractNo;
 	public String getSignComment() {
 		return signComment;
 	}
@@ -37,4 +38,12 @@ public class ProjectDetailBo extends ProjectListBo{
 	public void setBuyerProvince(String buyerProvince) {
 		this.buyerProvince = buyerProvince;
 	}
+
+	public String getContractNo() {
+		return contractNo;
+	}
+
+	public void setContractNo(String contractNo) {
+		this.contractNo = contractNo;
+	}
 }

+ 8 - 0
src/main/java/com/goafanti/techproject/bo/TaskDetailBo.java

@@ -29,6 +29,8 @@ public class TaskDetailBo{
 	private Integer deletedSign;
 	/** 客户名 **/
 	private String buyerName;
+	/** 订单编号 **/
+	private String orderNo;
 	public String getTaskId() {
 		return taskId;
 	}
@@ -113,4 +115,10 @@ public class TaskDetailBo{
 	public void setBuyerName(String buyerName) {
 		this.buyerName = buyerName;
 	}
+	public String getOrderNo() {
+		return orderNo;
+	}
+	public void setOrderNo(String orderNo) {
+		this.orderNo = orderNo;
+	}
 }