Browse Source

评分修改

anderx 1 year ago
parent
commit
4ac6e83e2f

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

@@ -1563,7 +1563,7 @@
 
     <select id="selectOrderTask" resultType="com.goafanti.order.bo.TOrderTaskBo">
         select a.id,e.contract_no contractNo,a.order_no as orderNo,h.nickname userName,f.name salesmanName,
-        a.outsource_name outsourceName,a.outsource, a.outsource_price outsourcePrice,g.name depName,
+        a.outsource_name outsourceName,a.outsource, a.outsource_price outsourcePrice,g.name depName,a.score_status scoreStatus,a.score_number scoreNumber,
         e.order_status orderStatus,d.name as contacts,d.contact_mobile as contactsMobile,a.main, c.cname,
         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,
@@ -2048,7 +2048,8 @@
         a.commodity_quantity as commodityQuantity,e.approval,l.refund_status outsourceStatus, ifnull(i.alreadyNumber,0) as alreadyNumber,a.task_comment taskComment ,
         f.nickname as userName,h.name as depName, j.name as outsourceName ,ifnull(k.hours,0) hours,a.split_status splitStatus,a.split_super splitSuper,a.member_type memberType,
         date_format(a.split_time,'%Y-%m-%d %H:%i:%S') splitTimes,ad.name splitAname,a.split_id splitId,a.patent_type  patentType,a.picture_url pictureUrl,
-        ttm.service_life serviceLife,ttm.service_year serviceYear ,ttm.year_sum yearSum ,ttm.contract_term contractTerm,a.process_status processStatus
+        ttm.service_life serviceLife,ttm.service_year serviceYear ,ttm.year_sum yearSum ,ttm.contract_term contractTerm,a.process_status processStatus,
+        a.score_status scoreStatus,a.score_number scoreNumber
         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 left join t_order_new e on a.order_no=e.order_no left join user f on e.buyer_id=f.id
         left join department h on e.order_dep=h.id left join (select task_id , sum(already_number) as alreadyNumber

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

@@ -92,6 +92,7 @@ public class TOrderNewBo extends TOrderNew{
 	 */
 	private String addDeductionOther;
 	private Integer approvalStatus;
+	private Integer scoreStatus;
 	private String approvalAid;
 	private String approvalName;
 	private String operationGuaranteeId;
@@ -101,6 +102,15 @@ public class TOrderNewBo extends TOrderNew{
 
 	private String type;
 
+	@Override
+	public Integer getScoreStatus() {
+		return scoreStatus;
+	}
+
+	@Override
+	public void setScoreStatus(Integer scoreStatus) {
+		this.scoreStatus = scoreStatus;
+	}
 
 	public String getTypeExplain() {
 		return typeExplain;

+ 6 - 3
src/main/java/com/goafanti/order/bo/TOrderTaskBo.java

@@ -1,12 +1,12 @@
 package com.goafanti.order.bo;
 
-import java.math.BigDecimal;
-import java.util.List;
-
 import com.goafanti.common.model.TOrderTask;
 import com.goafanti.common.utils.excel.Excel;
 import com.goafanti.order.enums.NewProjectStatus;
 
+import java.math.BigDecimal;
+import java.util.List;
+
 public class TOrderTaskBo extends TOrderTask{
 	/**
 	 *
@@ -53,10 +53,13 @@ public class TOrderTaskBo extends TOrderTask{
 	private Integer	stopType;
 	private Integer	projectStopStatus;
 	private Integer	change;
+
 	private String lastYear;
 	private BigDecimal lastYearCapital;
 	private BigDecimal lastYearIncome;
 
+
+
 	public Integer getChange() {
 		return change;
 	}

+ 2 - 2
src/main/resources/props/config_local.properties

@@ -1,8 +1,8 @@
 dev.name=local
 jdbc.driverClassName=com.mysql.jdbc.Driver
 
-static.host=//static.jishutao.com/1.3.25
-#static.host=//172.16.1.187/1.3.25
+#static.host=//static.jishutao.com/1.3.25
+static.host=//172.16.1.187/1.3.25
 
 #jdbc.url=jdbc\:mysql://localhost:3306/aft20240430?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
 #jdbc.url=jdbc\:mysql://localhost:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false