报账列表逐步撤回

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

@@ -21,6 +21,7 @@ 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.*;
 
@@ -58,6 +59,8 @@ public class StaReimbursementController extends BaseController {
 
     @Resource
     private PrjAnnualbudgetService prjAnnualbudgetService;
+    @Resource
+    private SysUserPostService sysUserPostService;
 
 
     /**
@@ -304,6 +307,66 @@ public class StaReimbursementController extends BaseController {
             return BaseResult.failure("撤销失败!");
         }
     }
+    /**
+     * 逐步撤销审批（基本信息）
+     *
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping(value = "/TJrevokeApprove1", method = RequestMethod.POST)
+    @Transactional
+    public BaseResult TJrevokeApprove1(@RequestBody String data) {
+        int num;
+        int temp;
+        StaReimbursement bzrxm = JsonTool.parseObject(data, StaReimbursement.class);
+        String spzt = bzrxm.getSpzt();
+        Map<String, String> paraMap = new HashMap<>();
+//        修改审批状态
+        switch (spzt) {
+            case "科技项目管理专责审批":
+                bzrxm.setSpzt("未提交");
+                paraMap.put("postName",null);
+                break;
+            case "审批结束":
+                bzrxm.setSpzt("科技项目管理专责审批");
+                paraMap.put("postName", "科技项目管理专责");
+                paraMap.put("postId","39");
+                break;
+        }
+        //        修改审批状态
+        num = staReimbursementService.tjrevokeApprove1(bzrxm);
+//修改审批列表里的状态为完成
+        temp = prjApproverecordService.updateRevokeRecord(bzrxm.getId());
+
+        if (paraMap.get("postName")!=null){
+            //获取默认审核人
+            List<SysUserPost> userPostList = sysUserPostService.getPostUserList(paraMap);
+            Integer shr = userPostList.get(0).getUserId();
+            //审批列表中新增一条数据
+            //先获取上条数据中的默认信息
+            PrjApproverecord record = prjApproverecordService.getOldApproveRecord(bzrxm.getId());
+            PrjApproverecord record1 =new PrjApproverecord();
+            record1.setTablename(record.getTablename());
+            record1.setXm(record.getXm());
+            record1.setXmid(record.getXmid());
+            record1.setZt(bzrxm.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);//完成
+            prjApproverecordService.insert(record1);
+        }
+        if (num > 0 && temp > 0) {
+            return BaseResult.success("撤销成功!");
+        } else {
+            return BaseResult.failure("撤销失败!");
+        }
+    }
 
     /**
      * 保存数据（基本信息）

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

@@ -133,5 +133,6 @@ public interface StaReimbursementDao {
 
     List<String> getYearList();
 
+    int tjrevokeApprove1(StaReimbursement bzrxm);
 }
 

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

@@ -108,4 +108,6 @@ public interface StaReimbursementService {
     int updateBZJE(StaReimbursement staReimbursement);
 
     List<ViewFileVo> viewFile(Integer bzId);
+
+    int tjrevokeApprove1(StaReimbursement bzrxm);
 }

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

@@ -175,4 +175,9 @@ public class StaReimbursementServiceImpl implements StaReimbursementService {
             throw new CustomException("暂无可查看文件");
         }
     }
+
+    @Override
+    public int tjrevokeApprove1(StaReimbursement bzrxm) {
+        return this.staReimbursementDao.tjrevokeApprove1(bzrxm);
+    }
 }

src/main/resources/mapper/PrjApproverecordDao.xml

@@ -531,7 +531,8 @@
         UPDATE prj_ApproveRecord
         SET WC = 1,
             SPCZ = '撤销审批',
-            SHSJ =  CURRENT_TIMESTAMP
+            SHSJ =  CURRENT_TIMESTAMP,
+            YJ = ''
         WHERE ID = (SELECT TOP 1 ID FROM prj_ApproveRecord WHERE XMID = #{xmid} ORDER BY ID DESC);
     </update>
 

src/main/resources/mapper/StaReimbursementDao.xml

@@ -264,6 +264,12 @@
         set SPZT = '未提交'
         where ID = #{id}
     </update>
+    <!--逐步撤销审核状态报账-->
+    <update id="tjrevokeApprove1">
+        update sta_Reimbursement
+        set SPZT = #{spzt}
+        where ID = #{id}
+    </update>
 
     <!--通过主键修改审批状态-->
     <update id="updateSpzt">

src/main/resources/templates/reimburse/list.html

@@ -556,9 +556,10 @@
                 Message.warning("请选择要撤销的报账！", 1500);
             } else if (data.length > 1) {
                 Message.warning("请选择一条记录进行撤销！", 1500);
-            } else if (data[0].spzt == "审批结束") {
-                Message.warning("该报账已审批结束！", 1500);
             }
+            // else if (data[0].spzt == "审批结束") {
+            //     Message.warning("该报账已审批结束！", 1500);
+            // }
             //else if (data[0].cjr != userId) {
                 //Message.error("您不是该报账的创建人！", 1500);}
             else {
@@ -573,12 +574,12 @@
                 }
                 var project = {
                     "id": xmApproval.xmid,
-                    "spzt": '未提交'
+                    "spzt": data[0].spzt
                 }
                 layer.confirm('确定撤销报账吗？', function (index) {
                     layer.close(index);
                     AjaxUtil.post({
-                        url: AjaxUtil.ctx + "staReimbursement/TJrevokeApprove",
+                        url: AjaxUtil.ctx + "staReimbursement/TJrevokeApprove1",
                         contentType: "application/json",
                         data: JSON.stringify(project),
                         success: function (res) {