fix:人员上岗

ln_ry20250512
wangxy 3 weeks ago
parent f04e1b7a38
commit 02e0320040

@ -15,6 +15,7 @@ import javax.annotation.Resource;
import java.util.Arrays; import java.util.Arrays;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Objects;
/** /**
* ClassName: ApplyInfoListManager * ClassName: ApplyInfoListManager
@ -43,6 +44,11 @@ public class ApplyInfoListManager {
} }
public List<TdApplyInfoList> selectTdAuditInfoListList(TdApplyInfoListDTO applyInfoListDTO) {
return applyInfoListService.selectTdAuditInfoListList(applyInfoListDTO);
}
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public boolean saveOrUpdate(TdApplyInfoListDTO applyInfoListDTO) { public boolean saveOrUpdate(TdApplyInfoListDTO applyInfoListDTO) {
TdApplyInfoList applyInfoList = Convert.convert(TdApplyInfoList.class, applyInfoListDTO); TdApplyInfoList applyInfoList = Convert.convert(TdApplyInfoList.class, applyInfoListDTO);
@ -83,6 +89,17 @@ public class ApplyInfoListManager {
@Transactional(rollbackFor = Exception.class)
public boolean submitAudit(String applyId,Integer applyStatus,String applyMsg) {
return applyInfoListService.lambdaUpdate()
.eq(TdApplyInfoList::getApplyId,applyId)
.set(TdApplyInfoList::getApplyStatus,applyStatus)
.set(Objects.nonNull(applyMsg), TdApplyInfoList::getApplyMsg, applyMsg)
.set(TdApplyInfoList::getAuthTime,new Date()).update();
}
} }

@ -0,0 +1,85 @@
package com.ruoyi.web.controller.system.apply;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.system.domain.apply.TdApplyInfoList;
import com.ruoyi.system.domain.apply.dto.TdApplyInfoListDTO;
import com.ruoyi.web.controller.manager.ApplyInfoListManager;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.List;
/**
* ClassName: ApplyInfoListController
* Package: com.ruoyi.web.controller.system.apply
* Description:
*
* @Author wangxy
* @Create 2025/5/14 11:32
* @Version 1.0
*/
@Controller
@RequestMapping("/system/auditList")
public class AuditInfoListController extends BaseController {
private String prefix = "system/newdev/audit";
@Resource
private ApplyInfoListManager applyInfoListManager;
@RequiresPermissions("system:audit:view")
@GetMapping()
public String auditListInfo() {
return prefix + "/auditList";
}
/**
*
*/
@RequiresPermissions("system:audit:list")
@PostMapping("/list")
@ResponseBody
public TableDataInfo list(TdApplyInfoListDTO applyInfoListDTO) {
startPage();
List<TdApplyInfoList> tdApplyInfoLists = applyInfoListManager.selectTdAuditInfoListList(applyInfoListDTO);
return getDataTable(tdApplyInfoLists);
}
/**
*
*/
@RequiresPermissions("system:audit:editAudit")
@GetMapping("/editAudit/{applyId}")
public String editAudit(@PathVariable("applyId") String applyId, ModelMap mmap) {
TdApplyInfoListDTO applyInfoList = applyInfoListManager.getTdApplyInfoList(applyId);
mmap.put("applyInfoList", applyInfoList);
return prefix + "/editAudit";
}
/**
*
*/
@PostMapping("/submitAudit")
@ResponseBody
public AjaxResult submitAudit(@RequestParam String applyId,
@RequestParam Integer auditStatus,
@RequestParam(required = false) String applyMsg) {
return toAjax(applyInfoListManager.submitAudit(applyId,auditStatus,applyMsg));
}
}

@ -0,0 +1,113 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<head>
<th:block th:include="include :: header('涉密人员审查列表')" />
</head>
<body class="gray-bg">
<div class="container-div" id="app">
<div class="row">
<div class="col-sm-12 search-collapse">
<form id="formId">
<div class="select-list">
<ul>
<li>
<label style="width: 80px">姓名:</label>
<input type="text" name="name"/>
</li>
<li>
<label>性别:</label>
<input type="text" name="sex"/>
</li>
<li>
<label>身份证号:</label>
<input type="text" name="cerno"/>
</li>
<li>
<label>联系方式:</label>
<input type="text" name="phone"/>
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
</li>
</ul>
</div>
</form>
</div>
<div class="btn-group-sm" id="toolbar" role="group">
</div>
<div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table"></table>
</div>
</div>
</div>
<th:block th:include="include :: footer" />
<script th:inline="javascript">
var detailFlag = [[${@permission.hasPermi('system:audit:editAudit')}]]
var prefix = ctx + "system/auditList";
$(function() {
var options = {
url: prefix + "/list",
modalName: "涉密人员上岗审查",
type: 0,
columns: [
{
field: 'applyId',
title: 'id',
visible: false
},
{
field: 'name',
title: '姓名'
},
{
field: 'sex',
title: '性别'
},
{
field: 'nationality',
title: '民族',
},
{
field: 'maritalStatus',
title: '婚姻状况',
},
{
field: 'cerno',
title: '身份证号',
},
{
field: 'phone',
title: '联系方式',
},
{
field: 'smPost',
title: '已(拟)任涉密岗位',
},
{
field: 'smGrade',
title: '涉密等级',
},
{
field: 'createTime',
title: '创建时间',
sortable: true
},
{
title: '操作',
align: 'center',
formatter: function(value, row, index) {
var actions = [];
actions.push('<a class="btn btn-info btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detailTab(\'' + row.applyId + '\')"><i class="fa fa-edit"></i>审查</a> ');
return actions.join('');
}
}]
};
$.table.init(options);
});
</script>
</body>
</html>

@ -18,6 +18,10 @@ public interface TdApplyInfoListMapper extends BaseMapper<TdApplyInfoList> {
public List<TdApplyInfoList> selectTdApplyInfoListList(TdApplyInfoListDTO applyInfoListDTO); public List<TdApplyInfoList> selectTdApplyInfoListList(TdApplyInfoListDTO applyInfoListDTO);
public List<TdApplyInfoList> selectTdAuditInfoListList(TdApplyInfoListDTO applyInfoListDTO);
} }

@ -17,4 +17,8 @@ public interface TdApplyInfoListService extends IService<TdApplyInfoList> {
public List<TdApplyInfoList> selectTdApplyInfoListList(TdApplyInfoListDTO applyInfoListDTO); public List<TdApplyInfoList> selectTdApplyInfoListList(TdApplyInfoListDTO applyInfoListDTO);
public List<TdApplyInfoList> selectTdAuditInfoListList(TdApplyInfoListDTO applyInfoListDTO);
} }

@ -9,6 +9,7 @@ import com.ruoyi.system.service.apply.TdApplyInfoListService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.Collections;
import java.util.List; import java.util.List;
/** /**
@ -28,6 +29,12 @@ public class TdApplyInfoListServiceImpl extends ServiceImpl<TdApplyInfoListMappe
public List<TdApplyInfoList> selectTdApplyInfoListList(TdApplyInfoListDTO applyInfoListDTO) { public List<TdApplyInfoList> selectTdApplyInfoListList(TdApplyInfoListDTO applyInfoListDTO) {
return applyInfoListMapper.selectTdApplyInfoListList(applyInfoListDTO); return applyInfoListMapper.selectTdApplyInfoListList(applyInfoListDTO);
} }
@DataScope(deptAlias = "d")
@Override
public List<TdApplyInfoList> selectTdAuditInfoListList(TdApplyInfoListDTO applyInfoListDTO) {
return applyInfoListMapper.selectTdAuditInfoListList(applyInfoListDTO);
}
} }

@ -69,12 +69,40 @@
<if test="smPost!=null and smPost!=''"> <if test="smPost!=null and smPost!=''">
AND sm_post = #{smPost} AND sm_post = #{smPost}
</if> </if>
AND apply_status = '0' AND apply_status in (0,3)
<!-- 数据范围过滤 --> <!-- 数据范围过滤 -->
${params.dataScope} ${params.dataScope}
</trim> </trim>
ORDER BY create_time DESC ORDER BY create_time DESC
</select> </select>
<select id="selectTdAuditInfoListList" resultType="com.ruoyi.system.domain.apply.TdApplyInfoList">
select <include refid="Base_Column_List"/> from td_apply_info_list d
<trim prefix="where" prefixOverrides="and|or">
<if test="name!=null and name!=''">
AND name = #{name}
</if>
<if test="nationa!=null and nationa!=''">
AND nationa = #{nationa}
</if>
<if test="formerName!=null and formerName!=''">
AND former_name = #{formerName}
</if>
<if test="cerno!=null and cerno!=''">
AND cerno = #{cerno}
</if>
<if test="phone!=null and phone!=''">
AND phone = #{phone}
</if>
<if test="smPost!=null and smPost!=''">
AND sm_post = #{smPost}
</if>
AND apply_status = '1'
<!-- 数据范围过滤 -->
${params.dataScope}
</trim>
ORDER BY create_time DESC
</select>
</mapper> </mapper>

Loading…
Cancel
Save