wangpeng
/
integrated_traffic
forked from integrated_whb/integrated_whb
1
0
Fork 0
Code Pull Requests Activity

修复安全体系管理，用户删除

dev
wangpeng 2024-04-09 16:09:03 +08:00
parent b37c6bea6b
commit 292883e482
12 changed files with 34 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyAssessmentController.java
View File

@ -127,18 +127,7 @@ public class TrafficSafetyAssessmentController extends BaseController {
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
String SYSTEMNAME = pd.getString("SYSTEMNAME"); // 关键词检索条件
if (Tools.notEmpty(SYSTEMNAME))
pd.put("SYSTEMNAME", SYSTEMNAME.trim());
String COMPLETIONSTATUS = pd.getString("COMPLETIONSTATUS"); // 关键词检索条件
if (Tools.notEmpty(COMPLETIONSTATUS))
pd.put("COMPLETIONSTATUS", COMPLETIONSTATUS.trim());
String VALIDSTATUS = pd.getString("VALIDSTATUS"); // 关键词检索条件
if (Tools.notEmpty(VALIDSTATUS))
pd.put("VALIDSTATUS", VALIDSTATUS.trim());
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
page.setPd(pd);
List<PageData> varList = safetyAssessmentService.listForSafetyAssessment(page);

16
src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyOccupationalHazardsController.java
View File

@ -145,22 +145,6 @@ public class TrafficSafetyOccupationalHazardsController extends BaseController {
PageData pd = new PageData();
pd = this.getPageData();
String OCCUPATIONALNAME = pd.getString("OCCUPATIONALNAME"); // 关键词检索条件
if (Tools.notEmpty(OCCUPATIONALNAME))
pd.put("OCCUPATIONALNAME", OCCUPATIONALNAME.trim());
String COMPLETIONSTATUS = pd.getString("COMPLETIONSTATUS"); // 关键词检索条件
if (Tools.notEmpty(COMPLETIONSTATUS))
pd.put("COMPLETIONSTATUS", COMPLETIONSTATUS.trim());
String VALIDSTATUS = pd.getString("VALIDSTATUS"); // 关键词检索条件
if (Tools.notEmpty(VALIDSTATUS))
pd.put("VALIDSTATUS", VALIDSTATUS.trim());
String ISSIGNED = pd.getString("ISSIGNED"); // 关键词检索条件
if (Tools.notEmpty(ISSIGNED))
pd.put("ISSIGNED", ISSIGNED.trim());
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
page.setPd(pd);

13
src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyProductionController.java
View File

@ -135,18 +135,7 @@ public class TrafficSafetyProductionController extends BaseController {
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
String SYSTEMNAME = pd.getString("SYSTEMNAME"); // 关键词检索条件
if (Tools.notEmpty(SYSTEMNAME))
pd.put("SYSTEMNAME", SYSTEMNAME.trim());
String COMPLETIONSTATUS = pd.getString("COMPLETIONSTATUS"); // 关键词检索条件
if (Tools.notEmpty(COMPLETIONSTATUS))
pd.put("COMPLETIONSTATUS", COMPLETIONSTATUS.trim());
String VALIDSTATUS = pd.getString("VALIDSTATUS"); // 关键词检索条件
if (Tools.notEmpty(VALIDSTATUS))
pd.put("VALIDSTATUS", VALIDSTATUS.trim());
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
page.setPd(pd);
List<PageData> varList = safetyProductionService.listForSafetyProductionlist(page);

16
src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyResponsibilityController.java
View File

@ -139,22 +139,6 @@ public class TrafficSafetyResponsibilityController extends BaseController {
PageData pd = new PageData();
pd = this.getPageData();
String RESPONSIBILITYNAME = pd.getString("RESPONSIBILITYNAME"); // 关键词检索条件
if (Tools.notEmpty(RESPONSIBILITYNAME))
pd.put("RESPONSIBILITYNAME", RESPONSIBILITYNAME.trim());
String COMPLETIONSTATUS = pd.getString("COMPLETIONSTATUS"); // 关键词检索条件
if (Tools.notEmpty(COMPLETIONSTATUS))
pd.put("COMPLETIONSTATUS", COMPLETIONSTATUS.trim());
String VALIDSTATUS = pd.getString("VALIDSTATUS"); // 关键词检索条件
if (Tools.notEmpty(VALIDSTATUS))
pd.put("VALIDSTATUS", VALIDSTATUS.trim());
String ISSIGNED = pd.getString("ISSIGNED"); // 关键词检索条件
if (Tools.notEmpty(ISSIGNED))
pd.put("ISSIGNED", ISSIGNED.trim());
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
page.setPd(pd);

17
src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityCommitmentController.java
View File

@ -130,23 +130,6 @@ public class TrafficSecurityCommitmentController extends BaseController {
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
String COMMITMENTNAME = pd.getString("COMMITMENTNAME"); // 关键词检索条件
if (Tools.notEmpty(COMMITMENTNAME))
pd.put("COMMITMENTNAME", COMMITMENTNAME.trim());
String COMPLETIONSTATUS = pd.getString("COMPLETIONSTATUS"); // 关键词检索条件
if (Tools.notEmpty(COMPLETIONSTATUS))
pd.put("COMPLETIONSTATUS", COMPLETIONSTATUS.trim());
String VALIDSTATUS = pd.getString("VALIDSTATUS"); // 关键词检索条件
if (Tools.notEmpty(VALIDSTATUS))
pd.put("VALIDSTATUS", VALIDSTATUS.trim());
String ISSIGNED = pd.getString("ISSIGNED"); // 关键词检索条件
if (Tools.notEmpty(ISSIGNED))
pd.put("ISSIGNED", ISSIGNED.trim());
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
page.setPd(pd);

17
src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityLaborContractController.java
View File

@ -136,22 +136,7 @@ public class TrafficSecurityLaborContractController extends BaseController {
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
String CONTRACTNAME = pd.getString("CONTRACTNAME"); // 关键词检索条件
if (Tools.notEmpty(CONTRACTNAME))
pd.put("CONTRACTNAME", CONTRACTNAME.trim());
String COMPLETIONSTATUS = pd.getString("COMPLETIONSTATUS"); // 关键词检索条件
if (Tools.notEmpty(COMPLETIONSTATUS))
pd.put("COMPLETIONSTATUS", COMPLETIONSTATUS.trim());
String VALIDSTATUS = pd.getString("VALIDSTATUS"); // 关键词检索条件
if (Tools.notEmpty(VALIDSTATUS))
pd.put("VALIDSTATUS", VALIDSTATUS.trim());
String ISSIGNED = pd.getString("ISSIGNED"); // 关键词检索条件
if (Tools.notEmpty(ISSIGNED))
pd.put("ISSIGNED", ISSIGNED.trim());
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
page.setPd(pd);
List<PageData> varList = laborContractService.listForLaborContract(page);

18
src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityManagementStaffingController.java
View File

@ -122,23 +122,7 @@ public class TrafficSecurityManagementStaffingController extends BaseController
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
String SYSTEMNAME = pd.getString("SYSTEMNAME"); // 关键词检索条件
if (Tools.notEmpty(SYSTEMNAME))
pd.put("SYSTEMNAME", SYSTEMNAME.trim());
String COMPLETIONSTATUS = pd.getString("COMPLETIONSTATUS"); // 关键词检索条件
if (Tools.notEmpty(COMPLETIONSTATUS))
pd.put("COMPLETIONSTATUS", COMPLETIONSTATUS.trim());
String VALIDSTATUS = pd.getString("VALIDSTATUS"); // 关键词检索条件
if (Tools.notEmpty(VALIDSTATUS))
pd.put("VALIDSTATUS", VALIDSTATUS.trim());
String OPERATIONTYPE = pd.getString("OPERATIONTYPE"); // 关键词检索条件
if (Tools.notEmpty(OPERATIONTYPE))
pd.put("OPERATIONTYPE", OPERATIONTYPE.trim());
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
page.setPd(pd);
List<PageData> varList = securityManagementStaffingService.listForSecurityStaffing(page);
map.put("varList", varList);

18
src/main/java/com/zcloud/controller/system/UsersController.java
View File

@ -827,11 +827,11 @@ public class UsersController extends BaseController {
String errInfo = "success";
pd = this.getPageData();
FHLOG.save(Jurisdiction.getUsername(), "删除用户ID：" + pd.getString("USER_ID")); //记录日志
if (!PLSUtil.removeUser(pd)) {
map.put("result", "errInfo"); //返回结果
map.put("msg", "删除失败，请联系管理员"); //返回结果
return map;
}
// if (!PLSUtil.removeUser(pd)) {
// map.put("result", "errInfo"); //返回结果
// map.put("msg", "删除失败，请联系管理员"); //返回结果
// return map;
// }
usersService.deleteUser(pd); //删除用户
ueditorService.delete(pd); //删除副文本关联数据
@ -1662,7 +1662,7 @@ public class UsersController extends BaseController {
}
}
// 进行定位卡号同步校验
for (PageData pageData : editUserList) {
/*for (PageData pageData : editUserList) {
String msg = usersService.changeOrUpdUserCardNo(pageData);
if (!msg.equals(Const.CAN_CHENG_USER)) {
errorStr.append("第" + number + "行,");
@ -1677,15 +1677,15 @@ public class UsersController extends BaseController {
errorStr.append("第" + number + "行,");
errorStr.append("人员定位系统用户添加失败，请联系管理员。" + "\n");
}
}
}*/
if (Tools.isEmpty(errorStr.toString())) {
for (PageData pageData : addUserList) {
usersService.saveUser(pageData);
}
for (PageData pageData : editUserList) {
if (PLSUtil.editUser(pageData)) {
// if (PLSUtil.editUser(pageData)) {
usersService.editUser(pageData);
}
// }
}
errorStr.append("成功导入" + addUserList.size() + "条数据!");
errorStr.append("成功修改" + editUserList.size() + "条数据!");

3
src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyAssessmentMapper.xml
View File

@ -126,6 +126,9 @@
<include refid="tableName"></include> f
left join bus_corp_info i on f.OPERATINGCOMPANY = i.CORPINFO_ID
where f.ISDELETE = '0'
<if test="pd.CORPINFO_ID != null and pd.CORPINFO_ID != ''">
and f.OPERATINGCOMPANY = #{pd.CORPINFO_ID}
</if>
<if test="pd.SYSTEMNAME != null and pd.SYSTEMNAME != ''"><!-- 关键词检索-制度名称 -->
and f.SYSTEMNAME LIKE CONCAT('%', #{pd.SYSTEMNAME}, '%')
</if>

12
src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyProductionMapper.xml
View File

@ -123,6 +123,9 @@
<include refid="tableName"></include> f
left join bus_corp_info i on f.OPERATINGCOMPANY = i.CORPINFO_ID
where f.ISDELETE = '0'
<if test="pd.CORPINFO_ID != null and pd.CORPINFO_ID != ''">
and f.OPERATINGCOMPANY = #{pd.CORPINFO_ID}
</if>
<if test="pd.SYSTEMNAME != null and pd.SYSTEMNAME != ''"><!-- 关键词检索-制度名称 -->
and f.SYSTEMNAME LIKE CONCAT('%', #{pd.SYSTEMNAME}, '%')
</if>
@ -130,7 +133,14 @@
and f.COMPLETIONSTATUS = #{pd.COMPLETIONSTATUS}
</if>
<if test="pd.VALIDSTATUS != null and pd.VALIDSTATUS != ''"><!-- 关键词检索-有效状态 -->
and f.VALIDSTATUS = #{pd.VALIDSTATUS}
<choose>
<when test="pd.VALIDSTATUS == 1">
and f.EXPIRYDATE &gt;= date_format(now(),'%Y-%m-%d')
</when>
<otherwise>
and f.EXPIRYDATE &lt; date_format(now(),'%Y-%m-%d')
</otherwise>
</choose>
</if>
ORDER BY f.OPERATTIME DESC
</select>

3
src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityLaborContractMapper.xml
View File

@ -146,6 +146,9 @@
where u.ISDELETE = '0'
and u.ISMAIN != '1'
and (c.VALIDSTATUS != '2' or c.VALIDSTATUS is null)
<if test="pd.CORPINFO_ID != null and pd.CORPINFO_ID != ''">
and u.CORPINFO_ID = #{pd.CORPINFO_ID}
</if>
<if test="pd.CONTRACTNAME != null and pd.CONTRACTNAME != ''"><!-- 关键词检索 -->
and c.CONTRACTNAME like CONCAT('%',#{pd.CONTRACTNAME},'%')
</if>

5
src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityManagementStaffingMapper.xml
View File

@ -125,8 +125,11 @@
<include refid="tableName"></include> f
left join bus_corp_info i on f.OPERATINGCOMPANY = i.CORPINFO_ID
where f.ISDELETE = '0'
<if test="pd.CORPINFO_ID != null and pd.CORPINFO_ID != ''">
and f.OPERATINGCOMPANY = #{pd.CORPINFO_ID}
</if>
<if test="pd.SYSTEMNAME != null and pd.SYSTEMNAME != ''"><!-- 关键词检索-制度名称 -->
and f.SYSTEMNAME = #{pd.SYSTEMNAME}
and f.SYSTEMNAME LIKE CONCAT(CONCAT('%', #{pd.SYSTEMNAME}),'%')
</if>
<if test="pd.COMPLETIONSTATUS != null and pd.COMPLETIONSTATUS != ''"><!-- 关键词检索-完成状态 -->
and f.COMPLETIONSTATUS = #{pd.COMPLETIONSTATUS}