加入保存属性

java110-bean/src/main/java/com/java110/dto/attendanceClasses/AttendanceClassesDto.java

@@ -1,6 +1,7 @@
 package com.java110.dto.attendanceClasses;
 
 import com.java110.dto.PageDto;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -15,16 +16,17 @@ import java.util.Date;
 public class AttendanceClassesDto extends PageDto implements Serializable {
 
     private String timeOffset;
-private String clockCount;
-private String classesObjType;
-private String storeId;
-private String clockType;
-private String classesObjId;
-private String classesName;
-private String classesId;
-private String leaveOffset;
-private String lateOffset;
-private String clockTypeValue;
+    private String clockCount;
+    private String classesObjType;
+    private String storeId;
+    private String clockType;
+    private String classesObjId;
+    private String classesName;
+    private String classesId;
+    private String leaveOffset;
+    private String lateOffset;
+    private String clockTypeValue;
+    private String classesObjName;
 
 
     private Date createTime;
@@ -35,67 +37,88 @@ private String clockTypeValue;
     public String getTimeOffset() {
         return timeOffset;
     }
-public void setTimeOffset(String timeOffset) {
+
+    public void setTimeOffset(String timeOffset) {
         this.timeOffset = timeOffset;
     }
-public String getClockCount() {
+
+    public String getClockCount() {
         return clockCount;
     }
-public void setClockCount(String clockCount) {
+
+    public void setClockCount(String clockCount) {
         this.clockCount = clockCount;
     }
-public String getClassesObjType() {
+
+    public String getClassesObjType() {
         return classesObjType;
     }
-public void setClassesObjType(String classesObjType) {
+
+    public void setClassesObjType(String classesObjType) {
         this.classesObjType = classesObjType;
     }
-public String getStoreId() {
+
+    public String getStoreId() {
         return storeId;
     }
-public void setStoreId(String storeId) {
+
+    public void setStoreId(String storeId) {
         this.storeId = storeId;
     }
-public String getClockType() {
+
+    public String getClockType() {
         return clockType;
     }
-public void setClockType(String clockType) {
+
+    public void setClockType(String clockType) {
         this.clockType = clockType;
     }
-public String getClassesObjId() {
+
+    public String getClassesObjId() {
         return classesObjId;
     }
-public void setClassesObjId(String classesObjId) {
+
+    public void setClassesObjId(String classesObjId) {
         this.classesObjId = classesObjId;
     }
-public String getClassesName() {
+
+    public String getClassesName() {
         return classesName;
     }
-public void setClassesName(String classesName) {
+
+    public void setClassesName(String classesName) {
         this.classesName = classesName;
     }
-public String getClassesId() {
+
+    public String getClassesId() {
         return classesId;
     }
-public void setClassesId(String classesId) {
+
+    public void setClassesId(String classesId) {
         this.classesId = classesId;
     }
-public String getLeaveOffset() {
+
+    public String getLeaveOffset() {
         return leaveOffset;
     }
-public void setLeaveOffset(String leaveOffset) {
+
+    public void setLeaveOffset(String leaveOffset) {
         this.leaveOffset = leaveOffset;
     }
-public String getLateOffset() {
+
+    public String getLateOffset() {
         return lateOffset;
     }
-public void setLateOffset(String lateOffset) {
+
+    public void setLateOffset(String lateOffset) {
         this.lateOffset = lateOffset;
     }
-public String getClockTypeValue() {
+
+    public String getClockTypeValue() {
         return clockTypeValue;
     }
-public void setClockTypeValue(String clockTypeValue) {
+
+    public void setClockTypeValue(String clockTypeValue) {
         this.clockTypeValue = clockTypeValue;
     }
 
@@ -115,4 +138,12 @@ public void setClockTypeValue(String clockTypeValue) {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String getClassesObjName() {
+        return classesObjName;
+    }
+
+    public void setClassesObjName(String classesObjName) {
+        this.classesObjName = classesObjName;
+    }
 }

java110-bean/src/main/java/com/java110/po/attendanceClasses/AttendanceClassesPo.java

@@ -1,88 +1,116 @@
 package com.java110.po.attendanceClasses;
 
 import java.io.Serializable;
-import java.util.Date;
 
 public class AttendanceClassesPo implements Serializable {
 
     private String timeOffset;
-private String clockCount;
-private String classesObjType;
-private String storeId;
-private String clockType;
-private String classesObjId;
-private String classesName;
-private String classesId;
-private String leaveOffset;
-private String lateOffset;
-private String clockTypeValue;
-public String getTimeOffset() {
+    private String clockCount;
+    private String classesObjType;
+    private String storeId;
+    private String clockType;
+    private String classesObjId;
+    private String classesName;
+    private String classesId;
+    private String leaveOffset;
+    private String lateOffset;
+    private String clockTypeValue;
+    private String classesObjName;
+
+
+    public String getTimeOffset() {
         return timeOffset;
     }
-public void setTimeOffset(String timeOffset) {
+
+    public void setTimeOffset(String timeOffset) {
         this.timeOffset = timeOffset;
     }
-public String getClockCount() {
+
+    public String getClockCount() {
         return clockCount;
     }
-public void setClockCount(String clockCount) {
+
+    public void setClockCount(String clockCount) {
         this.clockCount = clockCount;
     }
-public String getClassesObjType() {
+
+    public String getClassesObjType() {
         return classesObjType;
     }
-public void setClassesObjType(String classesObjType) {
+
+    public void setClassesObjType(String classesObjType) {
         this.classesObjType = classesObjType;
     }
-public String getStoreId() {
+
+    public String getStoreId() {
         return storeId;
     }
-public void setStoreId(String storeId) {
+
+    public void setStoreId(String storeId) {
         this.storeId = storeId;
     }
-public String getClockType() {
+
+    public String getClockType() {
         return clockType;
     }
-public void setClockType(String clockType) {
+
+    public void setClockType(String clockType) {
         this.clockType = clockType;
     }
-public String getClassesObjId() {
+
+    public String getClassesObjId() {
         return classesObjId;
     }
-public void setClassesObjId(String classesObjId) {
+
+    public void setClassesObjId(String classesObjId) {
         this.classesObjId = classesObjId;
     }
-public String getClassesName() {
+
+    public String getClassesName() {
         return classesName;
     }
-public void setClassesName(String classesName) {
+
+    public void setClassesName(String classesName) {
         this.classesName = classesName;
     }
-public String getClassesId() {
+
+    public String getClassesId() {
         return classesId;
     }
-public void setClassesId(String classesId) {
+
+    public void setClassesId(String classesId) {
         this.classesId = classesId;
     }
-public String getLeaveOffset() {
+
+    public String getLeaveOffset() {
         return leaveOffset;
     }
-public void setLeaveOffset(String leaveOffset) {
+
+    public void setLeaveOffset(String leaveOffset) {
         this.leaveOffset = leaveOffset;
     }
-public String getLateOffset() {
+
+    public String getLateOffset() {
         return lateOffset;
     }
-public void setLateOffset(String lateOffset) {
+
+    public void setLateOffset(String lateOffset) {
         this.lateOffset = lateOffset;
     }
-public String getClockTypeValue() {
+
+    public String getClockTypeValue() {
         return clockTypeValue;
     }
-public void setClockTypeValue(String clockTypeValue) {
+
+    public void setClockTypeValue(String clockTypeValue) {
         this.clockTypeValue = clockTypeValue;
     }
 
+    public String getClassesObjName() {
+        return classesObjName;
+    }
 
-
+    public void setClassesObjName(String classesObjName) {
+        this.classesObjName = classesObjName;
+    }
 }

java110-db/src/main/resources/mapper/common/AttendanceClassesServiceDaoImplMapper.xml

@@ -7,9 +7,11 @@
     <!-- 保存考勤班次信息 add by wuxw 2018-07-03 -->
     <insert id="saveBusinessAttendanceClassesInfo" parameterType="Map">
         insert into business_attendance_classes(
-        time_offset,clock_count,classes_obj_type,store_id,clock_type,classes_obj_id,classes_name,classes_id,operate,leave_offset,late_offset,b_id,clock_type_value
+        time_offset,clock_count,classes_obj_type,store_id,clock_type,classes_obj_id,classes_name,classes_id,operate,
+        leave_offset,late_offset,b_id,clock_type_value,classes_obj_name
         ) values (
-        #{timeOffset},#{clockCount},#{classesObjType},#{storeId},#{clockType},#{classesObjId},#{classesName},#{classesId},#{operate},#{leaveOffset},#{lateOffset},#{bId},#{clockTypeValue}
+        #{timeOffset},#{clockCount},#{classesObjType},#{storeId},#{clockType},#{classesObjId},#{classesName},#{classesId},#{operate},
+        #{leaveOffset},#{lateOffset},#{bId},#{clockTypeValue},#{classesObjName}
         )
     </insert>
 
@@ -21,7 +23,8 @@
         storeId,t.clock_type,t.clock_type clockType,t.classes_obj_id,t.classes_obj_id
         classesObjId,t.classes_name,t.classes_name classesName,t.classes_id,t.classes_id
         classesId,t.operate,t.leave_offset,t.leave_offset leaveOffset,t.late_offset,t.late_offset
-        lateOffset,t.b_id,t.b_id bId,t.clock_type_value,t.clock_type_value clockTypeValue
+        lateOffset,t.b_id,t.b_id bId,t.clock_type_value,t.clock_type_value clockTypeValue,
+        t.classes_obj_name,t.classes_obj_name classesObjName
         from business_attendance_classes t
         where 1 =1
         <if test="timeOffset !=null and timeOffset != ''">
@@ -70,9 +73,11 @@
     <!-- 保存考勤班次信息至 instance表中 add by wuxw 2018-07-03 -->
     <insert id="saveAttendanceClassesInfoInstance" parameterType="Map">
         insert into attendance_classes(
-        time_offset,status_cd,clock_count,classes_obj_type,store_id,clock_type,classes_obj_id,classes_name,classes_id,leave_offset,late_offset,b_id,clock_type_value
+        time_offset,status_cd,clock_count,classes_obj_type,store_id,clock_type,classes_obj_id,classes_name,classes_id,
+        leave_offset,late_offset,b_id,clock_type_value,classes_obj_name
         ) select
-        t.time_offset,'0',t.clock_count,t.classes_obj_type,t.store_id,t.clock_type,t.classes_obj_id,t.classes_name,t.classes_id,t.leave_offset,t.late_offset,t.b_id,t.clock_type_value
+        t.time_offset,'0',t.clock_count,t.classes_obj_type,t.store_id,t.clock_type,t.classes_obj_id,t.classes_name,t.classes_id,
+        t.leave_offset,t.late_offset,t.b_id,t.clock_type_value,t.classes_obj_name
         from business_attendance_classes t where 1=1
         <if test="timeOffset !=null and timeOffset != ''">
             and t.time_offset= #{timeOffset}
@@ -122,7 +127,8 @@
         storeId,t.clock_type,t.clock_type clockType,t.classes_obj_id,t.classes_obj_id
         classesObjId,t.classes_name,t.classes_name classesName,t.classes_id,t.classes_id
         classesId,t.leave_offset,t.leave_offset leaveOffset,t.late_offset,t.late_offset lateOffset,t.b_id,t.b_id
-        bId,t.clock_type_value,t.clock_type_value clockTypeValue
+        bId,t.clock_type_value,t.clock_type_value clockTypeValue,
+        t.classes_obj_name,t.classes_obj_name classesObjName
         from attendance_classes t
         where 1 =1
         <if test="timeOffset !=null and timeOffset != ''">

service-api/src/main/java/com/java110/api/bmo/attendanceClasses/impl/AttendanceClassesBMOImpl.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.java110.api.bmo.ApiBaseBMO;
 import com.java110.api.bmo.attendanceClasses.IAttendanceClassesBMO;
 import com.java110.core.context.DataFlowContext;
+import com.java110.core.factory.GenerateCodeFactory;
 import com.java110.intf.common.IAttendanceClassesInnerServiceSMO;
 import com.java110.po.attendanceClasses.AttendanceClassesPo;
 import com.java110.utils.constant.BusinessTypeConstant;
@@ -26,7 +27,7 @@ public class AttendanceClassesBMOImpl extends ApiBaseBMO implements IAttendanceC
      */
     public void addAttendanceClasses(JSONObject paramInJson, DataFlowContext dataFlowContext) {
 
-        paramInJson.put("classesId", "-1");
+        paramInJson.put("classesId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_classesId));
         AttendanceClassesPo attendanceClassesPo = BeanConvertUtil.covertBean(paramInJson, AttendanceClassesPo.class);
         super.insert(dataFlowContext, attendanceClassesPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_ATTENDANCE_CLASSES);
     }

service-api/src/main/java/com/java110/api/listener/attendanceClasses/SaveAttendanceClassesListener.java

@@ -1,7 +1,9 @@
 package com.java110.api.listener.attendanceClasses;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.java110.api.bmo.attendanceClasses.IAttendanceClassesBMO;
+import com.java110.api.bmo.attendanceClassesAttr.IAttendanceClassesAttrBMO;
 import com.java110.api.listener.AbstractServiceApiPlusListener;
 import com.java110.core.annotation.Java110Listener;
 import com.java110.core.context.DataFlowContext;
@@ -21,6 +23,9 @@ public class SaveAttendanceClassesListener extends AbstractServiceApiPlusListene
     @Autowired
     private IAttendanceClassesBMO attendanceClassesBMOImpl;
 
+    @Autowired
+    private IAttendanceClassesAttrBMO attendanceClassesAttrBMOImpl;
+
     @Override
     protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
         //Assert.hasKeyAndValue(reqJson, "xxx", "xxx");
@@ -40,6 +45,31 @@ public class SaveAttendanceClassesListener extends AbstractServiceApiPlusListene
     @Override
     protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
         attendanceClassesBMOImpl.addAttendanceClasses(reqJson, context);
+
+        //处理房屋属性
+        dealAttr(reqJson, context);
+    }
+
+    private void dealAttr(JSONObject reqJson, DataFlowContext context) {
+
+        if (!reqJson.containsKey("attrs")) {
+            return;
+        }
+
+        JSONArray attrs = reqJson.getJSONArray("attrs");
+        if (attrs == null || attrs.size() < 1) {
+            return;
+        }
+
+
+        JSONObject attr = null;
+        for (int attrIndex = 0; attrIndex < attrs.size(); attrIndex++) {
+            attr = attrs.getJSONObject(attrIndex);
+            attr.put("classesId", reqJson.getString("classesId"));
+            attr.put("storeId", reqJson.getString("storeId"));
+            attendanceClassesAttrBMOImpl.addAttendanceClassesAttr(attr, context);
+        }
+
     }
 
     @Override

service-common/src/main/java/com/java110/common/listener/attendanceClasses/AbstractAttendanceClassesBusinessServiceDataFlowListener.java

@@ -43,6 +43,7 @@ public abstract class AbstractAttendanceClassesBusinessServiceDataFlowListener e
         businessAttendanceClassesInfo.put("storeId", businessAttendanceClassesInfo.get("store_id"));
         businessAttendanceClassesInfo.put("clockType", businessAttendanceClassesInfo.get("clock_type"));
         businessAttendanceClassesInfo.put("classesObjId", businessAttendanceClassesInfo.get("classes_obj_id"));
+        businessAttendanceClassesInfo.put("classesObjName", businessAttendanceClassesInfo.get("classes_obj_name"));
         businessAttendanceClassesInfo.put("classesName", businessAttendanceClassesInfo.get("classes_name"));
         businessAttendanceClassesInfo.put("classesId", businessAttendanceClassesInfo.get("classes_id"));
         businessAttendanceClassesInfo.put("operate", businessAttendanceClassesInfo.get("operate"));
@@ -85,6 +86,7 @@ public abstract class AbstractAttendanceClassesBusinessServiceDataFlowListener e
         currentAttendanceClassesInfo.put("leaveOffset", currentAttendanceClassesInfo.get("leave_offset"));
         currentAttendanceClassesInfo.put("lateOffset", currentAttendanceClassesInfo.get("late_offset"));
         currentAttendanceClassesInfo.put("clockTypeValue", currentAttendanceClassesInfo.get("clock_type_value"));
+        currentAttendanceClassesInfo.put("classesObjName", currentAttendanceClassesInfo.get("classes_obj_name"));
 
 
         currentAttendanceClassesInfo.put("operate", StatusConstant.OPERATE_DEL);