Merge remote-tracking branch 'origin/master'

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/controller/UsegasAuditRecordController.java

@@ -7,13 +7,12 @@ import com.zd.bottle.vo.UsegasApplyVo;
 import com.zd.common.core.domain.per.PerFun;
 import com.zd.common.core.domain.per.PerPrefix;
 import com.zd.common.core.web.page.TableDataInfo;
+import com.zd.common.response.ResultData;
 import com.zd.common.security.annotation.PreAuthorize;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.hadoop.classification.InterfaceAudience;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import com.zd.common.core.web.controller.BaseController;
 
 import java.util.List;
@@ -33,7 +32,7 @@ public class UsegasAuditRecordController extends BaseController<UsegasAuditRecor
     @Autowired
     private UsegasAuditRecordService usegasAuditRecordService;
 
-    @ApiModelProperty(value = "审核记录表")
+    @ApiModelProperty(value = "审核记录列表")
     @GetMapping("/auditRecordList")
     public TableDataInfo <UsegasAuditRecord> auditRecordList(UsegasAuditRecord usegasAuditRecord){
         startPage();
@@ -41,4 +40,18 @@ public class UsegasAuditRecordController extends BaseController<UsegasAuditRecor
         return getDataTable(list);
     }
 
+    @ApiModelProperty(value = "审核通过")
+    @PostMapping("/auditPass")
+    public ResultData auditPass(@RequestBody UsegasAuditRecord usegasAuditRecord){
+        usegasAuditRecord.setAuditStatus(1L);
+        return ResultData.result(usegasAuditRecordService.auditPass(usegasAuditRecord));
+    }
+
+    @ApiModelProperty(value = "审核驳回")
+    @PostMapping("/auditRefuse")
+    public ResultData auditRefuse(@RequestBody UsegasAuditRecord usegasAuditRecord){
+        usegasAuditRecord.setAuditStatus(2L);
+        return ResultData.result(usegasAuditRecordService.auditPass(usegasAuditRecord));
+    }
+
 }

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/service/UsegasAuditRecordService.java

@@ -17,4 +17,6 @@ public interface UsegasAuditRecordService extends IService<UsegasAuditRecord> {
 
     List <UsegasAuditRecord> auditRecordList(UsegasAuditRecord usegasAuditRecord);
 
+    int auditPass(UsegasAuditRecord usegasAuditRecord);
+
 }

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/service/impl/UsegasApplyServiceImpl.java

@@ -1,8 +1,11 @@
 package com.zd.bottle.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.BeanUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.sun.org.apache.xpath.internal.operations.Bool;
 import com.zd.bottle.domain.UsegasApply;
 import com.zd.bottle.mapper.UsegasApplyMapper;
 import com.zd.bottle.service.UsegasApplyService;
@@ -41,4 +44,11 @@ public class UsegasApplyServiceImpl extends ServiceImpl<UsegasApplyMapper, Usega
     public UsegasApplyTabVo selectApplyTabCount(UsegasApply usegasApply) {
         return usegasApplyMapper.selectApplyTabCount(usegasApply);
     }
+
+
+    public Boolean updatetUseagsApply(Long applyId,Long auditStatus){
+        LambdaUpdateWrapper<UsegasApply> lambdaUpdateWrapper = Wrappers.lambdaUpdate();
+        lambdaUpdateWrapper.eq(UsegasApply::getId,applyId).set(UsegasApply::getLeadAuditStaus,auditStatus);
+        return update(lambdaUpdateWrapper);
+    }
 }

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/service/impl/UsegasAuditRecordServiceImpl.java

@@ -1,14 +1,22 @@
 package com.zd.bottle.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
 import com.zd.bottle.domain.UsegasApply;
 import com.zd.bottle.domain.UsegasAuditRecord;
 import com.zd.bottle.mapper.UsegasAuditRecordMapper;
 import com.zd.bottle.service.UsegasAuditRecordService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zd.common.security.service.TokenService;
+import jdk.nashorn.internal.parser.Token;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -22,6 +30,12 @@ import java.util.List;
 @Service
 public class UsegasAuditRecordServiceImpl extends ServiceImpl<UsegasAuditRecordMapper, UsegasAuditRecord> implements UsegasAuditRecordService {
 
+    @Autowired
+    private TokenService tokenService;
+
+    @Autowired
+    private UsegasApplyServiceImpl usegasApplyService;
+
     @Override
     public List <UsegasAuditRecord> auditRecordList(UsegasAuditRecord usegasAuditRecord) {
         LambdaQueryWrapper <UsegasAuditRecord> wrapper = Wrappers.lambdaQuery();
@@ -30,4 +44,20 @@ public class UsegasAuditRecordServiceImpl extends ServiceImpl<UsegasAuditRecordM
         List <UsegasAuditRecord> list = list(wrapper);
         return list;
     }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int auditPass(UsegasAuditRecord usegasAuditRecord) {
+        Boolean flag = usegasApplyService.updatetUseagsApply(usegasAuditRecord.getUsegasApplyId(),usegasAuditRecord.getAuditStatus());
+        if(flag){
+            usegasAuditRecord.setAuditUserid(tokenService.getLoginUser().getUserid());
+            usegasAuditRecord.setAuditUser(tokenService.getLoginUser().getNickName());
+            usegasAuditRecord.setAuditTime(new Date());
+            usegasAuditRecord.setCreateBy(tokenService.getLoginUser().getNickName());
+            usegasAuditRecord.setCreateTime(new Date());
+            save(usegasAuditRecord);
+        }
+        return 1;
+    }
+
 }