Browse Source

处理前端数据问题

anderx 3 years ago
parent
commit
5b07df9faf

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

@@ -242,6 +242,7 @@
     om.dep_no as depNo,
     om.remarks,
     om.status,
+    om.hide_sign hideSign ,
     dm.name as superName,
     wh.name as workingHoursName,
     x.name as managerName

+ 15 - 6
src/main/java/com/goafanti/organization/bo/OrganizationListOut.java

@@ -36,12 +36,21 @@ public class OrganizationListOut {
 	 */
 	private String abbreviation;
 	private String financeName;
-	
+
 	private String financeId;
 	private Integer province;
+	private Integer hideSign;
 	private Integer workingHoursType;
 	private String workingHoursName;
-	
+
+	public Integer getHideSign() {
+		return hideSign;
+	}
+
+	public void setHideSign(Integer hideSign) {
+		this.hideSign = hideSign;
+	}
+
 	public String getUid() {
 		return uid;
 	}
@@ -168,9 +177,9 @@ public class OrganizationListOut {
 	public void setWorkingHoursName(String workingHoursName) {
 		this.workingHoursName = workingHoursName;
 	}
-	
-	
-	
-	
+
+
+
+
 
 }

+ 5 - 4
src/main/java/com/goafanti/organization/controller/AdminOrganizationController.java

@@ -47,7 +47,8 @@ public class AdminOrganizationController extends BaseApiController{
 	}
 	/**部门组织管理新增**/
 	@RequestMapping(value = "/addOrganization" , method = RequestMethod.POST)
-	public Result addOrganization(String name, String managerId, String type, String superId, String remarks,Integer workingHoursType) throws Exception{
+	public Result addOrganization(String name, String managerId, String type, String superId, String remarks,
+								  Integer workingHoursType,Integer hideSign) throws Exception{
 		Result res = new Result();
 		if(StringUtils.isBlank(name) || StringUtils.isBlank(type) || StringUtils.isBlank(superId)){
 			res.getError().add(buildError("","组织名称、组织类型、上级组织不能为空"));
@@ -65,7 +66,7 @@ public class AdminOrganizationController extends BaseApiController{
 			return res;
 		}
 
-			organizationService.addOrganization(name, managerId, type, superId, remarks,sdepNo,count,workingHoursType);
+			organizationService.addOrganization(name, managerId, type, superId, remarks,sdepNo,count,workingHoursType,hideSign);
 
 		return res;
 	}
@@ -86,7 +87,7 @@ public class AdminOrganizationController extends BaseApiController{
 	/**修改信息**/
 	@RequestMapping(value = "/updateOrganization" , method = RequestMethod.POST)
 	public Result updateOrganization(String name, String type, String managerId, String superId, String status,Integer province,
-			String remarks,String id,String abbreviation,String financeId,Integer workingHoursType){
+			String remarks,String id,String abbreviation,String financeId,Integer workingHoursType,Integer hideSign){
 		Result res = new Result();
 		if(StringUtils.isBlank(name) || StringUtils.isBlank(type)
 				|| StringUtils.isBlank(managerId)|| StringUtils.isBlank(superId)
@@ -102,7 +103,7 @@ public class AdminOrganizationController extends BaseApiController{
 		}
 
 		int i=organizationService.updateOrganization(name, type, managerId, superId, status, province,remarks,id,
-				sdepNo,count,abbreviation,financeId,workingHoursType);
+				sdepNo,count,abbreviation,financeId,workingHoursType,hideSign);
 		return res.data(i);
 	}
 

+ 3 - 2
src/main/java/com/goafanti/organization/service/OrganizationService.java

@@ -27,7 +27,8 @@ public interface OrganizationService {
 	 * @param desc 组织职能说明
 	 * @return
 	 */
-	int addOrganization(String name,String managerId,String type,String superId,String desc,String sdepNo,Integer count,Integer workingHoursType);
+	int addOrganization(String name,String managerId,String type,String superId,String desc,String sdepNo,Integer count,
+						Integer workingHoursType,Integer hideSign);
 	/**
 	 * 模糊查询负责人名称
 	 * @param name
@@ -40,6 +41,6 @@ public interface OrganizationService {
 	int deleteById(String id);
 
 	int updateOrganization(String name,String type,String managerId,String superId,String status,Integer province,
-			String remarks,String id,String sdepNo,Integer count,String abbreviation,String financeId,Integer workingHoursType);
+			String remarks,String id,String sdepNo,Integer count,String abbreviation,String financeId,Integer workingHoursType,Integer hideSign);
 
 }

+ 5 - 5
src/main/java/com/goafanti/organization/service/impl/OrganizationServiceImpl.java

@@ -63,7 +63,8 @@ public class OrganizationServiceImpl extends BaseMybatisDao<DepartmentMapper> im
 	 *
 	 */
 	@Override
-	public int addOrganization( String name, String managerId, String type, String superId, String remarks,String sdepNo,Integer count,Integer workingHoursType) {
+	public int addOrganization( String name, String managerId, String type, String superId, String remarks,String sdepNo
+			,Integer count,Integer workingHoursType,Integer hideSign) {
 
 		String id = UUID.randomUUID().toString();
 		Date now = new Date();
@@ -83,7 +84,7 @@ public class OrganizationServiceImpl extends BaseMybatisDao<DepartmentMapper> im
 		dep.setRemarks(remarks);
 		dep.setStatus("0");
 		dep.setWorkingHoursType(workingHoursType);
-		departmentMapper.insert(dep);
+		departmentMapper.insertSelective(dep);
 		return 1;
 	}
 	@Override
@@ -104,10 +105,8 @@ public class OrganizationServiceImpl extends BaseMybatisDao<DepartmentMapper> im
 	}
 	@Override
 	public int updateOrganization(String name, String type, String managerId, String superId, String status,Integer province,
-			String remarks,String id,String sdepNo,Integer count,String abbreviation,String financeId,Integer workingHoursType) {
-
+			String remarks,String id,String sdepNo,Integer count,String abbreviation,String financeId,Integer workingHoursType,Integer hideSign) {
 		String deps = countDepNo(sdepNo,count);
-
 		Date now=new Date();
 		Department dep=new Department();
 		dep.setName(name);
@@ -122,6 +121,7 @@ public class OrganizationServiceImpl extends BaseMybatisDao<DepartmentMapper> im
 		dep.setAbbreviation(abbreviation);
 		dep.setFinanceId(financeId);
 		dep.setProvince(province);
+		dep.setHideSign(hideSign);
 		dep.setWorkingHoursType(workingHoursType);
 		tOrderMidMapper.updateFinanceId(id,financeId);
 		int x=departmentMapper.updateByPrimaryKeySelective(dep);