Merge branch 'master' of http://gitlab.scsmile.cn/zxf/attendance-performance-platform

attendance-performance-manager-ui/admin/vue.config.js

@@ -17,8 +17,8 @@ module.exports = {
 		hot: true,//自动保存
 		proxy: {
 			'/attendance': {
-				target: 'http://192.168.0.98:11039',
-				// target: 'http://localhost:17500',
+				//target: 'http://192.168.0.98:11039',
+				 target: 'http://localhost:17500',
 				changeOrigin: true,
 				secure: false,
 				cookieDomainRewrite: 'localhost',

attendance-performance-manager/pom.xml

@@ -37,9 +37,12 @@
 				<profiles.hik.appSecret>2m9RcPJOKq5j2QPQM4v5</profiles.hik.appSecret>
 
 				<profiles.dingtalk.domain>https://oapi.dingtalk.com</profiles.dingtalk.domain>
-				<profiles.dingtalk.agentId>2625340030</profiles.dingtalk.agentId>
-				<profiles.dingtalk.appKey>dingjcqjqjh1j82ho5zx</profiles.dingtalk.appKey>
-				<profiles.dingtalk.appSecret>_wNw2J6sxTYcu3ddNkFlG3U-3UlQ-P_7ufLSJ4wRxgdUflm3lPf8LIODCQOGkydy</profiles.dingtalk.appSecret>
+				<profiles.dingtalk.oaUrl>api.dingtalk.com</profiles.dingtalk.oaUrl>
+				<profiles.dingtalk.agentId>2652674890</profiles.dingtalk.agentId>
+				<profiles.dingtalk.appKey>dingpqzradgfr4efdi2j</profiles.dingtalk.appKey>
+				<profiles.dingtalk.appSecret>bF2WALmo5_Wuj3hg5gXeWqezrYnZChUJ88HjzNWpkA9ivdOxfBDGOGYcfVRfB3vd</profiles.dingtalk.appSecret>
+				<profiles.dingtalk.aesKey>1QcPYuSpAc98OS3qQwwx5HPH85CZDidxF95yBGad2fJ</profiles.dingtalk.aesKey>
+				<profiles.dingtalk.token>m3WeuVx5kcTY76kh22uWZOTSu0XjvcwNhd</profiles.dingtalk.token>
 				<profiles.webUrl>http://8.136.255.30:11039/attendance</profiles.webUrl>
 				<package.environment>serve</package.environment>
 				<skipUi>false</skipUi>

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/vo/AttendanceRecordVo.java

@@ -40,5 +40,10 @@ public class AttendanceRecordVo extends BaseEntityLong {
      * 班组id
      */
     private Long groupId;
+
+    /**
+     * 导出参数配置
+     */
+    private  List<String> properties;
 }
 

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/web/AttendanceRecordController.java

@@ -64,12 +64,16 @@ public class AttendanceRecordController extends BaseCRUDJsonBodyMappingControlle
         this.addDict(model, "signInResult", NormalEnum.getEnumMap());
         this.addDict(model, "signOutResult", NormalEnum.getEnumMap());
         this.addDict(model, "punchResult", NormalEnum.getEnumMap());
-
         //设置
-
         super.init(model, context);
     }
 
+    @Override
+    public void doExportBefore(Context context, AttendanceRecordEntity query, List<String> properties) throws AppException {
+
+
+
+    }
 
     @Override
     protected void doListBefore(AttendanceRecordEntity query, Map<String, Object> model, Context context) throws AppException {

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/web/AttendanceRecordErrorController.java

@@ -216,7 +216,7 @@ public class AttendanceRecordErrorController extends BaseCRUDJsonBodyMappingCont
 
     @Override
     protected void doListAfter(AttendanceRecordErrorEntity query, List<AttendanceRecordErrorEntity> list, Context context) throws AppException {
-        for (AttendanceRecordErrorEntity errorEntity : list) {
+/*        for (AttendanceRecordErrorEntity errorEntity : list) {
             Long shiftsId = errorEntity.getShiftsId();
             AttendanceClassDetailEntity attendanceClassDetailEntity = classDetailService.selectOne(new AttendanceClassDetailQuery().id(shiftsId));
             if (!ObjectUtils.isEmpty(attendanceClassDetailEntity)) {
@@ -227,7 +227,7 @@ public class AttendanceRecordErrorController extends BaseCRUDJsonBodyMappingCont
                     errorEntity.setGoOrOff("下班");
                 }
             }
-        }
+        }*/
         super.doListAfter(query, list, context);
     }
 }

attendance-performance-manager/src/main/java/com/mortals/xhx/module/window/service/impl/WindowOwnerServiceImpl.java

@@ -42,7 +42,7 @@ public class WindowOwnerServiceImpl extends AbstractCRUDServiceImpl<WindowOwnerD
         if (!ObjectUtils.isEmpty(entity.getWindowOwnerDetailList())) {
             entity.setWindowCount(entity.getWindowOwnerDetailList().size());
         }
-        DeptEntity deptEntity = deptService.get(entity.getId());
+        DeptEntity deptEntity = deptService.get(entity.getDeptId());
         entity.setDeptName(deptEntity == null ? "" : deptEntity.getDeptName());
     }