Browse Source

Merge branch 'dev02' of jishutao/kede-server into prod

anderx 3 years ago
parent
commit
12275706d8

+ 33 - 0
src/main/java/com/goafanti/admin/bo/DepartmentComboBox.java

@@ -0,0 +1,33 @@
+package com.goafanti.admin.bo;
+
+import java.util.List;
+
+public class DepartmentComboBox {
+    private String id;
+    private String name;
+    private List<DepartmentComboBox> list;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public List<DepartmentComboBox> getList() {
+        return list;
+    }
+
+    public void setList(List<DepartmentComboBox> list) {
+        this.list = list;
+    }
+}

+ 18 - 6
src/main/java/com/goafanti/admin/controller/AdminDepartmentApiController.java

@@ -20,10 +20,10 @@ import com.goafanti.common.utils.StringUtils;
 @Controller
 @RequestMapping(value = "/api/admin/department")
 public class AdminDepartmentApiController extends CertifyApiController {
-	
+
 	@Resource
 	private DepartmentService 	departmentService;
-	
+
 	/**
 	 * 新增工作时间
 	 */
@@ -43,7 +43,7 @@ public class AdminDepartmentApiController extends CertifyApiController {
 		res.setData(departmentService.addWorkingHours(in));
 		return res;
 	}
-	
+
 	/**
 	 * 删除工作时间
 	 */
@@ -61,7 +61,7 @@ public class AdminDepartmentApiController extends CertifyApiController {
 		res.setData(departmentService.deleteWorkingHours(id));
 		return res;
 	}
-	
+
 	/**
 	 * 工作时间列表
 	 */
@@ -71,7 +71,7 @@ public class AdminDepartmentApiController extends CertifyApiController {
 		res.setData(departmentService.selectWorkingHours());
 		return res;
 	}
-	
+
 	/**
 	 * 工作时间列表
 	 */
@@ -86,5 +86,17 @@ public class AdminDepartmentApiController extends CertifyApiController {
 		return res;
 	}
 
-	
+
+	/**
+	 * 工作时间列表
+	 */
+	@RequestMapping(value = "/selectAllDep", method = RequestMethod.GET)
+	public Result selectAllDep() {
+		Result res = new Result();
+
+		res.setData(departmentService.selectAllDep());
+		return res;
+	}
+
+
 }

+ 3 - 0
src/main/java/com/goafanti/admin/service/DepartmentService.java

@@ -1,5 +1,6 @@
 package com.goafanti.admin.service;
 
+import com.goafanti.admin.bo.DepartmentComboBox;
 import com.goafanti.common.model.Department;
 import com.goafanti.common.model.WorkingHours;
 
@@ -41,4 +42,6 @@ public interface DepartmentService {
 	List<Department> selectSubDeps(String subId);
 
 	List<Department> getLowerDep(String depIds);
+
+	List<DepartmentComboBox> selectAllDep();
 }

+ 8 - 0
src/main/java/com/goafanti/admin/service/impl/DepartmentServiceImpl.java

@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
+import com.goafanti.admin.bo.DepartmentComboBox;
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.dao.DepartmentMapper;
 import com.goafanti.common.model.Department;
@@ -117,6 +118,7 @@ public class DepartmentServiceImpl extends BaseMybatisDao<WorkingHoursMapper> im
 		return ls;
 	}
 
+
 	private List<Department> selectCurrentDep(String managerId){
 		List<Department> allData = new ArrayList<Department>();
 		List<Department> superData = departmentMapper.selectCurrentDeps(managerId);
@@ -143,4 +145,10 @@ public class DepartmentServiceImpl extends BaseMybatisDao<WorkingHoursMapper> im
 		return allData;
 	}
 
+
+	@Override
+	public List<DepartmentComboBox> selectAllDep() {
+		return null;
+	}
+
 }

+ 22 - 3
src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java

@@ -175,9 +175,28 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 			if(tn.getSalesType()!=null){
 				um.setLastSalesType(tn.getSalesType());
 			}
-			um.setFirstSigningTime(use.getFirstSigningTime());
-			um.setSignAmount(use.getSignAmount().add(tn.getTotalAmount()));
-			um.setSignNumber(use.getSignNumber()+1);
+			BigDecimal signAmount;
+			Integer signNumber;
+			if (use!=null){
+				if (use.getFirstSigningTime() != null) {
+					um.setFirstSigningTime(use.getFirstSigningTime()); }
+				if (use.getSignAmount() != null) {
+					signAmount=use.getSignAmount().add(tn.getTotalAmount());
+				}else{
+					signAmount=new BigDecimal(0).add(tn.getTotalAmount());
+
+				}
+				if (use.getSignNumber()!=null){
+					signNumber=use.getSignNumber()+1;
+				}else {
+					signNumber=1;
+				}
+			}else {
+				signAmount=new BigDecimal(0).add(tn.getTotalAmount());
+				signNumber=1;
+			}
+			um.setSignAmount(signAmount);
+			um.setSignNumber(signNumber);
 			userMidMapper.updateByUid(um);
 		}
 	}