优化 考勤同步功能

service-api/src/main/java/com/java110/api/smo/assetImport/impl/ImportOwnerRoomSMOImpl.java

@@ -146,6 +146,10 @@ public class ImportOwnerRoomSMOImpl extends DefaultAbstractComponentSMO implemen
                 throw new IllegalArgumentException((roomIndex + 1) + "行手机号不能为空");
             }
 
+            if (importOwnerRoomDto.getTel().length() > 11) {
+                throw new IllegalArgumentException((roomIndex + 1) + "行手机号超过11位,请核实");
+            }
+
             if (StringUtil.isEmpty(importOwnerRoomDto.getIdCard())) {
                 throw new IllegalArgumentException((roomIndex + 1) + "行身份证号不能为空");
             }

service-common/src/main/java/com/java110/common/cmd/attendanceClasses/SaveAttendanceClassesCmd.java

@@ -80,18 +80,19 @@ public class SaveAttendanceClassesCmd extends Cmd {
         AttendanceClassesPo attendanceClassesPo = BeanConvertUtil.covertBean(reqJson, AttendanceClassesPo.class);
         attendanceClassesPo.setClassesId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
         attendanceClassesPo.setStoreId(cmdDataFlowContext.getReqHeaders().get("store-id"));
+        //处理房屋属性
+        dealAttr(reqJson,attendanceClassesPo, cmdDataFlowContext);
+
         int flag = attendanceClassesV1InnerServiceSMOImpl.saveAttendanceClasses(attendanceClassesPo);
 
         if (flag < 1) {
             throw new CmdException("保存数据失败");
         }
-        //处理房屋属性
-        dealAttr(reqJson, cmdDataFlowContext);
 
         cmdDataFlowContext.setResponseEntity(ResultVo.success());
     }
 
-    private void dealAttr(JSONObject reqJson, ICmdDataFlowContext context) {
+    private void dealAttr(JSONObject reqJson,AttendanceClassesPo attendanceClassesPo, ICmdDataFlowContext context) {
 
         if (!reqJson.containsKey("attrs")) {
             return;
@@ -107,8 +108,8 @@ public class SaveAttendanceClassesCmd extends Cmd {
         int flag = 0;
         for (int attrIndex = 0; attrIndex < attrs.size(); attrIndex++) {
             attr = attrs.getJSONObject(attrIndex);
-            attr.put("classesId", reqJson.getString("classesId"));
-            attr.put("storeId", reqJson.getString("storeId"));
+            attr.put("classesId", attendanceClassesPo.getClassesId());
+            attr.put("storeId", attendanceClassesPo.getStoreId());
             attr.put("attrId",GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
             AttendanceClassesAttrPo attendanceClassesAttrPo = BeanConvertUtil.covertBean(attr, AttendanceClassesAttrPo.class);
             flag = attendanceClassesAttrV1InnerServiceSMOImpl.saveAttendanceClassesAttr(attendanceClassesAttrPo);

service-common/src/main/java/com/java110/common/cmd/attendanceClasses/UpdateAttendanceClassesCmd.java

@@ -85,8 +85,8 @@ public class UpdateAttendanceClassesCmd extends Cmd {
         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"));
+            attr.put("classesId", attendanceClassesPo.getClassesId());
+            attr.put("storeId", attendanceClassesPo.getStoreId());
             if (!attr.containsKey("attrId") || attr.getString("attrId").startsWith("-") || StringUtil.isEmpty(attr.getString("attrId"))) {
                 attr.put("attrId", GenerateCodeFactory.getGeneratorId("11"));
                 AttendanceClassesAttrPo attendanceClassesAttrPo = BeanConvertUtil.covertBean(attr, AttendanceClassesAttrPo.class);