Browse Source

技术部需求开发

anderx 6 years ago
parent
commit
3386812258

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

@@ -928,13 +928,14 @@
 select  
 	a.id,a.commodity_name as taskName,a.order_no as orderNo,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,
-	f.nickname as userName,g.name as salesmanName,date_format(a.task_start_time,'%Y-%m-%d') as startDate,
+	f.nickname as userName,g.name as salesmanName,date_format(a.task_start_time,'%Y-%m-%d') as startDate,a.retrieve_content as retrieveContent,
 	a.certificate_number as certificateNumber, a.status,a.form_retrieve as formRetrieve, a.task_refund as taskRefund,
 	a.refund_content as refundContent, a.declare_user as  declareUser, a.declare_pwd as declarePwd,e.contract_no as contractNo,
 	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,
 	date_format(a.review_time,'%Y-%m-%d') as reviewDate,date_format(a.publicity_time,'%Y-%m-%d') as publicityDate,
 	date_format(a.licence_time,'%Y-%m-%d') as licenceDate,date_format(a.task_distribution_time,'%Y-%m-%d') as taskDate,
-	e.contacts ,e.contact_mobile as contactMobile ,e.legal_person as legalPerson,e.legal_person_tel as legalPersonTel
+	e.contacts ,e.contact_mobile as contactMobile ,e.legal_person as legalPerson,e.legal_person_tel as legalPersonTel,
+	a.set_up_amount as setUpAmount,a.arrival_money as arrivalMoney
 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

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

@@ -284,8 +284,8 @@
     where id = #{id,jdbcType=INTEGER}
   </update>
   <select id="selectTaskProgress" resultType="com.goafanti.order.bo.TaskProgressBo">
-  select a.id,a.task_id as taskId,a.already_number as alreadyNumber,date_format(a.licence_time,'%Y-%m-%d')as licenceTimes,
-date_format(a.create_time,'%Y-%m-%d %H:%i:%S')as createTimes ,(b.commodity_quantity-a.already_number) as notCount
+      select a.id,a.task_id as taskId,a.already_number as alreadyNumber,date_format(a.licence_time,'%Y-%m-%d')as licenceTimes,
+date_format(a.create_time,'%Y-%m-%d %H:%i:%S')as createTimes ,b.commodity_quantity as ingCount
 from task_progress a left join t_order_task b on a.task_id=b.id
 where a.task_id=  #{id,jdbcType=INTEGER}
 order by a.create_time

+ 10 - 0
src/main/java/com/goafanti/order/bo/TOrderTaskDetailBo.java

@@ -41,6 +41,10 @@ public class TOrderTaskDetailBo {
 	 */
 	private Integer formRetrieve;
 	/**
+	 * 回收详情
+	 */
+	private String retrieveContent;
+	/**
 	 * 任务退单
 	 */
 	private Integer taskRefund;
@@ -281,5 +285,11 @@ public class TOrderTaskDetailBo {
 	public void setArrivalMoney(Integer arrivalMoney) {
 		this.arrivalMoney = arrivalMoney;
 	}
+	public String getRetrieveContent() {
+		return retrieveContent;
+	}
+	public void setRetrieveContent(String retrieveContent) {
+		this.retrieveContent = retrieveContent;
+	}
 	
 }

+ 10 - 0
src/main/java/com/goafanti/order/bo/TaskProgressBo.java

@@ -9,6 +9,8 @@ public class TaskProgressBo extends TaskProgress {
 	
 	private String createTimes;
 	
+	private Integer ingCount;
+	
 	private Integer notCount;
 
 	public String getLicenceTimes() {
@@ -34,6 +36,14 @@ public class TaskProgressBo extends TaskProgress {
 	public void setNotCount(Integer notCount) {
 		this.notCount = notCount;
 	}
+
+	public Integer getIngCount() {
+		return ingCount;
+	}
+
+	public void setIngCount(Integer ingCount) {
+		this.ingCount = ingCount;
+	}
 	
 	
 }

+ 7 - 2
src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java

@@ -414,8 +414,13 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 	}
 	@Override
 	public List<TaskProgressBo> selectTaskProgress(Integer tid) {
-		
-		return taskProgressMapper.selectTaskProgress(tid);
+		List<TaskProgressBo>  l=taskProgressMapper.selectTaskProgress(tid);
+		int notcount=0;
+		for (TaskProgressBo t : l) {
+			notcount+=t.getAlreadyNumber();
+			t.setNotCount(t.getIngCount()-notcount);
+		}
+		return l;
 	}
 	@Override
 	public XSSFWorkbook exportMyTaskList() {