Merge branch 'main' of http://git.innoschool.org:3000/WangJunyue/java

w3/Employee.java

@@ -0,0 +1,49 @@
+package Homework;
+
+public class Employee {
+    private String id;
+    private String name;
+    private String department;
+    private double salary;
+    public Employee(String id, String name, String department){
+        this.id = id;
+        this.name = name;
+        this.department = department;
+    }
+    public void setSalary(double salary){
+        if (salary>=2000){
+            this.salary = salary;
+        }
+    }
+    public double getSalary(){
+        return salary;
+    }
+    public void setDepartment(String department){
+        this.department = department;
+    }
+    public String getDepartment(){
+        return department;
+    }
+    public void setName(String name){
+        this.name = name;
+    }
+    public String getName(){
+        return name;
+    }
+    public void setId(String id){
+        this.id = id;
+    }
+    public String getId(){
+        return id;
+    }
+    public void raiseSalary(double percent){
+         double newSalary=this.salary*(1+percent/100);
+        if (newSalary>=2000){
+            this.salary = newSalary;
+        }
+    }
+}
+
+
+
+

w3/EmployeeTest.java

@@ -0,0 +1,19 @@
+package Homework;
+
+public class EmployeeTest {
+
+        public static void main(String[] args) {
+            Employee xiaoming = new Employee("1", "xiaoming", "技术部");
+            xiaoming.setSalary(3000);
+            System.out.println(xiaoming.getId() + " " + xiaoming.getName() + " " + xiaoming.getDepartment() + " " + xiaoming.getSalary());
+            xiaoming.raiseSalary(10);
+            System.out.println(xiaoming.getId() + " " + xiaoming.getName() + " " + xiaoming.getDepartment() + " " + xiaoming.getSalary());
+
+            Employee xiaohong = new Employee("2", "xiaohong", "销售部");
+            xiaohong.setSalary(2000);
+            System.out.println(xiaohong.getId() + " " + xiaohong.getName() + " " + xiaohong.getDepartment() + " " + xiaohong.getSalary());
+            xiaohong.raiseSalary(15);
+            System.out.println(xiaohong.getId() + " " + xiaohong.getName() + " " + xiaohong.getDepartment() + " " + xiaohong.getSalary());
+        }
+    }
+