Browse Source

变更修改

anderx 9 months ago
parent
commit
6c48005304

+ 25 - 0
src/main/java/com/goafanti/customer/bo/InputAddCustomer.java

@@ -60,6 +60,31 @@ public class InputAddCustomer {
      */
     private String natureOther;
 
+    /**
+     * 企业性质 0=其他,1=国企,2=央企,3=私企,4=合资企业(含港澳台),5=外资控股
+     */
+    private Integer enterpriseNature;
+    /**
+     * 上市 0=否,1=是
+     */
+    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;
     }

+ 3 - 0
src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java

@@ -347,6 +347,8 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 		user.setNickname(in.getName());
 		user.setNature(in.getNature());
 		if (in.getNatureOther()!=null)user.setNatureOther(in.getNatureOther());
+		user.setEnterpriseNature(in.getEnterpriseNature());
+		user.setListedNature(in.getListedNature());
 		user.setUsername(in.getName());
 		user.setStatus(AFTConstants.USER_STATUS_NORMAL);
 		user.setShareType(in.getShareType());
@@ -361,6 +363,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 		user.setUpdateTime(now);
 		user.setSignBills(0);
 		user.setNewChannel(0);
+
 		if(StringUtils.isNotBlank(in.getIntroduction()))user.setIntroduction(in.getIntroduction());
 		user.setMobile(in.getContactMobile());
 		user.setPassword(AFTConstants.INITIALPASSWORD);

+ 3 - 3
src/main/java/com/goafanti/order/controller/OrderChangeApiController.java

@@ -572,13 +572,13 @@ public class OrderChangeApiController extends CertifyApiController {
 	 *
 	 */
 	@RequestMapping(value = "/updateMemberSonProject" ,method = RequestMethod.POST)
-	public Result updateMemberSonProject(Integer id,String taskComment){
+	public Result updateMemberSonProject(InputAddSonProject in ){
 		Result res = new Result();
-		if(id==null){
+		if(in.getId()==null){
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","参数"));
 			return res;
 		}
-		return res.data(orderChangeService.updateMemberSonProject( id,taskComment));
+		return res.data(orderChangeService.updateMemberSonProject( in));
 	}
 
 

+ 1 - 1
src/main/java/com/goafanti/order/service/OrderChangeService.java

@@ -108,7 +108,7 @@ public interface OrderChangeService {
 
 	int deleteMemberSonProject(Integer id);
 
-    Object updateMemberSonProject(Integer id,String taskComment);
+    Object updateMemberSonProject(InputAddSonProject in);
 
 
 

+ 23 - 10
src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java

@@ -1698,8 +1698,12 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		if (in.getAdditionalDeduction()!=null)newT.setAdditionalDeduction(in.getAdditionalDeduction());
 		if (in.getRdAwardsubsidy()!=null)newT.setRdAwardsubsidy(in.getRdAwardsubsidy());
 		tChangeTaskMapper.insertSelective(newT);
-
-		List<TChangeTask> tChangeTasks = tChangeTaskMapper.selectBySuper(tid, null, tChangeTask.getCid());
+		List<TChangeTask> tChangeTasks;
+		if (tid!=null){
+			tChangeTasks = tChangeTaskMapper.selectBySuper(tid, null, tChangeTask.getCid());
+		}else {
+			tChangeTasks = tChangeTaskMapper.selectBySuper(null, in.getId(), tChangeTask.getCid());
+		}
 		int a=0,b=0,c=0;
 		for (TChangeTask e : tChangeTasks) {
 			if (a==0&&e.getHtMember()!=null&&e.getHtMember()==1)a=e.getHtMember();
@@ -1711,7 +1715,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		tChangeTask.setRdAwardsubsidy(c);
 		//根据上级id修改上级
 		updateSuperServiceYear(tChangeTask);
-		return tChangeTask;
+		return newT;
 	}
 
 	public  void updateSuperServiceYear(TChangeTask tChangeTask) {
@@ -1749,21 +1753,30 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 	}
 
 	@Override
-	public Object updateMemberSonProject(Integer id,String taskComment) {
-		TChangeTask tChangeTask = tChangeTaskMapper.selectById(id);
+	public Object updateMemberSonProject(InputAddSonProject in) {
+		TChangeTask tChangeTask = tChangeTaskMapper.selectById(in.getId());
 		tChangeTask.setType(2);
-		tChangeTask.setTaskComment(taskComment);
+		if (in.getHtMember()!=null) tChangeTask.setHtMember(in.getHtMember());
+		if (in.getAdditionalDeduction()!=null) tChangeTask.setAdditionalDeduction(in.getAdditionalDeduction());
+		if (in.getRdAwardsubsidy()!=null) tChangeTask.setRdAwardsubsidy(in.getRdAwardsubsidy());
 		tChangeTaskMapper.update(tChangeTask);
-		List<TChangeTask> tChangeTasks = tChangeTaskMapper.selectBySuper(tChangeTask.getTid(), null, tChangeTask.getCid());
+		List<TChangeTask> tChangeTasks;
+		if (tChangeTask.getSplitSuper()!=null){
+			tChangeTasks = tChangeTaskMapper.selectBySuper(tChangeTask.getSplitSuper(), null, tChangeTask.getCid());
+		}else {
+			tChangeTasks = tChangeTaskMapper.selectBySuper(null,tChangeTask.getChangeSplitSuper(), tChangeTask.getCid());
+		}
 		int a=0,b=0,c=0;
 		for (TChangeTask e : tChangeTasks) {
 			if (a==0&&e.getHtMember()!=null&&e.getHtMember()==1)a=e.getHtMember();
 			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.setHtMember(a);
-		tChangeTask.setAdditionalDeduction(b);
-		tChangeTask.setRdAwardsubsidy(c);
+		TChangeTask superTask = tChangeTaskMapper.selectBytid(tChangeTask.getSplitSuper());
+		superTask.setHtMember(a);
+		superTask.setAdditionalDeduction(b);
+		superTask.setRdAwardsubsidy(c);
+		tChangeTaskMapper.update(superTask);
 		updateSuperServiceYear(tChangeTask);
 		return tChangeTask;
 	}