Browse Source

修改列表参数

anderx 3 years ago
parent
commit
42ff3ca339

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

@@ -789,16 +789,16 @@
     c.sort cSort,a.commodity_name as commodityName,a.commodity_quantity as commodityQuantity,b.patent_transfer patentTransfer ,
     i.price,a.certificate_number as certificateNumber, a.commodity_id as commodityId,a.manager_id managerId,
     a.consultant_id consultantId,a.project_status as projectStatus,a.set_up_amount setUpAmount,j.contract_term contractTerm,
-    a.task_comment as taskComment ,a.commodity_price as commodityPrice, a.task_status as taskStatus,
+    a.task_comment as taskComment ,a.commodity_price as commodityPrice, a.task_status as taskStatus,ts.type stopType,ts.status stopStatus,
     a.task_receiver as taskReceiver ,a.if_certification_fee ifCertificationFee , a.split_status splitStatus,
     a.cost_reduction costReduction,a.official_cost officialCost,i.`type` ,d.name ,a.declaration_batch declarationBatch,
     a.patent_type patentType,a.picture_url pictureUrl,j.service_life serviceLife ,j.service_year serviceYear,j.year_sum yearSum,
-    ttm.last_year lastYear,ttm.last_year_capital lastYearCapital,ttm.last_year_income lastYearIncome,ttm.stop_status stopStatus
+    ttm.last_year lastYear,ttm.last_year_capital lastYearCapital,ttm.last_year_income lastYearIncome,ttm.stop_status projectStopStatus
     from t_order_task a left join business_project b on a.commodity_id=b.id left join t_order_new e on a.order_no=e.order_no
     left join admin f on e.salesman_id=f.id left join department g on e.order_dep=g.id left join user h on e.buyer_id=h.id
     left join business_project i on a.commodity_id=i.id left join business_category c on b.cid=c.id
     left join admin d on a.task_receiver=d.id left join t_task_member j on a.id =j.tid
-    left join t_task_mid ttm on a.id=ttm.tid
+    left join t_task_mid ttm on a.id=ttm.tid left join task_sopt ts on a.id = ts.tid
     where a.super_id is null and a.split_status in(0,1)
       <if test="orderNo != null">
       and a.order_no= #{orderNo,jdbcType=VARCHAR}

+ 1 - 2
src/main/java/com/goafanti/common/utils/AsyncUtils.java

@@ -181,11 +181,10 @@ public class AsyncUtils {
 	 */
 	public void addProjectSotpNotic(Integer type,  Integer sotpType, String ids, TOrderTask task) {
 		Integer noticeType=0;
+		if (task==null)task = tOrderTaskMapper.selectByPrimaryKey(Integer.valueOf(ids.split(",")[0]));
 		TOrderNewBo tOrderNew = tOrderNewMapper.getOrderNewDetail(task.getOrderNo());
 		if (type==0){
 			noticeType=sotpType==0?NoticeStatus.PROJECT_SOPT_START.getCode() :NoticeStatus.PROJECT_RENEW_START.getCode();
-			String[] split = ids.split(",");
-			task = tOrderTaskMapper.selectByPrimaryKey(Integer.valueOf(split[0]));
 			String str=String.format("客户名称[%s]订单编号[%s]项目编号[%s],请及时审核",tOrderNew.getUserName(),task.getOrderNo(),ids);
 			List<Admin> admins = adminMapper.listAdminBydepIdAndRoleType(tOrderNew.getOrderDep(),AFTConstants.SALESMAN_ADMIN);
 			for (Admin admin : admins) {

+ 17 - 1
src/main/java/com/goafanti/order/bo/TOrderTaskBo.java

@@ -50,12 +50,28 @@ public class TOrderTaskBo extends TOrderTask{
 	private String contractTerm;
 	private Integer	yearSum;
 	private Integer	stopStatus;
-
+	private Integer	stopType;
+	private Integer	projectStopStatus;
 	private String lastYear;
 	private BigDecimal lastYearCapital;
 	private BigDecimal lastYearIncome;
 
 
+	public Integer getStopType() {
+		return stopType;
+	}
+
+	public void setStopType(Integer stopType) {
+		this.stopType = stopType;
+	}
+
+	public Integer getProjectStopStatus() {
+		return projectStopStatus;
+	}
+
+	public void setProjectStopStatus(Integer projectStopStatus) {
+		this.projectStopStatus = projectStopStatus;
+	}
 
 	public Integer getStopStatus() {
 		return stopStatus;