撤销审批功能修改

src/main/java/com/liang/controller/StaBudgetapprovalController.java

@@ -12,10 +12,12 @@ import com.liang.common.exception.CustomException;
 import com.liang.entity.*;
 import com.liang.service.*;
 import io.swagger.annotations.ApiOperation;
+import lombok.Synchronized;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
 
@@ -56,6 +58,10 @@ public class StaBudgetapprovalController extends BaseController {
     private CyyService cyyService;
     @Resource
     private SysUserInfoService sysUserInfoService;
+    @Resource
+    private  SysUserPostService sysUserPostService;
+    @Resource
+    private  SysDeptInfoService sysDeptInfoService;
 
 
     /**
@@ -236,8 +242,100 @@ public class StaBudgetapprovalController extends BaseController {
      */
     @ResponseBody
     @RequestMapping(value = "/TJrevokeApprove", method = RequestMethod.POST)
+    @Transactional
     public BaseResult TJrevokeApprove(@RequestBody String data) {
-// PrjProject rws = JsonTool.parseObject(data, PrjProject.class);
+        StaBudgetapproval fysq = JsonTool.parseObject(data, StaBudgetapproval.class);
+        SysUserInfo userInfo = getSysUserInfo();
+        int num;
+        int temp;
+        String spzt = fysq.getSpzt();
+        switch (spzt) {
+            case "主管院领导审批":
+                fysq.setSpzt("科技部部门主任审批");
+                break;
+            case "科技部部门主任审批":
+                fysq.setSpzt("科技项目管理专责审批");
+                break;
+            case "科技项目管理专责审批":
+                fysq.setSpzt("部门主任审批");
+                break;
+            case "部门主任审批":
+                fysq.setSpzt("未提交");
+                break;
+        }
+//        修改为撤销后的审批状态
+        num = staBudgetapprovalService.updateSpzt(fysq);
+
+        Map<String, String> paraMap2 = new HashMap<>();
+        paraMap2.put("deptName",userInfo.getDeptName());
+        if (spzt.equals("科技项目管理专责审批")){
+            if (userInfo != null && userInfo.getDeptId().equals("52")) {
+                paraMap2.put("postName", "科技部部门主任");
+                paraMap2.put("postId","16");
+            } else {
+                paraMap2.put("postName", "科研负责人");
+                paraMap2.put("postId","28");
+            }
+    }else if (spzt.equals("科技部部门主任审批")){
+            paraMap2.put("postName", "科技项目管理专责");
+            paraMap2.put("postId","39");
+    }else if (spzt.equals("主管院领导审批")) {
+            paraMap2.put("postName", "科技部部门主任");
+            paraMap2.put("postId","16");
+    }else {
+            paraMap2.put("postName",null);
+    }
+//  获取当前费用申请申请人的所属部门名称
+        if(paraMap2.get("postId")=="28"){
+            Integer sqr = fysq.getSqr();
+            String deptName=sysDeptInfoService.getUserDept(sqr);
+            if(deptName.contains("电源")){
+                deptName = null;
+            }
+            paraMap2.put("deptName",deptName);
+        }
+
+//修改审批列表里的状态为完成
+        temp = prjApproverecordService.updateRevokeRecord(fysq.getId());
+        if (paraMap2.get("postName")!=null){
+//            获取默认审批人
+            List<SysUserPost> userPostList = sysUserPostService.getPostUserList(paraMap2);
+            Integer shr = userPostList.get(0).getUserId();
+            PrjApproverecord record = prjApproverecordService.getOldApproveRecord(fysq.getId());
+            List<PrjApproverecord> recordList= new ArrayList<>();
+//        审批列表中插入撤销后的审批流程
+            PrjApproverecord record1 =new PrjApproverecord();
+            record1.setTablename(record.getTablename());
+            record1.setXm(record.getXm());
+            record1.setXmid(record.getXmid());
+            record1.setZt(fysq.getSpzt());
+            record1.setTjr(record.getTjr());
+            record1.setTjsj(record.getTjsj());
+            record1.setShr(shr);
+            record1.setSfsjsh(true);//是否需要上级审核
+            record1.setSjshr(record.getShr());
+            record1.setSjshgw(record.getShgw());//上级审核岗位
+            record1.setSffh(false);//是否返回
+            record1.setYcshr(false);//隐藏审核人
+            record1.setWc(false);//完成
+            recordList.add(record1);
+
+            if (!fysq.getSpzt().equals("未提交")){
+                prjApproverecordService.insertBatch(recordList);
+            }
+            if (num > 0 && temp > 0) {
+                return BaseResult.success("撤销成功!");
+            } else {
+                return BaseResult.failure("撤销失败!");
+            }
+        }else {
+            return BaseResult.success("撤销成功！");
+        }
+    }
+
+    @ResponseBody
+    @RequestMapping(value = "/ThApproval", method = RequestMethod.POST)
+    public BaseResult ThApproval(@RequestBody String data) {
         StaBudgetapproval fysq = JsonTool.parseObject(data, StaBudgetapproval.class);
 
         int num;
@@ -310,8 +408,6 @@ public class StaBudgetapprovalController extends BaseController {
 
     }
 
-    @Resource
-    private SysUserPostService sysUserPostService;
 
     /**
      * 编辑数据（费用申请）
@@ -940,7 +1036,7 @@ public class StaBudgetapprovalController extends BaseController {
 //系统当前用户
         SysUserInfo userInfo = getSysUserInfo();
         if (userInfo != null && userInfo.getDeptId().equals("52")) {
-            paraMap.put("postName", "副主任");
+            paraMap.put("postName", "科技部部门主任");
         } else {
             paraMap.put("postName", "科研负责人");
         }
@@ -967,7 +1063,7 @@ public class StaBudgetapprovalController extends BaseController {
 //系统当前用户
         SysUserInfo userInfo = getSysUserInfo();
         if (userInfo != null && userInfo.getDeptId().equals("52")) {
-            paraMap.put("postName", "副主任");
+            paraMap.put("postName", "科技部部门主任");
         } else {
             paraMap.put("postName", "科研负责人");
         }
@@ -1115,7 +1211,7 @@ public class StaBudgetapprovalController extends BaseController {
             Map<String, String> paraMap2 = new HashMap<>();
             if (spzt.equals("未提交(返回)")) {
                 if (userInfo != null && userInfo.getDeptId().equals("52")) {
-                    paraMap2.put("postName", "副主任");
+                    paraMap2.put("postName", "科技部部门主任");
                 } else {
                     paraMap2.put("postName", "科研负责人");
                 }
@@ -1405,6 +1501,7 @@ public class StaBudgetapprovalController extends BaseController {
     ) {
         Integer count = prjAnnualbudgetdetailService.getSubNodeCount(nys, page, limit);
         List<PrjAnnualbudgetdetail> list = prjAnnualbudgetdetailService.getSubNode(nys, page, limit, mc);
+
         Map<String, Object> resultMap = new HashMap<>();
         resultMap.put("code", 0);
         resultMap.put("msg", "");

src/main/java/com/liang/dao/PrjApproverecordDao.java

@@ -112,5 +112,7 @@ public interface PrjApproverecordDao {
     int updateApprove(PrjApproverecord prjApproverecord);
 
     List<PrjApproverecord> getApproveByXmId2(Map map);
+
+    PrjApproverecord getOldApproveRecord(Integer id);
 }
 

src/main/java/com/liang/dao/SysDeptInfoDao.java

@@ -102,5 +102,7 @@ public interface SysDeptInfoDao {
      * @return
      */
     int batchDelete(List<Integer> deptIdList);
+
+    String getUserDept(Integer sqr);
 }
 

src/main/java/com/liang/service/PrjApproverecordService.java

@@ -97,4 +97,5 @@ public interface PrjApproverecordService {
      */
     List<PrjApproverecord> getApproveByXmId2(Map map);
 
+    PrjApproverecord getOldApproveRecord(Integer id);
 }

src/main/java/com/liang/service/SysDeptInfoService.java

@@ -77,4 +77,6 @@ public interface SysDeptInfoService {
      * @return
      */
     int batchDelete(List<Integer> deptIdList);
+
+    String getUserDept(Integer sqr);
 }

src/main/java/com/liang/service/impl/PrjApproverecordServiceImpl.java

@@ -105,6 +105,11 @@ public class PrjApproverecordServiceImpl implements PrjApproverecordService {
         return this.prjApproverecordDao.getApproveByXmId2(map);
     }
 
+    @Override
+    public PrjApproverecord getOldApproveRecord(Integer id) {
+        return prjApproverecordDao.getOldApproveRecord(id);
+    }
+
 
     @Override
     public int insertApprove(List<PrjApproverecord> recordList) {

src/main/java/com/liang/service/impl/SysDeptInfoServiceImpl.java

@@ -93,4 +93,9 @@ public class SysDeptInfoServiceImpl implements SysDeptInfoService {
     public int batchDelete(List<Integer> deptIdList) {
         return this.sysDeptInfoDao.batchDelete(deptIdList);
     }
+
+    @Override
+    public String getUserDept(Integer sqr) {
+        return sysDeptInfoDao.getUserDept(sqr);
+    }
 }

src/main/resources/mapper/SysDeptInfoDao.xml

@@ -225,5 +225,11 @@
         from sys_dept_info
         where del_flag = 0
     </select>
+    <!--获取用户对应的部门名称-->
+    <select id="getUserDept" resultType="java.lang.String">
+        SELECT b.dept_name FROM sys_user_info a
+                                    LEFT JOIN sys_dept_info b on a.dept_id =b.dept_id
+        WHERE a.user_id = #{sqr} and b.del_flag = 0
+    </select>
 </mapper>