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

attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/h5/web/PerformApiController.java

@@ -192,7 +192,7 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
                     PerformAttendAppealQuery appealQuery = new PerformAttendAppealQuery();
                     appealQuery.setCheckRecordId(item.getId());
                     appealQuery.setPerformType(item.getPerformType());
-                    appealQuery.setOrderColList(Arrays.asList(new OrderCol("appealResult",OrderCol.DESCENDING)));
+                    appealQuery.setOrderColList(Arrays.asList(new OrderCol("appealResult")));
                     PerformAttendAppealEntity entity = appealService.selectOne(appealQuery);
                     updateAppealResult(performInfo, entity);
                     return performInfo;
@@ -220,7 +220,7 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
                     PerformAttendAppealQuery appealQuery = new PerformAttendAppealQuery();
                     appealQuery.setCheckRecordId(item.getId());
                     appealQuery.setPerformType(performInfo.getPerformType());
-                    appealQuery.setOrderColList(Arrays.asList(new OrderCol("appealResult",OrderCol.DESCENDING)));
+                    appealQuery.setOrderColList(Arrays.asList(new OrderCol("appealResult")));
                     PerformAttendAppealEntity entity = appealService.selectOne(appealQuery);
                     //PerformAttendAppealEntity entity = appealService.selectOne(new PerformAttendAppealQuery().checkRecordId(item.getId()).performType(performInfo.getPerformType()));
                     updateAppealResult(performInfo, entity);
@@ -248,7 +248,7 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
                     PerformAttendAppealQuery appealQuery = new PerformAttendAppealQuery();
                     appealQuery.setCheckRecordId(item.getId());
                     appealQuery.setPerformType(performInfo.getPerformType());
-                    appealQuery.setOrderColList(Arrays.asList(new OrderCol("appealResult",OrderCol.DESCENDING)));
+                    appealQuery.setOrderColList(Arrays.asList(new OrderCol("appealResult")));
                     PerformAttendAppealEntity entity = appealService.selectOne(appealQuery);
                     //PerformAttendAppealEntity entity = appealService.selectOne(new PerformAttendAppealQuery().checkRecordId(item.getId()).performType(performInfo.getPerformType()));
 
@@ -277,7 +277,7 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
                     PerformAttendAppealQuery appealQuery = new PerformAttendAppealQuery();
                     appealQuery.setCheckRecordId(item.getId());
                     appealQuery.setPerformType(performInfo.getPerformType());
-                    appealQuery.setOrderColList(Arrays.asList(new OrderCol("appealResult",OrderCol.DESCENDING)));
+                    appealQuery.setOrderColList(Arrays.asList(new OrderCol("appealResult")));
                     PerformAttendAppealEntity entity = appealService.selectOne(appealQuery);
                     //PerformAttendAppealEntity entity = appealService.selectOne(new PerformAttendAppealQuery().checkRecordId(item.getId()).performType(performInfo.getPerformType()));
                     updateAppealResult(performInfo, entity);
@@ -304,7 +304,7 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
                     PerformAttendAppealQuery appealQuery = new PerformAttendAppealQuery();
                     appealQuery.setCheckRecordId(item.getId());
                     appealQuery.setPerformType(performInfo.getPerformType());
-                    appealQuery.setOrderColList(Arrays.asList(new OrderCol("appealResult",OrderCol.DESCENDING)));
+                    appealQuery.setOrderColList(Arrays.asList(new OrderCol("appealResult")));
                     PerformAttendAppealEntity entity = appealService.selectOne(appealQuery);
                    // PerformAttendAppealEntity entity = appealService.selectOne(new PerformAttendAppealQuery().checkRecordId(item.getId()).performType(performInfo.getPerformType()));
 
@@ -332,7 +332,7 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
                     PerformAttendAppealQuery appealQuery = new PerformAttendAppealQuery();
                     appealQuery.setCheckRecordId(item.getId());
                     appealQuery.setPerformType(performInfo.getPerformType());
-                    appealQuery.setOrderColList(Arrays.asList(new OrderCol("appealResult",OrderCol.DESCENDING)));
+                    appealQuery.setOrderColList(Arrays.asList(new OrderCol("appealResult")));
                     PerformAttendAppealEntity entity = appealService.selectOne(appealQuery);
                    // PerformAttendAppealEntity entity = appealService.selectOne(new PerformAttendAppealQuery().checkRecordId(item.getId()).performType(performInfo.getPerformType()));
                     updateAppealResult(performInfo, entity);
@@ -357,7 +357,7 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
                     PerformAttendAppealQuery appealQuery = new PerformAttendAppealQuery();
                     appealQuery.setCheckRecordId(item.getId());
                     appealQuery.setPerformType(performInfo.getPerformType());
-                    appealQuery.setOrderColList(Arrays.asList(new OrderCol("appealResult",OrderCol.DESCENDING)));
+                    appealQuery.setOrderColList(Arrays.asList(new OrderCol("appealResult")));
                     PerformAttendAppealEntity entity = appealService.selectOne(appealQuery);
                    // PerformAttendAppealEntity entity = appealService.selectOne(new PerformAttendAppealQuery().checkRecordId(item.getId()).performType(performInfo.getPerformType()));
 
@@ -483,7 +483,12 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
                 throw new AppException("不支持当前绩效类型");
             }
 
-            PerformAttendAppealEntity entity = appealService.selectOne(new PerformAttendAppealQuery().checkRecordId(performDetailInfo.getId()).performType(performReq.getPerformType()));
+            PerformAttendAppealQuery appealQuery = new PerformAttendAppealQuery();
+            appealQuery.setCheckRecordId(performDetailInfo.getId());
+            appealQuery.setPerformType(performReq.getPerformType());
+            appealQuery.setOrderColList(Arrays.asList(new OrderCol("appealResult")));
+
+            PerformAttendAppealEntity entity = appealService.selectOne(appealQuery);
             if (!ObjectUtils.isEmpty(entity)) {
                 log.info("entity:{}", JSONObject.toJSONString(entity));
                 Boolean bool = entity.newEntity();