部门统计查询修改输出

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendancesetting/ActionEnableType.java

@@ -1,14 +1,9 @@
 package com.x.attendance.assemble.control.jaxrs.attendancesetting;
 
-import com.x.attendance.assemble.control.Business;
-import com.x.base.core.container.EntityManagerContainer;
-import com.x.base.core.container.factory.EntityManagerContainerFactory;
 import com.x.base.core.project.config.Config;
-import com.x.base.core.project.exception.ExceptionAccessDenied;
 import com.x.base.core.project.http.ActionResult;
 import com.x.base.core.project.http.EffectivePerson;
 import com.x.base.core.project.jaxrs.WrapString;
-import com.x.base.core.project.organization.OrganizationDefinition;
 
 
 class ActionEnableType extends BaseAction {
@@ -17,26 +12,17 @@ class ActionEnableType extends BaseAction {
 	public static final String TYPE_DINGDING = "dingding";
 
 	ActionResult<Wo> execute(EffectivePerson effectivePerson) throws Exception {
-		try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
-			Business business = new Business(emc);
-			if (effectivePerson.isNotManager() && (!business.organization().person().hasRole(effectivePerson,
-					OrganizationDefinition.Manager, OrganizationDefinition.AttendanceManager))) {
-				throw new ExceptionAccessDenied(effectivePerson);
-			}
-			ActionResult<Wo> result = new ActionResult<>();
-
-			Wo wo = new Wo();
-
-			if (Config.qiyeweixin().getEnable() && Config.qiyeweixin().getAttendanceSyncEnable()) {
-				wo.setValue(TYPE_QIYEWEIXIN);
-			} else if (Config.dingding().getEnable() && Config.dingding().getAttendanceSyncEnable()) {
-				wo.setValue(TYPE_DINGDING);
-			} else {
-				wo.setValue("");
-			}
-			result.setData(wo);
-			return result;
+		ActionResult<Wo> result = new ActionResult<>();
+		Wo wo = new Wo();
+		if (Config.qiyeweixin().getEnable() && Config.qiyeweixin().getAttendanceSyncEnable()) {
+			wo.setValue(TYPE_QIYEWEIXIN);
+		} else if (Config.dingding().getEnable() && Config.dingding().getAttendanceSyncEnable()) {
+			wo.setValue(TYPE_DINGDING);
+		} else {
+			wo.setValue("");
 		}
+		result.setData(wo);
+		return result;
 	}
 
 	public static class Wo extends WrapString {

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/dingdingstatistic/ActionUnitStatistic.java

@@ -19,15 +19,19 @@ import java.util.List;
 public class ActionUnitStatistic extends BaseAction {
 
 
-    ActionResult<List<Wo>> execute(String unit, String year, String month) throws Exception {
-        ActionResult<List<Wo>> result = new ActionResult<>();
+    ActionResult<Wo> execute(String unit, String year, String month) throws Exception {
+        ActionResult<Wo> result = new ActionResult<>();
         if (StringUtils.isEmpty(unit) || StringUtils.isEmpty(year) || StringUtils.isEmpty(month)) {
             throw new EmptyArgsException();
         }
         try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
             Business business = new Business(emc);
             List<StatisticDingdingUnitForMonth> list = business.dingdingAttendanceFactory().findUnitStatistic(unit, year, month);
-            result.setData(Wo.copier.copy(list));
+            if (list!=null && !list.isEmpty()) {
+                result.setData(Wo.copier.copy(list.get(0)));
+            }else {
+                result.setData(new Wo());
+            }
         }
         return result;
     }

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/dingdingstatistic/DingdingAttendanceStatisticAction.java

@@ -96,7 +96,7 @@ public class DingdingAttendanceStatisticAction extends StandardJaxrsAction {
                             @JaxrsParameterDescribe("部门") @PathParam("unit") String unit,
                             @JaxrsParameterDescribe("年份: yyyy") @PathParam("year") String year,
                             @JaxrsParameterDescribe("月份: MM") @PathParam("month") String month) {
-        ActionResult<List<ActionUnitStatistic.Wo>> result = new ActionResult<>();
+        ActionResult<ActionUnitStatistic.Wo> result = new ActionResult<>();
         EffectivePerson effectivePerson = this.effectivePerson(request);
         try {
             result = new ActionUnitStatistic().execute(unit, year, month);

o2web/source/x_component_Attendance/Main.js

@@ -84,7 +84,6 @@ MWF.xApplication.Attendance.Main = new Class({
 		var action = o2.Actions.load("x_attendance_assemble_control");
 		action.AttendanceSettingAction.enableType(//平台封装好的方法
 			function (json) { //服务调用成功的回调函数, json为服务传回的数据
-				console.log(json);
 				if (json.data && json.data.value) {
 					debugger;
 					this.enableType = json.data.value;