Przeglądaj źródła

部门列表,新增、修改接口的修改

anderx 2 lat temu
rodzic
commit
506d711144

Plik diff jest za duży
+ 604 - 584
src/main/java/com/goafanti/common/mapper/DepartmentMapper.xml


+ 41 - 35
src/main/java/com/goafanti/common/model/Department.java

@@ -1,125 +1,113 @@
 package com.goafanti.common.model;
 
-import java.io.Serializable;
-import java.math.BigDecimal;
 import java.util.Date;
+import java.io.Serializable;
 
 /**
- * department
- * @author
+ * (Department)实体类
+ *
+ * @author andex
+ * @since 2023-11-08 15:00:45
  */
 public class Department implements Serializable {
+    private static final long serialVersionUID = -34395587561644846L;
     /**
      * 组织ID
      */
     private String id;
-
     /**
      * 创建人
      */
     private String createId;
-
     /**
      * 创建时间
      */
     private Date createTime;
-
     /**
      * 更新时间
      */
     private Date updateTime;
-
     /**
      * 删除标识
      */
     private Integer deletedSign;
-
     /**
      * 组织名称
      */
     private String name;
-
     /**
      * 组织类型
      */
     private String type;
-
     /**
      * 组织负责人ID
      */
     private String managerId;
-
     /**
      * 组织编号
      */
     private String depNo;
-
     /**
      * 上级组织
      */
     private String superId;
-
     /**
      * 组织职能说明
      */
     private String remarks;
-
     /**
      * 组织状态
      */
     private String status;
-
     /**
      * 缩写
      */
     private String abbreviation;
-
     /**
      * 财务id(指定跳转的财务)
      */
     private String financeId;
-
     /**
      * 所在省份
      */
     private Integer province;
-
     /**
      * 工作时间
      */
     private Integer workingHoursType;
-
     /**
      * 隐藏 0否 1是
      */
     private Integer hideSign;
-
     /**
      * 层级
      */
     private Integer lvl;
-
     /**
      * 当前金额
      */
-    private BigDecimal currentAmount;
-
+    private Double currentAmount;
     /**
      * 下级累计金额
      */
-    private BigDecimal subordinateAmount;
-
+    private Double subordinateAmount;
     /**
      * 总计金额
      */
-    private BigDecimal totalAmount;
-
+    private Double totalAmount;
     /**
      * 复审财务id
      */
     private String retrialFinanceId;
+    /**
+     * 特批审核状态 0=无需特批,1=需要特批
+     */
+    private Integer approval;
+    /**
+     * 特批审核人
+     */
+    private String approvalAid;
 
-    private static final long serialVersionUID = 1L;
 
     public String getId() {
         return id;
@@ -265,27 +253,27 @@ public class Department implements Serializable {
         this.lvl = lvl;
     }
 
-    public BigDecimal getCurrentAmount() {
+    public Double getCurrentAmount() {
         return currentAmount;
     }
 
-    public void setCurrentAmount(BigDecimal currentAmount) {
+    public void setCurrentAmount(Double currentAmount) {
         this.currentAmount = currentAmount;
     }
 
-    public BigDecimal getSubordinateAmount() {
+    public Double getSubordinateAmount() {
         return subordinateAmount;
     }
 
-    public void setSubordinateAmount(BigDecimal subordinateAmount) {
+    public void setSubordinateAmount(Double subordinateAmount) {
         this.subordinateAmount = subordinateAmount;
     }
 
-    public BigDecimal getTotalAmount() {
+    public Double getTotalAmount() {
         return totalAmount;
     }
 
-    public void setTotalAmount(BigDecimal totalAmount) {
+    public void setTotalAmount(Double totalAmount) {
         this.totalAmount = totalAmount;
     }
 
@@ -297,8 +285,26 @@ public class Department implements Serializable {
         this.retrialFinanceId = retrialFinanceId;
     }
 
+    public Integer getApproval() {
+        return approval;
+    }
+
+    public void setApproval(Integer approval) {
+        this.approval = approval;
+    }
+
+    public String getApprovalAid() {
+        return approvalAid;
+    }
+
+    public void setApprovalAid(String approvalAid) {
+        this.approvalAid = approvalAid;
+    }
+
+
     public Department() {}
     public Department(String id) {
         this.id = id;
     }
+
 }

+ 18 - 0
src/main/java/com/goafanti/organization/bo/OrganizationListOut.java

@@ -42,6 +42,8 @@ public class OrganizationListOut {
 
 	private String retrialFinanceId;
 	private String retrialFinanceName;
+	private Integer approval;
+	private String approvalAid;
 	private Integer province;
 	private Integer hideSign;
 	private Integer workingHoursType;
@@ -49,6 +51,22 @@ public class OrganizationListOut {
 	private Integer lvl;
 	private List<OrganizationListOut> list;
 
+	public Integer getApproval() {
+		return approval;
+	}
+
+	public void setApproval(Integer approval) {
+		this.approval = approval;
+	}
+
+	public String getApprovalAid() {
+		return approvalAid;
+	}
+
+	public void setApprovalAid(String approvalAid) {
+		this.approvalAid = approvalAid;
+	}
+
 	public String getRetrialFinanceId() {
 		return retrialFinanceId;
 	}

+ 6 - 2
src/main/java/com/goafanti/organization/controller/AdminOrganizationController.java

@@ -94,7 +94,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 retrialFinanceId,
-									 String remarks,String id,String abbreviation,String financeId,Integer workingHoursType,Integer hideSign,String depNo){
+									 String remarks,String id,String abbreviation,String financeId,Integer workingHoursType,Integer hideSign,String depNo,Integer approval,String approvalAid){
 		Result res = new Result();
 		if(StringUtils.isBlank(name) || StringUtils.isBlank(type)
 				|| StringUtils.isBlank(managerId)|| StringUtils.isBlank(superId)
@@ -110,8 +110,12 @@ public class AdminOrganizationController extends BaseApiController{
 			res.getError().add(buildError("","部门编号已存在"));
 			return res;
 		}
+		if (approval==1&&StringUtils.isBlank(approvalAid)){
+			res.getError().add(buildError("特批审核开启必须设置特批人"));
+			return res;
+		}
 		int i=organizationService.updateOrganization(name, type, managerId, superId, status, province,
-				retrialFinanceId,remarks,id, abbreviation,financeId,workingHoursType,hideSign,depNo);
+				retrialFinanceId,remarks,id, abbreviation,financeId,workingHoursType,hideSign,depNo, approval, approvalAid);
 		return res.data(i);
 	}
 

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

@@ -44,7 +44,8 @@ public interface OrganizationService {
 	int deleteById(String id);
 
 	int updateOrganization(String name,String type,String managerId,String superId,String status,Integer province,String retrialFinanceId,
-			String remarks,String id,String abbreviation,String financeId,Integer workingHoursType,Integer hideSign,String depNo);
+			String remarks,String id,String abbreviation,String financeId,Integer workingHoursType,Integer hideSign,String depNo,
+						   Integer approval,String approvalAid);
 
 	boolean checkDepNo(String depNo,Integer type);
 

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

@@ -172,7 +172,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 retrialFinanceId,
-			String remarks,String id,String abbreviation,String financeId,Integer workingHoursType,Integer hideSign,String depNo) {
+			String remarks,String id,String abbreviation,String financeId,Integer workingHoursType,Integer hideSign,String depNo,
+								  Integer approval,String approvalAid) {
 		//获取上级编号
 		Department superDep=departmentMapper.selectByPrimaryKey(superId);
 		Date now=new Date();
@@ -193,6 +194,8 @@ public class OrganizationServiceImpl extends BaseMybatisDao<DepartmentMapper> im
 		dep.setProvince(province);
 		dep.setHideSign(hideSign);
 		dep.setWorkingHoursType(workingHoursType);
+		dep.setApproval(approval);
+		dep.setApprovalAid(approvalAid);
 		checkFinaceUpdate(id,financeId);
 		int x=departmentMapper.updateByPrimaryKeySelective(dep);
 		return x;

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

@@ -1,12 +1,12 @@
 dev.name=local
 jdbc.driverClassName=com.mysql.jdbc.Driver
 #jdbc.url=jdbc\:mysql://localhost:3306/aft20221026?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
-#jdbc.username=root
-#jdbc.password=123456
-jdbc.url=jdbc:mysql://101.37.32.31:3306/aft?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
 jdbc.username=root
-jdbc.password=aftdev
+jdbc.password=123456
+#jdbc.url=jdbc:mysql://101.37.32.31:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+#jdbc.username=root
+#jdbc.password=aftdev
 jdbc.validationQuery=SELECT 'x'
 jdbc.initialSize=3
 jdbc.maxActive=20