Enford hace 5 años
padre
commit
bf855ad3fa

+ 9 - 0
src/main/java/com/jeeplus/modules/wexintheorder/entity/TheLeadership.java

@@ -3,12 +3,21 @@ package com.jeeplus.modules.wexintheorder.entity;
 import com.jeeplus.common.persistence.DataEntity;
 
 public class TheLeadership extends DataEntity<TheLeadership> {
+    private String name;
    private String team;
    private String department;
    private String specific;
    private String financial;
    private String correlationId;
 
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
     public String getSpecific() {
         return specific;
     }

+ 7 - 0
src/main/java/com/jeeplus/modules/wexintheorder/web/TheOrderController.java

@@ -174,6 +174,7 @@ public class TheOrderController extends BaseController {
         if (theOrder.getStatus().equals("1")){
             //保存信息分管领导信息
             TheLeadership theLeadership = new TheLeadership();
+            theLeadership.setName(theOrder.getName());
             theLeadership.setTeam(theOrder.getTeam());//添加团队
             theLeadership.setDepartment(theOrder.getDepartment());//部门
             theLeadership.setSpecific(theOrder.getSpecific());//具体部门
@@ -192,6 +193,9 @@ public class TheOrderController extends BaseController {
                List<TheLeadership> list = theLeadershipService.findListUserId(theLeadership);
                boolean flag = false;
                for (TheLeadership theLeadership1:list){
+                   if (theLeadership1.getName().equals(theOrder.getName())){
+                       flag = true;
+                   }
                    if (!theLeadership1.getTeam().equals(theOrder.getTeam())){
                        flag = true;
                    }
@@ -237,6 +241,9 @@ public class TheOrderController extends BaseController {
 
     //判断theorder
     public void getTheOrder(TheOrder theOrder){
+        if (null == theOrder.getName()){
+            theOrder.setName("");
+        }
         if (null == theOrder.getTeam()){
             theOrder.setTeam("");
         }

+ 4 - 0
src/main/resources/mappings/modules/wexintheorder/TheLeadershipDao.xml

@@ -54,6 +54,7 @@
 		a.update_by AS "updateBy.id",
 		a.update_date AS "updateDate",
 		a.remarks AS "remarks",
+		a.name AS "name",
 		a.team AS "team",
 		a.department AS "department",
 		a.specific AS "specific",
@@ -76,6 +77,7 @@
 			update_date,
 			remarks,
 			del_flag,
+			name,
 			team,
 			department,
 			`specific`,
@@ -88,6 +90,7 @@
 			#{updateDate},
 			#{remarks},
 			#{delFlag},
+			#{name},
 			#{team},
 			#{department},
 			#{specific},
@@ -98,6 +101,7 @@
 	<update id="updateLeaderShip">
 		UPDATE the_order_information SET
 			update_date = #{updateDate},
+			name = #{name},
 			team = #{team},
 			department = #{department},
 			`specific` = #{specific}