Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

见习之星考核-区级审核

Browse Source
This commit is contained in:
paidaxing444 2020-09-02 10:57:18 +08:00
parent 4925790a02
commit 1017240047
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ruoyi-admin/src/main/java/com/ruoyi/web/controller/jxzxkhgl/TsbzJxzxkhshController.java
View File

@ -3,6 +3,7 @@ package com.ruoyi.web.controller.jxzxkhgl;
import java.util.List;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.web.controller.common.SchoolCommonController;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@ -33,6 +34,8 @@ import com.ruoyi.common.core.page.TableDataInfo;
public class TsbzJxzxkhshController extends BaseController {
@Autowired
private ITsbzJxzxkhshService tsbzJxzxkhshService;
@Autowired
private SchoolCommonController schoolCommonController;
/**
* 查询考核审核过程列表
@ -96,8 +99,18 @@ public class TsbzJxzxkhshController extends BaseController {
@Log(title = "考核审核过程", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody TsbzJxzxkhsh tsbzJxzxkhsh) {
tsbzJxzxkhsh.setXjshr(SecurityUtils.getLoginUser().getUser().getUserId());
tsbzJxzxkhsh.setStatus("2");
//校级
if(!schoolCommonController.isStringEmpty(tsbzJxzxkhsh.getXjshjy())&&tsbzJxzxkhsh.getXjshjy()=="1") {
tsbzJxzxkhsh.setXjshr(SecurityUtils.getLoginUser().getUser().getUserId());
tsbzJxzxkhsh.setStatus("2");
}
//区级
if(!schoolCommonController.isStringEmpty(tsbzJxzxkhsh.getQjshjy())&&tsbzJxzxkhsh.getQjshjy()=="1") {
tsbzJxzxkhsh.setQjshr(SecurityUtils.getLoginUser().getUser().getUserId());
tsbzJxzxkhsh.setStatus("9");
}
return toAjax(tsbzJxzxkhshService.updateTsbzJxzxkhsh(tsbzJxzxkhsh));
}

6
ruoyi-system/src/main/resources/mapper/jxzxkhgl/TsbzJxzxkhshMapper.xml
View File

@ -47,8 +47,10 @@
</resultMap>
<sql id="selectTsbzJxzxkhshVo">
select d.id,d.faid,d.jsid,d.status,d.xjshr,d.xjshyj,d.xjshjy,d.qjshr,d.qjshjy,d.qjshyj,d.createuseird,d.create_time,b.name,b.prdwmc from tsbz_jxzxkhsh d
left join tsbz_jxjsjbxx b on b.id=d.jsid
selectd.id,d.faid,d.jsid,d.status,d.xjshr,d.xjshyj,d.xjshjy,d.qjshr,d.qjshjy,d.qjshyj,d.createuseird,d.create_time,b.name,b.prdwmc from tsbz_jxzxmd a
left join tsbz_jxjsjbxx b on b.id=a.jsid
left join sys_dept c on b.prdwid=c.schoolid
left join tsbz_jxzxkhsh d on a.jsid=d.jsid
</sql>
<select id="selectTsbzJxzxkhshList" parameterType="TsbzJxzxkhsh" resultMap="TsbzJxzxkhshResult">