Browse Source

Merge remote-tracking branch 'origin/test'

Administrator 7 years ago
parent
commit
2337f07e94

+ 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}

+ 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>

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

@@ -1488,6 +1488,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);

+ 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;
+	}
 }