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

岗位安全承诺书、责任书，职业危害告知书，管理人员配备，安全生产目标，安全责任制考核模块开发，优化

dev
WenShiJun 2024-03-13 18:03:41 +08:00
parent ddb8a559d4
commit 88dc82a3bd
32 changed files with 1211 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

160
src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyAssessmentController.java Normal file
View File

@ -0,0 +1,160 @@
package com.zcloud.controller.comprehensive;
import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import com.zcloud.service.comprehensive.TrafficSafetyAssessmentService;
import com.zcloud.util.*;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.multipart.MultipartFile;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@Controller
@RequestMapping("/assessment")
public class TrafficSafetyAssessmentController extends BaseController {
@Autowired
private TrafficSafetyAssessmentService safetyAssessmentService;
@Autowired
private Smb smb;
//新增
@RequestMapping(value = "/add")
@ResponseBody
public Object add(@RequestParam(value="FFILE",required=false) MultipartFile file) throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = this.getPageData();
String safetyassessmentId = this.get32UUID();
pd.put("CREATOR", Jurisdiction.getUSER_ID()); // 创建人id
pd.put("CREATORNAME", Jurisdiction.getName()); // 创建人姓名
pd.put("OPERATINGCOMPANY", Jurisdiction.getCORPINFO_ID()); // 经营企业
pd.put("SAFETYASSESSMENT_ID", safetyassessmentId); // 主键
pd.put("CREATETIME", DateUtil.date2Str(new Date())); // 添加时间
pd.put("COMPLETIONSTATUS", "0");
pd.put("ISDELETE", "0");
if (DateUtil.compareDate(DateUtil.getDay(), pd.getString("EXPIRYDATE"))) {
pd.put("VALIDSTATUS", "0");
} else {
pd.put("VALIDSTATUS", "1");
}
String ffile = DateUtil.getDays();
if (file != null && StringUtils.isNotBlank(pd.getString("CREATORNAME"))){
pd.put("COMPLETIONSTATUS", "1");
String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")+1).toLowerCase();
if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName)) {
errInfo = "fail";
map.put("result", errInfo);
map.put("msg", "文件格式不正确！");
return map;
}
String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("OPERATINGCOMPANY") + "/" + ffile);
pd.put("ATTACHMENT_ROUTE", Const.FILEPATHFILE + pd.getString("OPERATINGCOMPANY") + "/" + ffile + "/" + fileName);
pd.put("ATTACHMENT_NAME",pd.getString("CREATORNAME"));
pd.put("CONFIRM_MESSAGE_TIME",DateUtil.date2Str(new Date()));
}
safetyAssessmentService.save(pd);
map.put("result", errInfo);
map.put("pd", pd);
return map;
}
//修改
@RequestMapping(value = "/edit")
@ResponseBody
public Object edit(@RequestParam(value="FFILE",required=false) MultipartFile file) throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = this.getPageData();
pd.put("OPERATOR", Jurisdiction.getUSER_ID()); // 修改人id
pd.put("OPERATORNAME", Jurisdiction.getName()); // 修改人姓名
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间
pd.put("OPERATINGCOMPANY", Jurisdiction.getCORPINFO_ID()); // 经营企业
pd.put("ISDELETE", "0");
String ffile = DateUtil.getDays();
if (file != null && StringUtils.isNotBlank(pd.getString("OPERATORNAME"))){
pd.put("COMPLETIONSTATUS", "1");
String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")+1).toLowerCase();
if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName)) {
errInfo = "fail";
map.put("result", errInfo);
map.put("msg", "文件格式不正确！");
return map;
}
String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("OPERATINGCOMPANY") + "/" + ffile);
pd.put("ATTACHMENT_ROUTE", Const.FILEPATHFILE + pd.getString("OPERATINGCOMPANY") + "/" + ffile + "/" + fileName);
pd.put("ATTACHMENT_NAME",pd.getString("CREATORNAME"));
pd.put("CONFIRM_MESSAGE_TIME",DateUtil.date2Str(new Date()));
}
safetyAssessmentService.edit(pd);
map.put("result", errInfo);
map.put("pd", pd);
return map;
}
/**
* 列表
* @param page
* @return
* @throws Exception
*/
@RequestMapping(value = "/listForSafetyAssessmentlist")
@ResponseBody
public Object listForSafetyAssessment(Page page) throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
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());
page.setPd(pd);
List<PageData> varList = safetyAssessmentService.listForSafetyAssessment(page);
map.put("varList", varList);
map.put("page", page);
map.put("result", errInfo);
return map;
}
//详情
@RequestMapping(value="/goEdit")
@ResponseBody
public Object goEdit() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
pd = safetyAssessmentService.findById(pd); //根据ID读取
map.put("pd", pd);
map.put("result", errInfo);
return map;
}
}

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

@ -29,7 +29,7 @@ public class TrafficSafetyOccupationalHazardsController extends BaseController {
//新增
@RequestMapping(value = "/add")
@ResponseBody
public Object add(@RequestParam(value="FFILE",required=false) MultipartFile file) throws Exception {
public Object add(@RequestParam(value="FFILE",required=false) MultipartFile file,Page page) throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = this.getPageData();
@ -67,6 +67,14 @@ public class TrafficSafetyOccupationalHazardsController extends BaseController {
pd.put("CONFIRM_MESSAGE_TIME",DateUtil.date2Str(new Date()));
}
page.setPd(pd);
List<PageData> varList = occupationalHazardsService.listForSafetyOccupationalHazardsUser(page);
if (!varList.isEmpty()){
for(PageData varPd : varList){
varPd.put("VALIDSTATUS", "2");
occupationalHazardsService.edit(varPd);
}
}
occupationalHazardsService.save(pd);
map.put("result", errInfo);
@ -123,7 +131,7 @@ public class TrafficSafetyOccupationalHazardsController extends BaseController {
*/
@RequestMapping(value = "/listForSecurityOccupationalHazards")
@ResponseBody
public Object listForSecurityWaybillRegistra(Page page) throws Exception {
public Object listForSecurityOccupationalHazards(Page page) throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = new PageData();
@ -146,14 +154,56 @@ public class TrafficSafetyOccupationalHazardsController extends BaseController {
pd.put("ISSIGNED", ISSIGNED.trim());
page.setPd(pd);
List<PageData> varList = occupationalHazardsService.listForSecurityStaffing(page);
List<PageData> varList = occupationalHazardsService.listForSecurityOccupationalHazards(page);
map.put("varList", varList);
map.put("page", page);
map.put("result", errInfo);
return map;
}
//详情
/**
* 用户列表
* @param page
* @return
* @throws Exception
*/
@RequestMapping(value = "/listForSafetyOccupationalHazardsUser")
@ResponseBody
public Object listForSafetyOccupationalHazardsUser(Page page) throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
page.setPd(pd);
List<PageData> varList = occupationalHazardsService.listForSafetyOccupationalHazardsUser(page);
map.put("varList", varList);
map.put("page", page);
map.put("result", errInfo);
return map;
}
/**
* 删除
* @return
* @throws Exception
*/
@RequestMapping(value="/delete")
@ResponseBody
public Object delete() throws Exception{
Map<String,String> map = new HashMap<String,String>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
pd.put("DELETOR", Jurisdiction.getUSER_ID());//删除人id
pd.put("DELETORNAME", Jurisdiction.getUsername());//删除人姓名
pd.put("DELETETIME", DateUtil.date2Str(new Date()));//删除时间
occupationalHazardsService.delete(pd);
map.put("result", errInfo);
return map;
}
//详情
@RequestMapping(value="/goEdit")
@ResponseBody
public Object goEdit() throws Exception{

159
src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyProductionController.java Normal file
View File

@ -0,0 +1,159 @@
package com.zcloud.controller.comprehensive;
import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import com.zcloud.service.comprehensive.TrafficSafetyProductionService;
import com.zcloud.util.*;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.multipart.MultipartFile;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@Controller
@RequestMapping("/production")
public class TrafficSafetyProductionController extends BaseController {
@Autowired
private TrafficSafetyProductionService safetyProductionService;
@Autowired
private Smb smb;
//新增
@RequestMapping(value = "/add")
@ResponseBody
public Object add(@RequestParam(value="FFILE",required=false) MultipartFile file) throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = this.getPageData();
String safetyproductionId = this.get32UUID();
pd.put("CREATOR", Jurisdiction.getUSER_ID()); // 创建人id
pd.put("CREATORNAME", Jurisdiction.getName()); // 创建人姓名
pd.put("OPERATINGCOMPANY", Jurisdiction.getCORPINFO_ID()); // 经营企业
pd.put("SAFETYPRODUCTION_ID", safetyproductionId); // 主键
pd.put("CREATETIME", DateUtil.date2Str(new Date())); // 添加时间
pd.put("COMPLETIONSTATUS", "0");
pd.put("ISDELETE", "0");
if (DateUtil.compareDate(DateUtil.getDay(), pd.getString("EXPIRYDATE"))) {
pd.put("VALIDSTATUS", "0");
} else {
pd.put("VALIDSTATUS", "1");
}
String ffile = DateUtil.getDays();
if (file != null && StringUtils.isNotBlank(pd.getString("CREATORNAME"))){
pd.put("COMPLETIONSTATUS", "1");
String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")+1).toLowerCase();
if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName)) {
errInfo = "fail";
map.put("result", errInfo);
map.put("msg", "文件格式不正确！");
return map;
}
String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("OPERATINGCOMPANY") + "/" + ffile);
pd.put("ATTACHMENT_ROUTE", Const.FILEPATHFILE + pd.getString("OPERATINGCOMPANY") + "/" + ffile + "/" + fileName);
pd.put("ATTACHMENT_NAME",pd.getString("CREATORNAME"));
pd.put("CONFIRM_MESSAGE_TIME",DateUtil.date2Str(new Date()));
}
safetyProductionService.save(pd);
map.put("result", errInfo);
map.put("pd", pd);
return map;
}
//修改
@RequestMapping(value = "/edit")
@ResponseBody
public Object edit(@RequestParam(value="FFILE",required=false) MultipartFile file) throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = this.getPageData();
pd.put("OPERATOR", Jurisdiction.getUSER_ID()); // 修改人id
pd.put("OPERATORNAME", Jurisdiction.getName()); // 修改人姓名
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间
pd.put("OPERATINGCOMPANY", Jurisdiction.getCORPINFO_ID()); // 经营企业
pd.put("ISDELETE", "0");
String ffile = DateUtil.getDays();
if (file != null && StringUtils.isNotBlank(pd.getString("OPERATORNAME"))){
pd.put("COMPLETIONSTATUS", "1");
String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")+1).toLowerCase();
if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName)) {
errInfo = "fail";
map.put("result", errInfo);
map.put("msg", "文件格式不正确！");
return map;
}
String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("OPERATINGCOMPANY") + "/" + ffile);
pd.put("ATTACHMENT_ROUTE", Const.FILEPATHFILE + pd.getString("OPERATINGCOMPANY") + "/" + ffile + "/" + fileName);
pd.put("ATTACHMENT_NAME",pd.getString("CREATORNAME"));
pd.put("CONFIRM_MESSAGE_TIME",DateUtil.date2Str(new Date()));
}
safetyProductionService.edit(pd);
map.put("result", errInfo);
map.put("pd", pd);
return map;
}
/**
* 列表
* @param page
* @return
* @throws Exception
*/
@RequestMapping(value = "/listForSafetyProductionlist")
@ResponseBody
public Object listForSafetyProductionlist(Page page) throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
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());
page.setPd(pd);
List<PageData> varList = safetyProductionService.listForSafetyProductionlist(page);
map.put("varList", varList);
map.put("page", page);
map.put("result", errInfo);
return map;
}
//详情
@RequestMapping(value="/goEdit")
@ResponseBody
public Object goEdit() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
pd = safetyProductionService.findById(pd); //根据ID读取
map.put("pd", pd);
map.put("result", errInfo);
return map;
}
}

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

@ -29,7 +29,7 @@ public class TrafficSafetyResponsibilityController extends BaseController {
//新增
@RequestMapping(value = "/add")
@ResponseBody
public Object add(@RequestParam(value="FFILE",required=false) MultipartFile file) throws Exception {
public Object add(@RequestParam(value="FFILE",required=false) MultipartFile file,Page page) throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = this.getPageData();
@ -65,7 +65,14 @@ public class TrafficSafetyResponsibilityController extends BaseController {
pd.put("ATTACHMENT_NAME",pd.getString("CREATORNAME"));
pd.put("CONFIRM_MESSAGE_TIME",DateUtil.date2Str(new Date()));
}
page.setPd(pd);
List<PageData> varList = responseService.listForSafetyResponsibilityUser(page);
if (!varList.isEmpty()){
for(PageData varPd : varList){
varPd.put("VALIDSTATUS", "2");
responseService.edit(varPd);
}
}
responseService.save(pd);
map.put("result", errInfo);
@ -85,10 +92,6 @@ public class TrafficSafetyResponsibilityController extends BaseController {
pd.put("OPERATORNAME", Jurisdiction.getName()); // 修改人姓名
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间
pd.put("OPERATINGCOMPANY", Jurisdiction.getCORPINFO_ID()); // 经营企业
pd.put("ISDELETE", "0");
pd.put("COMPLETIONSTATUS", "1");
pd.put("VALIDSTATUS", "1");
pd.put("ISSIGNED", "1");
String ffile = DateUtil.getDays();
if (file != null && StringUtils.isNotBlank(pd.getString("OPERATORNAME"))){
@ -122,7 +125,7 @@ public class TrafficSafetyResponsibilityController extends BaseController {
*/
@RequestMapping(value = "/listForSecurityResponsibility")
@ResponseBody
public Object listForSecurityWaybillRegistra(Page page) throws Exception {
public Object listForSecurityResponsibility(Page page) throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = new PageData();
@ -145,7 +148,7 @@ public class TrafficSafetyResponsibilityController extends BaseController {
pd.put("ISSIGNED", ISSIGNED.trim());
page.setPd(pd);
List<PageData> varList = responseService.listForSecurityStaffing(page);
List<PageData> varList = responseService.listForSecurityResponsibility(page);
map.put("varList", varList);
map.put("page", page);
map.put("result", errInfo);
@ -165,4 +168,46 @@ public class TrafficSafetyResponsibilityController extends BaseController {
map.put("result", errInfo);
return map;
}
/**
* 用户列表
* @param page
* @return
* @throws Exception
*/
@RequestMapping(value = "/listForSafetyResponsibilityUser")
@ResponseBody
public Object listForSafetyResponsibilityUser(Page page) throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
page.setPd(pd);
List<PageData> varList = responseService.listForSafetyResponsibilityUser(page);
map.put("varList", varList);
map.put("page", page);
map.put("result", errInfo);
return map;
}
/**
* 删除
* @return
* @throws Exception
*/
@RequestMapping(value="/delete")
@ResponseBody
public Object delete() throws Exception{
Map<String,String> map = new HashMap<String,String>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
pd.put("DELETOR", Jurisdiction.getUSER_ID());//删除人id
pd.put("DELETORNAME", Jurisdiction.getUsername());//删除人姓名
pd.put("DELETETIME", DateUtil.date2Str(new Date()));//删除时间
responseService.delete(pd);
map.put("result", errInfo);
return map;
}
}

2
src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyThingsCheckController.java
View File

@ -31,7 +31,7 @@ public class TrafficSafetyThingsCheckController extends BaseController {
//列表
@RequestMapping(value = "/listForSafetyThingsCheck")
@ResponseBody
public Object listForSecurityNotice(Page page) throws Exception {
public Object listForSafetyThingsCheck(Page page) throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = new PageData();

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

@ -17,6 +17,7 @@ import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@Controller
@RequestMapping("/commitment")
@ -28,7 +29,7 @@ public class TrafficSecurityCommitmentController extends BaseController {
//新增
@RequestMapping(value = "/add")
@ResponseBody
public Object add(@RequestParam(value="FFILE",required=false) MultipartFile file) throws Exception {
public Object add(@RequestParam(value="FFILE",required=false) MultipartFile file, Page page) throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = this.getPageData();
@ -64,9 +65,15 @@ public class TrafficSecurityCommitmentController extends BaseController {
pd.put("ATTACHMENT_NAME",pd.getString("CREATORNAME"));
pd.put("CONFIRM_MESSAGE_TIME",DateUtil.date2Str(new Date()));
}
page.setPd(pd);
List<PageData> varList = securityCommitmentService.listForSecurityCommitmentUser(page);
if (!varList.isEmpty()){
for(PageData varPd : varList){
varPd.put("VALIDSTATUS", "2");
securityCommitmentService.edit(varPd);
}
}
securityCommitmentService.save(pd);
map.put("result", errInfo);
map.put("pd", pd);
return map;
@ -117,7 +124,7 @@ public class TrafficSecurityCommitmentController extends BaseController {
*/
@RequestMapping(value = "/listForSecurityCommitment")
@ResponseBody
public Object listForSecurityWaybillRegistra(Page page) throws Exception {
public Object listForSecurityCommitment(Page page) throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = new PageData();
@ -140,7 +147,29 @@ public class TrafficSecurityCommitmentController extends BaseController {
pd.put("ISSIGNED", ISSIGNED.trim());
page.setPd(pd);
List<PageData> varList = securityCommitmentService.listForSecurityStaffing(page);
List<PageData> varList = securityCommitmentService.listForSecurityCommitment(page);
map.put("varList", varList);
map.put("page", page);
map.put("result", errInfo);
return map;
}
/**
* 用户列表
* @param page
* @return
* @throws Exception
*/
@RequestMapping(value = "/listForSecurityCommitmentUser")
@ResponseBody
public Object listForSecurityCommitmentUser(Page page) throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
page.setPd(pd);
List<PageData> varList = securityCommitmentService.listForSecurityCommitmentUser(page);
map.put("varList", varList);
map.put("page", page);
map.put("result", errInfo);
@ -160,4 +189,24 @@ public class TrafficSecurityCommitmentController extends BaseController {
map.put("result", errInfo);
return map;
}
/**
* 删除
* @return
* @throws Exception
*/
@RequestMapping(value="/delete")
@ResponseBody
public Object delete() throws Exception{
Map<String,String> map = new HashMap<String,String>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
pd.put("DELETOR", Jurisdiction.getUSER_ID());//删除人id
pd.put("DELETORNAME", Jurisdiction.getUsername());//删除人姓名
pd.put("DELETETIME", DateUtil.date2Str(new Date()));//删除时间
securityCommitmentService.delete(pd);
map.put("result", errInfo);
return map;
}
}

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

@ -28,7 +28,7 @@ public class TrafficSecurityLaborContractController extends BaseController {
//新增
@RequestMapping(value = "/add")
@ResponseBody
public Object add(@RequestParam(value="FFILE",required=false) MultipartFile file) throws Exception {
public Object add(@RequestParam(value="FFILE",required=false) MultipartFile file,Page page) throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = this.getPageData();
@ -65,6 +65,14 @@ public class TrafficSecurityLaborContractController extends BaseController {
pd.put("CONFIRM_MESSAGE_TIME",DateUtil.date2Str(new Date()));
}
page.setPd(pd);
List<PageData> varList = laborContractService.listForLaborContractUser(page);
if (!varList.isEmpty()){
for(PageData varPd : varList){
varPd.put("VALIDSTATUS", "2");
laborContractService.edit(varPd);
}
}
laborContractService.save(pd);
map.put("result", errInfo);
@ -119,9 +127,9 @@ public class TrafficSecurityLaborContractController extends BaseController {
* @return
* @throws Exception
*/
@RequestMapping(value = "/listForSecurityStaffing")
@RequestMapping(value = "/listForLaborContract")
@ResponseBody
public Object listForSecurityWaybillRegistra(Page page) throws Exception {
public Object listForLaborContract(Page page) throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = new PageData();
@ -144,13 +152,54 @@ public class TrafficSecurityLaborContractController extends BaseController {
pd.put("ISSIGNED", ISSIGNED.trim());
page.setPd(pd);
List<PageData> varList = laborContractService.listForSecurityStaffing(page);
List<PageData> varList = laborContractService.listForLaborContract(page);
map.put("varList", varList);
map.put("page", page);
map.put("result", errInfo);
return map;
}
/**
* 用户列表
* @param page
* @return
* @throws Exception
*/
@RequestMapping(value = "/listForLaborContractUser")
@ResponseBody
public Object listForLaborContractUser(Page page) throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
page.setPd(pd);
List<PageData> varList = laborContractService.listForLaborContractUser(page);
map.put("varList", varList);
map.put("page", page);
map.put("result", errInfo);
return map;
}
/**
* 删除
* @return
* @throws Exception
*/
@RequestMapping(value="/delete")
@ResponseBody
public Object delete() throws Exception{
Map<String,String> map = new HashMap<String,String>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
pd.put("DELETOR", Jurisdiction.getUSER_ID());//删除人id
pd.put("DELETORNAME", Jurisdiction.getUsername());//删除人姓名
pd.put("DELETETIME", DateUtil.date2Str(new Date()));//删除时间
laborContractService.delete(pd);
map.put("result", errInfo);
return map;
}
//详情
@RequestMapping(value="/goEdit")
@ResponseBody

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

@ -19,7 +19,7 @@ import java.util.List;
import java.util.Map;
@Controller
@RequestMapping("/staffing")
@RequestMapping("/managementstaffing")
public class TrafficSecurityManagementStaffingController extends BaseController {
@Autowired
private TrafficSecurityManagementStaffingService securityManagementStaffingService;
@ -115,7 +115,7 @@ public class TrafficSecurityManagementStaffingController extends BaseController
* @return
* @throws Exception
*/
@RequestMapping(value = "/listForSecurityStaffing")
@RequestMapping(value = "/listForManagementStaffing")
@ResponseBody
public Object listForSecurityWaybillRegistra(Page page) throws Exception {
Map<String, Object> map = new HashMap<String, Object>();

18
src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSafetyAssessmentMapper.java Normal file
View File

@ -0,0 +1,18 @@
package com.zcloud.mapper.datasource.comprehensive;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
@Mapper
public interface TrafficSafetyAssessmentMapper {
void save(PageData pd);
List<PageData> datalistPage(Page page);
void edit(PageData pd);
PageData findById(PageData pd);
}

4
src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSafetyOccupationalHazardsMapper.java
View File

@ -15,4 +15,8 @@ public interface TrafficSafetyOccupationalHazardsMapper {
void edit(PageData pd);
PageData findById(PageData pd);
List<PageData> datalistPageUser(Page page);
void delete(PageData pd);
}

18
src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSafetyProductionMapper.java Normal file
View File

@ -0,0 +1,18 @@
package com.zcloud.mapper.datasource.comprehensive;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
@Mapper
public interface TrafficSafetyProductionMapper {
void save(PageData pd);
List<PageData> datalistPage(Page page);
void edit(PageData pd);
PageData findById(PageData pd);
}

4
src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSafetyResponsibilityMapper.java
View File

@ -15,4 +15,8 @@ public interface TrafficSafetyResponsibilityMapper {
void edit(PageData pd);
PageData findById(PageData pd);
List<PageData> datalistPageUser(Page page);
void delete(PageData pd);
}

4
src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityCommitmentMapper.java
View File

@ -15,4 +15,8 @@ public interface TrafficSecurityCommitmentMapper {
void edit(PageData pd);
PageData findById(PageData pd);
List<PageData> datalistPageUser(Page page);
void delete(PageData pd);
}

4
src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityLaborContractMapper.java
View File

@ -15,4 +15,8 @@ public interface TrafficSecurityLaborContractMapper {
void edit(PageData pd);
PageData findById(PageData pd);
List<PageData> datalistPageUser(Page page);
void delete(PageData pd);
}

16
src/main/java/com/zcloud/service/comprehensive/TrafficSafetyAssessmentService.java Normal file
View File

@ -0,0 +1,16 @@
package com.zcloud.service.comprehensive;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import java.util.List;
public interface TrafficSafetyAssessmentService {
void save(PageData pd);
void edit(PageData pd);
List<PageData> listForSafetyAssessment(Page page);
PageData findById(PageData pd);
}

6
src/main/java/com/zcloud/service/comprehensive/TrafficSafetyOccupationalHazardsService.java
View File

@ -10,7 +10,11 @@ public interface TrafficSafetyOccupationalHazardsService {
void edit(PageData pd);
List<PageData> listForSecurityStaffing(Page page);
List<PageData> listForSecurityOccupationalHazards(Page page);
PageData findById(PageData pd);
List<PageData> listForSafetyOccupationalHazardsUser(Page page);
void delete(PageData pd);
}

16
src/main/java/com/zcloud/service/comprehensive/TrafficSafetyProductionService.java Normal file
View File

@ -0,0 +1,16 @@
package com.zcloud.service.comprehensive;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import java.util.List;
public interface TrafficSafetyProductionService {
void save(PageData pd);
void edit(PageData pd);
List<PageData> listForSafetyProductionlist(Page page);
PageData findById(PageData pd);
}

6
src/main/java/com/zcloud/service/comprehensive/TrafficSafetyResponsibilityService.java
View File

@ -10,7 +10,11 @@ public interface TrafficSafetyResponsibilityService {
void edit(PageData pd);
List<PageData> listForSecurityStaffing(Page page);
List<PageData> listForSecurityResponsibility(Page page);
PageData findById(PageData pd);
List<PageData> listForSafetyResponsibilityUser(Page page);
void delete(PageData pd);
}

6
src/main/java/com/zcloud/service/comprehensive/TrafficSecurityCommitmentService.java
View File

@ -10,7 +10,11 @@ public interface TrafficSecurityCommitmentService {
void edit(PageData pd);
List<PageData> listForSecurityStaffing(Page page);
List<PageData> listForSecurityCommitment(Page page);
PageData findById(PageData pd);
List<PageData> listForSecurityCommitmentUser(Page page);
void delete(PageData pd);
}

12
src/main/java/com/zcloud/service/comprehensive/TrafficSecurityCommitmentServiceImpl.java
View File

@ -24,7 +24,7 @@ public class TrafficSecurityCommitmentServiceImpl implements TrafficSecurityComm
}
@Override
public List<PageData> listForSecurityStaffing(Page page) {
public List<PageData> listForSecurityCommitment(Page page) {
return securityCommitmentMapper.datalistPage(page);
}
@ -32,4 +32,14 @@ public class TrafficSecurityCommitmentServiceImpl implements TrafficSecurityComm
public PageData findById(PageData pd) {
return securityCommitmentMapper.findById(pd);
}
@Override
public List<PageData> listForSecurityCommitmentUser(Page page) {
return securityCommitmentMapper.datalistPageUser(page);
}
@Override
public void delete(PageData pd) {
securityCommitmentMapper.delete(pd);
}
}

6
src/main/java/com/zcloud/service/comprehensive/TrafficSecurityLaborContractService.java
View File

@ -10,7 +10,11 @@ public interface TrafficSecurityLaborContractService {
void edit(PageData pd);
List<PageData> listForSecurityStaffing(Page page);
List<PageData> listForLaborContract(Page page);
PageData findById(PageData pd);
List<PageData> listForLaborContractUser(Page page);
void delete(PageData pd);
}

36
src/main/java/com/zcloud/service/comprehensive/impl/TrafficSafetyAssessmentServiceImpl.java Normal file
View File

@ -0,0 +1,36 @@
package com.zcloud.service.comprehensive.impl;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import com.zcloud.mapper.datasource.comprehensive.TrafficSafetyAssessmentMapper;
import com.zcloud.mapper.datasource.comprehensive.TrafficSafetyProductionMapper;
import com.zcloud.service.comprehensive.TrafficSafetyAssessmentService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
@Service
public class TrafficSafetyAssessmentServiceImpl implements TrafficSafetyAssessmentService {
@Autowired
private TrafficSafetyAssessmentMapper safetyAssessmentMapper;
@Override
public void save(PageData pd) {
safetyAssessmentMapper.save(pd);
}
@Override
public void edit(PageData pd) {
safetyAssessmentMapper.edit(pd);
}
@Override
public List<PageData> listForSafetyAssessment(Page page) {
return safetyAssessmentMapper.datalistPage(page);
}
@Override
public PageData findById(PageData pd) {
return safetyAssessmentMapper.findById(pd);
}
}

12
src/main/java/com/zcloud/service/comprehensive/impl/TrafficSafetyOccupationalHazardsServiceImpl.java
View File

@ -25,7 +25,7 @@ public class TrafficSafetyOccupationalHazardsServiceImpl implements TrafficSafet
}
@Override
public List<PageData> listForSecurityStaffing(Page page) {
public List<PageData> listForSecurityOccupationalHazards(Page page) {
return occupationalHazardsMapper.datalistPage(page);
}
@ -33,4 +33,14 @@ public class TrafficSafetyOccupationalHazardsServiceImpl implements TrafficSafet
public PageData findById(PageData pd) {
return occupationalHazardsMapper.findById(pd);
}
@Override
public List<PageData> listForSafetyOccupationalHazardsUser(Page page) {
return occupationalHazardsMapper.datalistPageUser(page);
}
@Override
public void delete(PageData pd) {
occupationalHazardsMapper.delete(pd);
}
}

35
src/main/java/com/zcloud/service/comprehensive/impl/TrafficSafetyProductionServiceImpl.java Normal file
View File

@ -0,0 +1,35 @@
package com.zcloud.service.comprehensive.impl;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import com.zcloud.mapper.datasource.comprehensive.TrafficSafetyProductionMapper;
import com.zcloud.service.comprehensive.TrafficSafetyProductionService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
@Service
public class TrafficSafetyProductionServiceImpl implements TrafficSafetyProductionService {
@Autowired
private TrafficSafetyProductionMapper speedProductionMapper;
@Override
public void save(PageData pd) {
speedProductionMapper.save(pd);
}
@Override
public void edit(PageData pd) {
speedProductionMapper.edit(pd);
}
@Override
public List<PageData> listForSafetyProductionlist(Page page) {
return speedProductionMapper.datalistPage(page);
}
@Override
public PageData findById(PageData pd) {
return speedProductionMapper.findById(pd);
}
}

12
src/main/java/com/zcloud/service/comprehensive/impl/TrafficSafetyResponsibilityServiceImpl.java
View File

@ -25,7 +25,7 @@ public class TrafficSafetyResponsibilityServiceImpl implements TrafficSafetyResp
}
@Override
public List<PageData> listForSecurityStaffing(Page page) {
public List<PageData> listForSecurityResponsibility(Page page) {
return responseMapper.datalistPage(page);
}
@ -33,4 +33,14 @@ public class TrafficSafetyResponsibilityServiceImpl implements TrafficSafetyResp
public PageData findById(PageData pd) {
return responseMapper.findById(pd);
}
@Override
public List<PageData> listForSafetyResponsibilityUser(Page page) {
return responseMapper.datalistPageUser(page);
}
@Override
public void delete(PageData pd) {
responseMapper.delete(pd);
}
}

12
src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityLaborContractServiceImpl.java
View File

@ -24,7 +24,7 @@ public class TrafficSecurityLaborContractServiceImpl implements TrafficSecurityL
}
@Override
public List<PageData> listForSecurityStaffing(Page page) {
public List<PageData> listForLaborContract(Page page) {
return laborContractMapper.datalistPage(page);
}
@ -32,4 +32,14 @@ public class TrafficSecurityLaborContractServiceImpl implements TrafficSecurityL
public PageData findById(PageData pd) {
return laborContractMapper.findById(pd);
}
@Override
public List<PageData> listForLaborContractUser(Page page) {
return laborContractMapper.datalistPageUser(page);
}
@Override
public void delete(PageData pd) {
laborContractMapper.delete(pd);
}
}

132
src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyAssessmentMapper.xml Normal file
View File

@ -0,0 +1,132 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zcloud.mapper.datasource.comprehensive.TrafficSafetyAssessmentMapper">
<!-- 表名 -->
<sql id="tableName">
BUS_TRAFFIC_SAFETY_ASSESSMENT
</sql>
<!-- 数据字典表名 -->
<sql id="dicTableName">
SYS_DICTIONARIES
</sql>
<!-- 字段 -->
<sql id="Field">
f.SAFETYASSESSMENT_ID,
f.SYSTEMNAME,
f.COMPLETIONSTATUS,
f.VALIDSTATUS,
f.OPERATINGCOMPANY,
f.EXPIRYDATE,
f.ATTACHMENT_ROUTE,
f.USER_ID,
f.ISDELETE,
f.DELETOR,
f.DELETORNAME,
f.DELETETIME,
f.CREATOR,
f.CREATORNAME,
f.CREATETIME,
f.OPERATOR,
f.OPERATORNAME,
f.OPERATTIME
</sql>
<!-- 字段用于新增 -->
<sql id="Field2">
SAFETYASSESSMENT_ID,
SYSTEMNAME,
COMPLETIONSTATUS,
VALIDSTATUS,
OPERATINGCOMPANY,
EXPIRYDATE,
ATTACHMENT_ROUTE,
USER_ID,
ISDELETE,
DELETOR,
DELETORNAME,
DELETETIME,
CREATOR,
CREATORNAME,
CREATETIME,
OPERATOR,
OPERATORNAME,
OPERATTIME
</sql>
<!-- 字段值 -->
<sql id="FieldValue">
#{SAFETYASSESSMENT_ID},
#{SYSTEMNAME},
#{COMPLETIONSTATUS},
#{VALIDSTATUS},
#{OPERATINGCOMPANY},
#{EXPIRYDATE},
#{ATTACHMENT_ROUTE},
#{USER_ID},
#{ISDELETE},
#{DELETOR},
#{DELETORNAME},
#{DELETETIME},
#{CREATOR},
#{CREATORNAME},
#{CREATETIME},
#{OPERATOR},
#{OPERATORNAME},
#{OPERATTIME}
</sql>
<!-- 新增-->
<insert id="save" parameterType="pd">
insert into
<include refid="tableName"></include>
(
<include refid="Field2"></include>
) values (
<include refid="FieldValue"></include>
)
</insert>
<!-- 修改 -->
<update id="edit" parameterType="pd">
update
<include refid="tableName"></include>
set
OPERATOR = #{OPERATOR},
OPERATORNAME = #{OPERATORNAME},
OPERATTIME = #{OPERATTIME},
ATTACHMENT_ROUTE=#{ATTACHMENT_ROUTE}
where
SAFETYASSESSMENT_ID = #{SAFETYASSESSMENT_ID}
</update>
<!--列表-->
<select id="datalistPage" parameterType="page" resultType="pd">
select
f.*,
i.CORP_NAME
from
<include refid="tableName"></include> f
left join bus_corp_info i on f.OPERATINGCOMPANY = i.CORPINFO_ID
where f.ISDELETE = '0'
<if test="pd.SYSTEMNAME != null and pd.SYSTEMNAME != ''"><!-- 关键词检索-制度名称 -->
and f.SYSTEMNAME LIKE CONCAT('%', #{pd.SYSTEMNAME}, '%')
</if>
<if test="pd.COMPLETIONSTATUS != null and pd.COMPLETIONSTATUS != ''"><!-- 关键词检索-完成状态 -->
and f.COMPLETIONSTATUS = #{pd.COMPLETIONSTATUS}
</if>
<if test="pd.VALIDSTATUS != null and pd.VALIDSTATUS != ''"><!-- 关键词检索-有效状态 -->
and f.VALIDSTATUS = #{pd.VALIDSTATUS}
</if>
</select>
<select id="findById" resultType="com.zcloud.entity.PageData" parameterType="com.zcloud.entity.PageData">
select
<include refid="Field"></include>
from
<include refid="tableName"></include> f
where
f.SAFETYASSESSMENT_ID = #{SAFETYASSESSMENT_ID}
</select>
</mapper>

47
src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyOccupationalHazardsMapper.xml
View File

@ -17,7 +17,6 @@
f.OCCUPATIONALNAME,
f.COMPLETIONSTATUS,
f.VALIDSTATUS,
f.ISSIGNED,
f.OPERATINGCOMPANY,
f.EXPIRYDATE,
f.ATTACHMENT_ROUTE,
@ -40,7 +39,6 @@
OCCUPATIONALNAME,
COMPLETIONSTATUS,
VALIDSTATUS,
ISSIGNED,
OPERATINGCOMPANY,
EXPIRYDATE,
ATTACHMENT_ROUTE,
@ -63,7 +61,6 @@
#{OCCUPATIONALNAME},
#{COMPLETIONSTATUS},
#{VALIDSTATUS},
#{ISSIGNED},
#{OPERATINGCOMPANY},
#{EXPIRYDATE},
#{ATTACHMENT_ROUTE},
@ -99,11 +96,27 @@
OPERATOR = #{OPERATOR},
OPERATORNAME = #{OPERATORNAME},
OPERATTIME = #{OPERATTIME},
EXPIRYDATE = #{EXPIRYDATE},
ATTACHMENT_ROUTE=#{ATTACHMENT_ROUTE}
<if test="VALIDSTATUS != null">
, VALIDSTATUS = #{VALIDSTATUS}
</if>
where
OCCUPATIONALHAZARDS_ID = #{OCCUPATIONALHAZARDS_ID}
</update>
<!-- 删除-->
<delete id="delete" parameterType="pd">
update
<include refid="tableName"></include>
set
ISDELETE = '1',
DELETOR = #{DELETOR},
DELETETIME = #{DELETETIME}
where
OCCUPATIONALHAZARDS_ID = #{OCCUPATIONALHAZARDS_ID}
</delete>
<!--列表-->
<select id="datalistPage" parameterType="page" resultType="pd">
select
@ -116,14 +129,23 @@
c.EXPIRYDATE,
c.CREATETIME,
c.OPERATTIME,
c.OCCUPATIONALHAZARDS_ID,
c.ISSIGNED
c.OCCUPATIONALHAZARDS_ID
from
sys_user u
left join bus_corp_info i on u.CORPINFO_ID = i.CORPINFO_ID
left join BUS_TRAFFIC_OCCUPATIONAL_HAZARDS c on u.USER_ID = c.USER_ID
where u.ISDELETE = '0'
and u.ISMAIN != '1'
and (c.VALIDSTATUS != '2' or c.VALIDSTATUS is null)
<if test="pd.OCCUPATIONALNAME != null and pd.OCCUPATIONALNAME != ''"><!-- 关键词检索-名称 -->
and c.OCCUPATIONALNAME like CONCAT('%',#{pd.OCCUPATIONALNAME},'%')
</if>
<if test="pd.COMPLETIONSTATUS != null and pd.COMPLETIONSTATUS != ''"><!-- 关键词检索-完成状态 -->
and c.COMPLETIONSTATUS = #{pd.COMPLETIONSTATUS}
</if>
<if test="pd.VALIDSTATUS != null and pd.VALIDSTATUS != ''"><!-- 关键词检索-有效状态 -->
and c.VALIDSTATUS = #{pd.VALIDSTATUS}
</if>
</select>
<select id="findById" resultType="com.zcloud.entity.PageData" parameterType="com.zcloud.entity.PageData">
@ -134,4 +156,19 @@
where
f.OCCUPATIONALHAZARDS_ID = #{OCCUPATIONALHAZARDS_ID}
</select>
<select id="datalistPageUser" parameterType="page" resultType="pd">
select
f.*,
i.CORP_NAME,
u.NAME
from
<include refid="tableName"></include> f
left join bus_corp_info i on f.OPERATINGCOMPANY = i.CORPINFO_ID
left join sys_user u on f.USER_ID = u.USER_ID
where f.ISDELETE = '0'
<if test="pd.USER_ID != null and pd.USER_ID != ''">
and f.USER_ID = #{pd.USER_ID}
</if>
</select>
</mapper>

151
src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyProductionMapper.xml Normal file
View File

@ -0,0 +1,151 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zcloud.mapper.datasource.comprehensive.TrafficSafetyProductionMapper">
<!-- 表名 -->
<sql id="tableName">
BUS_TRAFFIC_SAFETY_PRODUCTION
</sql>
<!-- 数据字典表名 -->
<sql id="dicTableName">
SYS_DICTIONARIES
</sql>
<!-- 字段 -->
<sql id="Field">
f.SAFETYPRODUCTION_ID,
f.SYSTEMNAME,
f.COMPLETIONSTATUS,
f.VALIDSTATUS,
f.OPERATINGCOMPANY,
f.EXPIRYDATE,
f.ATTACHMENT_ROUTE,
f.USER_ID,
f.ISDELETE,
f.DELETOR,
f.DELETORNAME,
f.DELETETIME,
f.CREATOR,
f.CREATORNAME,
f.CREATETIME,
f.OPERATOR,
f.OPERATORNAME,
f.OPERATTIME
</sql>
<!-- 字段用于新增 -->
<sql id="Field2">
SAFETYPRODUCTION_ID,
SYSTEMNAME,
COMPLETIONSTATUS,
VALIDSTATUS,
OPERATINGCOMPANY,
EXPIRYDATE,
ATTACHMENT_ROUTE,
USER_ID,
ISDELETE,
DELETOR,
DELETORNAME,
DELETETIME,
CREATOR,
CREATORNAME,
CREATETIME,
OPERATOR,
OPERATORNAME,
OPERATTIME
</sql>
<!-- 字段值 -->
<sql id="FieldValue">
#{SAFETYPRODUCTION_ID},
#{SYSTEMNAME},
#{COMPLETIONSTATUS},
#{VALIDSTATUS},
#{OPERATINGCOMPANY},
#{EXPIRYDATE},
#{ATTACHMENT_ROUTE},
#{USER_ID},
#{ISDELETE},
#{DELETOR},
#{DELETORNAME},
#{DELETETIME},
#{CREATOR},
#{CREATORNAME},
#{CREATETIME},
#{OPERATOR},
#{OPERATORNAME},
#{OPERATTIME}
</sql>
<!-- 新增-->
<insert id="save" parameterType="pd">
insert into
<include refid="tableName"></include>
(
<include refid="Field2"></include>
) values (
<include refid="FieldValue"></include>
)
</insert>
<!-- 修改 -->
<update id="edit" parameterType="pd">
update
<include refid="tableName"></include>
set
OPERATOR = #{OPERATOR},
OPERATORNAME = #{OPERATORNAME},
OPERATTIME = #{OPERATTIME},
ATTACHMENT_ROUTE=#{ATTACHMENT_ROUTE}
where
SAFETYPRODUCTION_ID = #{SAFETYPRODUCTION_ID}
</update>
<!--列表-->
<select id="datalistPage" parameterType="page" resultType="pd">
select
f.*,
i.CORP_NAME
from
<include refid="tableName"></include> f
left join bus_corp_info i on f.OPERATINGCOMPANY = i.CORPINFO_ID
where f.ISDELETE = '0'
<if test="pd.SYSTEMNAME != null and pd.SYSTEMNAME != ''"><!-- 关键词检索-制度名称 -->
and f.SYSTEMNAME LIKE CONCAT('%', #{pd.SYSTEMNAME}, '%')
</if>
<if test="pd.COMPLETIONSTATUS != null and pd.COMPLETIONSTATUS != ''"><!-- 关键词检索-完成状态 -->
and f.COMPLETIONSTATUS = #{pd.COMPLETIONSTATUS}
</if>
<if test="pd.VALIDSTATUS != null and pd.VALIDSTATUS != ''"><!-- 关键词检索-有效状态 -->
and f.VALIDSTATUS = #{pd.VALIDSTATUS}
</if>
</select>
<!-- <select id="datalistPage" parameterType="page" resultType="pd">-->
<!-- select-->
<!-- u.NAME,-->
<!-- u.USER_ID,-->
<!-- i.CORP_NAME,-->
<!-- c.SYSTEMNAME,-->
<!-- c.COMPLETIONSTATUS,-->
<!-- c.VALIDSTATUS,-->
<!-- c.EXPIRYDATE,-->
<!-- c.CREATETIME,-->
<!-- c.OPERATTIME,-->
<!-- c.SAFETYPRODUCTION_ID-->
<!-- from-->
<!-- sys_user u-->
<!-- left join bus_corp_info i on u.CORPINFO_ID = i.CORPINFO_ID-->
<!-- left join BUS_TRAFFIC_SAFETY_PRODUCTION c on u.USER_ID = c.USER_ID-->
<!-- where u.ISDELETE = '0'-->
<!-- and u.ISMAIN != '1'-->
<!-- </select>-->
<select id="findById" resultType="com.zcloud.entity.PageData" parameterType="com.zcloud.entity.PageData">
select
<include refid="Field"></include>
from
<include refid="tableName"></include> f
where
f.SAFETYPRODUCTION_ID = #{SAFETYPRODUCTION_ID}
</select>
</mapper>

47
src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyResponsibilityMapper.xml
View File

@ -17,7 +17,6 @@
f.RESPONSIBILITYNAME,
f.COMPLETIONSTATUS,
f.VALIDSTATUS,
f.ISSIGNED,
f.OPERATINGCOMPANY,
f.EXPIRYDATE,
f.ATTACHMENT_ROUTE,
@ -40,7 +39,6 @@
RESPONSIBILITYNAME,
COMPLETIONSTATUS,
VALIDSTATUS,
ISSIGNED,
OPERATINGCOMPANY,
EXPIRYDATE,
ATTACHMENT_ROUTE,
@ -63,7 +61,6 @@
#{RESPONSIBILITYNAME},
#{COMPLETIONSTATUS},
#{VALIDSTATUS},
#{ISSIGNED},
#{OPERATINGCOMPANY},
#{EXPIRYDATE},
#{ATTACHMENT_ROUTE},
@ -99,11 +96,27 @@
OPERATOR = #{OPERATOR},
OPERATORNAME = #{OPERATORNAME},
OPERATTIME = #{OPERATTIME},
EXPIRYDATE = #{EXPIRYDATE},
ATTACHMENT_ROUTE=#{ATTACHMENT_ROUTE}
<if test="VALIDSTATUS != null">
, VALIDSTATUS = #{VALIDSTATUS}
</if>
where
SAFETYRESPONSIBILITY_ID = #{SAFETYRESPONSIBILITY_ID}
</update>
<!-- 删除-->
<delete id="delete" parameterType="pd">
update
<include refid="tableName"></include>
set
ISDELETE = '1',
DELETOR = #{DELETOR},
DELETETIME = #{DELETETIME}
where
SAFETYRESPONSIBILITY_ID = #{SAFETYRESPONSIBILITY_ID}
</delete>
<!--列表-->
<select id="datalistPage" parameterType="page" resultType="pd">
select
@ -116,14 +129,23 @@
c.EXPIRYDATE,
c.CREATETIME,
c.OPERATTIME,
c.SAFETYRESPONSIBILITY_ID,
c.ISSIGNED
c.SAFETYRESPONSIBILITY_ID
from
sys_user u
left join bus_corp_info i on u.CORPINFO_ID = i.CORPINFO_ID
left join BUS_TRAFFIC_SAFETY_RESPONSIBILITY c on u.USER_ID = c.USER_ID
where u.ISDELETE = '0'
and u.ISMAIN != '1'
and (c.VALIDSTATUS != '2' or c.VALIDSTATUS is null)
<if test="pd.RESPONSIBILITYNAME != null and pd.RESPONSIBILITYNAME != ''"><!-- 关键词检索-制度名称 -->
and c.RESPONSIBILITYNAME like CONCAT('%',#{pd.RESPONSIBILITYNAME},'%')
</if>
<if test="pd.COMPLETIONSTATUS != null and pd.COMPLETIONSTATUS != ''"><!-- 关键词检索-完成状态 -->
and c.COMPLETIONSTATUS = #{pd.COMPLETIONSTATUS}
</if>
<if test="pd.VALIDSTATUS != null and pd.VALIDSTATUS != ''"><!-- 关键词检索-有效状态 -->
and c.VALIDSTATUS = #{pd.VALIDSTATUS}
</if>
</select>
<select id="findById" resultType="com.zcloud.entity.PageData" parameterType="com.zcloud.entity.PageData">
@ -134,4 +156,19 @@
where
f.SAFETYRESPONSIBILITY_ID = #{SAFETYRESPONSIBILITY_ID}
</select>
<select id="datalistPageUser" parameterType="page" resultType="pd">
select
f.*,
i.CORP_NAME,
u.NAME
from
<include refid="tableName"></include> f
left join bus_corp_info i on f.OPERATINGCOMPANY = i.CORPINFO_ID
left join sys_user u on f.USER_ID = u.USER_ID
where f.ISDELETE = '0'
<if test="pd.USER_ID != null and pd.USER_ID != ''">
and f.USER_ID = #{pd.USER_ID}
</if>
</select>
</mapper>

56
src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityCommitmentMapper.xml
View File

@ -17,7 +17,6 @@
f.COMMITMENTNAME,
f.COMPLETIONSTATUS,
f.VALIDSTATUS,
f.ISSIGNED,
f.OPERATINGCOMPANY,
f.OPERATINGTYPE,
f.EXPIRYDATE,
@ -42,7 +41,6 @@
COMMITMENTNAME,
COMPLETIONSTATUS,
VALIDSTATUS,
ISSIGNED,
OPERATINGCOMPANY,
OPERATINGTYPE,
EXPIRYDATE,
@ -67,7 +65,6 @@
#{COMMITMENTNAME},
#{COMPLETIONSTATUS},
#{VALIDSTATUS},
#{ISSIGNED},
#{OPERATINGCOMPANY},
#{OPERATINGTYPE},
#{EXPIRYDATE},
@ -105,10 +102,25 @@
OPERATOR = #{OPERATOR},
OPERATORNAME = #{OPERATORNAME},
OPERATTIME = #{OPERATTIME},
EXPIRYDATE = #{EXPIRYDATE},
ATTACHMENT_ROUTE=#{ATTACHMENT_ROUTE}
<if test="VALIDSTATUS != null">
, VALIDSTATUS = #{VALIDSTATUS}
</if>
where SECURITYCOMMITMENT_ID = #{SECURITYCOMMITMENT_ID}
</update>
<!-- 删除-->
<delete id="delete" parameterType="pd">
update
<include refid="tableName"></include>
set
ISDELETE = '1',
DELETOR = #{DELETOR},
DELETETIME = #{DELETETIME}
where
SECURITYCOMMITMENT_ID = #{SECURITYCOMMITMENT_ID}
</update>
</delete>
<!--列表-->
<!-- <select id="datalistPage" parameterType="page" resultType="pd">-->
@ -125,9 +137,9 @@
<!-- <if test="pd.COMPLETIONSTATUS != null and pd.COMPLETIONSTATUS != ''">&lt;!&ndash; 关键词检索-完成状态 &ndash;&gt;-->
<!-- and f.COMPLETIONSTATUS = #{pd.COMPLETIONSTATUS}-->
<!-- </if>-->
<!-- <if test="pd.VALIDSTATUS != null and pd.VALIDSTATUS != ''">&lt;!&ndash; 关键词检索-有效状态 &ndash;&gt;-->
<!-- and f.VALIDSTATUS = #{pd.VALIDSTATUS}-->
<!-- </if>-->
<!-- <if test="pd.VALIDSTATUS != null and pd.VALIDSTATUS != ''">&lt;!&ndash; 关键词检索-有效状态 &ndash;&gt;
and f.VALIDSTATUS = #{pd.VALIDSTATUS}
</if>-->
<!-- </select>-->
<select id="datalistPage" parameterType="page" resultType="pd">
select
@ -140,14 +152,23 @@
c.EXPIRYDATE,
c.CREATETIME,
c.OPERATTIME,
c.SECURITYCOMMITMENT_ID,
c.ISSIGNED
c.SECURITYCOMMITMENT_ID
from
sys_user u
left join bus_corp_info i on u.CORPINFO_ID = i.CORPINFO_ID
left join BUS_TRAFFIC_SECURITY_COMMITMENT c on u.USER_ID = c.USER_ID
where u.ISDELETE = '0'
and u.ISMAIN != '1'
and (c.VALIDSTATUS != '2' or c.VALIDSTATUS is null)
<if test="pd.COMMITMENTNAME != null and pd.COMMITMENTNAME != ''"><!-- 关键词检索-制度名称 -->
and c.COMMITMENTNAME like CONCAT('%',#{pd.COMMITMENTNAME},'%')
</if>
<if test="pd.COMPLETIONSTATUS != null and pd.COMPLETIONSTATUS != ''"><!-- 关键词检索-完成状态 -->
and c.COMPLETIONSTATUS = #{pd.COMPLETIONSTATUS}
</if>
<if test="pd.VALIDSTATUS != null and pd.VALIDSTATUS != ''"><!-- 关键词检索-有效状态 -->
and c.VALIDSTATUS = #{pd.VALIDSTATUS}
</if>
</select>
<select id="findById" resultType="com.zcloud.entity.PageData" parameterType="com.zcloud.entity.PageData">
@ -158,4 +179,21 @@
where
f.SECURITYCOMMITMENT_ID = #{SECURITYCOMMITMENT_ID}
</select>
<select id="datalistPageUser" parameterType="page" resultType="pd">
select
f.*,
i.CORP_NAME,
u.NAME
from
<include refid="tableName"></include> f
left join bus_corp_info i on f.OPERATINGCOMPANY = i.CORPINFO_ID
left join sys_user u on f.USER_ID = u.USER_ID
where f.ISDELETE = '0'
<if test="pd.USER_ID != null and pd.USER_ID != ''">
and f.USER_ID = #{pd.USER_ID}
</if>
</select>
</mapper>

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

@ -17,7 +17,6 @@
f.CONTRACTNAME,
f.COMPLETIONSTATUS,
f.VALIDSTATUS,
f.ISSIGNED,
f.OPERATINGCOMPANY,
f.EXPIRYDATE,
f.PRACTITIONER,
@ -41,7 +40,6 @@
CONTRACTNAME,
COMPLETIONSTATUS,
VALIDSTATUS,
ISSIGNED,
OPERATINGCOMPANY,
EXPIRYDATE,
PRACTITIONER,
@ -65,7 +63,6 @@
#{CONTRACTNAME},
#{COMPLETIONSTATUS},
#{VALIDSTATUS},
#{ISSIGNED},
#{OPERATINGCOMPANY},
#{EXPIRYDATE},
#{PRACTITIONER},
@ -102,11 +99,27 @@
OPERATOR = #{OPERATOR},
OPERATORNAME = #{OPERATORNAME},
OPERATTIME = #{OPERATTIME},
EXPIRYDATE = #{EXPIRYDATE},
ATTACHMENT_ROUTE=#{ATTACHMENT_ROUTE}
<if test="VALIDSTATUS != null">
, VALIDSTATUS = #{VALIDSTATUS}
</if>
where
LABORCONTRACT_ID = #{LABORCONTRACT_ID}
</update>
<!-- 删除-->
<delete id="delete" parameterType="pd">
update
<include refid="tableName"></include>
set
ISDELETE = '1',
DELETOR = #{DELETOR},
DELETETIME = #{DELETETIME}
where
LABORCONTRACT_ID = #{LABORCONTRACT_ID}
</delete>
<!--列表-->
<!-- <select id="datalistPage" parameterType="page" resultType="pd">-->
<!-- select-->
@ -125,9 +138,6 @@
<!-- <if test="pd.VALIDSTATUS != null and pd.VALIDSTATUS != ''">&lt;!&ndash; 关键词检索-有效状态 &ndash;&gt;-->
<!-- and f.VALIDSTATUS = #{pd.VALIDSTATUS}-->
<!-- </if>-->
<!-- <if test="pd.ISSIGNED != null and pd.ISSIGNED != ''">&lt;!&ndash; 关键词检索-经营类型 &ndash;&gt;-->
<!-- and f.ISSIGNED = #{pd.ISSIGNED}-->
<!-- </if>-->
<!-- </select>-->
<!--列表-->
<select id="datalistPage" parameterType="page" resultType="pd">
@ -141,14 +151,23 @@
c.EXPIRYDATE,
c.CREATETIME,
c.OPERATTIME,
c.LABORCONTRACT_ID,
c.ISSIGNED
c.LABORCONTRACT_ID
from
sys_user u
left join bus_corp_info i on u.CORPINFO_ID = i.CORPINFO_ID
left join BUS_TRAFFIC_LABOR_CONTRACT c on u.USER_ID = c.USER_ID
where u.ISDELETE = '0'
and u.ISMAIN != '1'
and (c.VALIDSTATUS != '2' or c.VALIDSTATUS is null)
<if test="pd.CONTRACTNAME != null and pd.CONTRACTNAME != ''"><!-- 关键词检索 -->
and c.CONTRACTNAME like CONCAT('%',#{pd.CONTRACTNAME},'%')
</if>
<if test="pd.COMPLETIONSTATUS != null and pd.COMPLETIONSTATUS != ''"><!-- 关键词检索-完成状态 -->
and c.COMPLETIONSTATUS = #{pd.COMPLETIONSTATUS}
</if>
<if test="pd.VALIDSTATUS != null and pd.VALIDSTATUS != ''"><!-- 关键词检索-有效状态 -->
and c.VALIDSTATUS = #{pd.VALIDSTATUS}
</if>
</select>
<select id="findById" resultType="com.zcloud.entity.PageData" parameterType="com.zcloud.entity.PageData">
@ -159,4 +178,19 @@
where
f.LABORCONTRACT_ID = #{LABORCONTRACT_ID}
</select>
<select id="datalistPageUser" parameterType="page" resultType="pd">
select
f.*,
i.CORP_NAME,
u.NAME
from
<include refid="tableName"></include> f
left join bus_corp_info i on f.OPERATINGCOMPANY = i.CORPINFO_ID
left join sys_user u on f.USER_ID = u.USER_ID
where f.ISDELETE = '0'
<if test="pd.USER_ID != null and pd.USER_ID != ''">
and f.USER_ID = #{pd.USER_ID}
</if>
</select>
</mapper>