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

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

@@ -182,7 +182,6 @@ public class FeedbackApiController extends AbstractBaseController<FeedbackReq> {
         model.put(PAGEINFO_KEY, pageInfo);
     }
 
-
     public static void main(String[] args) {
 
     }

attendance-performance-manager/src/main/java/com/mortals/xhx/common/code/SubMethodEnum.java

@@ -11,7 +11,8 @@ import java.util.Map;
 public enum SubMethodEnum {
     系统自动(1, "系统自动"),
     人工添加(2, "人工添加"),
-    大厅巡查(3, "大厅巡查");
+    大厅巡查(3, "大厅巡查"),
+    申诉冲销(4, "申诉冲销");
     private Integer value;
     private String desc;
 

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckAttendRecordEntity.java

@@ -110,7 +110,7 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo {
     */
     private Integer checkStatus;
     /**
-    * 扣分方式(1.系统自动,2.人工添加,3.大厅巡查)
+    * 扣分方式(1.系统自动,2.人工添加,3.大厅巡查,4.申诉冲销)
     */
     private Integer subMethod;
     /**

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/service/PerformAttendAppealService.java

 package com.mortals.xhx.module.perform.service;
+
+import com.mortals.framework.common.Rest;
+import com.mortals.framework.model.Context;
 import com.mortals.framework.service.ICRUDService;
 import com.mortals.xhx.module.perform.model.PerformAttendAppealEntity;
 import com.mortals.xhx.module.perform.dao.PerformAttendAppealDao;
+
 /**
-* PerformAttendAppealService
-*
-* 绩效记录申诉信息 service接口
-*
-* @author zxfei
-* @date 2023-07-12
-*/
-public interface PerformAttendAppealService extends ICRUDService<PerformAttendAppealEntity,Long>{
+ * PerformAttendAppealService
+ * <p>
+ * 绩效记录申诉信息 service接口
+ *
+ * @author zxfei
+ * @date 2023-07-12
+ */
+public interface PerformAttendAppealService extends ICRUDService<PerformAttendAppealEntity, Long> {
 
     PerformAttendAppealDao getDao();
+
+
+    Rest<Void> audit(PerformAttendAppealEntity appeal, Context context);
+
 }
\ No newline at end of file

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

 package com.mortals.xhx.module.perform.web;
+
+import com.mortals.framework.common.Rest;
+import com.mortals.framework.exception.AppException;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.common.code.EnabledEnum;
+import com.mortals.xhx.common.code.YesNoEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.*;
 import com.mortals.framework.model.Context;
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.module.perform.model.PerformAttendAppealEntity;
 import com.mortals.xhx.module.perform.service.PerformAttendAppealService;
 import org.apache.commons.lang3.ArrayUtils;
 import com.mortals.framework.util.StringUtils;
+
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
+
 import com.alibaba.fastjson.JSONObject;
+
 import java.util.Arrays;
+
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
+
 import static com.mortals.framework.ap.SysConstains.*;
+
 /**
-*
-* 绩效记录申诉信息
-*
-* @author zxfei
-* @date 2023-07-12
-*/
+ * 绩效记录申诉信息
+ *
+ * @author zxfei
+ * @date 2023-07-12
+ */
 @RestController
 @RequestMapping("perform/attend/appeal")
-public class PerformAttendAppealController extends BaseCRUDJsonBodyMappingController<PerformAttendAppealService,PerformAttendAppealEntity,Long> {
+public class PerformAttendAppealController extends BaseCRUDJsonBodyMappingController<PerformAttendAppealService, PerformAttendAppealEntity, Long> {
 
     @Autowired
     private ParamService paramService;
 
-    public PerformAttendAppealController(){
-        super.setModuleDesc( "绩效记录申诉信息");
+    public PerformAttendAppealController() {
+        super.setModuleDesc("绩效记录申诉信息");
     }
 
     @Override
     protected void init(Map<String, Object> model, Context context) {
-        this.addDict(model, "subMethod", paramService.getParamBySecondOrganize("PerformAttendAppeal","subMethod"));
-        this.addDict(model, "subAddType", paramService.getParamBySecondOrganize("PerformAttendAppeal","subAddType"));
-        this.addDict(model, "processStatus", paramService.getParamBySecondOrganize("PerformAttendAppeal","processStatus"));
-        this.addDict(model, "appealResult", paramService.getParamBySecondOrganize("PerformAttendAppeal","appealResult"));
-        this.addDict(model, "reviewResult", paramService.getParamBySecondOrganize("PerformAttendAppeal","reviewResult"));
-        this.addDict(model, "reviewSource", paramService.getParamBySecondOrganize("PerformAttendAppeal","reviewSource"));
-        this.addDict(model, "irregularType", paramService.getParamBySecondOrganize("PerformAttendAppeal","irregularType"));
-        this.addDict(model, "irregularOtherType", paramService.getParamBySecondOrganize("PerformAttendAppeal","irregularOtherType"));
+        this.addDict(model, "subMethod", paramService.getParamBySecondOrganize("PerformAttendAppeal", "subMethod"));
+        this.addDict(model, "subAddType", paramService.getParamBySecondOrganize("PerformAttendAppeal", "subAddType"));
+        this.addDict(model, "processStatus", paramService.getParamBySecondOrganize("PerformAttendAppeal", "processStatus"));
+        this.addDict(model, "appealResult", paramService.getParamBySecondOrganize("PerformAttendAppeal", "appealResult"));
+        this.addDict(model, "reviewResult", paramService.getParamBySecondOrganize("PerformAttendAppeal", "reviewResult"));
+        this.addDict(model, "reviewSource", paramService.getParamBySecondOrganize("PerformAttendAppeal", "reviewSource"));
+        this.addDict(model, "irregularType", paramService.getParamBySecondOrganize("PerformAttendAppeal", "irregularType"));
+        this.addDict(model, "irregularOtherType", paramService.getParamBySecondOrganize("PerformAttendAppeal", "irregularOtherType"));
         super.init(model, context);
     }
 
 
+    /**
+     * 申诉审核
+     */
+    @PostMapping(value = "audit")
+    public String appealAudit(@RequestBody PerformAttendAppealEntity appeal) {
+        JSONObject jsonObject = new JSONObject();
+        Map<String, Object> model = new HashMap<>();
+        String busiDesc = this.getModuleDesc() + "审核";
+        try {
+            Rest<Void> audit = this.service.audit(appeal, getContext());
+            if (audit.getCode() == YesNoEnum.NO.getValue()) {
+                throw new AppException("申诉审核异常！");
+            }
+            recordSysLog(request, busiDesc + " 【成功】");
+            jsonObject.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
+        } catch (Exception e) {
+            log.error("申诉审核", e);
+            jsonObject.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
+            jsonObject.put(KEY_RESULT_MSG, super.convertException(e));
+        }
+        return jsonObject.toJSONString();
+    }
+
+
 }
\ No newline at end of file