Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

java110-bean/src/main/java/com/java110/dto/repair/RepairDto.java

@@ -123,6 +123,7 @@ public class RepairDto extends PageDto implements Serializable {
     private String repairSettingType;
     private String repairSettingTypeName;
 
+
     public String getRepairName() {
         return repairName;
     }

java110-db/src/main/resources/mapper/community/RepairServiceDaoImplMapper.xml

@@ -140,7 +140,7 @@
         t.repair_obj_type,t.repair_obj_id,t.repair_obj_name,t.repair_obj_type repairObjType,t.repair_obj_id repairObjId,
         t.repair_obj_name repairObjName,rrv.visit_type visitType,rrv.context visitContext,a.appraise_score
         appraiseScore, a.door_speed_score doorSpeedScore,a.repairman_service_score repairmanServiceScore,
-        t.pay_type,t.pay_type payType,rs.repair_setting_type repairSettingType,d1.name repairSettingTypeName
+        t.pay_type,t.pay_type payType,rs.repair_setting_type repairSettingType,d1.name repairSettingTypeName,t.create_time createTime
         <if test="staffId != null and staffId != ''">
             ,rru.state repairDispatchState,rru.context repairDispatchContext,td.name repairDispatchStateName
         </if>

java110-db/src/main/resources/mapper/report/ReportAttendanceServiceDaoImplMapper.xml

@@ -43,7 +43,6 @@
         SELECT
         t.staff_name staffName,
         t.staff_id staffId,
-        uo.org_name departmentName,
         t.classes_id classesId,
         ac.classes_name classesName,
         (
@@ -143,10 +142,12 @@
         AND ac.status_cd = '0'
         LEFT JOIN u_user s ON t.staff_id = s.user_id
         AND s.status_cd = '0'
-        LEFT JOIN u_org_staff_rel uosr ON uosr.staff_id = s.user_id
-        AND uosr.status_cd = '0'
-        LEFT JOIN u_org uo ON uosr.org_id = uo.org_id
-        AND uo.status_cd = '0'
+        <if test="departmentId !=null and departmentId != ''">
+            LEFT JOIN u_org_staff_rel uosr ON uosr.staff_id = s.user_id
+            AND uosr.status_cd = '0'
+            LEFT JOIN u_org uo ON uosr.org_id = uo.org_id
+            AND uo.status_cd = '0'
+        </if>
         WHERE
         t.status_cd = '0'
         <if test="staffName !=null and staffName != ''">

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

@@ -23,6 +23,7 @@ import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
 import com.java110.core.factory.GenerateCodeFactory;
 import com.java110.core.smo.IPhotoSMO;
+import com.java110.dto.attendanceClassesStaff.AttendanceClassesStaffDto;
 import com.java110.dto.user.UserDto;
 import com.java110.intf.user.IAttendanceClassesStaffV1InnerServiceSMO;
 import com.java110.intf.user.IUserV1InnerServiceSMO;
@@ -63,6 +64,7 @@ public class SaveAttendanceClassesStaffCmd extends Cmd {
     @Autowired
     private IUserV1InnerServiceSMO userV1InnerServiceSMOImpl;
 
+
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "classesId", "请求报文中未包含classesId");
@@ -72,6 +74,14 @@ public class SaveAttendanceClassesStaffCmd extends Cmd {
         String storeId = cmdDataFlowContext.getReqHeaders().get("store-id");
         Assert.hasLength(storeId, "未包含商户信息");
 
+        AttendanceClassesStaffDto attendanceClassesStaffDto = new AttendanceClassesStaffDto();
+        attendanceClassesStaffDto.setClassesId(reqJson.getString("classesId"));
+        attendanceClassesStaffDto.setStaffId(reqJson.getString("staffId"));
+        int count = attendanceClassesStaffV1InnerServiceSMOImpl.queryAttendanceClassesStaffsCount(attendanceClassesStaffDto);
+
+        if (count > 0) {
+            throw new CmdException("考勤员工已经存在");
+        }
     }
 
     @Override
@@ -83,7 +93,7 @@ public class SaveAttendanceClassesStaffCmd extends Cmd {
         userDto.setUserId(reqJson.getString("staffId"));
         List<UserDto> userDtos = userV1InnerServiceSMOImpl.queryUsers(userDto);
 
-        Assert.listOnlyOne(userDtos,"员工不存在");
+        Assert.listOnlyOne(userDtos, "员工不存在");
 
         AttendanceClassesStaffPo attendanceClassesStaffPo = BeanConvertUtil.covertBean(reqJson, AttendanceClassesStaffPo.class);
         attendanceClassesStaffPo.setStoreId(storeId);

service-common/src/main/java/com/java110/common/cmd/machine/ListMachinesCmd.java

@@ -158,7 +158,7 @@ public class ListMachinesCmd extends Cmd {
 
         if (MachineDto.MACHINE_TYPE_ATTENDANCE.equals(machineDto.getMachineTypeCd())) {
             AttendanceClassesDto attendanceClassesDto = new AttendanceClassesDto();
-            attendanceClassesDto.setClassesId(machineDto.getLocationType());
+            attendanceClassesDto.setClassesId(machineDto.getLocationObjId());
             List<AttendanceClassesDto> attendanceClassesDtos = attendanceClassesV1InnerServiceSMOImpl.queryAttendanceClassess(attendanceClassesDto);
             if (attendanceClassesDtos == null || attendanceClassesDtos.size() < 1) {
                 machineDto.setLocationType(machineDto.getLocationTypeCd());