Bläddra i källkod

私有/签单客户列表修改

anderx 9 månader sedan
förälder
incheckning
1f58680004

+ 2 - 0
src/main/java/com/goafanti/common/dao/TChangeTaskMapper.java

@@ -120,6 +120,8 @@ public interface TChangeTaskMapper {
 
 
     void insertSelective(TChangeTask t);
+
+    TChangeTask selectByChageSplitSuper(Integer changeSplitSuper);
 }
 
 

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

@@ -795,6 +795,7 @@ unilateral_service = values(unilateral_service)
         where noc.process_state < 4 and noc.status in (0,1,2)
           and tct.tid= #{tid}
     </select>
+
     <update id="updateSuperServiceYear" parameterType="com.goafanti.common.model.TChangeTask">
         update t_change_task a,(select a.split_super,GROUP_CONCAT(a.service_year) counts
                                 from t_change_task a where a.split_status =2 and a.type in (0,1,2)

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

@@ -1304,6 +1304,7 @@
         select a.id uid,a.aid,a.nickname name,a.society_tag societyTag,a.`level`,b.name aName,dg1.name as province,dg2.name as city,
         a.guidance, dg3.name as area,d.intended_project  intendedProject,d.business_scope businessScope,d.org_code orgCode,ic.name industry,
         date_format(um.last_sign_time,'%Y-%m-%d %H:%i:%S') lastSignTime,a.nature,a.nature_other as natureOther,
+        a.enterprise_nature as enterpriseNature,a.listed_nature as listedNature,
         date_format(a.transfer_time,'%Y-%m-%d %H:%i:%S') as transferTime,
         date_format(a.create_time,'%Y-%m-%d %H:%i:%S') as createTime,
         date_format(um.last_follow_time,'%Y-%m-%d %H:%i:%S') lastFollowTime,

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

@@ -544,6 +544,8 @@
 			b.org_code orgCode,
 			a.nature,
 			a.nature_other as natureOther,
+			a.enterprise_nature as enterpriseNature,
+			a.listed_nature as listedNature,
 			d.name as adminName
 		from user a
 		left join user_mid um on a.id=um.uid

+ 18 - 0
src/main/java/com/goafanti/customer/bo/CustomerListIn.java

@@ -81,6 +81,24 @@ public class CustomerListIn {
 	private String natureOther;
 
 	private Integer nature;
+	private Integer enterpriseNature;
+	private Integer listedNature;
+
+	public Integer getEnterpriseNature() {
+		return enterpriseNature;
+	}
+
+	public void setEnterpriseNature(Integer enterpriseNature) {
+		this.enterpriseNature = enterpriseNature;
+	}
+
+	public Integer getListedNature() {
+		return listedNature;
+	}
+
+	public void setListedNature(Integer listedNature) {
+		this.listedNature = listedNature;
+	}
 
 	public String getNatureOther() {
 		return natureOther;

+ 7 - 1
src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java

@@ -1772,7 +1772,13 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 			if (b==0&&e.getAdditionalDeduction()!=null&&e.getAdditionalDeduction()==1)b=e.getAdditionalDeduction();
 			if (c==0&&e.getRdAwardsubsidy()!=null&&e.getRdAwardsubsidy()==1)c=e.getRdAwardsubsidy();
 		}
-		TChangeTask superTask = tChangeTaskMapper.selectBytid(tChangeTask.getSplitSuper());
+		TChangeTask superTask;
+		if (tChangeTask.getSplitSuper()!=null){
+			superTask=tChangeTaskMapper.selectBytid(tChangeTask.getSplitSuper());
+		}else {
+			superTask=tChangeTaskMapper.selectById(tChangeTask.getChangeSplitSuper());
+		}
+
 		superTask.setHtMember(a);
 		superTask.setAdditionalDeduction(b);
 		superTask.setRdAwardsubsidy(c);