Merge remote-tracking branch 'origin/main'

srs-admin/src/main/java/com/srs/web/controller/comprehensive/KnzzZsgApplyController.java

@@ -158,6 +158,12 @@ public class KnzzZsgApplyController extends BaseController {
         return knzzZsgApplyService.doEdit(param);
     }
 
+    @PreAuthorize("@ss.hasPermi('comprehensive:knzzZsgApply:doAudit')")
+    @PostMapping("/fdyEdit")
+    public AjaxResult fdyEdit(@RequestBody KnzzZsgApply param) {
+        return knzzZsgApplyService.fdyEdit(param);
+    }
+
     @PreAuthorize("@ss.hasPermi('comprehensive:knzzZsgApply:doAudit')")
     @PostMapping("/doAudit")
     public AjaxResult doAudit(@RequestBody KnzzZsgApply param) {

srs-comprehensive/src/main/java/com/srs/comprehensive/service/IKnzzZsgApplyService.java

@@ -22,6 +22,7 @@ public interface IKnzzZsgApplyService extends IService<KnzzZsgApply> {
     public AjaxResult doApply(KnzzZsgApply param);
 
     public AjaxResult doCancel(Long id);
+    public AjaxResult fdyEdit(KnzzZsgApply param) ;
     public AjaxResult doEdit(KnzzZsgApply param) ;
     public AjaxResult doAudit(KnzzZsgApply param);
 

srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/KnzzZsgApplyServiceImpl.java

@@ -94,11 +94,47 @@ public class KnzzZsgApplyServiceImpl extends ServiceImpl<KnzzZsgApplyMapper,Knzz
         }
     }
 
+    @Override
+    public AjaxResult fdyEdit(KnzzZsgApply param) {
+        try{
+            KnzzZsgApply apply = knzzZsgApplyMapper.selectById(param.getId());
+            if(apply == null){
+                throw new Exception("申请不存在");
+            }
+
+            if(!Objects.equals(apply.getApplyStatus(), "1")){
+                throw new Exception("申请已处理");
+            }
+
+            apply.setInTime(param.getInTime());
+            apply.setZzxx(param.getZzxx());
+            apply.setFamilyNum(param.getFamilyNum());
+            apply.setMonthMoney(param.getMonthMoney());
+            apply.setPerMoney(param.getPerMoney());
+            apply.setMoneySrc(param.getMoneySrc());
+            apply.setApplyReasonNum(param.getApplyReasonNum());
+            apply.setApplyReason(param.getApplyReason());
+            apply.setApplyReason1(param.getApplyReason1());
+            apply.setApplyExtraReason(param.getApplyExtraReason());
+            apply.setApplyFile(param.getApplyFile());
+            apply.setApplySign(param.getApplySign());
+            apply.setUpdateTime(getNowDate());
+            apply.setUpdateBy(getUsername());
+            apply.setDiplomaCertificate(param.getDiplomaCertificate());
+            int res = knzzZsgApplyMapper.updateById(apply);
+            if(res == 0){
+                throw new Exception("修改失败");
+            }
+
+            return AjaxResult.success();
+        }catch(Exception ex){
+            return AjaxResult.error(ex.getMessage());
+        }
+    }
+
     @Override
     public AjaxResult doEdit(KnzzZsgApply param) {
         try{
-//            打印param
-            System.out.println(JSON.toJSONString(param));
             KnzzZsgApply apply = knzzZsgApplyMapper.selectById(param.getId());
             if(apply == null){
                 throw new Exception("申请不存在");
@@ -132,7 +168,6 @@ public class KnzzZsgApplyServiceImpl extends ServiceImpl<KnzzZsgApplyMapper,Knzz
                 throw new Exception("修改失败");
             }
 
-
             return AjaxResult.success();
         }catch(Exception ex){
             return AjaxResult.error(ex.getMessage());