guoyuepeng
/
qa-prevention-gwj
1
0
Fork 3
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

改为3级页面 

一级列表改成作业单位
二级列表改成作业单位，作业类别，作业人数
三级列表展示 单位 类别 操作项目，姓名，特种作业编号，证书有效期，复审时间，状态（是否有效）
新增或修改人员增加是否复审的确认框。
0927cmt
songwenxuan 2024-06-11 18:04:01 +08:00
parent f62622a42b
commit 627d6282bd
16 changed files with 767 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
src/main/java/com/zcloud/controller/bus/CorpPromiseController.java
View File

@ -6,10 +6,12 @@ import com.zcloud.aspect.DockAnnotation;
import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import com.zcloud.entity.system.Role;
import com.zcloud.service.bus.CorpPromiseDetailsService;
import com.zcloud.service.bus.CorpPromisePeopleService;
import com.zcloud.service.bus.CorpPromiseService;
import com.zcloud.service.bus.ImgFilesService;
import com.zcloud.service.system.RoleService;
import com.zcloud.util.*;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
@ -38,6 +40,8 @@ public class CorpPromiseController extends BaseController {
private CorpPromisePeopleService corpPromisePeopleService;
@Autowired
private ImgFilesService imgFilesService;
@Autowired
private RoleService roleService;
/**
* 新增
@ -178,6 +182,64 @@ public class CorpPromiseController extends BaseController {
return map;
}
@RequestMapping("/userPromiseList")
@ResponseBody
public Object userPromiseList(Page page) throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
if (pd.get("YEAR").equals("")){
String year = DateUtil.getYear();
pd.put("YEAR",year);
}
/*检索条件*/
String ROLE_ID = pd.getString("ROLE_ID"); //角色ID
String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件
if (Tools.notEmpty(KEYWORDS)) pd.put("KEYWORDS", KEYWORDS.trim());
String DEPARTMENT_ID = pd.getString("DEPARTMENT_ID"); //关键词检索条件
String USER_ID = pd.getString("USER_ID");
if (Tools.notEmpty(DEPARTMENT_ID)) pd.put("DEPARTMENT_ID", DEPARTMENT_ID.trim());
String STRARTTIME = pd.getString("STRARTTIME"); //开始时间
String ENDTIME = pd.getString("ENDTIME"); //结束时间
if (Tools.notEmpty(STRARTTIME)) pd.put("STRARTTIME", STRARTTIME + " 00:00:00");
if (Tools.notEmpty(ENDTIME)) pd.put("ENDTIME", ENDTIME + " 00:00:00");
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
page.setPd(pd);
List<PageData> userList = corpPromiseService.userpromiselistPage(page); //列出用户列表
pd.put("ROLE_ID", "1");
List<Role> roleList = roleService.listAllRolesByPId(pd); //列出所有系统用户角色
map.put("userList", userList);
map.put("roleList", roleList);
map.put("ROLE_ID", ROLE_ID);
map.put("page", page);
map.put("pd", pd);
map.put("result", errInfo);
return map;
}
@RequestMapping("/userpromisedetaillistPage")
@ResponseBody
public Object userpromisedetaillistPage(Page page) throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
if (pd.get("YEAR").equals("")){
String year = DateUtil.getYear();
pd.put("YEAR",year);
}
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
page.setPd(pd);
List<PageData> varList = corpPromiseService.userpromisedetaillistPage(page); //列出用户列表
map.put("varList", varList);
map.put("page", page);
map.put("result", errInfo);
return map;
}
/**
* 启用禁用
*

62
src/main/java/com/zcloud/controller/bus/CorpResponsibilityController.java
View File

@ -5,7 +5,9 @@ import com.alibaba.fastjson.JSONObject;
import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import com.zcloud.entity.system.Role;
import com.zcloud.service.bus.*;
import com.zcloud.service.system.RoleService;
import com.zcloud.util.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@ -34,6 +36,8 @@ public class CorpResponsibilityController extends BaseController {
private CorpResponsibilityFinalsService corpResponsibilityFinalsService;
@Autowired
private ImgFilesService imgFilesService;
@Autowired
private RoleService roleService;
/**
* 新增
@ -572,4 +576,62 @@ public class CorpResponsibilityController extends BaseController {
mv = new ModelAndView(erv,dataMap);
return mv;
}
@RequestMapping("/userResponsibilityList")
@ResponseBody
public Object userResponsibilityList(Page page) throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
if (pd.get("YEAR").equals("")){
String year = DateUtil.getYear();
pd.put("YEAR",year);
}
/*检索条件*/
String ROLE_ID = pd.getString("ROLE_ID"); //角色ID
String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件
if (Tools.notEmpty(KEYWORDS)) pd.put("KEYWORDS", KEYWORDS.trim());
String DEPARTMENT_ID = pd.getString("DEPARTMENT_ID"); //关键词检索条件
String USER_ID = pd.getString("USER_ID");
if (Tools.notEmpty(DEPARTMENT_ID)) pd.put("DEPARTMENT_ID", DEPARTMENT_ID.trim());
String STRARTTIME = pd.getString("STRARTTIME"); //开始时间
String ENDTIME = pd.getString("ENDTIME"); //结束时间
if (Tools.notEmpty(STRARTTIME)) pd.put("STRARTTIME", STRARTTIME + " 00:00:00");
if (Tools.notEmpty(ENDTIME)) pd.put("ENDTIME", ENDTIME + " 00:00:00");
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
page.setPd(pd);
List<PageData> userList = corpResponsibilityService.userResponsibilitylistPage(page); //列出用户列表
pd.put("ROLE_ID", "1");
List<Role> roleList = roleService.listAllRolesByPId(pd); //列出所有系统用户角色
map.put("userList", userList);
map.put("roleList", roleList);
map.put("ROLE_ID", ROLE_ID);
map.put("page", page);
map.put("pd", pd);
map.put("result", errInfo);
return map;
}
@RequestMapping("/userresponsibilitydetaillistPage")
@ResponseBody
public Object userresponsibilitydetaillistPage(Page page) throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
if (pd.get("YEAR").equals("")){
String year = DateUtil.getYear();
pd.put("YEAR",year);
}
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
page.setPd(pd);
List<PageData> varList = corpResponsibilityService.userResponsibilitydetaillistPage(page); //列出用户列表
map.put("varList", varList);
map.put("page", page);
map.put("result", errInfo);
return map;
}
}

76
src/main/java/com/zcloud/controller/bus/SpecialUserController.java
View File

@ -1,5 +1,6 @@
package com.zcloud.controller.bus;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
@ -53,6 +54,11 @@ public class SpecialUserController extends BaseController {
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
if (pd.getString("ISREVIEW").equals("true")) {
pd.put("ISREVIEW","1");
}else {
pd.put("ISREVIEW","0");
}
PageData dockData = new PageData(); // 主要对接数据
PageData blindPageData = new PageData(); // pd对接数据
@ -138,6 +144,11 @@ public class SpecialUserController extends BaseController {
PageData pd = new PageData();
pd = this.getPageData();
PageData dockData = new PageData();
if (pd.getString("ISREVIEW").equals("true")) {
pd.put("ISREVIEW","1");
}else {
pd.put("ISREVIEW","0");
}
// 修改与删除功能仅企业主账号可操作，并仅可修改与删除本单位添加的特种人员信息
String corpID = Jurisdiction.getCORPINFO_ID(); // 登录企业信息
@ -189,6 +200,71 @@ public class SpecialUserController extends BaseController {
pd.put("keyTypeIn1And2","1");
page.setPd(pd);
List<PageData> varList = specialuserService.list(page); //列出SpecialUser列表
//判断证件是否有效（先判断有效期是否符合，再判断是否复审过）
for (PageData pageData : varList) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
String validity_time_start = pageData.getString("VALIDITY_TIME_START");
Date startTime = sdf.parse(validity_time_start);
String validity_time_end = pageData.getString("VALIDITY_TIME_END");
Date endTime = sdf.parse(validity_time_end);
Date currentTime = new Date();
if (startTime.compareTo(currentTime) >= 1 && currentTime.compareTo(endTime) >= 1) {
if (pageData.get("ISREVIEW").equals("1")){
pageData.put("ISEFFECTIVE","是");
} else {
pageData.put("ISEFFECTIVE","否");
}
} else {
pageData.put("ISEFFECTIVE","否");
}
}
map.put("varList", varList);
map.put("page", page);
map.put("result", errInfo);
return map;
}
/**列表
* @param page
* @throws Exception
*/
@RequestMapping(value="/listByDept")
@RequiresPermissions("specialuser:list")
@ResponseBody
public Object listByDept(Page page) throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件
if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim());
pd.put("keyTypeIn1And2","1");
page.setPd(pd);
List<PageData> varList = specialuserService.listByDept(page); //列出SpecialUser列表
map.put("varList", varList);
map.put("page", page);
map.put("result", errInfo);
return map;
}
/**列表
* @param page
* @throws Exception
*/
@RequestMapping(value="/listByOperation")
@RequiresPermissions("specialuser:list")
@ResponseBody
public Object listByOperation(Page page) throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件
if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim());
pd.put("keyTypeIn1And2","1");
page.setPd(pd);
List<PageData> varList = specialuserService.listByOperation(page); //列出SpecialUser列表
map.put("varList", varList);
map.put("page", page);
map.put("result", errInfo);

7
src/main/java/com/zcloud/mapper/datasource/bus/CorpPromiseMapper.java
View File

@ -44,5 +44,12 @@ public interface CorpPromiseMapper {
void decPeoplenumInvolved(PageData pd);
/**用户列表
* @param page
* @return
*/
List<PageData> userpromiselistPage(Page page);
List<PageData> userpromisedetaillistPage(Page page);
}

4
src/main/java/com/zcloud/mapper/datasource/bus/CorpResponsibilityMapper.java
View File

@ -45,5 +45,9 @@ public interface CorpResponsibilityMapper {
List<PageData> getAllSignatureStatuslistPage(Page page);
List<PageData> getAllSignatureStatus(PageData pd);
List<PageData> userResponsibilitylistPage(Page page);
List<PageData> userResponsibilitydetaillistPage(Page page);
}

6
src/main/java/com/zcloud/mapper/datasource/bus/SpecialUserMapper.java
View File

@ -30,12 +30,18 @@ public interface SpecialUserMapper{
*/
void edit(PageData pd);
void editIsReview(PageData pd);
/**列表
* @param page
* @throws Exception
*/
List<PageData> datalistPage(Page page);
List<PageData> listByDeptlistPage(Page page);
List<PageData> listByOperationlistPage(Page page);
/**列表(全部)
* @param pd
* @throws Exception

4
src/main/java/com/zcloud/service/bus/CorpPromiseService.java
View File

@ -58,4 +58,8 @@ public interface CorpPromiseService {
* @throws Exception
*/
void delete(PageData pd)throws Exception;
public List<PageData> userpromiselistPage(Page page)throws Exception;
public List<PageData> userpromisedetaillistPage(Page page)throws Exception;
}

4
src/main/java/com/zcloud/service/bus/CorpResponsibilityService.java
View File

@ -60,4 +60,8 @@ public interface CorpResponsibilityService {
List<PageData> listAllSignatureStatus(Page page)throws Exception;
List<PageData> listAllSignatureStatus(PageData pd)throws Exception;
public List<PageData> userResponsibilitylistPage(Page page)throws Exception;
public List<PageData> userResponsibilitydetaillistPage(Page page)throws Exception;
}

6
src/main/java/com/zcloud/service/bus/SpecialUserService.java
View File

@ -30,12 +30,18 @@ public interface SpecialUserService{
*/
public void edit(PageData pd)throws Exception;
public void editIsReview(PageData pd)throws Exception;
/**列表
* @param page
* @throws Exception
*/
public List<PageData> list(Page page)throws Exception;
public List<PageData> listByDept(Page page)throws Exception;
public List<PageData> listByOperation(Page page)throws Exception;
/**列表(全部)
* @param pd
* @throws Exception

8
src/main/java/com/zcloud/service/bus/impl/CorpPromiseServiceImpl.java
View File

@ -76,4 +76,12 @@ public class CorpPromiseServiceImpl implements CorpPromiseService {
public void delete(PageData pd) throws Exception {
corpPromiseMapper.delete(pd);
}
public List<PageData> userpromiselistPage(Page page) throws Exception {
return corpPromiseMapper.userpromiselistPage(page);
}
public List<PageData> userpromisedetaillistPage(Page page) throws Exception {
return corpPromiseMapper.userpromisedetaillistPage(page);
}
}

35
src/main/java/com/zcloud/service/bus/impl/CorpResponsibilityServiceImpl.java
View File

@ -22,65 +22,74 @@ import java.util.List;
public class CorpResponsibilityServiceImpl implements CorpResponsibilityService {
@Autowired
private CorpResponsibilityMapper corpPromiseMapper;
private CorpResponsibilityMapper corpResponsibilityMapper;
@Override
public void save(PageData pd) throws Exception {
corpPromiseMapper.save(pd);
corpResponsibilityMapper.save(pd);
}
@Override
public List<PageData> list(Page page) throws Exception {
return corpPromiseMapper.datalistPage(page);
return corpResponsibilityMapper.datalistPage(page);
}
@Override
public void editdelete(PageData pd) throws Exception {
corpPromiseMapper.editdelete(pd);
corpResponsibilityMapper.editdelete(pd);
}
@Override
public PageData findById(PageData pd) throws Exception {
return corpPromiseMapper.findById(pd);
return corpResponsibilityMapper.findById(pd);
}
@Override
public void edit(PageData pd) throws Exception {
corpPromiseMapper.edit(pd);
corpResponsibilityMapper.edit(pd);
}
@Override
public List<PageData> listAll(Page page) throws Exception {
return corpPromiseMapper.dataAlllistPage(page);
return corpResponsibilityMapper.dataAlllistPage(page);
}
@Override
public List<PageData> collateralall(PageData pd) throws Exception {
return corpPromiseMapper.collateralall(pd);
return corpResponsibilityMapper.collateralall(pd);
}
@Override
public List<PageData> collateralAllFinal(PageData pd) throws Exception {
return corpPromiseMapper.collateralAllFinal(pd);
return corpResponsibilityMapper.collateralAllFinal(pd);
}
@Override
public void editpeople(PageData pd) throws Exception {
corpPromiseMapper.editpeople(pd);
corpResponsibilityMapper.editpeople(pd);
}
public void delete(PageData pd) throws Exception {
corpPromiseMapper.delete(pd);
corpResponsibilityMapper.delete(pd);
}
@Override
public List<PageData> listAllSignatureStatus(Page page) throws Exception {
return corpPromiseMapper.getAllSignatureStatuslistPage(page);
return corpResponsibilityMapper.getAllSignatureStatuslistPage(page);
}
@Override
public List<PageData> listAllSignatureStatus(PageData pd) throws Exception {
return corpPromiseMapper.getAllSignatureStatus(pd);
return corpResponsibilityMapper.getAllSignatureStatus(pd);
}
public List<PageData> userResponsibilitylistPage(Page page) throws Exception {
return corpResponsibilityMapper.userResponsibilitylistPage(page);
}
public List<PageData> userResponsibilitydetaillistPage(Page page) throws Exception {
return corpResponsibilityMapper.userResponsibilitydetaillistPage(page);
}
}

24
src/main/java/com/zcloud/service/bus/impl/SpecialUserServiceImpl.java
View File

@ -46,6 +46,14 @@ public class SpecialUserServiceImpl implements SpecialUserService{
specialuserMapper.edit(pd);
}
/**修改
* @param pd
* @throws Exception
*/
public void editIsReview(PageData pd)throws Exception{
specialuserMapper.editIsReview(pd);
}
/**列表
* @param page
* @throws Exception
@ -54,6 +62,22 @@ public class SpecialUserServiceImpl implements SpecialUserService{
return specialuserMapper.datalistPage(page);
}
/**列表
* @param page
* @throws Exception
*/
public List<PageData> listByDept(Page page)throws Exception{
return specialuserMapper.listByDeptlistPage(page);
}
/**列表
* @param page
* @throws Exception
*/
public List<PageData> listByOperation(Page page)throws Exception{
return specialuserMapper.listByOperationlistPage(page);
}
/**列表(全部)
* @param pd
* @throws Exception

36
src/main/java/com/zcloud/util/SpecialReviewScheduled.java Normal file
View File

@ -0,0 +1,36 @@
package com.zcloud.util;
import com.zcloud.entity.PageData;
import com.zcloud.service.bus.SpecialUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import java.text.SimpleDateFormat;
import java.util.Date;
@Component
public class SpecialReviewScheduled {
@Autowired
private SpecialUserService specialuserService;
@Scheduled(cron ="0 35 0 * * ?")//每天12点35
// @Scheduled(cron ="* * * * * ?")//每15秒
public void scheduled() throws Exception {
System.out.println("============判断证书复审时间是否有效========");
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
PageData pd = new PageData();
Date currentTime = new Date();
String format = sdf.format(currentTime);
pd.put("currentTime",format);
specialuserService.editIsReview(pd);
System.out.println("============证书判断结束========");
}
/**得到32位的uuid
* @return
*/
public String get32UUID(){
return UuidUtil.get32UUID();
}
}

182
src/main/resources/mybatis/datasource/bus/CorpPromiseMapper.xml
View File

@ -296,4 +296,186 @@
where
PROMISE_ID = #{PROMISE_ID}
</delete>
<!-- 用户列表 -->
<select id="userpromiselistPage" parameterType="page" resultType="pd" >
select
u.USER_ID,
u.USERNAME,
u.PASSWORD,
u.LAST_LOGIN,
u.NAME,
u.IP,
u.EMAIL,
u.NUMBER,
u.PHONE,
u.ISMAIN,
u.PERSON_TYPE,
u.SHIFTDUTYONE,
u.SHIFTDUTYTWO,
u.DURATION,
u.WORKSTATUS,
u.WORKPERIOD,
u.STATUS,
r.ROLE_ID,
r.ROLE_NAME,
o.NAME as PID_NAME,
o.PARENT_ID,
d.NAME as DEPARTMENT_NAME,
p.NAME AS POST_NAME,
sw.NAME SHIFTDUTYONENAME,
swr.NAME SHIFTDUTYTWONAME,
info.IS_RECORDER,
info.IS_CHARGE,
count( DISTINCT b.PROMISEPEOPLE_ID ) ALL_SIGN_COUNT,
count( DISTINCT c.PROMISEPEOPLE_ID ) SIGNED_COUNT
<if test="pd.IS_ARCHIVES != null and pd.IS_ARCHIVES != ''"> <!--档案列表 -->
,(select count(1) from BUS_STAGESTUDENTRELATION s where s.USER_ID = u.USER_ID) as TASK_COUNT,
(select count(1) from BUS_STAGESTUDENTRELATION s where s.USER_ID = u.USER_ID and s.STAGEEXAMSTATE=3) as COMPLETE_COUNT
</if>
from SYS_USER u
left join SYS_ROLE r on u.ROLE_ID = r.ROLE_ID
left join OA_DEPARTMENT d on d.DEPARTMENT_ID=u.DEPARTMENT_ID
left join OA_DEPARTMENT o ON o.DEPARTMENT_ID = d.PARENT_ID
left join SYS_POST p on p.POST_ID=u.POST_ID
left join BUS_SHIFTWORKRULES sw on sw.SHIFTWORKRULES_ID = u.SHIFTDUTYONE
left join BUS_SHIFTWORKRULES swr on swr.SHIFTWORKRULES_ID = u.SHIFTDUTYTWO
left join SYS_USERINFO info on info.USER_ID = u.USER_ID
LEFT JOIN (
SELECT
f.*,
c.CREATTIME
FROM
bus_corppromise_people f
LEFT JOIN bus_corppromise c ON f.PROMISE_ID = c.PROMISE_ID
) b ON b.USER_ID = u.USER_ID
AND b.ISPROMISE_PEOPLE = '0'
AND b.ISDELETE = '0'
<if test="pd.YEAR != null and pd.YEAR != ''">
AND date_format( `b`.`CREATTIME`, '%Y' ) = #{pd.YEAR}
</if>
LEFT JOIN (
SELECT
f.*,
c.CREATTIME
FROM
bus_corppromise_people f
LEFT JOIN bus_corppromise c ON f.PROMISE_ID = c.PROMISE_ID
) c ON c.USER_ID = u.USER_ID
AND c.ISSIGN = 1
AND c.ISPROMISE_PEOPLE = '0'
AND c.ISDELETE = '0'
<if test="pd.YEAR != null and pd.YEAR != ''">
AND date_format( `c`.`CREATTIME`, '%Y' ) = #{pd.YEAR}
</if>
LEFT JOIN vi_department_all v ON v.DEPARTMENT_ID = u.DEPARTMENT_ID
LEFT JOIN bus_corppromise l ON l.PROMISE_ID = b.PROMISE_ID AND l.STATE = '0'
LEFT JOIN bus_corppromise e ON e.PROMISE_ID = c.PROMISE_ID AND ( e.PROMISE_ID IS NULL OR e.STATE != '1' )
where u.ISDELETE = '0' and
u.USERNAME != 'admin'
<!-- and r.PARENT_ID = '1' -->
<if test="pd.KEYWORDS!= null and pd.KEYWORDS != ''">
and
(
u.USERNAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
or
u.EMAIL LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
or
u.NUMBER LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
or
u.NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
or
u.PHONE LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
)
</if>
<if test="pd.ROLE_ID != null and pd.ROLE_ID != ''"> <!-- 角色检索 -->
and u.ROLE_ID=#{pd.ROLE_ID}
</if>
<if test="pd.DEPARTMENT_ID != null and pd.DEPARTMENT_ID != ''"> <!-- 角色检索 -->
and u.DEPARTMENT_ID=#{pd.DEPARTMENT_ID}
</if>
<if test="pd.STRARTTIME!=null and pd.STRARTTIME!=''"> <!-- 登录时间检索 -->
and u.LAST_LOGIN &gt;= #{pd.STRARTTIME}
</if>
<if test="pd.ENDTIME!=null and pd.ENDTIME!=''"> <!-- 登录时间检索 -->
and u.LAST_LOGIN &lt;= #{pd.ENDTIME}
</if>
<if test="pd.SHIFTDUTYONE != null and pd.SHIFTDUTYONE != ''">
and u.SHIFTDUTYONE=#{pd.SHIFTDUTYONE}
</if>
<if test="pd.SHIFTDUTYTWO != null and pd.SHIFTDUTYTWO != ''">
and u.SHIFTDUTYTWO=#{pd.SHIFTDUTYTWO}
</if>
<if test="pd.CORPINFO_ID != null and pd.CORPINFO_ID != ''"><!-- 关键词检索 -->
AND
u.CORPINFO_ID = #{pd.CORPINFO_ID}
</if>
<if test="pd.IS_ARCHIVES != null and pd.IS_ARCHIVES != ''">
and (select count(1) from BUS_STAGESTUDENTRELATION s where s.USER_ID = u.USER_ID) &gt; 0
</if>
<if test="pd.IS_STUDEANT != null and pd.IS_STUDEANT != ''">
and exists (select 1 from SYS_USERINFO i where i.USER_ID = u.USER_ID)
</if>
<if test="pd.IS_RECORDER != null and pd.IS_RECORDER != '' and pd.IS_RECORDER == 1 ">
and info.IS_RECORDER = #{pd.IS_RECORDER}
</if>
<if test="pd.IS_CHARGE != null and pd.IS_CHARGE != '' and pd.IS_CHARGE == 1 ">
and info.IS_CHARGE = #{pd.IS_CHARGE}
</if>
<if test="pd.IS_HAZARDCONFIRMER != null and pd.IS_HAZARDCONFIRMER != ''"><!-- 关键词检索 -->
AND
u.IS_HAZARDCONFIRMER =#{pd.IS_HAZARDCONFIRMER}
</if>
GROUP BY
u.USER_ID
order by u.SORT asc,d.LEVEL asc ,d.DEP_ORDER,d.DEPARTMENT_ID asc, u.LAST_LOGIN desc
</select>
<!-- 用户列表 -->
<select id="userpromisedetaillistPage" parameterType="page" resultType="pd" >
SELECT
u.USER_ID,
u.USERNAME,
u.NAME,
d.NAME AS DEPARTMENT_NAME,
c.ISSIGN,
c.ISPROMISE_PEOPLE,
c.SIGNTIME,
c.PROMISE_NAME,
c.LEVELNAME,
c.PROMISE_TERM_START,
c.PROMISE_TERM_END,
c.PROMISE_ID
FROM
SYS_USER u
LEFT JOIN OA_DEPARTMENT d ON d.DEPARTMENT_ID = u.DEPARTMENT_ID
LEFT JOIN (
SELECT
f.*,
c.PROMISE_NAME,
c.CREATTIME,
d.NAME LEVELNAME,
c.PROMISE_TERM_START,
c.PROMISE_TERM_END
FROM
bus_corppromise_people f
LEFT JOIN bus_corppromise c ON f.PROMISE_ID = c.PROMISE_ID
left join <include refid="dicTableName"></include> d on c.LEVEL = d.BIANMA and d.PARENT_ID = '8c5064693fba4dbca1cbfea631cd097a'
) c ON c.USER_ID = u.USER_ID
WHERE
u.CORPINFO_ID = #{pd.CORPINFO_ID}
and
u.USER_ID = #{pd.USER_ID}
AND c.ISPROMISE_PEOPLE = '0'
AND c.ISDELETE = '0'
AND date_format( `c`.`CREATTIME`, '%Y' ) = '2024'
GROUP BY
c.PROMISEPEOPLE_ID
ORDER BY
u.SORT ASC,
d.LEVEL ASC,
d.DEP_ORDER,
d.DEPARTMENT_ID ASC,
u.LAST_LOGIN DESC
</select>
</mapper>

181
src/main/resources/mybatis/datasource/bus/CorpResponsibilityMapper.xml
View File

@ -310,4 +310,185 @@
ORDER BY
NEED_SINGED DESC,SIGNED_COUNT DESC, ALL_SIGN_COUNT DESC
</select>
<!-- 用户列表 -->
<select id="userResponsibilitylistPage" parameterType="page" resultType="pd" >
select
u.USER_ID,
u.USERNAME,
u.PASSWORD,
u.LAST_LOGIN,
u.NAME,
u.IP,
u.EMAIL,
u.NUMBER,
u.PHONE,
u.ISMAIN,
u.PERSON_TYPE,
u.SHIFTDUTYONE,
u.SHIFTDUTYTWO,
u.DURATION,
u.WORKSTATUS,
u.WORKPERIOD,
u.STATUS,
r.ROLE_ID,
r.ROLE_NAME,
o.NAME as PID_NAME,
o.PARENT_ID,
d.NAME as DEPARTMENT_NAME,
p.NAME AS POST_NAME,
sw.NAME SHIFTDUTYONENAME,
swr.NAME SHIFTDUTYTWONAME,
info.IS_RECORDER,
info.IS_CHARGE,
count( DISTINCT b.RESPONSIBILITYPEOPLE_ID ) ALL_SIGN_COUNT,
count( DISTINCT c.RESPONSIBILITYPEOPLE_ID ) SIGNED_COUNT
<if test="pd.IS_ARCHIVES != null and pd.IS_ARCHIVES != ''"> <!--档案列表 -->
,(select count(1) from BUS_STAGESTUDENTRELATION s where s.USER_ID = u.USER_ID) as TASK_COUNT,
(select count(1) from BUS_STAGESTUDENTRELATION s where s.USER_ID = u.USER_ID and s.STAGEEXAMSTATE=3) as COMPLETE_COUNT
</if>
from SYS_USER u
left join SYS_ROLE r on u.ROLE_ID = r.ROLE_ID
left join OA_DEPARTMENT d on d.DEPARTMENT_ID=u.DEPARTMENT_ID
left join OA_DEPARTMENT o ON o.DEPARTMENT_ID = d.PARENT_ID
left join SYS_POST p on p.POST_ID=u.POST_ID
left join BUS_SHIFTWORKRULES sw on sw.SHIFTWORKRULES_ID = u.SHIFTDUTYONE
left join BUS_SHIFTWORKRULES swr on swr.SHIFTWORKRULES_ID = u.SHIFTDUTYTWO
left join SYS_USERINFO info on info.USER_ID = u.USER_ID
LEFT JOIN (
SELECT
f.*,
c.CREATTIME
FROM
bus_corpresponsibility_people f
LEFT JOIN bus_corpresponsibility c ON f.RESPONSIBILITY_ID = c.RESPONSIBILITY_ID
) b ON b.USER_ID = u.USER_ID
AND b.ISRESPONSIBILITY_PEOPLE = '0'
AND b.ISDELETE = '0'
<if test="pd.YEAR != null and pd.YEAR != ''">
AND date_format( `b`.`CREATTIME`, '%Y' ) = #{pd.YEAR}
</if>
LEFT JOIN (
SELECT
f.*,
c.CREATTIME
FROM
bus_corpresponsibility_people f
LEFT JOIN bus_corpresponsibility c ON f.RESPONSIBILITY_ID = c.RESPONSIBILITY_ID
) c ON c.USER_ID = u.USER_ID
AND c.ISSIGN = 1
AND c.ISRESPONSIBILITY_PEOPLE = '0'
AND c.ISDELETE = '0'
<if test="pd.YEAR != null and pd.YEAR != ''">
AND date_format( `c`.`CREATTIME`, '%Y' ) = #{pd.YEAR}
</if>
LEFT JOIN vi_department_all v ON v.DEPARTMENT_ID = u.DEPARTMENT_ID
LEFT JOIN bus_corpresponsibility l ON l.RESPONSIBILITY_ID = b.RESPONSIBILITY_ID AND l.STATE = '0'
LEFT JOIN bus_corpresponsibility e ON e.RESPONSIBILITY_ID = c.RESPONSIBILITY_ID AND ( e.RESPONSIBILITY_ID IS NULL OR e.STATE != '1' )
where u.ISDELETE = '0' and
u.USERNAME != 'admin'
<!-- and r.PARENT_ID = '1' -->
<if test="pd.KEYWORDS!= null and pd.KEYWORDS != ''">
and
(
u.USERNAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
or
u.EMAIL LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
or
u.NUMBER LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
or
u.NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
or
u.PHONE LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
)
</if>
<if test="pd.ROLE_ID != null and pd.ROLE_ID != ''"> <!-- 角色检索 -->
and u.ROLE_ID=#{pd.ROLE_ID}
</if>
<if test="pd.DEPARTMENT_ID != null and pd.DEPARTMENT_ID != ''"> <!-- 角色检索 -->
and u.DEPARTMENT_ID=#{pd.DEPARTMENT_ID}
</if>
<if test="pd.STRARTTIME!=null and pd.STRARTTIME!=''"> <!-- 登录时间检索 -->
and u.LAST_LOGIN &gt;= #{pd.STRARTTIME}
</if>
<if test="pd.ENDTIME!=null and pd.ENDTIME!=''"> <!-- 登录时间检索 -->
and u.LAST_LOGIN &lt;= #{pd.ENDTIME}
</if>
<if test="pd.SHIFTDUTYONE != null and pd.SHIFTDUTYONE != ''">
and u.SHIFTDUTYONE=#{pd.SHIFTDUTYONE}
</if>
<if test="pd.SHIFTDUTYTWO != null and pd.SHIFTDUTYTWO != ''">
and u.SHIFTDUTYTWO=#{pd.SHIFTDUTYTWO}
</if>
<if test="pd.CORPINFO_ID != null and pd.CORPINFO_ID != ''"><!-- 关键词检索 -->
AND
u.CORPINFO_ID = #{pd.CORPINFO_ID}
</if>
<if test="pd.IS_ARCHIVES != null and pd.IS_ARCHIVES != ''">
and (select count(1) from BUS_STAGESTUDENTRELATION s where s.USER_ID = u.USER_ID) &gt; 0
</if>
<if test="pd.IS_STUDEANT != null and pd.IS_STUDEANT != ''">
and exists (select 1 from SYS_USERINFO i where i.USER_ID = u.USER_ID)
</if>
<if test="pd.IS_RECORDER != null and pd.IS_RECORDER != '' and pd.IS_RECORDER == 1 ">
and info.IS_RECORDER = #{pd.IS_RECORDER}
</if>
<if test="pd.IS_CHARGE != null and pd.IS_CHARGE != '' and pd.IS_CHARGE == 1 ">
and info.IS_CHARGE = #{pd.IS_CHARGE}
</if>
<if test="pd.IS_HAZARDCONFIRMER != null and pd.IS_HAZARDCONFIRMER != ''"><!-- 关键词检索 -->
AND
u.IS_HAZARDCONFIRMER =#{pd.IS_HAZARDCONFIRMER}
</if>
GROUP BY
u.USER_ID
order by u.SORT asc,d.LEVEL asc ,d.DEP_ORDER,d.DEPARTMENT_ID asc, u.LAST_LOGIN desc
</select>
<!-- 用户列表 -->
<select id="userResponsibilitydetaillistPage" parameterType="page" resultType="pd" >
SELECT
u.USER_ID,
u.USERNAME,
u.NAME,
d.NAME AS DEPARTMENT_NAME,
c.ISSIGN,
c.ISRESPONSIBILITY_PEOPLE,
c.SIGNTIME,
c.RESPONSIBILITY_NAME,
c.LEVELNAME,
c.RESPONSIBILITY_TERM_START,
c.RESPONSIBILITY_TERM_END,
c.RESPONSIBILITY_ID
FROM
SYS_USER u
LEFT JOIN OA_DEPARTMENT d ON d.DEPARTMENT_ID = u.DEPARTMENT_ID
LEFT JOIN (
SELECT
f.*,
c.RESPONSIBILITY_NAME,
c.CREATTIME,
d.NAME LEVELNAME,
c.RESPONSIBILITY_TERM_START,
c.RESPONSIBILITY_TERM_END
FROM
bus_corpresponsibility_people f
LEFT JOIN bus_corpresponsibility c ON f.RESPONSIBILITY_ID = c.RESPONSIBILITY_ID
left join <include refid="dicTableName"></include> d on c.LEVEL = d.BIANMA and d.PARENT_ID = '8c5064693fba4dbca1cbfea631cd097a'
) c ON c.USER_ID = u.USER_ID
WHERE
u.CORPINFO_ID = #{pd.CORPINFO_ID}
and
u.USER_ID = #{pd.USER_ID}
AND c.ISRESPONSIBILITY_PEOPLE = '0'
AND c.ISDELETE = '0'
AND date_format( `c`.`CREATTIME`, '%Y' ) = '2024'
GROUP BY
c.RESPONSIBILITYPEOPLE_ID
ORDER BY
u.SORT ASC,
d.LEVEL ASC,
d.DEP_ORDER,
d.DEPARTMENT_ID ASC,
u.LAST_LOGIN DESC
</select>
</mapper>

83
src/main/resources/mybatis/datasource/bus/SpecialUserMapper.xml
View File

@ -21,6 +21,7 @@
f.SPECIAL_TYPE,
f.OPERATION_TYPE,
f.ISSUING_AUTHORITY,
f.ISREVIEW,
f.REVIEW_TIME,
f.VALIDITY_TIME_END,
f.VALIDITY_TIME_START,
@ -49,6 +50,7 @@
SPECIAL_TYPE,
OPERATION_TYPE,
ISSUING_AUTHORITY,
ISREVIEW,
REVIEW_TIME,
USER_ID,
USER_TYPE,
@ -78,6 +80,7 @@
#{SPECIAL_TYPE},
#{OPERATION_TYPE},
#{ISSUING_AUTHORITY},
#{ISREVIEW},
#{REVIEW_TIME},
#{USER_ID},
#{USER_TYPE},
@ -133,6 +136,7 @@
ISSUING_AUTHORITY = #{ISSUING_AUTHORITY},
VALIDITY_TIME_END = #{VALIDITY_TIME_END},
VALIDITY_TIME_START = #{VALIDITY_TIME_START},
ISREVIEW = #{ISREVIEW},
REVIEW_TIME = #{REVIEW_TIME},
SPECIAL_NUMBER = #{SPECIAL_NUMBER},
USER_ID = #{USER_ID},
@ -151,6 +155,16 @@
SPECIALUSER_ID = #{SPECIALUSER_ID}
</update>
<!-- 修改 -->
<update id="editIsReview" parameterType="pd">
update
<include refid="tableName"></include>
set
ISREVIEW = "0"
where
#{currentTime} > REVIEW_TIME
</update>
<!-- 通过ID获取数据 -->
<select id="findById" parameterType="pd" resultType="pd">
select
@ -189,6 +203,9 @@
<if test="pd.keySpecialType != null and pd.keySpecialType != ''"><!-- 作业类别 -->
and f.SPECIAL_TYPE = #{pd.keySpecialType}
</if>
<if test="pd.UNIT_ID != null and pd.UNIT_ID != ''"><!-- 作业单位 -->
and f.UNIT_ID = #{pd.UNIT_ID}
</if>
<if test="pd.keyTypeIn1And2 != null and pd.keyTypeIn1And2 != ''"><!-- 人员类型 -->
and f.USER_TYPE in ('1','2')
</if>
@ -208,6 +225,72 @@
order by f.CREATTIME desc
</select>
<!-- 列表 -->
<select id="listByDeptlistPage" parameterType="page" resultType="pd">
select
<include refid="Field"></include>,
IF(f.USER_TYPE='1',corp.CORP_NAME,unit.RELEVANT_NAME) unitName,
cuser.USERNAME as cuserName ,
ccorp.CORP_NAME as corpName ,
poDic.NAME as operationName
from
<include refid="tableName"></include> f
left join bus_relevantunit unit on unit.RELEVANTUNIT_ID = f.UNIT_ID<!-- 相关单位 -->
left join bus_corp_info corp on corp.CORPINFO_ID = f.UNIT_ID<!-- 相关单位 企业-->
left join sys_user cuser on cuser.USER_ID = f.CREATOR<!-- 添加人信息-->
left join bus_corp_info ccorp on ccorp.CORPINFO_ID = cuser.CORPINFO_ID <!-- 添加人信息 企业-->
left join sys_dictionaries poDic on poDic.DICTIONARIES_ID = f.OPERATION_TYPE <!-- 操作项目-->
where f.ISDELETE = '0'
<if test="pd.keySpecialType != null and pd.keySpecialType != ''"><!-- 作业类别 -->
and f.SPECIAL_TYPE = #{pd.keySpecialType}
</if>
<if test="pd.keyTypeIn1And2 != null and pd.keyTypeIn1And2 != ''"><!-- 人员类型 -->
and f.USER_TYPE in ('1','2')
</if>
<if test="pd.keyUserType != null and pd.keyUserType != ''"><!-- 人员类型 -->
and f.USER_TYPE = #{pd.keyUserType}
</if>
<if test="pd.keyUserName != null and pd.keyUserName != ''"><!-- 姓名 -->
and(f.USERNAME LIKE CONCAT(CONCAT('%', #{pd.keyUserName}),'%'))
</if>
<if test="pd.keyUnitName != null and pd.keyUnitName != ''"><!-- 单位名称 -->
and(unit.RELEVANT_NAME LIKE CONCAT(CONCAT('%', #{pd.keyUnitName}),'%')
or corp.CORP_NAME LIKE CONCAT(CONCAT('%', #{pd.keyUnitName}),'%') )
</if>
<if test="pd.keySpecialNumber != null and pd.keySpecialNumber != ''"><!-- 特种作业证书编号 -->
and(f.SPECIAL_NUMBER LIKE CONCAT(CONCAT('%', #{pd.keySpecialNumber}),'%'))
</if>
GROUP BY unitName
order by f.CREATTIME desc
</select>
<!-- 列表 -->
<select id="listByOperationlistPage" parameterType="page" resultType="pd">
select
<include refid="Field"></include>,
IF(f.USER_TYPE='1',corp.CORP_NAME,unit.RELEVANT_NAME) unitName,
cuser.USERNAME as cuserName ,
ccorp.CORP_NAME as corpName ,
poDic.NAME as operationName ,
count(distinct poDic.NAME) OPERATE_COUNT
from
<include refid="tableName"></include> f
left join bus_relevantunit unit on unit.RELEVANTUNIT_ID = f.UNIT_ID<!-- 相关单位 -->
left join bus_corp_info corp on corp.CORPINFO_ID = f.UNIT_ID<!-- 相关单位 企业-->
left join sys_user cuser on cuser.USER_ID = f.CREATOR<!-- 添加人信息-->
left join bus_corp_info ccorp on ccorp.CORPINFO_ID = cuser.CORPINFO_ID <!-- 添加人信息 企业-->
left join sys_dictionaries poDic on poDic.DICTIONARIES_ID = f.OPERATION_TYPE <!-- 操作项目-->
where f.ISDELETE = '0'
<if test="pd.UNIT_ID != null and pd.UNIT_ID != ''"><!-- 作业类别 -->
and f.UNIT_ID = #{pd.UNIT_ID}
</if>
<if test="pd.operationName != null and pd.operationName != ''"><!-- 单位名称 -->
and poDic.NAME LIKE CONCAT(CONCAT('%', #{pd.operationName}),'%') )
</if>
GROUP BY operationName
order by f.CREATTIME desc
</select>
<!-- 列表(全部) -->
<select id="listAll" parameterType="pd" resultType="pd">
select