Browse Source

项目管理显示BUG修复

anderx 7 years ago
parent
commit
c0f7fde6f8

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

@@ -21,6 +21,7 @@
     <result column="task_allocator" jdbcType="VARCHAR" property="taskAllocator" />
     <result column="task_receiver" jdbcType="VARCHAR" property="taskReceiver" />
     <result column="deleted_sign" jdbcType="INTEGER" property="deletedSign" />
+    <result column="publish_status" jdbcType="INTEGER" property="publishStatus" />
     <result column="serial_number" jdbcType="INTEGER" property="serialNumber" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.goafanti.common.model.ContractTask">
@@ -556,6 +557,7 @@
 			a.task_status as taskStatus,
 			date_format(a.task_distribution_time ,'%Y-%m-%d %H:%i:%S') as taskDistributionTime,
 			a.task_comment as taskComment,
+			a.publish_status as publishStatus,
 			b.bname as commodityName ,
 			c.cname as categoryName,
 			c.id as categoryId,
@@ -578,7 +580,8 @@
 			left join admin f on a.task_receiver = f.id 
 			left join user g on d.uid = g.id
 			left join t_order h on h.order_no=d.order_no
-			left join admin i on h.salesman_id = i.id 
-			a.id = #{taskId,jdbcType=VARCHAR}
+			left join admin i on h.salesman_id = i.id
+			where 1=1 
+			and a.id = #{taskId,jdbcType=VARCHAR}
   </select>
 </mapper>

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

@@ -764,7 +764,7 @@ from
 	where a.contract_id = #{contractId,jdbcType=VARCHAR}
   </select>
   <select id="selectProjectTaskByPage" resultType="com.goafanti.techproject.bo.TaskListBo">
-		select
+			select
 			a.id as taskId,
 			a.commodity_id as commodityId,
 			a.serial_number as taskNo,
@@ -772,6 +772,7 @@ from
 			a.deleted_sign as deletedSign,
 			date_format(a.task_distribution_time,'%Y-%m-%d %H:%i:%S') as taskDistributionTimes,
 			a.task_comment as taskComment,
+			a.publish_status as publishStatus,
 			b.bname as commodityName ,
 			c.cname as categoryName,
 			c.id as categoryId,

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

@@ -510,7 +510,7 @@
 	</select>
 	
 	<select id="findAllContacts" parameterType="java.lang.String" resultType="com.goafanti.common.model.OrganizationContactBook">
-		select id,name,mobile,major,sex,depatrment,wechat,qq from organization_contact_book 
+		select id,name,mobile,major,sex,depatrment,position,wechat,qq from organization_contact_book  
 		where uid = #{uid,jdbcType=VARCHAR}
 	</select>
 	

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

@@ -40,6 +40,8 @@ public class TaskDetailBo{
 	/** 订单留言 **/
 	private String orderRemarks;
 	
+	private Integer publishStatus;
+	
 	public String getTaskId() {
 		return taskId;
 	}
@@ -154,4 +156,10 @@ public class TaskDetailBo{
 	public void setOrderRemarks(String orderRemarks) {
 		this.orderRemarks = orderRemarks;
 	}
+	public Integer getPublishStatus() {
+		return publishStatus;
+	}
+	public void setPublishStatus(Integer publishStatus) {
+		this.publishStatus = publishStatus;
+	}
 }

+ 0 - 1
src/main/java/com/goafanti/techproject/controller/AdminTechProjectApiController.java

@@ -971,7 +971,6 @@ public class AdminTechProjectApiController extends CertifyApiController {
 	 * @param taskComment
 	 * @return
 	 */
-	@SuppressWarnings("null")
 	@RequestMapping(value = "/updatePublishStatus",method = RequestMethod.POST)
 	public Result updateProjectTask(String taskId,String publishStatus){
 		Result res = new Result();