forked from integrated_whb/integrated_whb
Merge remote-tracking branch 'origin/dev' into dev
commit
9fc2b68dc2
src/main
java/com/zcloud
controller
assignedManage
eightwork
freighttrailer
hidden
hiddenDangerCheckStandard
inspectAnnually
mapApi
operatingvehicles
taxationManage
entity/hotWorkApplication
mapper/datasource
assignedManage
eightwork
freighttrailer
inspectAnnually
operatingvehicles
system
taxationManage
service
assignedManage
corp/impl
eightwork
freighttrailer
inspectAnnually
inspection/impl
operatingvehicles
taxationManage
resources/mybatis/datasource
assignedManage
depository
eightwork
File diff suppressed because it is too large
Load Diff
|
@ -0,0 +1,155 @@
|
|||
package com.zcloud.controller.assignedManage;
|
||||
|
||||
import com.zcloud.controller.base.BaseController;
|
||||
import com.zcloud.entity.Page;
|
||||
import com.zcloud.entity.PageData;
|
||||
import com.zcloud.service.assignedManage.AssignedManageService;
|
||||
import com.zcloud.service.taxationManage.TaxationManageService;
|
||||
import com.zcloud.util.*;
|
||||
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("/assignedmanage")
|
||||
public class AssignedManageController extends BaseController {
|
||||
|
||||
@Autowired
|
||||
private AssignedManageService assignedManageService;
|
||||
|
||||
@Autowired
|
||||
private Smb smb;
|
||||
|
||||
/**新增
|
||||
* @param
|
||||
* @throws Exception
|
||||
*/
|
||||
@RequestMapping(value="/add")
|
||||
@ResponseBody
|
||||
public Object add() throws Exception{
|
||||
Map<String,Object> map = new HashMap<String,Object>();
|
||||
String errInfo = "success";
|
||||
PageData pd = new PageData();
|
||||
pd = this.getPageData();
|
||||
pd.put("ASSIGNED_ID", this.get32UUID()); //车船税主键
|
||||
pd.put("ISDELETE", "0"); //是否删除(0:有效 1:删除)
|
||||
pd.put("CREATOR", Jurisdiction.getUSER_ID()); //添加人id
|
||||
pd.put("CREATORNAME", Jurisdiction.getUsername()); //添加人名字
|
||||
pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间
|
||||
pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id
|
||||
pd.put("OPERATORNAME", Jurisdiction.getUsername()); // 修改人名字
|
||||
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间
|
||||
pd.put("ASSIGNED_DATE", pd.get("TRANSACTION_DATE"));
|
||||
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
|
||||
pd.put("VEHICLE_TYPE",pd.get("ASSIGNED_VEHICLE_MODEL"));
|
||||
pd.put("NOW_CONTACT_NUMBER",pd.get("NOW_OWNERS_NUMBER"));
|
||||
assignedManageService.save(pd);
|
||||
map.put("pd", pd);
|
||||
map.put("result", errInfo);
|
||||
return map;
|
||||
}
|
||||
|
||||
/**删除
|
||||
* @param
|
||||
* @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());
|
||||
pd.put("DELETORNAME", Jurisdiction.getUsername());
|
||||
pd.put("DELETTIME", DateUtil.date2Str(new Date()));
|
||||
assignedManageService.delete(pd);
|
||||
map.put("result", errInfo); //返回结果
|
||||
return map;
|
||||
}
|
||||
|
||||
/**修改
|
||||
* @param
|
||||
* @throws Exception
|
||||
*/
|
||||
@RequestMapping(value="/edit")
|
||||
@ResponseBody
|
||||
public Object edit() throws Exception{
|
||||
Map<String,Object> map = new HashMap<String,Object>();
|
||||
String errInfo = "success";
|
||||
PageData pd = new PageData();
|
||||
pd = this.getPageData();
|
||||
pd.put("ISDELETE", "0"); //是否删除(0:有效 1:删除)
|
||||
pd.put("CREATOR", Jurisdiction.getUSER_ID()); //添加人id
|
||||
pd.put("CREATORNAME", Jurisdiction.getUsername()); //添加人名字
|
||||
pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间
|
||||
pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id
|
||||
pd.put("OPERATORNAME", Jurisdiction.getUsername()); // 修改人名字
|
||||
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间
|
||||
String expireDate = pd.getString("EXPIRE_DATE");
|
||||
String day = DateUtil.getDay();
|
||||
boolean flag = DateUtil.compareDate(expireDate, day);
|
||||
if(flag) {
|
||||
pd.put("EXPIRE_STATUS","expirestatus_01");
|
||||
}else{
|
||||
pd.put("EXPIRE_STATUS","expirestatus_02");
|
||||
}
|
||||
assignedManageService.edit(pd);
|
||||
map.put("pd", pd);
|
||||
map.put("result", errInfo);
|
||||
return map;
|
||||
}
|
||||
/**去修改页面获取数据
|
||||
* @param
|
||||
* @throws Exception
|
||||
*/
|
||||
@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 = assignedManageService.findById(pd);
|
||||
map.put("pd", pd);
|
||||
map.put("result", errInfo);
|
||||
return map;
|
||||
}
|
||||
|
||||
@RequestMapping(value="/list")
|
||||
@ResponseBody
|
||||
public Object list(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());
|
||||
page.setPd(pd);
|
||||
List<PageData> varList = assignedManageService.list(page); //列出MajorDangerSource列表
|
||||
map.put("varList", varList);
|
||||
map.put("page", page);
|
||||
map.put("result", errInfo);
|
||||
return map;
|
||||
}
|
||||
|
||||
@RequestMapping(value = "/operationvehicleList")
|
||||
@ResponseBody
|
||||
public Object operationVehicleList() throws Exception {
|
||||
Map<String, Object> map = new HashMap<String, Object>();
|
||||
String errInfo = "success";
|
||||
String corpId = Jurisdiction.getCORPINFO_ID();
|
||||
List<PageData> list = assignedManageService.operationVehicleList(corpId); //列出Question列表
|
||||
map.put("list", list);
|
||||
map.put("result", errInfo);
|
||||
return map;
|
||||
}
|
||||
}
|
|
@ -0,0 +1,262 @@
|
|||
package com.zcloud.controller.eightwork;
|
||||
|
||||
import com.zcloud.controller.base.BaseController;
|
||||
import com.zcloud.entity.Page;
|
||||
import com.zcloud.entity.PageData;
|
||||
import com.zcloud.logs.LogAnno;
|
||||
import com.zcloud.service.eightwork.BlindBoardInfoService;
|
||||
import com.zcloud.service.eightwork.BlindBoardService;
|
||||
import com.zcloud.util.Const;
|
||||
import com.zcloud.util.DateUtil;
|
||||
import com.zcloud.util.Smb;
|
||||
import com.zcloud.util.Tools;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
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 org.springframework.web.multipart.MultipartRequest;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 说明:动土作业
|
||||
* 官网:www.zcloudchina.com
|
||||
*/
|
||||
@Controller
|
||||
@RequestMapping("/app/blindboard")
|
||||
public class AppBlindBoardController extends BaseController {
|
||||
|
||||
@Autowired
|
||||
private BlindBoardService blindboardService;
|
||||
@Autowired
|
||||
private BlindBoardInfoService blindboardinfoService;
|
||||
@Autowired
|
||||
private Smb smb;
|
||||
|
||||
/**
|
||||
* 新增
|
||||
* @param
|
||||
* @throws Exception
|
||||
*/
|
||||
@RequestMapping(value = "/add")
|
||||
@ResponseBody
|
||||
@LogAnno(menuType = "手机", menuServer = "动土作业", instructionsOperate = "动土作业", instructionsType = "新增")
|
||||
public Object add() throws Exception {
|
||||
Map<String, Object> map = new HashMap<String, Object>();
|
||||
String errInfo = "success";
|
||||
PageData pd = new PageData();
|
||||
pd = this.getPageData();
|
||||
blindboardService.save(pd);
|
||||
map.put("result", errInfo);
|
||||
return map;
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改
|
||||
* @param
|
||||
* @throws Exception
|
||||
*/
|
||||
@RequestMapping(value = "/edit")
|
||||
@ResponseBody
|
||||
@LogAnno(menuType = "手机", menuServer = "动土作业", instructionsOperate = "动土作业", instructionsType = "新增")
|
||||
public Object edit() throws Exception {
|
||||
Map<String, Object> map = new HashMap<String, Object>();
|
||||
String errInfo = "success";
|
||||
PageData pd = new PageData();
|
||||
pd = this.getPageData();
|
||||
blindboardService.edit(pd);
|
||||
map.put("result", errInfo);
|
||||
return map;
|
||||
}
|
||||
/**
|
||||
* 删除
|
||||
* @throws Exception
|
||||
*/
|
||||
@RequestMapping(value = "/delete")
|
||||
@ResponseBody
|
||||
@LogAnno(menuType = "手机", menuServer = "动土作业", instructionsOperate = "动土作业", instructionsType = "删除")
|
||||
public Object delete() throws Exception {
|
||||
Map<String, String> map = new HashMap<String, String>();
|
||||
String errInfo = "success";
|
||||
PageData pd = new PageData();
|
||||
pd = this.getPageData();
|
||||
blindboardService.delete(pd);
|
||||
map.put("result", errInfo); //返回结果
|
||||
return map;
|
||||
}
|
||||
|
||||
/**列表
|
||||
* @param page
|
||||
* @throws Exception
|
||||
*/
|
||||
@RequestMapping(value="/list")
|
||||
@ResponseBody
|
||||
@LogAnno(menuType= "手机",menuServer= "动土作业",instructionsOperate = "动土作业",instructionsType = "列表")
|
||||
public Object list(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());
|
||||
page.setPd(pd);
|
||||
List<PageData> varList = blindboardService.list(page); //列出blindboard列表
|
||||
map.put("varList", varList);
|
||||
map.put("page", page);
|
||||
map.put("result", errInfo);
|
||||
return map;
|
||||
}
|
||||
|
||||
@RequestMapping("/findById")
|
||||
@ResponseBody
|
||||
@LogAnno(menuType= "手机",menuServer= "动土作业",instructionsOperate = "动土作业",instructionsType = "获取详情")
|
||||
public Object findById() throws Exception {
|
||||
Map<String,Object> map = new HashMap<>();
|
||||
String errInfo = "success";
|
||||
PageData pd = new PageData();
|
||||
pd = this.getPageData();
|
||||
pd = blindboardService.findById(pd);
|
||||
map.put("result",errInfo);
|
||||
map.put("pd",pd);
|
||||
map.put("boardList", blindboardinfoService.listAll(pd));
|
||||
return map;
|
||||
}
|
||||
|
||||
/**上传图
|
||||
* @param
|
||||
* @throws Exception
|
||||
*/
|
||||
@RequestMapping(value="/uploadImg")
|
||||
@ResponseBody
|
||||
@Transactional
|
||||
@LogAnno(menuType= "手机",menuServer= "动土作业",instructionsOperate = "动土作业",instructionsType = "上传图片")
|
||||
public Object uploadImg(
|
||||
@RequestParam(value="FFILE",required=false) MultipartFile[] files
|
||||
) throws Exception{
|
||||
Map<String,Object> map = new HashMap<String,Object>();
|
||||
String errInfo = "success";
|
||||
PageData pd = new PageData();
|
||||
pd = this.getPageData();
|
||||
if (files != null && files.length > 0) {
|
||||
MultipartFile file = files[0];
|
||||
|
||||
String ffile = DateUtil.getDays();
|
||||
String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
|
||||
smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
|
||||
|
||||
map.put("path", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
|
||||
}
|
||||
|
||||
map.put("result", errInfo);
|
||||
return map;
|
||||
}
|
||||
|
||||
@RequestMapping("/listSignFinished")
|
||||
@ResponseBody
|
||||
public Object listSignFinished() throws Exception {
|
||||
Map<String,Object> map = new HashMap<>();
|
||||
String errInfo = "success";
|
||||
PageData pd = new PageData();
|
||||
pd = this.getPageData();
|
||||
PageData signs = blindboardService.listSignFinished(pd);
|
||||
map.put("result",errInfo);
|
||||
map.put("signs",signs);
|
||||
return map;
|
||||
}
|
||||
|
||||
@RequestMapping("/nextStep")
|
||||
@ResponseBody
|
||||
@LogAnno(menuType= "手机",menuServer= "动土作业",instructionsOperate = "动土作业",instructionsType = "通过")
|
||||
public Object nextStep(MultipartRequest request) throws Exception {
|
||||
Map<String,Object> map = new HashMap<>();
|
||||
String errInfo = "success";
|
||||
PageData pd = new PageData();
|
||||
pd = this.getPageData();
|
||||
List<MultipartFile> fileList = new ArrayList<MultipartFile>();
|
||||
String SIGNTIME[] = pd.getString("SIGNTIME").split(",");
|
||||
|
||||
for (int i = 0; i < SIGNTIME.length; i++) {
|
||||
fileList.add(request.getFile("file" + i));
|
||||
}
|
||||
blindboardService.nextStep(pd, fileList.toArray(new MultipartFile[fileList.size()]));
|
||||
map.put("result",errInfo);
|
||||
return map;
|
||||
}
|
||||
|
||||
|
||||
@RequestMapping("/checkWorkCount")
|
||||
@ResponseBody
|
||||
public Object checkWorkCount() throws Exception{
|
||||
Map<String,Object> map = new HashMap<>();
|
||||
String errorInfo = "success";
|
||||
PageData pd = new PageData();
|
||||
pd = this.getPageData();
|
||||
map.put("count",blindboardService.checkWorkCount(pd));
|
||||
map.put("result",errorInfo);
|
||||
return map;
|
||||
}
|
||||
|
||||
@RequestMapping("/listAllMeasures")
|
||||
@ResponseBody
|
||||
public Object listAllMeasures() throws Exception {
|
||||
Map<String,Object> map = new HashMap<>();
|
||||
String errInfo = "success";
|
||||
PageData pd = new PageData();
|
||||
pd = this.getPageData();
|
||||
List<PageData> measuresList = blindboardService.listAllMeasures();
|
||||
map.put("result",errInfo);
|
||||
map.put("measuresList",measuresList);
|
||||
return map;
|
||||
}
|
||||
|
||||
@RequestMapping("/listAllMeasuresForSign")
|
||||
@ResponseBody
|
||||
public Object listAllMeasuresForSign() throws Exception {
|
||||
Map<String,Object> map = new HashMap<>();
|
||||
String errInfo = "success";
|
||||
PageData pd = new PageData();
|
||||
pd = this.getPageData();
|
||||
List<PageData> measuresForSignList = blindboardService.listAllMeasuresForSign(pd);
|
||||
map.put("result",errInfo);
|
||||
map.put("measuresForSignList",measuresForSignList);
|
||||
return map;
|
||||
}
|
||||
|
||||
@RequestMapping("/listSignFinishMeasures")
|
||||
@ResponseBody
|
||||
public Object listSignFinishMeasures() throws Exception {
|
||||
Map<String,Object> map = new HashMap<>();
|
||||
String errInfo = "success";
|
||||
PageData pd = new PageData();
|
||||
pd = this.getPageData();
|
||||
List<PageData> finishMeasuresList = blindboardService.listSignFinishMeasures(pd);
|
||||
map.put("result",errInfo);
|
||||
map.put("finishMeasuresList",finishMeasuresList);
|
||||
return map;
|
||||
}
|
||||
|
||||
/**获取动土作业流程
|
||||
* @param
|
||||
* @throws Exception
|
||||
*/
|
||||
@RequestMapping(value="/getFlowList")
|
||||
@ResponseBody
|
||||
@LogAnno(menuType= "手机",menuServer= "动土作业",instructionsOperate = "动土作业",instructionsType = "获取动土作业流程")
|
||||
public Object getFlowList() throws Exception{
|
||||
Map<String,Object> map = new HashMap<String,Object>();
|
||||
String errInfo = "success";
|
||||
PageData pd = new PageData();
|
||||
pd = this.getPageData();
|
||||
List<PageData> flowList = blindboardService.getFlowList(pd);
|
||||
map.put("flowList", flowList);
|
||||
map.put("result", errInfo); //返回结果
|
||||
return map;
|
||||
}
|
||||
|
||||
}
|
|
@ -0,0 +1,258 @@
|
|||
package com.zcloud.controller.eightwork;
|
||||
|
||||
import com.zcloud.controller.base.BaseController;
|
||||
import com.zcloud.entity.Page;
|
||||
import com.zcloud.entity.PageData;
|
||||
import com.zcloud.logs.LogAnno;
|
||||
import com.zcloud.service.eightwork.BreakGroundService;
|
||||
import com.zcloud.util.Const;
|
||||
import com.zcloud.util.DateUtil;
|
||||
import com.zcloud.util.Smb;
|
||||
import com.zcloud.util.Tools;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
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 org.springframework.web.multipart.MultipartRequest;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 说明:动土作业
|
||||
* 官网:www.zcloudchina.com
|
||||
*/
|
||||
@Controller
|
||||
@RequestMapping("/app/breakground")
|
||||
public class AppBreakGroundController extends BaseController {
|
||||
|
||||
@Autowired
|
||||
private BreakGroundService breakgroundService;
|
||||
@Autowired
|
||||
private Smb smb;
|
||||
|
||||
/**
|
||||
* 新增
|
||||
* @param
|
||||
* @throws Exception
|
||||
*/
|
||||
@RequestMapping(value = "/add")
|
||||
@ResponseBody
|
||||
@LogAnno(menuType = "手机", menuServer = "动土作业", instructionsOperate = "动土作业", instructionsType = "新增")
|
||||
public Object add() throws Exception {
|
||||
Map<String, Object> map = new HashMap<String, Object>();
|
||||
String errInfo = "success";
|
||||
PageData pd = new PageData();
|
||||
pd = this.getPageData();
|
||||
breakgroundService.save(pd);
|
||||
map.put("result", errInfo);
|
||||
return map;
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改
|
||||
* @param
|
||||
* @throws Exception
|
||||
*/
|
||||
@RequestMapping(value = "/edit")
|
||||
@ResponseBody
|
||||
@LogAnno(menuType = "手机", menuServer = "动土作业", instructionsOperate = "动土作业", instructionsType = "新增")
|
||||
public Object edit() throws Exception {
|
||||
Map<String, Object> map = new HashMap<String, Object>();
|
||||
String errInfo = "success";
|
||||
PageData pd = new PageData();
|
||||
pd = this.getPageData();
|
||||
breakgroundService.edit(pd);
|
||||
map.put("result", errInfo);
|
||||
return map;
|
||||
}
|
||||
/**
|
||||
* 删除
|
||||
* @throws Exception
|
||||
*/
|
||||
@RequestMapping(value = "/delete")
|
||||
@ResponseBody
|
||||
@LogAnno(menuType = "手机", menuServer = "动土作业", instructionsOperate = "动土作业", instructionsType = "删除")
|
||||
public Object delete() throws Exception {
|
||||
Map<String, String> map = new HashMap<String, String>();
|
||||
String errInfo = "success";
|
||||
PageData pd = new PageData();
|
||||
pd = this.getPageData();
|
||||
breakgroundService.delete(pd);
|
||||
map.put("result", errInfo); //返回结果
|
||||
return map;
|
||||
}
|
||||
|
||||
/**列表
|
||||
* @param page
|
||||
* @throws Exception
|
||||
*/
|
||||
@RequestMapping(value="/list")
|
||||
@ResponseBody
|
||||
@LogAnno(menuType= "手机",menuServer= "动土作业",instructionsOperate = "动土作业",instructionsType = "列表")
|
||||
public Object list(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());
|
||||
page.setPd(pd);
|
||||
List<PageData> varList = breakgroundService.list(page); //列出breakground列表
|
||||
map.put("varList", varList);
|
||||
map.put("page", page);
|
||||
map.put("result", errInfo);
|
||||
return map;
|
||||
}
|
||||
|
||||
@RequestMapping("/findById")
|
||||
@ResponseBody
|
||||
@LogAnno(menuType= "手机",menuServer= "动土作业",instructionsOperate = "动土作业",instructionsType = "获取详情")
|
||||
public Object findById() throws Exception {
|
||||
Map<String,Object> map = new HashMap<>();
|
||||
String errInfo = "success";
|
||||
PageData pd = new PageData();
|
||||
pd = this.getPageData();
|
||||
pd = breakgroundService.findById(pd);
|
||||
map.put("result",errInfo);
|
||||
map.put("pd",pd);
|
||||
return map;
|
||||
}
|
||||
|
||||
/**上传图
|
||||
* @param
|
||||
* @throws Exception
|
||||
*/
|
||||
@RequestMapping(value="/uploadImg")
|
||||
@ResponseBody
|
||||
@Transactional
|
||||
@LogAnno(menuType= "手机",menuServer= "动土作业",instructionsOperate = "动土作业",instructionsType = "上传图片")
|
||||
public Object uploadImg(
|
||||
@RequestParam(value="FFILE",required=false) MultipartFile[] files
|
||||
) throws Exception{
|
||||
Map<String,Object> map = new HashMap<String,Object>();
|
||||
String errInfo = "success";
|
||||
PageData pd = new PageData();
|
||||
pd = this.getPageData();
|
||||
if (files != null && files.length > 0) {
|
||||
MultipartFile file = files[0];
|
||||
|
||||
String ffile = DateUtil.getDays();
|
||||
String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
|
||||
smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
|
||||
|
||||
map.put("path", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
|
||||
}
|
||||
|
||||
map.put("result", errInfo);
|
||||
return map;
|
||||
}
|
||||
|
||||
@RequestMapping("/listSignFinished")
|
||||
@ResponseBody
|
||||
public Object listSignFinished() throws Exception {
|
||||
Map<String,Object> map = new HashMap<>();
|
||||
String errInfo = "success";
|
||||
PageData pd = new PageData();
|
||||
pd = this.getPageData();
|
||||
PageData signs = breakgroundService.listSignFinished(pd);
|
||||
map.put("result",errInfo);
|
||||
map.put("signs",signs);
|
||||
return map;
|
||||
}
|
||||
|
||||
@RequestMapping("/nextStep")
|
||||
@ResponseBody
|
||||
@LogAnno(menuType= "手机",menuServer= "动土作业",instructionsOperate = "动土作业",instructionsType = "通过")
|
||||
public Object nextStep(MultipartRequest request) throws Exception {
|
||||
Map<String,Object> map = new HashMap<>();
|
||||
String errInfo = "success";
|
||||
PageData pd = new PageData();
|
||||
pd = this.getPageData();
|
||||
List<MultipartFile> fileList = new ArrayList<MultipartFile>();
|
||||
String SIGNTIME[] = pd.getString("SIGNTIME").split(",");
|
||||
|
||||
for (int i = 0; i < SIGNTIME.length; i++) {
|
||||
fileList.add(request.getFile("file" + i));
|
||||
}
|
||||
breakgroundService.nextStep(pd, fileList.toArray(new MultipartFile[fileList.size()]));
|
||||
map.put("result",errInfo);
|
||||
return map;
|
||||
}
|
||||
|
||||
|
||||
@RequestMapping("/checkWorkCount")
|
||||
@ResponseBody
|
||||
public Object checkWorkCount() throws Exception{
|
||||
Map<String,Object> map = new HashMap<>();
|
||||
String errorInfo = "success";
|
||||
PageData pd = new PageData();
|
||||
pd = this.getPageData();
|
||||
map.put("count",breakgroundService.checkWorkCount(pd));
|
||||
map.put("result",errorInfo);
|
||||
return map;
|
||||
}
|
||||
|
||||
@RequestMapping("/listAllMeasures")
|
||||
@ResponseBody
|
||||
public Object listAllMeasures() throws Exception {
|
||||
Map<String,Object> map = new HashMap<>();
|
||||
String errInfo = "success";
|
||||
PageData pd = new PageData();
|
||||
pd = this.getPageData();
|
||||
List<PageData> measuresList = breakgroundService.listAllMeasures();
|
||||
map.put("result",errInfo);
|
||||
map.put("measuresList",measuresList);
|
||||
return map;
|
||||
}
|
||||
|
||||
@RequestMapping("/listAllMeasuresForSign")
|
||||
@ResponseBody
|
||||
public Object listAllMeasuresForSign() throws Exception {
|
||||
Map<String,Object> map = new HashMap<>();
|
||||
String errInfo = "success";
|
||||
PageData pd = new PageData();
|
||||
pd = this.getPageData();
|
||||
List<PageData> measuresForSignList = breakgroundService.listAllMeasuresForSign(pd);
|
||||
map.put("result",errInfo);
|
||||
map.put("measuresForSignList",measuresForSignList);
|
||||
return map;
|
||||
}
|
||||
|
||||
@RequestMapping("/listSignFinishMeasures")
|
||||
@ResponseBody
|
||||
public Object listSignFinishMeasures() throws Exception {
|
||||
Map<String,Object> map = new HashMap<>();
|
||||
String errInfo = "success";
|
||||
PageData pd = new PageData();
|
||||
pd = this.getPageData();
|
||||
List<PageData> finishMeasuresList = breakgroundService.listSignFinishMeasures(pd);
|
||||
map.put("result",errInfo);
|
||||
map.put("finishMeasuresList",finishMeasuresList);
|
||||
return map;
|
||||
}
|
||||
|
||||
/**获取动土作业流程
|
||||
* @param
|
||||
* @throws Exception
|
||||
*/
|
||||
@RequestMapping(value="/getFlowList")
|
||||
@ResponseBody
|
||||
@LogAnno(menuType= "手机",menuServer= "动土作业",instructionsOperate = "动土作业",instructionsType = "获取动土作业流程")
|
||||
public Object getFlowList() throws Exception{
|
||||
Map<String,Object> map = new HashMap<String,Object>();
|
||||
String errInfo = "success";
|
||||
PageData pd = new PageData();
|
||||
pd = this.getPageData();
|
||||
List<PageData> flowList = breakgroundService.getFlowList(pd);
|
||||
map.put("flowList", flowList);
|
||||
map.put("result", errInfo); //返回结果
|
||||
return map;
|
||||
}
|
||||
|
||||
}
|
|
@ -0,0 +1,258 @@
|
|||
package com.zcloud.controller.eightwork;
|
||||
|
||||
import com.zcloud.controller.base.BaseController;
|
||||
import com.zcloud.entity.Page;
|
||||
import com.zcloud.entity.PageData;
|
||||
import com.zcloud.logs.LogAnno;
|
||||
import com.zcloud.service.eightwork.CutRoadService;
|
||||
import com.zcloud.util.Const;
|
||||
import com.zcloud.util.DateUtil;
|
||||
import com.zcloud.util.Smb;
|
||||
import com.zcloud.util.Tools;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
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 org.springframework.web.multipart.MultipartRequest;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 说明:动土作业
|
||||
* 官网:www.zcloudchina.com
|
||||
*/
|
||||
@Controller
|
||||
@RequestMapping("/app/cutroad")
|
||||
public class AppCutRoadController extends BaseController {
|
||||
|
||||
@Autowired
|
||||
private CutRoadService cutroadService;
|
||||
@Autowired
|
||||
private Smb smb;
|
||||
|
||||
/**
|
||||
* 新增
|
||||
* @param
|
||||
* @throws Exception
|
||||
*/
|
||||
@RequestMapping(value = "/add")
|
||||
@ResponseBody
|
||||
@LogAnno(menuType = "手机", menuServer = "动土作业", instructionsOperate = "动土作业", instructionsType = "新增")
|
||||
public Object add() throws Exception {
|
||||
Map<String, Object> map = new HashMap<String, Object>();
|
||||
String errInfo = "success";
|
||||
PageData pd = new PageData();
|
||||
pd = this.getPageData();
|
||||
cutroadService.save(pd);
|
||||
map.put("result", errInfo);
|
||||
return map;
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改
|
||||
* @param
|
||||
* @throws Exception
|
||||
*/
|
||||
@RequestMapping(value = "/edit")
|
||||
@ResponseBody
|
||||
@LogAnno(menuType = "手机", menuServer = "动土作业", instructionsOperate = "动土作业", instructionsType = "新增")
|
||||
public Object edit() throws Exception {
|
||||
Map<String, Object> map = new HashMap<String, Object>();
|
||||
String errInfo = "success";
|
||||
PageData pd = new PageData();
|
||||
pd = this.getPageData();
|
||||
cutroadService.edit(pd);
|
||||
map.put("result", errInfo);
|
||||
return map;
|
||||
}
|
||||
/**
|
||||
* 删除
|
||||
* @throws Exception
|
||||
*/
|
||||
@RequestMapping(value = "/delete")
|
||||
@ResponseBody
|
||||
@LogAnno(menuType = "手机", menuServer = "动土作业", instructionsOperate = "动土作业", instructionsType = "删除")
|
||||
public Object delete() throws Exception {
|
||||
Map<String, String> map = new HashMap<String, String>();
|
||||
String errInfo = "success";
|
||||
PageData pd = new PageData();
|
||||
pd = this.getPageData();
|
||||
cutroadService.delete(pd);
|
||||
map.put("result", errInfo); //返回结果
|
||||
return map;
|
||||
}
|
||||
|
||||
/**列表
|
||||
* @param page
|
||||
* @throws Exception
|
||||
*/
|
||||
@RequestMapping(value="/list")
|
||||
@ResponseBody
|
||||
@LogAnno(menuType= "手机",menuServer= "动土作业",instructionsOperate = "动土作业",instructionsType = "列表")
|
||||
public Object list(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());
|
||||
page.setPd(pd);
|
||||
List<PageData> varList = cutroadService.list(page); //列出cutroad列表
|
||||
map.put("varList", varList);
|
||||
map.put("page", page);
|
||||
map.put("result", errInfo);
|
||||
return map;
|
||||
}
|
||||
|
||||
@RequestMapping("/findById")
|
||||
@ResponseBody
|
||||
@LogAnno(menuType= "手机",menuServer= "动土作业",instructionsOperate = "动土作业",instructionsType = "获取详情")
|
||||
public Object findById() throws Exception {
|
||||
Map<String,Object> map = new HashMap<>();
|
||||
String errInfo = "success";
|
||||
PageData pd = new PageData();
|
||||
pd = this.getPageData();
|
||||
pd = cutroadService.findById(pd);
|
||||
map.put("result",errInfo);
|
||||
map.put("pd",pd);
|
||||
return map;
|
||||
}
|
||||
|
||||
/**上传图
|
||||
* @param
|
||||
* @throws Exception
|
||||
*/
|
||||
@RequestMapping(value="/uploadImg")
|
||||
@ResponseBody
|
||||
@Transactional
|
||||
@LogAnno(menuType= "手机",menuServer= "动土作业",instructionsOperate = "动土作业",instructionsType = "上传图片")
|
||||
public Object uploadImg(
|
||||
@RequestParam(value="FFILE",required=false) MultipartFile[] files
|
||||
) throws Exception{
|
||||
Map<String,Object> map = new HashMap<String,Object>();
|
||||
String errInfo = "success";
|
||||
PageData pd = new PageData();
|
||||
pd = this.getPageData();
|
||||
if (files != null && files.length > 0) {
|
||||
MultipartFile file = files[0];
|
||||
|
||||
String ffile = DateUtil.getDays();
|
||||
String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
|
||||
smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
|
||||
|
||||
map.put("path", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
|
||||
}
|
||||
|
||||
map.put("result", errInfo);
|
||||
return map;
|
||||
}
|
||||
|
||||
@RequestMapping("/listSignFinished")
|
||||
@ResponseBody
|
||||
public Object listSignFinished() throws Exception {
|
||||
Map<String,Object> map = new HashMap<>();
|
||||
String errInfo = "success";
|
||||
PageData pd = new PageData();
|
||||
pd = this.getPageData();
|
||||
PageData signs = cutroadService.listSignFinished(pd);
|
||||
map.put("result",errInfo);
|
||||
map.put("signs",signs);
|
||||
return map;
|
||||
}
|
||||
|
||||
@RequestMapping("/nextStep")
|
||||
@ResponseBody
|
||||
@LogAnno(menuType= "手机",menuServer= "动土作业",instructionsOperate = "动土作业",instructionsType = "通过")
|
||||
public Object nextStep(MultipartRequest request) throws Exception {
|
||||
Map<String,Object> map = new HashMap<>();
|
||||
String errInfo = "success";
|
||||
PageData pd = new PageData();
|
||||
pd = this.getPageData();
|
||||
List<MultipartFile> fileList = new ArrayList<MultipartFile>();
|
||||
String SIGNTIME[] = pd.getString("SIGNTIME").split(",");
|
||||
|
||||
for (int i = 0; i < SIGNTIME.length; i++) {
|
||||
fileList.add(request.getFile("file" + i));
|
||||
}
|
||||
cutroadService.nextStep(pd, fileList.toArray(new MultipartFile[fileList.size()]));
|
||||
map.put("result",errInfo);
|
||||
return map;
|
||||
}
|
||||
|
||||
|
||||
@RequestMapping("/checkWorkCount")
|
||||
@ResponseBody
|
||||
public Object checkWorkCount() throws Exception{
|
||||
Map<String,Object> map = new HashMap<>();
|
||||
String errorInfo = "success";
|
||||
PageData pd = new PageData();
|
||||
pd = this.getPageData();
|
||||
map.put("count",cutroadService.checkWorkCount(pd));
|
||||
map.put("result",errorInfo);
|
||||
return map;
|
||||
}
|
||||
|
||||
@RequestMapping("/listAllMeasures")
|
||||
@ResponseBody
|
||||
public Object listAllMeasures() throws Exception {
|
||||
Map<String,Object> map = new HashMap<>();
|
||||
String errInfo = "success";
|
||||
PageData pd = new PageData();
|
||||
pd = this.getPageData();
|
||||
List<PageData> measuresList = cutroadService.listAllMeasures();
|
||||
map.put("result",errInfo);
|
||||
map.put("measuresList",measuresList);
|
||||
return map;
|
||||
}
|
||||
|
||||
@RequestMapping("/listAllMeasuresForSign")
|
||||
@ResponseBody
|
||||
public Object listAllMeasuresForSign() throws Exception {
|
||||
Map<String,Object> map = new HashMap<>();
|
||||
String errInfo = "success";
|
||||
PageData pd = new PageData();
|
||||
pd = this.getPageData();
|
||||
List<PageData> measuresForSignList = cutroadService.listAllMeasuresForSign(pd);
|
||||
map.put("result",errInfo);
|
||||
map.put("measuresForSignList",measuresForSignList);
|
||||
return map;
|
||||
}
|
||||
|
||||
@RequestMapping("/listSignFinishMeasures")
|
||||
@ResponseBody
|
||||
public Object listSignFinishMeasures() throws Exception {
|
||||
Map<String,Object> map = new HashMap<>();
|
||||
String errInfo = "success";
|
||||
PageData pd = new PageData();
|
||||
pd = this.getPageData();
|
||||
List<PageData> finishMeasuresList = cutroadService.listSignFinishMeasures(pd);
|
||||
map.put("result",errInfo);
|
||||
map.put("finishMeasuresList",finishMeasuresList);
|
||||
return map;
|
||||
}
|
||||
|
||||
/**获取动土作业流程
|
||||
* @param
|
||||
* @throws Exception
|
||||
*/
|
||||
@RequestMapping(value="/getFlowList")
|
||||
@ResponseBody
|
||||
@LogAnno(menuType= "手机",menuServer= "动土作业",instructionsOperate = "动土作业",instructionsType = "获取动土作业流程")
|
||||
public Object getFlowList() throws Exception{
|
||||
Map<String,Object> map = new HashMap<String,Object>();
|
||||
String errInfo = "success";
|
||||
PageData pd = new PageData();
|
||||
pd = this.getPageData();
|
||||
List<PageData> flowList = cutroadService.getFlowList(pd);
|
||||
map.put("flowList", flowList);
|
||||
map.put("result", errInfo); //返回结果
|
||||
return map;
|
||||
}
|
||||
|
||||
}
|
|
@ -25,7 +25,7 @@ import java.util.Map;
|
|||
*/
|
||||
@Controller
|
||||
@RequestMapping("/app/electricity")
|
||||
public class AppElertricityController extends BaseController {
|
||||
public class AppElectricityController extends BaseController {
|
||||
|
||||
@Autowired
|
||||
private ElectricityService electricityService;
|
|
@ -0,0 +1,222 @@
|
|||
package com.zcloud.controller.eightwork;
|
||||
|
||||
import com.zcloud.controller.base.BaseController;
|
||||
import com.zcloud.entity.Page;
|
||||
import com.zcloud.entity.PageData;
|
||||
import com.zcloud.logs.LogAnno;
|
||||
import com.zcloud.service.eightwork.HoistingService;
|
||||
import com.zcloud.util.Tools;
|
||||
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.ResponseBody;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
import org.springframework.web.multipart.MultipartRequest;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 说明:吊装作业
|
||||
* 官网:www.zcloudchina.com
|
||||
*/
|
||||
@Controller
|
||||
@RequestMapping("/app/hoisting")
|
||||
public class AppHoistingController extends BaseController {
|
||||
|
||||
@Autowired
|
||||
private HoistingService hoistingService;
|
||||
|
||||
/**
|
||||
* 新增
|
||||
* @param
|
||||
* @throws Exception
|
||||
*/
|
||||
@RequestMapping(value = "/add")
|
||||
@ResponseBody
|
||||
@LogAnno(menuType = "手机", menuServer = "吊装作业", instructionsOperate = "吊装作业", instructionsType = "新增")
|
||||
public Object add() throws Exception {
|
||||
Map<String, Object> map = new HashMap<String, Object>();
|
||||
String errInfo = "success";
|
||||
PageData pd = new PageData();
|
||||
pd = this.getPageData();
|
||||
hoistingService.save(pd);
|
||||
map.put("result", errInfo);
|
||||
return map;
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改
|
||||
* @param
|
||||
* @throws Exception
|
||||
*/
|
||||
@RequestMapping(value = "/edit")
|
||||
@ResponseBody
|
||||
@LogAnno(menuType = "手机", menuServer = "吊装作业", instructionsOperate = "吊装作业", instructionsType = "新增")
|
||||
public Object edit() throws Exception {
|
||||
Map<String, Object> map = new HashMap<String, Object>();
|
||||
String errInfo = "success";
|
||||
PageData pd = new PageData();
|
||||
pd = this.getPageData();
|
||||
hoistingService.edit(pd);
|
||||
map.put("result", errInfo);
|
||||
return map;
|
||||
}
|
||||
/**
|
||||
* 删除
|
||||
* @throws Exception
|
||||
*/
|
||||
@RequestMapping(value = "/delete")
|
||||
@ResponseBody
|
||||
@LogAnno(menuType = "手机", menuServer = "吊装作业", instructionsOperate = "吊装作业", instructionsType = "删除")
|
||||
public Object delete() throws Exception {
|
||||
Map<String, String> map = new HashMap<String, String>();
|
||||
String errInfo = "success";
|
||||
PageData pd = new PageData();
|
||||
pd = this.getPageData();
|
||||
hoistingService.delete(pd);
|
||||
map.put("result", errInfo); //返回结果
|
||||
return map;
|
||||
}
|
||||
|
||||
/**列表
|
||||
* @param page
|
||||
* @throws Exception
|
||||
*/
|
||||
@RequestMapping(value="/list")
|
||||
@ResponseBody
|
||||
@LogAnno(menuType= "手机",menuServer= "吊装作业",instructionsOperate = "吊装作业",instructionsType = "列表")
|
||||
public Object list(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());
|
||||
page.setPd(pd);
|
||||
List<PageData> varList = hoistingService.list(page); //列出hoisting列表
|
||||
map.put("varList", varList);
|
||||
map.put("page", page);
|
||||
map.put("result", errInfo);
|
||||
return map;
|
||||
}
|
||||
|
||||
@RequestMapping("/findById")
|
||||
@ResponseBody
|
||||
@LogAnno(menuType= "手机",menuServer= "吊装作业",instructionsOperate = "吊装作业",instructionsType = "获取详情")
|
||||
public Object findById() throws Exception {
|
||||
Map<String,Object> map = new HashMap<>();
|
||||
String errInfo = "success";
|
||||
PageData pd = new PageData();
|
||||
pd = this.getPageData();
|
||||
pd = hoistingService.findById(pd);
|
||||
map.put("result",errInfo);
|
||||
map.put("pd",pd);
|
||||
return map;
|
||||
}
|
||||
|
||||
@RequestMapping("/listSignFinished")
|
||||
@ResponseBody
|
||||
public Object listSignFinished() throws Exception {
|
||||
Map<String,Object> map = new HashMap<>();
|
||||
String errInfo = "success";
|
||||
PageData pd = new PageData();
|
||||
pd = this.getPageData();
|
||||
PageData signs = hoistingService.listSignFinished(pd);
|
||||
map.put("result",errInfo);
|
||||
map.put("signs",signs);
|
||||
return map;
|
||||
}
|
||||
|
||||
@RequestMapping("/nextStep")
|
||||
@ResponseBody
|
||||
@LogAnno(menuType= "手机",menuServer= "吊装作业",instructionsOperate = "吊装作业",instructionsType = "通过")
|
||||
public Object nextStep(MultipartRequest request) throws Exception {
|
||||
Map<String,Object> map = new HashMap<>();
|
||||
String errInfo = "success";
|
||||
PageData pd = new PageData();
|
||||
pd = this.getPageData();
|
||||
List<MultipartFile> fileList = new ArrayList<MultipartFile>();
|
||||
String SIGNTIME[] = pd.getString("SIGNTIME").split(",");
|
||||
|
||||
for (int i = 0; i < SIGNTIME.length; i++) {
|
||||
fileList.add(request.getFile("file" + i));
|
||||
}
|
||||
hoistingService.nextStep(pd, fileList.toArray(new MultipartFile[fileList.size()]));
|
||||
map.put("result",errInfo);
|
||||
return map;
|
||||
}
|
||||
|
||||
|
||||
@RequestMapping("/checkWorkCount")
|
||||
@ResponseBody
|
||||
public Object checkWorkCount() throws Exception{
|
||||
Map<String,Object> map = new HashMap<>();
|
||||
String errorInfo = "success";
|
||||
PageData pd = new PageData();
|
||||
pd = this.getPageData();
|
||||
map.put("count",hoistingService.checkWorkCount(pd));
|
||||
map.put("result",errorInfo);
|
||||
return map;
|
||||
}
|
||||
|
||||
@RequestMapping("/listAllMeasures")
|
||||
@ResponseBody
|
||||
public Object listAllMeasures() throws Exception {
|
||||
Map<String,Object> map = new HashMap<>();
|
||||
String errInfo = "success";
|
||||
PageData pd = new PageData();
|
||||
pd = this.getPageData();
|
||||
List<PageData> measuresList = hoistingService.listAllMeasures();
|
||||
map.put("result",errInfo);
|
||||
map.put("measuresList",measuresList);
|
||||
return map;
|
||||
}
|
||||
|
||||
@RequestMapping("/listAllMeasuresForSign")
|
||||
@ResponseBody
|
||||
public Object listAllMeasuresForSign() throws Exception {
|
||||
Map<String,Object> map = new HashMap<>();
|
||||
String errInfo = "success";
|
||||
PageData pd = new PageData();
|
||||
pd = this.getPageData();
|
||||
List<PageData> measuresForSignList = hoistingService.listAllMeasuresForSign(pd);
|
||||
map.put("result",errInfo);
|
||||
map.put("measuresForSignList",measuresForSignList);
|
||||
return map;
|
||||
}
|
||||
|
||||
@RequestMapping("/listSignFinishMeasures")
|
||||
@ResponseBody
|
||||
public Object listSignFinishMeasures() throws Exception {
|
||||
Map<String,Object> map = new HashMap<>();
|
||||
String errInfo = "success";
|
||||
PageData pd = new PageData();
|
||||
pd = this.getPageData();
|
||||
List<PageData> finishMeasuresList = hoistingService.listSignFinishMeasures(pd);
|
||||
map.put("result",errInfo);
|
||||
map.put("finishMeasuresList",finishMeasuresList);
|
||||
return map;
|
||||
}
|
||||
|
||||
/**获取吊装作业流程
|
||||
* @param
|
||||
* @throws Exception
|
||||
*/
|
||||
@RequestMapping(value="/getFlowList")
|
||||
@ResponseBody
|
||||
@LogAnno(menuType= "手机",menuServer= "吊装作业",instructionsOperate = "吊装作业",instructionsType = "获取吊装作业流程")
|
||||
public Object getFlowList() throws Exception{
|
||||
Map<String,Object> map = new HashMap<String,Object>();
|
||||
String errInfo = "success";
|
||||
PageData pd = new PageData();
|
||||
pd = this.getPageData();
|
||||
List<PageData> flowList = hoistingService.getFlowList(pd);
|
||||
map.put("flowList", flowList);
|
||||
map.put("result", errInfo); //返回结果
|
||||
return map;
|
||||
}
|
||||
|
||||
}
|
|
@ -0,0 +1,95 @@
|
|||
package com.zcloud.controller.eightwork;
|
||||
|
||||
import com.zcloud.controller.base.BaseController;
|
||||
import com.zcloud.entity.Page;
|
||||
import com.zcloud.entity.PageData;
|
||||
import com.zcloud.logs.LogAnno;
|
||||
import com.zcloud.service.eightwork.BlindBoardInfoService;
|
||||
import com.zcloud.service.eightwork.BlindBoardService;
|
||||
import com.zcloud.util.Jurisdiction;
|
||||
import com.zcloud.util.Tools;
|
||||
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.ResponseBody;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 说明:盲板作业
|
||||
* 官网:www.zcloudchina.com
|
||||
*/
|
||||
@Controller
|
||||
@RequestMapping("/blindboard")
|
||||
public class BlindBoardController extends BaseController {
|
||||
|
||||
@Autowired
|
||||
private BlindBoardService blindboardService;
|
||||
@Autowired
|
||||
private BlindBoardInfoService blindBoardInfoService;
|
||||
|
||||
|
||||
/**列表
|
||||
* @param page
|
||||
* @throws Exception
|
||||
*/
|
||||
@RequestMapping(value="/list")
|
||||
@ResponseBody
|
||||
@LogAnno(menuType= "高危作业管理",menuServer= "盲板作业",instructionsOperate = "盲板作业",instructionsType = "列表")
|
||||
public Object list(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("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
|
||||
page.setPd(pd);
|
||||
List<PageData> varList = blindboardService.list(page); //列出blindboard列表
|
||||
map.put("varList", varList);
|
||||
map.put("page", page);
|
||||
map.put("result", errInfo);
|
||||
|
||||
return map;
|
||||
}
|
||||
|
||||
/**获取盲板作业流程
|
||||
* @param
|
||||
* @throws Exception
|
||||
*/
|
||||
@RequestMapping(value="/getFlowList")
|
||||
@ResponseBody
|
||||
@LogAnno(menuType= "高危作业管理",menuServer= "盲板作业",instructionsOperate = "盲板作业",instructionsType = "获取盲板作业流程")
|
||||
public Object getFlowList() throws Exception{
|
||||
Map<String,Object> map = new HashMap<String,Object>();
|
||||
String errInfo = "success";
|
||||
PageData pd = new PageData();
|
||||
pd = this.getPageData();
|
||||
List<PageData> flowList = blindboardService.getFlowList(pd);
|
||||
map.put("flowList", flowList);
|
||||
map.put("result", errInfo); //返回结果
|
||||
return map;
|
||||
}
|
||||
|
||||
@RequestMapping("/findById")
|
||||
@ResponseBody
|
||||
@LogAnno(menuType= "高危作业管理",menuServer= "盲板作业",instructionsOperate = "盲板作业",instructionsType = "获取详情")
|
||||
public Object findById() throws Exception {
|
||||
Map<String,Object> map = new HashMap<>();
|
||||
String errInfo = "success";
|
||||
PageData pd = new PageData();
|
||||
pd = this.getPageData();
|
||||
pd = blindboardService.findById(pd);
|
||||
PageData signs = blindboardService.listSignFinished(pd);
|
||||
List<PageData> finishMeasuresList = blindboardService.listSignFinishMeasures(pd);
|
||||
map.put("measuresList",finishMeasuresList);
|
||||
map.put("signs",signs);
|
||||
map.put("boardList", blindBoardInfoService.listAll(pd));
|
||||
map.put("pd",pd);
|
||||
map.put("result",errInfo);
|
||||
return map;
|
||||
}
|
||||
|
||||
}
|
|
@ -0,0 +1,91 @@
|
|||
package com.zcloud.controller.eightwork;
|
||||
|
||||
import com.zcloud.controller.base.BaseController;
|
||||
import com.zcloud.entity.Page;
|
||||
import com.zcloud.entity.PageData;
|
||||
import com.zcloud.logs.LogAnno;
|
||||
import com.zcloud.service.eightwork.BreakGroundService;
|
||||
import com.zcloud.util.Jurisdiction;
|
||||
import com.zcloud.util.Tools;
|
||||
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.ResponseBody;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 说明:动土作业
|
||||
* 官网:www.zcloudchina.com
|
||||
*/
|
||||
@Controller
|
||||
@RequestMapping("/breakground")
|
||||
public class BreakGroundController extends BaseController {
|
||||
|
||||
@Autowired
|
||||
private BreakGroundService breakgroundService;
|
||||
|
||||
|
||||
/**列表
|
||||
* @param page
|
||||
* @throws Exception
|
||||
*/
|
||||
@RequestMapping(value="/list")
|
||||
@ResponseBody
|
||||
@LogAnno(menuType= "高危作业管理",menuServer= "动土作业",instructionsOperate = "动土作业",instructionsType = "列表")
|
||||
public Object list(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("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
|
||||
page.setPd(pd);
|
||||
List<PageData> varList = breakgroundService.list(page); //列出breakground列表
|
||||
map.put("varList", varList);
|
||||
map.put("page", page);
|
||||
map.put("result", errInfo);
|
||||
|
||||
return map;
|
||||
}
|
||||
|
||||
/**获取动土作业流程
|
||||
* @param
|
||||
* @throws Exception
|
||||
*/
|
||||
@RequestMapping(value="/getFlowList")
|
||||
@ResponseBody
|
||||
@LogAnno(menuType= "高危作业管理",menuServer= "动土作业",instructionsOperate = "动土作业",instructionsType = "获取动土作业流程")
|
||||
public Object getFlowList() throws Exception{
|
||||
Map<String,Object> map = new HashMap<String,Object>();
|
||||
String errInfo = "success";
|
||||
PageData pd = new PageData();
|
||||
pd = this.getPageData();
|
||||
List<PageData> flowList = breakgroundService.getFlowList(pd);
|
||||
map.put("flowList", flowList);
|
||||
map.put("result", errInfo); //返回结果
|
||||
return map;
|
||||
}
|
||||
|
||||
@RequestMapping("/findById")
|
||||
@ResponseBody
|
||||
@LogAnno(menuType= "高危作业管理",menuServer= "动土作业",instructionsOperate = "动土作业",instructionsType = "获取详情")
|
||||
public Object findById() throws Exception {
|
||||
Map<String,Object> map = new HashMap<>();
|
||||
String errInfo = "success";
|
||||
PageData pd = new PageData();
|
||||
pd = this.getPageData();
|
||||
pd = breakgroundService.findById(pd);
|
||||
PageData signs = breakgroundService.listSignFinished(pd);
|
||||
List<PageData> finishMeasuresList = breakgroundService.listSignFinishMeasures(pd);
|
||||
map.put("measuresList",finishMeasuresList);
|
||||
map.put("signs",signs);
|
||||
map.put("pd",pd);
|
||||
map.put("result",errInfo);
|
||||
return map;
|
||||
}
|
||||
|
||||
}
|
|
@ -0,0 +1,91 @@
|
|||
package com.zcloud.controller.eightwork;
|
||||
|
||||
import com.zcloud.controller.base.BaseController;
|
||||
import com.zcloud.entity.Page;
|
||||
import com.zcloud.entity.PageData;
|
||||
import com.zcloud.logs.LogAnno;
|
||||
import com.zcloud.service.eightwork.CutRoadService;
|
||||
import com.zcloud.util.Jurisdiction;
|
||||
import com.zcloud.util.Tools;
|
||||
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.ResponseBody;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 说明:断路作业
|
||||
* 官网:www.zcloudchina.com
|
||||
*/
|
||||
@Controller
|
||||
@RequestMapping("/cutroad")
|
||||
public class CutRoadController extends BaseController {
|
||||
|
||||
@Autowired
|
||||
private CutRoadService cutroadService;
|
||||
|
||||
|
||||
/**列表
|
||||
* @param page
|
||||
* @throws Exception
|
||||
*/
|
||||
@RequestMapping(value="/list")
|
||||
@ResponseBody
|
||||
@LogAnno(menuType= "高危作业管理",menuServer= "断路作业",instructionsOperate = "断路作业",instructionsType = "列表")
|
||||
public Object list(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("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
|
||||
page.setPd(pd);
|
||||
List<PageData> varList = cutroadService.list(page); //列出cutroad列表
|
||||
map.put("varList", varList);
|
||||
map.put("page", page);
|
||||
map.put("result", errInfo);
|
||||
|
||||
return map;
|
||||
}
|
||||
|
||||
/**获取断路作业流程
|
||||
* @param
|
||||
* @throws Exception
|
||||
*/
|
||||
@RequestMapping(value="/getFlowList")
|
||||
@ResponseBody
|
||||
@LogAnno(menuType= "高危作业管理",menuServer= "断路作业",instructionsOperate = "断路作业",instructionsType = "获取断路作业流程")
|
||||
public Object getFlowList() throws Exception{
|
||||
Map<String,Object> map = new HashMap<String,Object>();
|
||||
String errInfo = "success";
|
||||
PageData pd = new PageData();
|
||||
pd = this.getPageData();
|
||||
List<PageData> flowList = cutroadService.getFlowList(pd);
|
||||
map.put("flowList", flowList);
|
||||
map.put("result", errInfo); //返回结果
|
||||
return map;
|
||||
}
|
||||
|
||||
@RequestMapping("/findById")
|
||||
@ResponseBody
|
||||
@LogAnno(menuType= "高危作业管理",menuServer= "断路作业",instructionsOperate = "断路作业",instructionsType = "获取详情")
|
||||
public Object findById() throws Exception {
|
||||
Map<String,Object> map = new HashMap<>();
|
||||
String errInfo = "success";
|
||||
PageData pd = new PageData();
|
||||
pd = this.getPageData();
|
||||
pd = cutroadService.findById(pd);
|
||||
PageData signs = cutroadService.listSignFinished(pd);
|
||||
List<PageData> finishMeasuresList = cutroadService.listSignFinishMeasures(pd);
|
||||
map.put("measuresList",finishMeasuresList);
|
||||
map.put("signs",signs);
|
||||
map.put("pd",pd);
|
||||
map.put("result",errInfo);
|
||||
return map;
|
||||
}
|
||||
|
||||
}
|
|
@ -2,7 +2,9 @@ package com.zcloud.controller.eightwork;
|
|||
|
||||
import com.zcloud.controller.base.BaseController;
|
||||
import com.zcloud.entity.PageData;
|
||||
import com.zcloud.logs.LogAnno;
|
||||
import com.zcloud.service.corp.CorpInfoService;
|
||||
import com.zcloud.service.eightwork.EightWorkService;
|
||||
import com.zcloud.util.*;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Controller;
|
||||
|
@ -22,6 +24,8 @@ public class EightWorkController extends BaseController {
|
|||
|
||||
@Autowired
|
||||
private CorpInfoService corpInfoService;
|
||||
@Autowired
|
||||
private EightWorkService eightWorkService;
|
||||
|
||||
/**新增
|
||||
* @param
|
||||
|
@ -40,4 +44,28 @@ public class EightWorkController extends BaseController {
|
|||
map.put("result", errInfo);
|
||||
return map;
|
||||
}
|
||||
|
||||
/**持续改进企业报告
|
||||
* @param
|
||||
* @throws Exception
|
||||
*/
|
||||
@RequestMapping(value="/getDiagnosis")
|
||||
@ResponseBody
|
||||
public Object getDiagnosis() throws Exception{
|
||||
Map<String,Object> map = new HashMap<String,Object>();
|
||||
String errInfo = "success";
|
||||
PageData pd = new PageData();
|
||||
pd = this.getPageData();
|
||||
pd.put("CORPINFO_ID",Jurisdiction.getCORPINFO_ID());
|
||||
List<PageData> eightlist = eightWorkService.listAllForDiagnosis(pd);
|
||||
|
||||
map.put("eightlist", eightlist);
|
||||
if(pd!=null) {
|
||||
errInfo = "success";
|
||||
}else {
|
||||
errInfo = "faild";
|
||||
}
|
||||
map.put("result", errInfo);
|
||||
return map;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -0,0 +1,97 @@
|
|||
package com.zcloud.controller.eightwork;
|
||||
|
||||
import com.zcloud.controller.base.BaseController;
|
||||
import com.zcloud.entity.Page;
|
||||
import com.zcloud.entity.PageData;
|
||||
import com.zcloud.logs.LogAnno;
|
||||
import com.zcloud.service.eightwork.ElectricityGasService;
|
||||
import com.zcloud.service.eightwork.ElectricityService;
|
||||
import com.zcloud.util.Jurisdiction;
|
||||
import com.zcloud.util.Tools;
|
||||
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.ResponseBody;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 说明:临时用电作业
|
||||
* 官网:www.zcloudchina.com
|
||||
*/
|
||||
@Controller
|
||||
@RequestMapping("/electricity")
|
||||
public class ElectricityController extends BaseController {
|
||||
|
||||
@Autowired
|
||||
private ElectricityService electricityService;
|
||||
@Autowired
|
||||
private ElectricityGasService electricityGasService;
|
||||
|
||||
|
||||
/**列表
|
||||
* @param page
|
||||
* @throws Exception
|
||||
*/
|
||||
@RequestMapping(value="/list")
|
||||
@ResponseBody
|
||||
@LogAnno(menuType= "高危作业管理",menuServer= "临时用电作业",instructionsOperate = "临时用电作业",instructionsType = "列表")
|
||||
public Object list(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("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
|
||||
page.setPd(pd);
|
||||
List<PageData> varList = electricityService.list(page); //列出electricity列表
|
||||
map.put("varList", varList);
|
||||
map.put("page", page);
|
||||
map.put("result", errInfo);
|
||||
|
||||
return map;
|
||||
}
|
||||
|
||||
/**获取临时用电作业流程
|
||||
* @param
|
||||
* @throws Exception
|
||||
*/
|
||||
@RequestMapping(value="/getFlowList")
|
||||
@ResponseBody
|
||||
@LogAnno(menuType= "高危作业管理",menuServer= "临时用电作业",instructionsOperate = "临时用电作业",instructionsType = "获取临时用电作业流程")
|
||||
public Object getFlowList() throws Exception{
|
||||
Map<String,Object> map = new HashMap<String,Object>();
|
||||
String errInfo = "success";
|
||||
PageData pd = new PageData();
|
||||
pd = this.getPageData();
|
||||
pd = electricityService.findById(pd);
|
||||
List<PageData> flowList = electricityService.getFlowList(pd);
|
||||
map.put("flowingWork", pd);
|
||||
map.put("flowList", flowList);
|
||||
map.put("result", errInfo); //返回结果
|
||||
return map;
|
||||
}
|
||||
|
||||
@RequestMapping("/findById")
|
||||
@ResponseBody
|
||||
@LogAnno(menuType= "高危作业管理",menuServer= "临时用电作业",instructionsOperate = "临时用电作业",instructionsType = "获取详情")
|
||||
public Object findById() throws Exception {
|
||||
Map<String,Object> map = new HashMap<>();
|
||||
String errInfo = "success";
|
||||
PageData pd = new PageData();
|
||||
pd = this.getPageData();
|
||||
pd = electricityService.findById(pd);
|
||||
PageData signs = electricityService.listSignFinished(pd);
|
||||
List<PageData> finishMeasuresList = electricityService.listSignFinishMeasures(pd);
|
||||
map.put("measuresList",finishMeasuresList);
|
||||
map.put("gasList", electricityGasService.listAll(pd));
|
||||
map.put("signs",signs);
|
||||
map.put("pd",pd);
|
||||
map.put("result",errInfo);
|
||||
return map;
|
||||
}
|
||||
|
||||
}
|
|
@ -64,8 +64,10 @@ public class HighworkController extends BaseController {
|
|||
String errInfo = "success";
|
||||
PageData pd = new PageData();
|
||||
pd = this.getPageData();
|
||||
pd = highworkService.findById(pd);
|
||||
List<PageData> flowList = highworkService.getFlowList(pd);
|
||||
map.put("flowList", flowList);
|
||||
map.put("flowingWork", pd);
|
||||
map.put("result", errInfo); //返回结果
|
||||
return map;
|
||||
}
|
||||
|
|
|
@ -0,0 +1,93 @@
|
|||
package com.zcloud.controller.eightwork;
|
||||
|
||||
import com.zcloud.controller.base.BaseController;
|
||||
import com.zcloud.entity.Page;
|
||||
import com.zcloud.entity.PageData;
|
||||
import com.zcloud.logs.LogAnno;
|
||||
import com.zcloud.service.eightwork.HoistingService;
|
||||
import com.zcloud.util.Jurisdiction;
|
||||
import com.zcloud.util.Tools;
|
||||
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.ResponseBody;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 说明:吊装作业
|
||||
* 官网:www.zcloudchina.com
|
||||
*/
|
||||
@Controller
|
||||
@RequestMapping("/hoisting")
|
||||
public class HoistingController extends BaseController {
|
||||
|
||||
@Autowired
|
||||
private HoistingService hoistingService;
|
||||
|
||||
|
||||
/**列表
|
||||
* @param page
|
||||
* @throws Exception
|
||||
*/
|
||||
@RequestMapping(value="/list")
|
||||
@ResponseBody
|
||||
@LogAnno(menuType= "高危作业管理",menuServer= "吊装作业",instructionsOperate = "吊装作业",instructionsType = "列表")
|
||||
public Object list(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("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
|
||||
page.setPd(pd);
|
||||
List<PageData> varList = hoistingService.list(page); //列出hoisting列表
|
||||
map.put("varList", varList);
|
||||
map.put("page", page);
|
||||
map.put("result", errInfo);
|
||||
|
||||
return map;
|
||||
}
|
||||
|
||||
/**获取吊装作业流程
|
||||
* @param
|
||||
* @throws Exception
|
||||
*/
|
||||
@RequestMapping(value="/getFlowList")
|
||||
@ResponseBody
|
||||
@LogAnno(menuType= "高危作业管理",menuServer= "吊装作业",instructionsOperate = "吊装作业",instructionsType = "获取吊装作业流程")
|
||||
public Object getFlowList() throws Exception{
|
||||
Map<String,Object> map = new HashMap<String,Object>();
|
||||
String errInfo = "success";
|
||||
PageData pd = new PageData();
|
||||
pd = this.getPageData();
|
||||
pd = hoistingService.findById(pd);
|
||||
List<PageData> flowList = hoistingService.getFlowList(pd);
|
||||
map.put("flowingWork", pd);
|
||||
map.put("flowList", flowList);
|
||||
map.put("result", errInfo); //返回结果
|
||||
return map;
|
||||
}
|
||||
|
||||
@RequestMapping("/findById")
|
||||
@ResponseBody
|
||||
@LogAnno(menuType= "高危作业管理",menuServer= "吊装作业",instructionsOperate = "吊装作业",instructionsType = "获取详情")
|
||||
public Object findById() throws Exception {
|
||||
Map<String,Object> map = new HashMap<>();
|
||||
String errInfo = "success";
|
||||
PageData pd = new PageData();
|
||||
pd = this.getPageData();
|
||||
pd = hoistingService.findById(pd);
|
||||
PageData signs = hoistingService.listSignFinished(pd);
|
||||
List<PageData> finishMeasuresList = hoistingService.listSignFinishMeasures(pd);
|
||||
map.put("measuresList",finishMeasuresList);
|
||||
map.put("signs",signs);
|
||||
map.put("pd",pd);
|
||||
map.put("result",errInfo);
|
||||
return map;
|
||||
}
|
||||
|
||||
}
|
|
@ -0,0 +1,233 @@
|
|||
package com.zcloud.controller.freighttrailer;
|
||||
|
||||
import com.zcloud.controller.base.BaseController;
|
||||
import com.zcloud.entity.Page;
|
||||
import com.zcloud.entity.PageData;
|
||||
import com.zcloud.logs.LogAnno;
|
||||
import com.zcloud.service.freighttrailer.FreightTrailerService;
|
||||
import com.zcloud.service.system.ImgFilesService;
|
||||
import com.zcloud.util.*;
|
||||
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.ResponseBody;
|
||||
|
||||
import java.util.*;
|
||||
|
||||
/**
|
||||
* 企业信息管理-货运挂车
|
||||
*/
|
||||
@Controller
|
||||
@RequestMapping("/freightTrailer")
|
||||
public class FreighttTrailerController extends BaseController {
|
||||
|
||||
@Autowired
|
||||
private FreightTrailerService freightTrailerService;
|
||||
@Autowired
|
||||
private ImgFilesService imgfilesService;
|
||||
|
||||
/**
|
||||
* 新增
|
||||
*
|
||||
* @param
|
||||
* @throws Exception
|
||||
*/
|
||||
@RequestMapping(value = "/add")
|
||||
// @RequiresPermissions( value = {"question:add" , "courseware:add"}, logical = Logical.OR)
|
||||
@ResponseBody
|
||||
@LogAnno(menuType = "基础信息管理", menuServer = "货运挂车", instructionsOperate = "货运挂车", instructionsType = "新增")
|
||||
public Object add() throws Exception {
|
||||
Map<String, Object> map = new HashMap<String, Object>();
|
||||
String errInfo = "success";
|
||||
PageData pd = new PageData();
|
||||
pd = this.getPageData();
|
||||
pd.put("FREIGHTTRAILER_ID", this.get32UUID()); //主键
|
||||
pd.put("CREATOR", Jurisdiction.getUSER_ID()); //添加人id
|
||||
pd.put("CREATORNAME", Jurisdiction.getUsername()); //添加人
|
||||
pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间
|
||||
pd.put("ISDELETE", "0"); //是否删除(0:有效 1:删除)
|
||||
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID
|
||||
|
||||
freightTrailerService.save(pd);
|
||||
map.put("pd", pd);
|
||||
map.put("result", errInfo);
|
||||
return map;
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除
|
||||
*
|
||||
* @param
|
||||
* @throws Exception
|
||||
*/
|
||||
@RequestMapping(value = "/delete")
|
||||
// @RequiresPermissions( value = {"question:del" , "courseware:del"}, logical = Logical.OR)
|
||||
@ResponseBody
|
||||
@LogAnno(menuType = "基础信息管理", menuServer = "货运挂车", instructionsOperate = "货运挂车", instructionsType = "删除")
|
||||
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("DELETEOR", Jurisdiction.getUSER_ID()); //删除人id
|
||||
pd.put("DELETEORNAME", Jurisdiction.getUsername()); //删除人
|
||||
pd.put("DELETTIME", DateUtil.date2Str(new Date())); //删除时间
|
||||
freightTrailerService.delete(pd);
|
||||
map.put("result", errInfo); //返回结果
|
||||
return map;
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改
|
||||
*
|
||||
* @param
|
||||
* @throws Exception
|
||||
*/
|
||||
@RequestMapping(value = "/edit")
|
||||
// @RequiresPermissions( value = {"question:edit" , "courseware:edit"}, logical = Logical.OR)
|
||||
@ResponseBody
|
||||
@LogAnno(menuType = "基础信息管理", menuServer = "货运挂车", instructionsOperate = "货运挂车", instructionsType = "修改")
|
||||
public Object edit() throws Exception {
|
||||
Map<String, Object> map = new HashMap<String, Object>();
|
||||
String errInfo = "success";
|
||||
PageData pd = new PageData();
|
||||
pd = this.getPageData();
|
||||
pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id
|
||||
pd.put("OPERATORNAME", Jurisdiction.getUsername()); //修改人
|
||||
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
|
||||
freightTrailerService.edit(pd);
|
||||
map.put("pd", pd);
|
||||
map.put("result", errInfo);
|
||||
return map;
|
||||
}
|
||||
|
||||
/**
|
||||
* 列表
|
||||
*
|
||||
* @param page
|
||||
* @throws Exception
|
||||
*/
|
||||
@RequestMapping(value = "/list")
|
||||
// @RequiresPermissions( value = {"question:list" , "courseware:list"}, logical = Logical.OR)
|
||||
@ResponseBody
|
||||
@LogAnno(menuType = "基础信息管理", menuServer = "货运挂车", instructionsOperate = "货运挂车", instructionsType = "列表")
|
||||
public Object list(Page page) throws Exception {
|
||||
Map<String, Object> map = new HashMap<String, Object>();
|
||||
String errInfo = "success";
|
||||
PageData pd = new PageData();
|
||||
pd = this.getPageData();
|
||||
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID
|
||||
page.setPd(pd);
|
||||
List<PageData> varList = freightTrailerService.list(page); //列出Question列表
|
||||
map.put("varList", varList);
|
||||
map.put("page", page);
|
||||
map.put("result", errInfo);
|
||||
return map;
|
||||
}
|
||||
|
||||
/**
|
||||
* 去修改页面获取数据
|
||||
*
|
||||
* @param
|
||||
* @throws Exception
|
||||
*/
|
||||
@RequestMapping(value = "/goEdit")
|
||||
// @RequiresPermissions( value = {"question:edit" , "courseware:edit"}, logical = Logical.OR)
|
||||
@ResponseBody
|
||||
@LogAnno(menuType = "基础信息管理", menuServer = "货运挂车", instructionsOperate = "货运挂车", instructionsType = "去修改页面获取数据")
|
||||
public Object goEdit() throws Exception {
|
||||
Map<String, Object> map = new HashMap<String, Object>();
|
||||
String errInfo = "success";
|
||||
PageData pd = new PageData();
|
||||
pd = this.getPageData();
|
||||
pd = freightTrailerService.findById(pd); //根据ID读取
|
||||
|
||||
pd.put("FOREIGN_KEY", pd.getString("FREIGHTTRAILER_ID"));
|
||||
pd.put("TYPE",120);
|
||||
List<PageData> trailerImgs = imgfilesService.listAll(pd);//挂车照片
|
||||
pd.put("TYPE",121);
|
||||
List<PageData> drivingLicenseImgs = imgfilesService.listAll(pd);//行驶证照片
|
||||
pd.put("TYPE",122);
|
||||
List<PageData> operCertificateImgs = imgfilesService.listAll(pd);//运营证照片
|
||||
pd.put("TYPE",123);
|
||||
List<PageData> trailerInfoImgs = imgfilesService.listAll(pd);//挂车资料图片
|
||||
|
||||
map.put("pd", pd);
|
||||
map.put("trailerImgs", trailerImgs);
|
||||
map.put("drivingLicenseImgs", drivingLicenseImgs);
|
||||
map.put("operCertificateImgs", operCertificateImgs);
|
||||
map.put("trailerInfoImgs", trailerInfoImgs);
|
||||
map.put("result", errInfo);
|
||||
return map;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 列表
|
||||
*
|
||||
* @param
|
||||
* @throws Exception
|
||||
*/
|
||||
@RequestMapping(value = "/corpList")
|
||||
// @RequiresPermissions( value = {"question:list" , "courseware:list"}, logical = Logical.OR)
|
||||
@ResponseBody
|
||||
@LogAnno(menuType = "基础信息管理", menuServer = "所属企业", instructionsOperate = "所属企业", instructionsType = "列表")
|
||||
public Object corpList() throws Exception {
|
||||
Map<String, Object> map = new HashMap<String, Object>();
|
||||
String errInfo = "success";
|
||||
String corpId = Jurisdiction.getCORPINFO_ID();
|
||||
List<PageData> list = freightTrailerService.corpList(corpId); //列出Question列表
|
||||
map.put("list", list);
|
||||
map.put("result", errInfo);
|
||||
return map;
|
||||
}
|
||||
|
||||
/**
|
||||
* 列表
|
||||
*
|
||||
* @param
|
||||
* @throws Exception
|
||||
*/
|
||||
@RequestMapping(value = "/trailerList")
|
||||
// @RequiresPermissions( value = {"question:list" , "courseware:list"}, logical = Logical.OR)
|
||||
@ResponseBody
|
||||
@LogAnno(menuType = "基础信息管理", menuServer = "货运挂车", instructionsOperate = "货运挂车", instructionsType = "列表")
|
||||
public Object trailerList() throws Exception {
|
||||
Map<String, Object> map = new HashMap<String, Object>();
|
||||
String errInfo = "success";
|
||||
String corpId = Jurisdiction.getCORPINFO_ID();
|
||||
List<PageData> list = freightTrailerService.trailerList(corpId); //列出Question列表
|
||||
map.put("list", list);
|
||||
map.put("result", errInfo);
|
||||
return map;
|
||||
}
|
||||
|
||||
/**
|
||||
* 列表
|
||||
*
|
||||
* @param
|
||||
* @throws Exception
|
||||
*/
|
||||
@RequestMapping(value = "/vehicleList")
|
||||
// @RequiresPermissions( value = {"question:list" , "courseware:list"}, logical = Logical.OR)
|
||||
@ResponseBody
|
||||
@LogAnno(menuType = "基础信息管理", menuServer = "营运车辆", instructionsOperate = "营运车辆", instructionsType = "列表")
|
||||
public Object vehicleList() throws Exception {
|
||||
Map<String, Object> map = new HashMap<String, Object>();
|
||||
String errInfo = "success";
|
||||
PageData pd = new PageData();
|
||||
pd = this.getPageData();
|
||||
pd.put("CORPINFO_ID",Jurisdiction.getCORPINFO_ID());
|
||||
List<PageData> list = freightTrailerService.vehicleList(pd); //列出Question列表
|
||||
if(pd.containsKey("ID")){
|
||||
pd.put("FOREIGN_KEY", pd.getString("ID"));
|
||||
pd.put("TYPE",121);
|
||||
List<PageData> drivingLicenseImgs = imgfilesService.listAll(pd);//行驶证照片
|
||||
map.put("drivingLicenseImgs", drivingLicenseImgs);
|
||||
}
|
||||
map.put("list", list);
|
||||
map.put("result", errInfo);
|
||||
return map;
|
||||
}
|
||||
|
||||
}
|
|
@ -456,8 +456,8 @@ public class HiddenController extends BaseController {
|
|||
PageData checkUser = new PageData();
|
||||
checkUser.put("HIDDENCHECK_ID", this.get32UUID()); // 主键
|
||||
checkUser.put("HIDDEN_ID", pd.get("HIDDEN_ID"));
|
||||
checkUser.put("DEPARTMENT_ID", pd.get("CHECKDEPT"));
|
||||
checkUser.put("USER_ID", pd.get("CHECKOR"));
|
||||
checkUser.put("DEPARTMENT_ID", Jurisdiction.getDEPARTMENT_ID());
|
||||
checkUser.put("USER_ID", Jurisdiction.getUSER_ID());
|
||||
checkUser.put("STATUS", "0");
|
||||
hiddenCheckService.save(checkUser);
|
||||
if (pd.get("OTHER") != null && !pd.get("OTHER").equals("")) {
|
||||
|
@ -924,6 +924,8 @@ public class HiddenController extends BaseController {
|
|||
List<PageData> hImgs = imgFilesService.listAll(pd2);// 隐患图片
|
||||
pd2.put("TYPE", 4);
|
||||
List<PageData> rImgs = imgFilesService.listAll(pd2);// 整改图片
|
||||
pd2.put("TYPE", 50);
|
||||
List<PageData> yImgs = imgFilesService.listAll(pd2);// 安全环保检查验收图片
|
||||
/*
|
||||
* pd2.put("TYPE",5); List<PageData> cImgs = imgFilesService.listAll(pd2);//验收图片
|
||||
*/ // 查询整改方案
|
||||
|
@ -958,6 +960,7 @@ public class HiddenController extends BaseController {
|
|||
map.put("hs", hs);
|
||||
map.put("hImgs", hImgs);
|
||||
map.put("rImgs", rImgs);
|
||||
map.put("yImgs", yImgs);
|
||||
// map.put("cImgs", cImgs);
|
||||
map.put("sImgs", sImgs);
|
||||
map.put("pImgs", pImgs);
|
||||
|
|
|
@ -292,6 +292,7 @@ public class AppCustomHiddenController extends BaseController {
|
|||
pd.put("RISK_POSITION", item.get("POSITIONNAME"));
|
||||
pd.put("LEVEL", item.get("DNAME5"));
|
||||
}
|
||||
pd.put("SOURCE", "3");
|
||||
customHiddenService.save(pd);
|
||||
// 清除同检查记录合格图片
|
||||
if(pd.get("CLEARIMG") != null && Tools.notEmpty(pd.get("CLEARIMG").toString()) && "1".equals(pd.get("CLEARIMG").toString())) {
|
||||
|
@ -453,6 +454,7 @@ public class AppCustomHiddenController extends BaseController {
|
|||
}
|
||||
}
|
||||
}
|
||||
pd.put("SOURCE", "3");
|
||||
customHiddenService.save(pd);
|
||||
// 发送短信
|
||||
if(Tools.notEmpty(pd.getString("CONFIRM_USER")) && !pd.getString("STATE").equals("0")){
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -0,0 +1,185 @@
|
|||
package com.zcloud.controller.inspectAnnually;
|
||||
|
||||
import com.zcloud.controller.base.BaseController;
|
||||
import com.zcloud.entity.Page;
|
||||
import com.zcloud.entity.PageData;
|
||||
import com.zcloud.logs.LogAnno;
|
||||
import com.zcloud.service.inspectAnnually.InspectAnnuallyService;
|
||||
import com.zcloud.service.system.ImgFilesService;
|
||||
import com.zcloud.util.DateUtil;
|
||||
import com.zcloud.util.Jurisdiction;
|
||||
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.ResponseBody;
|
||||
|
||||
import java.util.Date;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 年检管理
|
||||
*/
|
||||
@Controller
|
||||
@RequestMapping("/inspectAnnually")
|
||||
public class InspectAnnuallyController extends BaseController {
|
||||
|
||||
@Autowired
|
||||
private InspectAnnuallyService inspectAnnuallyService;
|
||||
@Autowired
|
||||
private ImgFilesService imgfilesService;
|
||||
|
||||
/**
|
||||
* 新增
|
||||
*
|
||||
* @param
|
||||
* @throws Exception
|
||||
*/
|
||||
@RequestMapping(value = "/add")
|
||||
// @RequiresPermissions( value = {"question:add" , "courseware:add"}, logical = Logical.OR)
|
||||
@ResponseBody
|
||||
@LogAnno(menuType = "机务档案", menuServer = "年检管理", instructionsOperate = "年检管理", instructionsType = "新增")
|
||||
public Object add() throws Exception {
|
||||
Map<String, Object> map = new HashMap<String, Object>();
|
||||
String errInfo = "success";
|
||||
PageData pd = new PageData();
|
||||
pd = this.getPageData();
|
||||
pd.put("INSPECTANNUALLY_ID", this.get32UUID()); //主键
|
||||
pd.put("CREATOR", Jurisdiction.getUSER_ID()); //添加人id
|
||||
pd.put("CREATORNAME", Jurisdiction.getUsername()); //添加人
|
||||
pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间
|
||||
pd.put("ISDELETE", "0"); //是否删除(0:有效 1:删除)
|
||||
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID
|
||||
pd.put("ARCHIVES_TYPE", "正常"); //档案状态
|
||||
|
||||
inspectAnnuallyService.save(pd);
|
||||
map.put("pd", pd);
|
||||
map.put("result", errInfo);
|
||||
return map;
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除
|
||||
*
|
||||
* @param
|
||||
* @throws Exception
|
||||
*/
|
||||
@RequestMapping(value = "/delete")
|
||||
// @RequiresPermissions( value = {"question:del" , "courseware:del"}, logical = Logical.OR)
|
||||
@ResponseBody
|
||||
@LogAnno(menuType = "机务档案", menuServer = "年检管理", instructionsOperate = "年检管理", instructionsType = "删除")
|
||||
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("DELETEOR", Jurisdiction.getUSER_ID()); //删除人id
|
||||
pd.put("DELETEORNAME", Jurisdiction.getUsername()); //删除人
|
||||
pd.put("DELETTIME", DateUtil.date2Str(new Date())); //删除时间
|
||||
inspectAnnuallyService.delete(pd);
|
||||
map.put("result", errInfo); //返回结果
|
||||
return map;
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改
|
||||
*
|
||||
* @param
|
||||
* @throws Exception
|
||||
*/
|
||||
@RequestMapping(value = "/edit")
|
||||
// @RequiresPermissions( value = {"question:edit" , "courseware:edit"}, logical = Logical.OR)
|
||||
@ResponseBody
|
||||
@LogAnno(menuType = "机务档案", menuServer = "年检管理", instructionsOperate = "年检管理", instructionsType = "修改")
|
||||
public Object edit() throws Exception {
|
||||
Map<String, Object> map = new HashMap<String, Object>();
|
||||
String errInfo = "success";
|
||||
PageData pd = new PageData();
|
||||
pd = this.getPageData();
|
||||
pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id
|
||||
pd.put("OPERATORNAME", Jurisdiction.getUsername()); //修改人
|
||||
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
|
||||
inspectAnnuallyService.edit(pd);
|
||||
map.put("pd", pd);
|
||||
map.put("result", errInfo);
|
||||
return map;
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改
|
||||
*
|
||||
* @param
|
||||
* @throws Exception
|
||||
*/
|
||||
@RequestMapping(value = "/edit2")
|
||||
// @RequiresPermissions( value = {"question:edit" , "courseware:edit"}, logical = Logical.OR)
|
||||
@ResponseBody
|
||||
@LogAnno(menuType = "机务档案", menuServer = "年检管理", instructionsOperate = "年检管理", instructionsType = "修改")
|
||||
public Object edit2() throws Exception {
|
||||
Map<String, Object> map = new HashMap<String, Object>();
|
||||
String errInfo = "success";
|
||||
PageData pd = new PageData();
|
||||
pd = this.getPageData();
|
||||
pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id
|
||||
pd.put("OPERATORNAME", Jurisdiction.getUsername()); //修改人
|
||||
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
|
||||
inspectAnnuallyService.edit2(pd);
|
||||
map.put("pd", pd);
|
||||
map.put("result", errInfo);
|
||||
return map;
|
||||
}
|
||||
|
||||
/**
|
||||
* 列表
|
||||
*
|
||||
* @param page
|
||||
* @throws Exception
|
||||
*/
|
||||
@RequestMapping(value = "/list")
|
||||
// @RequiresPermissions( value = {"question:list" , "courseware:list"}, logical = Logical.OR)
|
||||
@ResponseBody
|
||||
@LogAnno(menuType = "机务档案", menuServer = "年检管理", instructionsOperate = "年检管理", instructionsType = "列表")
|
||||
public Object list(Page page) throws Exception {
|
||||
Map<String, Object> map = new HashMap<String, Object>();
|
||||
String errInfo = "success";
|
||||
PageData pd = new PageData();
|
||||
pd = this.getPageData();
|
||||
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID
|
||||
page.setPd(pd);
|
||||
List<PageData> varList = inspectAnnuallyService.list(page); //列出Question列表
|
||||
map.put("varList", varList);
|
||||
map.put("page", page);
|
||||
map.put("result", errInfo);
|
||||
return map;
|
||||
}
|
||||
|
||||
/**
|
||||
* 去修改页面获取数据
|
||||
*
|
||||
* @param
|
||||
* @throws Exception
|
||||
*/
|
||||
@RequestMapping(value = "/goEdit")
|
||||
// @RequiresPermissions( value = {"question:edit" , "courseware:edit"}, logical = Logical.OR)
|
||||
@ResponseBody
|
||||
@LogAnno(menuType = "机务档案", menuServer = "年检管理", instructionsOperate = "年检管理", instructionsType = "去修改页面获取数据")
|
||||
public Object goEdit() throws Exception {
|
||||
Map<String, Object> map = new HashMap<String, Object>();
|
||||
String errInfo = "success";
|
||||
PageData pd = new PageData();
|
||||
pd = this.getPageData();
|
||||
pd = inspectAnnuallyService.findById(pd); //根据ID读取
|
||||
|
||||
pd.put("FOREIGN_KEY", pd.getString("INSPECTANNUALLY_ID"));
|
||||
pd.put("TYPE",124);
|
||||
List<PageData> inspectinfoImgs = imgfilesService.listAll(pd);//年检资料图片
|
||||
|
||||
map.put("pd", pd);
|
||||
map.put("inspectinfoImgs", inspectinfoImgs);
|
||||
map.put("result", errInfo);
|
||||
return map;
|
||||
}
|
||||
|
||||
|
||||
}
|
|
@ -73,6 +73,7 @@ public class MapController extends BaseController {
|
|||
public ReturnMap getAlarmTypeCount() throws Exception {
|
||||
return ReturnMap.ok().put("data", PLSUtil.getAlarmTypeCount(Jurisdiction.getCORPINFO_ID()));
|
||||
}
|
||||
|
||||
/**
|
||||
* @Description: 告警数据 来自人员定位系统
|
||||
* @Author: dearLin
|
||||
|
@ -96,6 +97,7 @@ public class MapController extends BaseController {
|
|||
}
|
||||
return returnMap;
|
||||
}
|
||||
|
||||
/**
|
||||
* @Description: 人员定位情况 来自人员定位系统
|
||||
* @Author: dearLin
|
||||
|
@ -118,7 +120,7 @@ public class MapController extends BaseController {
|
|||
@RequestMapping(value = "/getRealTimeList")
|
||||
@ResponseBody
|
||||
public ReturnMap getRealTimeList() throws Exception {
|
||||
return ReturnMap.ok().put("data", PLSUtil.getRealTimeList(Jurisdiction.getCORPINFO_ID()));
|
||||
return ReturnMap.ok().put("data", PLSUtil.getRealTimeList(Jurisdiction.getCORPINFO_ID()));
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -129,7 +131,7 @@ public class MapController extends BaseController {
|
|||
@RequestMapping(value = "/getFenceList")
|
||||
@ResponseBody
|
||||
public ReturnMap getFenceList() throws Exception {
|
||||
return ReturnMap.ok().put("data", PLSUtil.getAreaRegionList(Jurisdiction.getCORPINFO_ID(),1,999999));
|
||||
return ReturnMap.ok().put("data", PLSUtil.getAreaRegionList(Jurisdiction.getCORPINFO_ID(), 1, 999999));
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -143,6 +145,19 @@ public class MapController extends BaseController {
|
|||
return eightWorkService.getEightWorks();
|
||||
}
|
||||
|
||||
/**
|
||||
* @Description: 获取八项作业数
|
||||
* @Param: [] []
|
||||
* @Return: com.zcloud.util.ReturnMap
|
||||
*/
|
||||
@RequestMapping(value = "/getEightWorksByType")
|
||||
@ResponseBody
|
||||
public ReturnMap getEightWorksByType() throws Exception {
|
||||
PageData pageData = this.getPageData();
|
||||
pageData.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
|
||||
return ReturnMap.ok().put("varList", eightWorkService.getEightWorksByType(pageData));
|
||||
}
|
||||
|
||||
/**
|
||||
* @Description: 获取动火作业
|
||||
* @Param: [] []
|
||||
|
@ -187,6 +202,7 @@ public class MapController extends BaseController {
|
|||
PageData cameraCount = videomanagerService.getCameraTopToShow(pageData);
|
||||
return ReturnMap.ok().put("pd", cameraCount);
|
||||
}
|
||||
|
||||
/**
|
||||
* @Description: 摄像头告警数
|
||||
* @Author: dearLin
|
||||
|
@ -202,6 +218,7 @@ public class MapController extends BaseController {
|
|||
List<PageData> cameraCount = videomanagerService.getCameraAlarmCount(pageData);
|
||||
return ReturnMap.ok().put("CameraAlarmCount", cameraCount);
|
||||
}
|
||||
|
||||
/**
|
||||
* @Description: 摄像头报警类型
|
||||
* @Author: dearLin
|
||||
|
@ -260,8 +277,8 @@ public class MapController extends BaseController {
|
|||
@ResponseBody
|
||||
public ReturnMap getCharacterTrajectories() throws Exception {
|
||||
PageData pageData = getPageData();
|
||||
return ReturnMap.ok().put("data", PLSUtil.characterTrajectories(Jurisdiction.getCORPINFO_ID(),Integer.parseInt(pageData.getString("id")),
|
||||
pageData.getString("startTime"),pageData.getString("endTime"),Integer.parseInt(pageData.getString("type"))));
|
||||
return ReturnMap.ok().put("data", PLSUtil.characterTrajectories(Jurisdiction.getCORPINFO_ID(), Integer.parseInt(pageData.getString("id")),
|
||||
pageData.getString("startTime"), pageData.getString("endTime"), Integer.parseInt(pageData.getString("type"))));
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -288,7 +305,7 @@ public class MapController extends BaseController {
|
|||
int year = calendar.get(Calendar.YEAR);
|
||||
int month = calendar.get(Calendar.MONTH) + 1;
|
||||
|
||||
String monthString = String.format(year+"-%02d", month);
|
||||
String monthString = String.format(year + "-%02d", month);
|
||||
String firstDayOfMonth = String.format("%04d-%02d-01 00:00:00", year, month);
|
||||
calendar.set(Calendar.DAY_OF_MONTH, calendar.getActualMaximum(Calendar.DAY_OF_MONTH));
|
||||
calendar.set(Calendar.HOUR_OF_DAY, 23);
|
||||
|
@ -323,6 +340,7 @@ public class MapController extends BaseController {
|
|||
public Object getCameraList() throws Exception {
|
||||
return ReturnMap.ok().put("varList", videomanagerService.getCameraList(getPageData()));
|
||||
}
|
||||
|
||||
public static void main(String[] args) {
|
||||
List<Map<String, String>> timeArray = generateTimeArray();
|
||||
for (Map<String, String> monthInfo : timeArray) {
|
||||
|
|
|
@ -35,9 +35,9 @@ public class OperatingVehiclesController extends BaseController {
|
|||
@RequestMapping(value="/add")
|
||||
@ResponseBody
|
||||
public Object add(
|
||||
@RequestParam(value="headstockFile",required=false) MultipartFile headstockFile,
|
||||
@RequestParam(value="drivinglicenseFile",required=false) MultipartFile drivinglicenseFile,
|
||||
@RequestParam(value="operatingCertificateFile",required=false) MultipartFile operatingCertificateFile
|
||||
/*@RequestParam(value="headstockphoto",required=false) MultipartFile headstockphoto,
|
||||
@RequestParam(value="drivinglicensephoto",required=false) MultipartFile drivinglicensephoto,
|
||||
@RequestParam(value="operatingcertificatephoto",required=false) MultipartFile operatingcertificatephoto*/
|
||||
) throws Exception{
|
||||
Map<String,Object> map = new HashMap<String,Object>();
|
||||
String errInfo = "success";
|
||||
|
@ -51,36 +51,37 @@ public class OperatingVehiclesController extends BaseController {
|
|||
pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id
|
||||
pd.put("OPERATORNAME", Jurisdiction.getUsername()); // 修改人名字
|
||||
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间
|
||||
if (null != headstockFile && !headstockFile.isEmpty()) {
|
||||
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
|
||||
/*if (null != headstockphoto && !headstockphoto.isEmpty()) {
|
||||
String ffile = DateUtil.getDays();
|
||||
//本地
|
||||
// String filePath = PathUtil.getProjectpath() + Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile; //文件上传路径
|
||||
// String fileName = FileUpload.fileUp(file, filePath, this.get32UUID()); //执行上传
|
||||
//服务器
|
||||
String fileName = this.get32UUID()+headstockFile.getOriginalFilename().substring(headstockFile.getOriginalFilename().lastIndexOf("."));
|
||||
smb.sshSftp(headstockFile, fileName, Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile);
|
||||
String fileName = this.get32UUID()+headstockphoto.getOriginalFilename().substring(headstockphoto.getOriginalFilename().lastIndexOf("."));
|
||||
smb.sshSftp(headstockphoto, fileName, Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile);
|
||||
pd.put("HEADSTOCK_PHOTO", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName);
|
||||
}
|
||||
if (null != drivinglicenseFile && !drivinglicenseFile.isEmpty()) {
|
||||
if (null != drivinglicensephoto && !drivinglicensephoto.isEmpty()) {
|
||||
String ffile = DateUtil.getDays();
|
||||
//本地
|
||||
// String filePath = PathUtil.getProjectpath() + Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile; //文件上传路径
|
||||
// String fileName = FileUpload.fileUp(file, filePath, this.get32UUID()); //执行上传
|
||||
//服务器
|
||||
String fileName = this.get32UUID()+drivinglicenseFile.getOriginalFilename().substring(drivinglicenseFile.getOriginalFilename().lastIndexOf("."));
|
||||
smb.sshSftp(drivinglicenseFile, fileName, Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile);
|
||||
String fileName = this.get32UUID()+drivinglicensephoto.getOriginalFilename().substring(drivinglicensephoto.getOriginalFilename().lastIndexOf("."));
|
||||
smb.sshSftp(drivinglicensephoto, fileName, Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile);
|
||||
pd.put("DRIVINGLICENSE_PHOTO", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName);
|
||||
}
|
||||
if (null != operatingCertificateFile && !operatingCertificateFile.isEmpty()) {
|
||||
if (null != operatingcertificatephoto && !operatingcertificatephoto.isEmpty()) {
|
||||
String ffile = DateUtil.getDays();
|
||||
//本地
|
||||
// String filePath = PathUtil.getProjectpath() + Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile; //文件上传路径
|
||||
// String fileName = FileUpload.fileUp(file, filePath, this.get32UUID()); //执行上传
|
||||
//服务器
|
||||
String fileName = this.get32UUID()+operatingCertificateFile.getOriginalFilename().substring(operatingCertificateFile.getOriginalFilename().lastIndexOf("."));
|
||||
smb.sshSftp(operatingCertificateFile, fileName, Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile);
|
||||
String fileName = this.get32UUID()+operatingcertificatephoto.getOriginalFilename().substring(operatingcertificatephoto.getOriginalFilename().lastIndexOf("."));
|
||||
smb.sshSftp(operatingcertificatephoto, fileName, Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile);
|
||||
pd.put("OPERATING_CERTIFICATE_PHOTO", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName);
|
||||
}
|
||||
}*/
|
||||
operatingVehiclesService.save(pd);
|
||||
map.put("pd", pd);
|
||||
map.put("result", errInfo);
|
||||
|
@ -98,6 +99,10 @@ public class OperatingVehiclesController extends BaseController {
|
|||
String errInfo = "success";
|
||||
PageData pd = new PageData();
|
||||
pd = this.getPageData();
|
||||
pd.put("DELETOR", Jurisdiction.getUSER_ID());
|
||||
pd.put("DELETORNAME", Jurisdiction.getUsername());
|
||||
pd.put("DELETTIME", DateUtil.date2Str(new Date()));
|
||||
operatingVehiclesService.delete(pd);
|
||||
map.put("result", errInfo); //返回结果
|
||||
return map;
|
||||
}
|
||||
|
@ -172,20 +177,49 @@ public class OperatingVehiclesController extends BaseController {
|
|||
return map;
|
||||
}
|
||||
|
||||
@RequestMapping(value="/list")
|
||||
@RequestMapping(value = "/list")
|
||||
// @RequiresPermissions( value = {"question:list" , "courseware:list"}, logical = Logical.OR)
|
||||
@ResponseBody
|
||||
public Object list(Page page) throws Exception{
|
||||
Map<String,Object> map = new HashMap<String,Object>();
|
||||
@LogAnno(menuType = "基础信息管理", menuServer = "货运挂车", instructionsOperate = "货运挂车", instructionsType = "列表")
|
||||
public Object list(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("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID
|
||||
page.setPd(pd);
|
||||
List<PageData> varList = operatingVehiclesService.list(page); //列出MajorDangerSource列表
|
||||
List<PageData> varList = operatingVehiclesService.list(page); //列出Question列表
|
||||
map.put("varList", varList);
|
||||
map.put("page", page);
|
||||
map.put("result", errInfo);
|
||||
return map;
|
||||
}
|
||||
|
||||
@RequestMapping(value = "/operationvehicleList")
|
||||
@ResponseBody
|
||||
public Object operationVehicleList() throws Exception {
|
||||
Map<String, Object> map = new HashMap<String, Object>();
|
||||
String errInfo = "success";
|
||||
String corpId = Jurisdiction.getCORPINFO_ID();
|
||||
List<PageData> list = operatingVehiclesService.operationVehicleList(corpId); //列出Question列表
|
||||
map.put("list", list);
|
||||
map.put("result", errInfo);
|
||||
return map;
|
||||
}
|
||||
|
||||
/*@RequestMapping(value = "/list")
|
||||
@ResponseBody
|
||||
public Object list(Page page) throws Exception {
|
||||
Map<String, Object> map = new HashMap<String, Object>();
|
||||
String errInfo = "success";
|
||||
PageData pd = new PageData();
|
||||
pd = this.getPageData();
|
||||
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID
|
||||
page.setPd(pd);
|
||||
List<PageData> varList = operatingVehiclesService.list(page); //列出Question列表
|
||||
map.put("varList", varList);
|
||||
map.put("page", page);
|
||||
map.put("result", errInfo);
|
||||
return map;
|
||||
}*/
|
||||
}
|
||||
|
|
|
@ -509,4 +509,30 @@ public class PositAlarmController extends BaseController {
|
|||
}
|
||||
return returnMap;
|
||||
}
|
||||
|
||||
@RequestMapping(value = "/alarmRecordgoEdit")
|
||||
@ResponseBody
|
||||
public ReturnMap alarmRecordgoEdit(Page page) throws Exception {
|
||||
PageData pageData = this.getPageData();
|
||||
ReturnMap returnMap = new ReturnMap();
|
||||
JSONObject body = PLSUtil.GeneralList("/old/gatherAlarms/regAlarmGatherInfoList", pageData);
|
||||
if (body != null) {
|
||||
returnMap.putAll(body);
|
||||
page.setTotalResult(body.getIntValue("total"));
|
||||
returnMap.put("page", page);
|
||||
}
|
||||
return returnMap;
|
||||
}
|
||||
@RequestMapping(value = "/getAlarmGatherPsnInfo")
|
||||
@ResponseBody
|
||||
public ReturnMap getAlarmGatherPsnInfo() throws Exception {
|
||||
PageData pageData = this.getPageData();
|
||||
ReturnMap returnMap = new ReturnMap();
|
||||
JSONObject body = PLSUtil.GeneralGetById("/old/gatherAlarms/getAlarmGatherPsnInfo?id=", pageData.getString("id"),Jurisdiction.getCORPINFO_ID());
|
||||
if (body != null) {
|
||||
returnMap.putAll(body);
|
||||
}
|
||||
return returnMap;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -42,7 +42,7 @@ public class UserCardController extends BaseController {
|
|||
ReturnMap returnMap = new ReturnMap();
|
||||
page.setPd(pageData);
|
||||
JSONObject body = PLSUtil.getUserCardDataList(
|
||||
Jurisdiction.getCORPINFO_ID(), Integer.parseInt(pageData.getString("currentPage")), Integer.parseInt(pageData.getString("showCount")), pageData.getString("str"));
|
||||
Jurisdiction.getCORPINFO_ID(), Integer.parseInt(pageData.getString("currentPage")), Integer.parseInt(pageData.getString("showCount")), pageData.getString("KEYWORDS"));
|
||||
if (body != null) {
|
||||
List<JSONObject> list = body.getJSONArray("rows").toJavaList(JSONObject.class);
|
||||
returnMap.put("varList", list);
|
||||
|
|
|
@ -100,6 +100,10 @@ public class IdentificationPartsController extends BaseController {
|
|||
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
|
||||
pd.put("ISDELETE", "0"); //是否删除 1-是 0-否
|
||||
pd.put("ISMATCHING", "0");
|
||||
if (Tools.isEmpty(pd.getString("ELECTRONIC_FENCE_ID"))) {
|
||||
pd.put("ELECTRONIC_FENCE_NAME", null);
|
||||
pd.put("ELECTRONIC_FENCE_ID", null);
|
||||
}
|
||||
identificationpartsService.save(pd);
|
||||
|
||||
if (files != null && files.length > 0) {
|
||||
|
@ -237,7 +241,7 @@ public class IdentificationPartsController extends BaseController {
|
|||
PageData pageData = this.getPageData();
|
||||
String KEYWORDS = (String) pageData.getOrDefault("KEYWORDS", "");
|
||||
|
||||
JSONObject body = PLSUtil.getRyRegionList(Jurisdiction.getCORPINFO_ID(),KEYWORDS,Integer.parseInt(pageData.getString("currentPage")),Integer.parseInt(pageData.getString("showCount")),0);
|
||||
JSONObject body = PLSUtil.getRyRegionList(Jurisdiction.getCORPINFO_ID(), KEYWORDS, Integer.parseInt(pageData.getString("currentPage")), Integer.parseInt(pageData.getString("showCount")), 0);
|
||||
|
||||
if (body != null) {
|
||||
List<JSONObject> list = body.getJSONArray("rows").toJavaList(JSONObject.class);
|
||||
|
|
|
@ -1030,4 +1030,27 @@ public class DictionariesController extends BaseController {
|
|||
return map;
|
||||
}
|
||||
|
||||
@RequestMapping(value = "/getVehicleType")
|
||||
@ResponseBody
|
||||
public Object getVehicleType() throws Exception {
|
||||
Map<String, Object> map = new HashMap<String, Object>();
|
||||
String errInfo = "success";
|
||||
PageData pd = new PageData();
|
||||
pd = this.getPageData();
|
||||
String DICTIONARIES_ID = pd.getString("DICTIONARIES_ID");
|
||||
DICTIONARIES_ID = Tools.isEmpty(DICTIONARIES_ID) ? "0" : DICTIONARIES_ID;
|
||||
List<Dictionaries> varList = dictionariesService.listgetVehicleType(DICTIONARIES_ID); //用传过来的ID获取此ID下的子列表数据
|
||||
List<PageData> pdList = new ArrayList<PageData>();
|
||||
for (Dictionaries d : varList) {
|
||||
PageData pdf = new PageData();
|
||||
pdf.put("DICTIONARIES_ID", d.getDICTIONARIES_ID());
|
||||
pdf.put("BIANMA", d.getBIANMA());
|
||||
pdf.put("NAME", d.getNAME());
|
||||
pdList.add(pdf);
|
||||
}
|
||||
map.put("list", pdList);
|
||||
map.put("result", errInfo); //返回结果
|
||||
return map;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -149,7 +149,7 @@ public class LoginController extends BaseController {
|
|||
PageData dpd = new PageData();
|
||||
dpd.put("DEPARTMENT_ID", pd.getString("DEPARTMENT_ID"));
|
||||
dpd = departmentService.findById(dpd);
|
||||
if (dpd.getString("FOREIGNPERSONNEL").equals("1")) {
|
||||
if ("1".equals(dpd.getString("FOREIGNPERSONNEL"))) {
|
||||
return ReturnMap.error("账号密码不正确");
|
||||
}
|
||||
map.put("DEPARTMENT_NAME", dpd.getString("NAME"));
|
||||
|
|
|
@ -445,6 +445,7 @@ public class UsersController extends BaseController {
|
|||
String msg = usersService.changeOrUpdUserCardNo(pd);
|
||||
if (msg.equals(Const.CAN_CHENG_USER)) {
|
||||
if (PLSUtil.editUser(pd)) {
|
||||
if (Tools.isEmpty(pd.getString("CARDNO"))) {pd.put("CARDNO", null);}
|
||||
usersService.editUser(pd); //执行修改
|
||||
if ("true".equals(pd.getString("ISSTUDENT"))) {
|
||||
if ("select".equals(pd.getString("letDutiesType"))) {
|
||||
|
|
|
@ -0,0 +1,176 @@
|
|||
package com.zcloud.controller.taxationManage;
|
||||
|
||||
import com.alibaba.excel.util.DateUtils;
|
||||
import com.zcloud.controller.base.BaseController;
|
||||
import com.zcloud.entity.Page;
|
||||
import com.zcloud.entity.PageData;
|
||||
import com.zcloud.logs.LogAnno;
|
||||
import com.zcloud.service.assignedManage.AssignedManageService;
|
||||
import com.zcloud.service.system.DictionariesService;
|
||||
import com.zcloud.service.taxationManage.TaxationManageService;
|
||||
import com.zcloud.util.*;
|
||||
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("/taxationmanage")
|
||||
public class TaxationManageController extends BaseController {
|
||||
|
||||
@Autowired
|
||||
private TaxationManageService taxationManageService;
|
||||
|
||||
@Autowired
|
||||
private Smb smb;
|
||||
|
||||
/**新增
|
||||
* @param
|
||||
* @throws Exception
|
||||
*/
|
||||
@RequestMapping(value="/add")
|
||||
@ResponseBody
|
||||
public Object add(
|
||||
@RequestParam(value="drivinglicenseFile",required=false) MultipartFile drivinglicenseFile
|
||||
) throws Exception{
|
||||
Map<String,Object> map = new HashMap<String,Object>();
|
||||
String errInfo = "success";
|
||||
PageData pd = new PageData();
|
||||
pd = this.getPageData();
|
||||
pd.put("TAXATION_ID", this.get32UUID()); //车船税主键
|
||||
pd.put("ISDELETE", "0"); //是否删除(0:有效 1:删除)
|
||||
pd.put("CREATOR", Jurisdiction.getUSER_ID()); //添加人id
|
||||
pd.put("CREATORNAME", Jurisdiction.getUsername()); //添加人名字
|
||||
pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间
|
||||
pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id
|
||||
pd.put("OPERATORNAME", Jurisdiction.getUsername()); // 修改人名字
|
||||
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间
|
||||
if("".equals(pd.getString("EXPIRE_STATUS"))) {
|
||||
String expireDate = pd.getString("EXPIRE_DATE");
|
||||
String day = DateUtil.getDay();
|
||||
boolean flag = DateUtil.compareDate(expireDate, day);
|
||||
if(flag) {
|
||||
pd.put("EXPIRE_STATUS","未到期");
|
||||
}else{
|
||||
pd.put("EXPIRE_STATUS","已到期");
|
||||
}
|
||||
}
|
||||
if (null != drivinglicenseFile && !drivinglicenseFile.isEmpty()) {
|
||||
String ffile = DateUtil.getDays();
|
||||
//本地
|
||||
// String filePath = PathUtil.getProjectpath() + Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile; //文件上传路径
|
||||
// String fileName = FileUpload.fileUp(file, filePath, this.get32UUID()); //执行上传
|
||||
//服务器
|
||||
String fileName = this.get32UUID()+drivinglicenseFile.getOriginalFilename().substring(drivinglicenseFile.getOriginalFilename().lastIndexOf("."));
|
||||
smb.sshSftp(drivinglicenseFile, fileName, Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile);
|
||||
pd.put("DRIVINGLICENSE_PHOTO", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName);
|
||||
}
|
||||
taxationManageService.save(pd);
|
||||
map.put("pd", pd);
|
||||
map.put("result", errInfo);
|
||||
return map;
|
||||
}
|
||||
|
||||
/**删除
|
||||
* @param
|
||||
* @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());
|
||||
pd.put("DELETORNAME", Jurisdiction.getUsername());
|
||||
pd.put("DELETTIME", DateUtil.date2Str(new Date()));
|
||||
taxationManageService.delete(pd);
|
||||
map.put("result", errInfo); //返回结果
|
||||
return map;
|
||||
}
|
||||
|
||||
/**修改
|
||||
* @param
|
||||
* @throws Exception
|
||||
*/
|
||||
@RequestMapping(value="/edit")
|
||||
@ResponseBody
|
||||
public Object edit() throws Exception{
|
||||
Map<String,Object> map = new HashMap<String,Object>();
|
||||
String errInfo = "success";
|
||||
PageData pd = new PageData();
|
||||
pd = this.getPageData();
|
||||
pd.put("ISDELETE", "0"); //是否删除(0:有效 1:删除)
|
||||
pd.put("CREATOR", Jurisdiction.getUSER_ID()); //添加人id
|
||||
pd.put("CREATORNAME", Jurisdiction.getUsername()); //添加人名字
|
||||
pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间
|
||||
pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id
|
||||
pd.put("OPERATORNAME", Jurisdiction.getUsername()); // 修改人名字
|
||||
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间
|
||||
String expireDate = pd.getString("EXPIRE_DATE");
|
||||
String day = DateUtil.getDay();
|
||||
boolean flag = DateUtil.compareDate(expireDate, day);
|
||||
if(flag) {
|
||||
pd.put("EXPIRE_STATUS","未到期");
|
||||
}else{
|
||||
pd.put("EXPIRE_STATUS","已到期");
|
||||
}
|
||||
taxationManageService.edit(pd);
|
||||
map.put("pd", pd);
|
||||
map.put("result", errInfo);
|
||||
return map;
|
||||
}
|
||||
/**去修改页面获取数据
|
||||
* @param
|
||||
* @throws Exception
|
||||
*/
|
||||
@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 = taxationManageService.findById(pd);
|
||||
map.put("pd", pd);
|
||||
map.put("result", errInfo);
|
||||
return map;
|
||||
}
|
||||
|
||||
@RequestMapping(value="/list")
|
||||
@ResponseBody
|
||||
public Object list(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());
|
||||
page.setPd(pd);
|
||||
List<PageData> varList = taxationManageService.list(page); //列出MajorDangerSource列表
|
||||
map.put("varList", varList);
|
||||
map.put("page", page);
|
||||
map.put("result", errInfo);
|
||||
return map;
|
||||
}
|
||||
|
||||
@RequestMapping(value = "/taxationList")
|
||||
@ResponseBody
|
||||
public Object taxationList() throws Exception {
|
||||
Map<String, Object> map = new HashMap<String, Object>();
|
||||
String errInfo = "success";
|
||||
String corpId = Jurisdiction.getCORPINFO_ID();
|
||||
List<PageData> list = taxationManageService.taxationList(corpId); //列出Question列表
|
||||
map.put("list", list);
|
||||
map.put("result", errInfo);
|
||||
return map;
|
||||
}
|
||||
}
|
|
@ -121,6 +121,8 @@ public class NodeApp {
|
|||
buffer.append("\n");
|
||||
if (StringUtils.isNotBlank(inspector.getString("INSPECTION_USER_SIGN_TIME"))){
|
||||
buffer.append(inspector.getString("INSPECTION_USER_NAME"));
|
||||
buffer.append("\n");
|
||||
buffer.append(inspector.getString("INSPECTION_USER_SIGN_TIME"));
|
||||
// buffer.append("(");
|
||||
// buffer.append(")");
|
||||
}else {
|
||||
|
@ -132,11 +134,11 @@ public class NodeApp {
|
|||
this.title = buffer.toString();
|
||||
|
||||
buffer.setLength(0);
|
||||
for (PageData inspector : inspectors) {
|
||||
if (StringUtils.isNotBlank(inspector.getString("INSPECTION_USER_SIGN_TIME"))){
|
||||
buffer.append(inspector.getString("INSPECTION_USER_SIGN_TIME"));
|
||||
}
|
||||
}
|
||||
// for (PageData inspector : inspectors) {
|
||||
// if (StringUtils.isNotBlank(inspector.getString("INSPECTION_USER_SIGN_TIME"))){
|
||||
// buffer.append(inspector.getString("INSPECTION_USER_SIGN_TIME"));
|
||||
// }
|
||||
// }
|
||||
|
||||
if (buffer.length() > 0) {
|
||||
this.desc = buffer.toString();
|
||||
|
|
|
@ -0,0 +1,38 @@
|
|||
package com.zcloud.mapper.datasource.assignedManage;
|
||||
|
||||
import com.zcloud.entity.Page;
|
||||
import com.zcloud.entity.PageData;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public interface AssignedManageMapper {
|
||||
|
||||
/**新增
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
void save(PageData pd);
|
||||
|
||||
/**删除
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
void delete(PageData pd);
|
||||
|
||||
/**修改
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
void edit(PageData pd);
|
||||
|
||||
/**通过id获取数据
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
PageData findById(PageData pd);
|
||||
|
||||
|
||||
List<PageData> datalistPage(Page page);
|
||||
|
||||
List<PageData> operationvehicleList(String corpId);
|
||||
}
|
|
@ -0,0 +1,59 @@
|
|||
package com.zcloud.mapper.datasource.eightwork;
|
||||
|
||||
import com.zcloud.entity.Page;
|
||||
import com.zcloud.entity.PageData;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 说明:盲板信息
|
||||
* 作者:luoxiaobao
|
||||
* 时间:2021-08-23
|
||||
* 官网:www.zcloudchina.com
|
||||
*/
|
||||
public interface BlindBoardInfoMapper {
|
||||
|
||||
/**新增
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
void save(PageData pd);
|
||||
|
||||
/**删除
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
void delete(PageData pd);
|
||||
|
||||
/**修改
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
void edit(PageData pd);
|
||||
|
||||
/**列表
|
||||
* @param page
|
||||
* @throws Exception
|
||||
*/
|
||||
List<PageData> datalistPage(Page page);
|
||||
|
||||
/**列表(全部)
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
List<PageData> listAll(PageData pd);
|
||||
|
||||
/**通过id获取数据
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
PageData findById(PageData pd);
|
||||
|
||||
/**批量删除
|
||||
* @param ArrayDATA_IDS
|
||||
* @throws Exception
|
||||
*/
|
||||
void deleteAll(String[] ArrayDATA_IDS);
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,34 @@
|
|||
package com.zcloud.mapper.datasource.eightwork;
|
||||
|
||||
import com.zcloud.entity.Page;
|
||||
import com.zcloud.entity.PageData;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author fangjiakai
|
||||
* @date 2024/01/17 11:31
|
||||
*/
|
||||
public interface BlindBoardMapper {
|
||||
PageData getCode(PageData pd);
|
||||
PageData findById(PageData pd);
|
||||
void save(PageData pd);
|
||||
void delete(PageData pd);
|
||||
void edit(PageData pd);
|
||||
void editStep(PageData pd);
|
||||
void editContent(PageData pd);
|
||||
|
||||
void editVideo(PageData pd);
|
||||
|
||||
List<PageData> datalistPage(Page page);
|
||||
|
||||
List<PageData> listAllMeasures();
|
||||
|
||||
List<PageData> checkWorkCount(PageData pd);
|
||||
|
||||
List<PageData> getFlowList(PageData pd);
|
||||
|
||||
void setPosition(PageData pd);
|
||||
|
||||
List<PageData> getMapList(PageData pd);
|
||||
}
|
|
@ -0,0 +1,37 @@
|
|||
package com.zcloud.mapper.datasource.eightwork;
|
||||
|
||||
import com.zcloud.entity.PageData;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author fangjiakai
|
||||
* @date 2024/01/17 11:31
|
||||
*/
|
||||
public interface BlindBoardSignMapper {
|
||||
|
||||
/**新增
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
void save(PageData pd);
|
||||
void saveBatch(List<PageData> signers);
|
||||
|
||||
/**修改
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
void edit(PageData pd);
|
||||
|
||||
/**根据动火ID查询签字列表
|
||||
* @throws Exception
|
||||
*/
|
||||
List<PageData> listById(PageData pd);
|
||||
|
||||
List<PageData> listAll(PageData sign);
|
||||
|
||||
/**根据动火ID查询未签字列表
|
||||
* @throws Exception
|
||||
*/
|
||||
List<PageData> checkUnsigned(PageData sign);
|
||||
}
|
|
@ -0,0 +1,57 @@
|
|||
package com.zcloud.mapper.datasource.eightwork;
|
||||
|
||||
import com.zcloud.entity.PageData;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 说明:动火措施中间表
|
||||
* 作者:luoxiaobao
|
||||
* 时间:2021-09-18
|
||||
* 官网:www.zcloudchina.com
|
||||
*/
|
||||
public interface BlindBoardToMeasuresMapper {
|
||||
|
||||
/**新增
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
void save(PageData pd);
|
||||
|
||||
void saveBatch(List<PageData> signers);
|
||||
|
||||
/**删除
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
void delete(PageData pd);
|
||||
|
||||
/**修改
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
void edit(PageData pd);
|
||||
|
||||
/**列表(全部)
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
List<PageData> listAll(PageData pd);
|
||||
|
||||
/**通过id获取数据
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
PageData findById(PageData pd);
|
||||
|
||||
/**批量删除
|
||||
* @param ArrayDATA_IDS
|
||||
* @throws Exception
|
||||
*/
|
||||
void deleteAll(String[] ArrayDATA_IDS);
|
||||
|
||||
List<PageData> listAllMeasuresForSign(PageData pd);
|
||||
|
||||
List<PageData> listSignFinishMeasures(PageData pd);
|
||||
}
|
||||
|
|
@ -0,0 +1,34 @@
|
|||
package com.zcloud.mapper.datasource.eightwork;
|
||||
|
||||
import com.zcloud.entity.Page;
|
||||
import com.zcloud.entity.PageData;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author fangjiakai
|
||||
* @date 2024/01/17 11:31
|
||||
*/
|
||||
public interface BreakGroundMapper {
|
||||
PageData getCode(PageData pd);
|
||||
PageData findById(PageData pd);
|
||||
void save(PageData pd);
|
||||
void delete(PageData pd);
|
||||
void edit(PageData pd);
|
||||
void editStep(PageData pd);
|
||||
void editContent(PageData pd);
|
||||
|
||||
void editVideo(PageData pd);
|
||||
|
||||
List<PageData> datalistPage(Page page);
|
||||
|
||||
List<PageData> listAllMeasures();
|
||||
|
||||
List<PageData> checkWorkCount(PageData pd);
|
||||
|
||||
List<PageData> getFlowList(PageData pd);
|
||||
|
||||
void setPosition(PageData pd);
|
||||
|
||||
List<PageData> getMapList(PageData pd);
|
||||
}
|
|
@ -0,0 +1,37 @@
|
|||
package com.zcloud.mapper.datasource.eightwork;
|
||||
|
||||
import com.zcloud.entity.PageData;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author fangjiakai
|
||||
* @date 2024/01/17 11:31
|
||||
*/
|
||||
public interface BreakGroundSignMapper {
|
||||
|
||||
/**新增
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
void save(PageData pd);
|
||||
void saveBatch(List<PageData> signers);
|
||||
|
||||
/**修改
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
void edit(PageData pd);
|
||||
|
||||
/**根据动火ID查询签字列表
|
||||
* @throws Exception
|
||||
*/
|
||||
List<PageData> listById(PageData pd);
|
||||
|
||||
List<PageData> listAll(PageData sign);
|
||||
|
||||
/**根据动火ID查询未签字列表
|
||||
* @throws Exception
|
||||
*/
|
||||
List<PageData> checkUnsigned(PageData sign);
|
||||
}
|
|
@ -0,0 +1,57 @@
|
|||
package com.zcloud.mapper.datasource.eightwork;
|
||||
|
||||
import com.zcloud.entity.PageData;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 说明:动火措施中间表
|
||||
* 作者:luoxiaobao
|
||||
* 时间:2021-09-18
|
||||
* 官网:www.zcloudchina.com
|
||||
*/
|
||||
public interface BreakGroundToMeasuresMapper {
|
||||
|
||||
/**新增
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
void save(PageData pd);
|
||||
|
||||
void saveBatch(List<PageData> signers);
|
||||
|
||||
/**删除
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
void delete(PageData pd);
|
||||
|
||||
/**修改
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
void edit(PageData pd);
|
||||
|
||||
/**列表(全部)
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
List<PageData> listAll(PageData pd);
|
||||
|
||||
/**通过id获取数据
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
PageData findById(PageData pd);
|
||||
|
||||
/**批量删除
|
||||
* @param ArrayDATA_IDS
|
||||
* @throws Exception
|
||||
*/
|
||||
void deleteAll(String[] ArrayDATA_IDS);
|
||||
|
||||
List<PageData> listAllMeasuresForSign(PageData pd);
|
||||
|
||||
List<PageData> listSignFinishMeasures(PageData pd);
|
||||
}
|
||||
|
|
@ -17,6 +17,9 @@ public interface ConfinedspaceMapper {
|
|||
void edit(PageData pd);
|
||||
void editGasTime(PageData pd);
|
||||
void editStep(PageData pd);
|
||||
|
||||
void editVideo(PageData pd);
|
||||
|
||||
void setPosition(PageData pd);
|
||||
List<PageData> datalistPage(Page page);
|
||||
|
||||
|
|
|
@ -0,0 +1,34 @@
|
|||
package com.zcloud.mapper.datasource.eightwork;
|
||||
|
||||
import com.zcloud.entity.Page;
|
||||
import com.zcloud.entity.PageData;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author fangjiakai
|
||||
* @date 2024/01/17 11:31
|
||||
*/
|
||||
public interface CutRoadMapper {
|
||||
PageData getCode(PageData pd);
|
||||
PageData findById(PageData pd);
|
||||
void save(PageData pd);
|
||||
void delete(PageData pd);
|
||||
void edit(PageData pd);
|
||||
void editStep(PageData pd);
|
||||
void editContent(PageData pd);
|
||||
|
||||
void editVideo(PageData pd);
|
||||
|
||||
List<PageData> datalistPage(Page page);
|
||||
|
||||
List<PageData> listAllMeasures();
|
||||
|
||||
List<PageData> checkWorkCount(PageData pd);
|
||||
|
||||
List<PageData> getFlowList(PageData pd);
|
||||
|
||||
void setPosition(PageData pd);
|
||||
|
||||
List<PageData> getMapList(PageData pd);
|
||||
}
|
|
@ -0,0 +1,37 @@
|
|||
package com.zcloud.mapper.datasource.eightwork;
|
||||
|
||||
import com.zcloud.entity.PageData;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author fangjiakai
|
||||
* @date 2024/01/17 11:31
|
||||
*/
|
||||
public interface CutRoadSignMapper {
|
||||
|
||||
/**新增
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
void save(PageData pd);
|
||||
void saveBatch(List<PageData> signers);
|
||||
|
||||
/**修改
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
void edit(PageData pd);
|
||||
|
||||
/**根据动火ID查询签字列表
|
||||
* @throws Exception
|
||||
*/
|
||||
List<PageData> listById(PageData pd);
|
||||
|
||||
List<PageData> listAll(PageData sign);
|
||||
|
||||
/**根据动火ID查询未签字列表
|
||||
* @throws Exception
|
||||
*/
|
||||
List<PageData> checkUnsigned(PageData sign);
|
||||
}
|
|
@ -0,0 +1,57 @@
|
|||
package com.zcloud.mapper.datasource.eightwork;
|
||||
|
||||
import com.zcloud.entity.PageData;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 说明:动火措施中间表
|
||||
* 作者:luoxiaobao
|
||||
* 时间:2021-09-18
|
||||
* 官网:www.zcloudchina.com
|
||||
*/
|
||||
public interface CutRoadToMeasuresMapper {
|
||||
|
||||
/**新增
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
void save(PageData pd);
|
||||
|
||||
void saveBatch(List<PageData> signers);
|
||||
|
||||
/**删除
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
void delete(PageData pd);
|
||||
|
||||
/**修改
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
void edit(PageData pd);
|
||||
|
||||
/**列表(全部)
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
List<PageData> listAll(PageData pd);
|
||||
|
||||
/**通过id获取数据
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
PageData findById(PageData pd);
|
||||
|
||||
/**批量删除
|
||||
* @param ArrayDATA_IDS
|
||||
* @throws Exception
|
||||
*/
|
||||
void deleteAll(String[] ArrayDATA_IDS);
|
||||
|
||||
List<PageData> listAllMeasuresForSign(PageData pd);
|
||||
|
||||
List<PageData> listSignFinishMeasures(PageData pd);
|
||||
}
|
||||
|
|
@ -14,5 +14,9 @@ import java.util.List;
|
|||
public interface EightWorkMapper {
|
||||
|
||||
List<PageData> getEightWorks(PageData corp);
|
||||
|
||||
List<PageData> listAllForDiagnosis(PageData pd);
|
||||
|
||||
List<PageData> getEightWorksByType(PageData pageData);
|
||||
}
|
||||
|
||||
|
|
|
@ -20,6 +20,9 @@ public interface ElectricityMapper {
|
|||
void edit(PageData pd);
|
||||
void editGasTime(PageData pd);
|
||||
void editStep(PageData pd);
|
||||
|
||||
void editVideo(PageData pd);
|
||||
|
||||
void setPosition(PageData pd);
|
||||
List<PageData> datalistPage(Page page);
|
||||
|
||||
|
|
|
@ -16,6 +16,9 @@ public interface HighworkMapper {
|
|||
void delete(PageData pd);
|
||||
void edit(PageData pd);
|
||||
void editStep(PageData pd);
|
||||
|
||||
void editVideo(PageData pd);
|
||||
|
||||
List<PageData> datalistPage(Page page);
|
||||
|
||||
List<PageData> listAllMeasures();
|
||||
|
|
|
@ -0,0 +1,33 @@
|
|||
package com.zcloud.mapper.datasource.eightwork;
|
||||
|
||||
import com.zcloud.entity.Page;
|
||||
import com.zcloud.entity.PageData;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author fangjiakai
|
||||
* @date 2024/01/17 11:31
|
||||
*/
|
||||
public interface HoistingMapper {
|
||||
PageData getCode(PageData pd);
|
||||
PageData findById(PageData pd);
|
||||
void save(PageData pd);
|
||||
void delete(PageData pd);
|
||||
void edit(PageData pd);
|
||||
void editStep(PageData pd);
|
||||
|
||||
void editVideo(PageData pd);
|
||||
|
||||
List<PageData> datalistPage(Page page);
|
||||
|
||||
List<PageData> listAllMeasures();
|
||||
|
||||
List<PageData> checkWorkCount(PageData pd);
|
||||
|
||||
List<PageData> getFlowList(PageData pd);
|
||||
|
||||
void setPosition(PageData pd);
|
||||
|
||||
List<PageData> getMapList(PageData pd);
|
||||
}
|
|
@ -0,0 +1,37 @@
|
|||
package com.zcloud.mapper.datasource.eightwork;
|
||||
|
||||
import com.zcloud.entity.PageData;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author fangjiakai
|
||||
* @date 2024/01/17 11:31
|
||||
*/
|
||||
public interface HoistingSignMapper {
|
||||
|
||||
/**新增
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
void save(PageData pd);
|
||||
void saveBatch(List<PageData> signers);
|
||||
|
||||
/**修改
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
void edit(PageData pd);
|
||||
|
||||
/**根据动火ID查询签字列表
|
||||
* @throws Exception
|
||||
*/
|
||||
List<PageData> listById(PageData pd);
|
||||
|
||||
List<PageData> listAll(PageData sign);
|
||||
|
||||
/**根据动火ID查询未签字列表
|
||||
* @throws Exception
|
||||
*/
|
||||
List<PageData> checkUnsigned(PageData sign);
|
||||
}
|
|
@ -0,0 +1,57 @@
|
|||
package com.zcloud.mapper.datasource.eightwork;
|
||||
|
||||
import com.zcloud.entity.PageData;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 说明:动火措施中间表
|
||||
* 作者:luoxiaobao
|
||||
* 时间:2021-09-18
|
||||
* 官网:www.zcloudchina.com
|
||||
*/
|
||||
public interface HoistingToMeasuresMapper {
|
||||
|
||||
/**新增
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
void save(PageData pd);
|
||||
|
||||
void saveBatch(List<PageData> signers);
|
||||
|
||||
/**删除
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
void delete(PageData pd);
|
||||
|
||||
/**修改
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
void edit(PageData pd);
|
||||
|
||||
/**列表(全部)
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
List<PageData> listAll(PageData pd);
|
||||
|
||||
/**通过id获取数据
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
PageData findById(PageData pd);
|
||||
|
||||
/**批量删除
|
||||
* @param ArrayDATA_IDS
|
||||
* @throws Exception
|
||||
*/
|
||||
void deleteAll(String[] ArrayDATA_IDS);
|
||||
|
||||
List<PageData> listAllMeasuresForSign(PageData pd);
|
||||
|
||||
List<PageData> listSignFinishMeasures(PageData pd);
|
||||
}
|
||||
|
|
@ -0,0 +1,78 @@
|
|||
package com.zcloud.mapper.datasource.freighttrailer;
|
||||
|
||||
import com.zcloud.entity.Page;
|
||||
import com.zcloud.entity.PageData;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 企业信息管理-货运挂车
|
||||
*/
|
||||
public interface FreightTrailerMapper {
|
||||
|
||||
/**
|
||||
* 新增
|
||||
*
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
void save(PageData pd);
|
||||
|
||||
/**
|
||||
* 删除
|
||||
*
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
void delete(PageData pd);
|
||||
|
||||
/**
|
||||
* 修改
|
||||
*
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
void edit(PageData pd);
|
||||
|
||||
/**
|
||||
* 列表
|
||||
*
|
||||
* @param page
|
||||
* @throws Exception
|
||||
*/
|
||||
List<PageData> datalistPage(Page page);
|
||||
|
||||
|
||||
/**
|
||||
* 通过id获取数据
|
||||
*
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
PageData findById(PageData pd);
|
||||
|
||||
/**
|
||||
* 列表
|
||||
*
|
||||
* @param
|
||||
* @throws Exception
|
||||
*/
|
||||
List<PageData> corpList(String corpId);
|
||||
|
||||
/**
|
||||
* 列表
|
||||
*
|
||||
* @param
|
||||
* @throws Exception
|
||||
*/
|
||||
List<PageData> trailerList(String corpId);
|
||||
|
||||
/**
|
||||
* 列表
|
||||
*
|
||||
* @param
|
||||
* @throws Exception
|
||||
*/
|
||||
List<PageData> vehicleList(PageData pd);
|
||||
}
|
||||
|
|
@ -0,0 +1,64 @@
|
|||
package com.zcloud.mapper.datasource.inspectAnnually;
|
||||
|
||||
import com.zcloud.entity.Page;
|
||||
import com.zcloud.entity.PageData;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 企业信息管理-货运挂车
|
||||
*/
|
||||
public interface InspectAnnuallyMapper {
|
||||
|
||||
/**
|
||||
* 新增
|
||||
*
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
void save(PageData pd);
|
||||
|
||||
/**
|
||||
* 删除
|
||||
*
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
void delete(PageData pd);
|
||||
|
||||
/**
|
||||
* 修改
|
||||
*
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
void edit(PageData pd);
|
||||
|
||||
/**
|
||||
* 修改
|
||||
*
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
void edit2(PageData pd);
|
||||
|
||||
/**
|
||||
* 列表
|
||||
*
|
||||
* @param page
|
||||
* @throws Exception
|
||||
*/
|
||||
List<PageData> datalistPage(Page page);
|
||||
|
||||
|
||||
/**
|
||||
* 通过id获取数据
|
||||
*
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
PageData findById(PageData pd);
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -33,4 +33,6 @@ public interface OperatingVehiclesMapper {
|
|||
|
||||
|
||||
List<PageData> datalistPage(Page page);
|
||||
|
||||
List<PageData> operationVehicleList(String corpId);
|
||||
}
|
||||
|
|
|
@ -154,4 +154,6 @@ public interface DictionariesMapper {
|
|||
List<Dictionaries> listgetAssignedVehicleModel(String parentId);
|
||||
|
||||
List<Dictionaries> listgetAssignedVehicle(String parentId);
|
||||
|
||||
List<Dictionaries> listgetVehicleType(String parentId);
|
||||
}
|
||||
|
|
|
@ -0,0 +1,38 @@
|
|||
package com.zcloud.mapper.datasource.taxationManage;
|
||||
|
||||
import com.zcloud.entity.Page;
|
||||
import com.zcloud.entity.PageData;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public interface TaxationManageMapper {
|
||||
|
||||
/**新增
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
void save(PageData pd);
|
||||
|
||||
/**删除
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
void delete(PageData pd);
|
||||
|
||||
/**修改
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
void edit(PageData pd);
|
||||
|
||||
/**通过id获取数据
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
PageData findById(PageData pd);
|
||||
|
||||
|
||||
List<PageData> datalistPage(Page page);
|
||||
|
||||
List<PageData> taxationList(String corpId);
|
||||
}
|
|
@ -0,0 +1,38 @@
|
|||
package com.zcloud.service.assignedManage;
|
||||
|
||||
import com.zcloud.entity.Page;
|
||||
import com.zcloud.entity.PageData;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public interface AssignedManageService {
|
||||
|
||||
/**新增
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public void save(PageData pd)throws Exception;
|
||||
|
||||
|
||||
/**删除
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public void delete(PageData pd)throws Exception;
|
||||
|
||||
/**修改
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public void edit(PageData pd)throws Exception;
|
||||
|
||||
/**通过id获取数据
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public PageData findById(PageData pd)throws Exception;
|
||||
|
||||
public List<PageData> list(Page page);
|
||||
|
||||
List<PageData> operationVehicleList(String corpId);
|
||||
}
|
|
@ -0,0 +1,51 @@
|
|||
package com.zcloud.service.assignedManage.impl;
|
||||
|
||||
import com.zcloud.entity.Page;
|
||||
import com.zcloud.entity.PageData;
|
||||
import com.zcloud.mapper.datasource.assignedManage.AssignedManageMapper;
|
||||
import com.zcloud.mapper.datasource.taxationManage.TaxationManageMapper;
|
||||
import com.zcloud.service.assignedManage.AssignedManageService;
|
||||
import com.zcloud.service.taxationManage.TaxationManageService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Service
|
||||
@Transactional //开启事物
|
||||
public class AssignedManageServiceImpl implements AssignedManageService {
|
||||
|
||||
@Autowired
|
||||
private AssignedManageMapper assignedManageMapper;
|
||||
|
||||
@Override
|
||||
public void save(PageData pd) throws Exception {
|
||||
assignedManageMapper.save(pd);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void delete(PageData pd) throws Exception {
|
||||
assignedManageMapper.delete(pd);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void edit(PageData pd) throws Exception {
|
||||
assignedManageMapper.edit(pd);
|
||||
}
|
||||
|
||||
@Override
|
||||
public PageData findById(PageData pd) throws Exception {
|
||||
return assignedManageMapper.findById(pd);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<PageData> list(Page page) {
|
||||
return assignedManageMapper.datalistPage(page);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<PageData> operationVehicleList(String corpId) {
|
||||
return assignedManageMapper.operationvehicleList(corpId);
|
||||
}
|
||||
}
|
|
@ -112,7 +112,6 @@ public class CorpInfoServiceImpl implements CorpInfoService {
|
|||
public PageData eightWorkBI(PageData pd) throws Exception{
|
||||
return corpinfoMapper.eightWorkBI(pd);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void updateEnterpriseId(PageData corpPage) {
|
||||
corpinfoMapper.updateEnterpriseId(corpPage);
|
||||
|
|
|
@ -0,0 +1,59 @@
|
|||
package com.zcloud.service.eightwork;
|
||||
|
||||
import com.zcloud.entity.Page;
|
||||
import com.zcloud.entity.PageData;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 说明:盲板信息
|
||||
* 作者:luoxiaobao
|
||||
* 时间:2021-08-23
|
||||
* 官网:www.zcloudchina.com
|
||||
*/
|
||||
public interface BlindBoardInfoService {
|
||||
|
||||
/**新增
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public void save(PageData pd)throws Exception;
|
||||
|
||||
/**删除
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public void delete(PageData pd)throws Exception;
|
||||
|
||||
/**修改
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public void edit(PageData pd)throws Exception;
|
||||
|
||||
/**列表
|
||||
* @param page
|
||||
* @throws Exception
|
||||
*/
|
||||
public List<PageData> list(Page page)throws Exception;
|
||||
|
||||
/**列表(全部)
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public List<PageData> listAll(PageData pd)throws Exception;
|
||||
|
||||
/**通过id获取数据
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public PageData findById(PageData pd)throws Exception;
|
||||
|
||||
/**批量删除
|
||||
* @param ArrayDATA_IDS
|
||||
* @throws Exception
|
||||
*/
|
||||
public void deleteAll(String[] ArrayDATA_IDS)throws Exception;
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,44 @@
|
|||
package com.zcloud.service.eightwork;
|
||||
|
||||
import com.zcloud.entity.Page;
|
||||
import com.zcloud.entity.PageData;
|
||||
import com.zcloud.util.ReturnMap;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author fangjiakai
|
||||
* @date 2024/01/17 11:29
|
||||
*/
|
||||
public interface BlindBoardService {
|
||||
void save(PageData pd)throws Exception;
|
||||
|
||||
void edit(PageData pd)throws Exception;
|
||||
|
||||
void delete(PageData pd)throws Exception;
|
||||
|
||||
List<PageData> list(Page page) throws Exception;
|
||||
|
||||
void nextStep(PageData pd, MultipartFile[] files) throws Exception;
|
||||
|
||||
PageData findById(PageData pd) throws Exception;
|
||||
|
||||
PageData listSignFinished(PageData pd) throws Exception;
|
||||
|
||||
PageData checkWorkCount(PageData pd);
|
||||
|
||||
//获取所有措施(bus_highwork_measures)
|
||||
List<PageData> listAllMeasures() throws Exception;
|
||||
//
|
||||
// //获取需要签字的措施(bus_highworktomeasures)
|
||||
List<PageData> listAllMeasuresForSign(PageData pd) throws Exception;
|
||||
//
|
||||
// //获取所有签字完成的措施(bus_highworktomeasures)
|
||||
List<PageData> listSignFinishMeasures(PageData pd) throws Exception;
|
||||
|
||||
|
||||
List<PageData> getFlowList(PageData pd)throws Exception;
|
||||
|
||||
ReturnMap getMapList()throws Exception;
|
||||
}
|
|
@ -0,0 +1,44 @@
|
|||
package com.zcloud.service.eightwork;
|
||||
|
||||
import com.zcloud.entity.Page;
|
||||
import com.zcloud.entity.PageData;
|
||||
import com.zcloud.util.ReturnMap;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author fangjiakai
|
||||
* @date 2024/01/17 11:29
|
||||
*/
|
||||
public interface BreakGroundService {
|
||||
void save(PageData pd)throws Exception;
|
||||
|
||||
void edit(PageData pd)throws Exception;
|
||||
|
||||
void delete(PageData pd)throws Exception;
|
||||
|
||||
List<PageData> list(Page page) throws Exception;
|
||||
|
||||
void nextStep(PageData pd, MultipartFile[] files) throws Exception;
|
||||
|
||||
PageData findById(PageData pd) throws Exception;
|
||||
|
||||
PageData listSignFinished(PageData pd) throws Exception;
|
||||
|
||||
PageData checkWorkCount(PageData pd);
|
||||
|
||||
//获取所有措施(bus_highwork_measures)
|
||||
List<PageData> listAllMeasures() throws Exception;
|
||||
//
|
||||
// //获取需要签字的措施(bus_highworktomeasures)
|
||||
List<PageData> listAllMeasuresForSign(PageData pd) throws Exception;
|
||||
//
|
||||
// //获取所有签字完成的措施(bus_highworktomeasures)
|
||||
List<PageData> listSignFinishMeasures(PageData pd) throws Exception;
|
||||
|
||||
|
||||
List<PageData> getFlowList(PageData pd)throws Exception;
|
||||
|
||||
ReturnMap getMapList()throws Exception;
|
||||
}
|
|
@ -0,0 +1,44 @@
|
|||
package com.zcloud.service.eightwork;
|
||||
|
||||
import com.zcloud.entity.Page;
|
||||
import com.zcloud.entity.PageData;
|
||||
import com.zcloud.util.ReturnMap;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author fangjiakai
|
||||
* @date 2024/01/17 11:29
|
||||
*/
|
||||
public interface CutRoadService {
|
||||
void save(PageData pd)throws Exception;
|
||||
|
||||
void edit(PageData pd)throws Exception;
|
||||
|
||||
void delete(PageData pd)throws Exception;
|
||||
|
||||
List<PageData> list(Page page) throws Exception;
|
||||
|
||||
void nextStep(PageData pd, MultipartFile[] files) throws Exception;
|
||||
|
||||
PageData findById(PageData pd) throws Exception;
|
||||
|
||||
PageData listSignFinished(PageData pd) throws Exception;
|
||||
|
||||
PageData checkWorkCount(PageData pd);
|
||||
|
||||
//获取所有措施(bus_highwork_measures)
|
||||
List<PageData> listAllMeasures() throws Exception;
|
||||
//
|
||||
// //获取需要签字的措施(bus_highworktomeasures)
|
||||
List<PageData> listAllMeasuresForSign(PageData pd) throws Exception;
|
||||
//
|
||||
// //获取所有签字完成的措施(bus_highworktomeasures)
|
||||
List<PageData> listSignFinishMeasures(PageData pd) throws Exception;
|
||||
|
||||
|
||||
List<PageData> getFlowList(PageData pd)throws Exception;
|
||||
|
||||
ReturnMap getMapList()throws Exception;
|
||||
}
|
|
@ -17,4 +17,8 @@ public interface EightWorkService {
|
|||
ReturnMap getEightWorks()throws Exception;
|
||||
|
||||
List<PageData> list(PageData pd)throws Exception;
|
||||
|
||||
List<PageData> listAllForDiagnosis(PageData pd)throws Exception;
|
||||
|
||||
List<PageData> getEightWorksByType(PageData pageData);
|
||||
}
|
||||
|
|
|
@ -0,0 +1,44 @@
|
|||
package com.zcloud.service.eightwork;
|
||||
|
||||
import com.zcloud.entity.Page;
|
||||
import com.zcloud.entity.PageData;
|
||||
import com.zcloud.util.ReturnMap;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author fangjiakai
|
||||
* @date 2024/01/17 11:29
|
||||
*/
|
||||
public interface HoistingService {
|
||||
void save(PageData pd)throws Exception;
|
||||
|
||||
void edit(PageData pd)throws Exception;
|
||||
|
||||
void delete(PageData pd)throws Exception;
|
||||
|
||||
List<PageData> list(Page page) throws Exception;
|
||||
|
||||
void nextStep(PageData pd, MultipartFile[] files) throws Exception;
|
||||
|
||||
PageData findById(PageData pd) throws Exception;
|
||||
|
||||
PageData listSignFinished(PageData pd) throws Exception;
|
||||
|
||||
PageData checkWorkCount(PageData pd);
|
||||
|
||||
//获取所有措施(bus_highwork_measures)
|
||||
List<PageData> listAllMeasures() throws Exception;
|
||||
//
|
||||
// //获取需要签字的措施(bus_highworktomeasures)
|
||||
List<PageData> listAllMeasuresForSign(PageData pd) throws Exception;
|
||||
//
|
||||
// //获取所有签字完成的措施(bus_highworktomeasures)
|
||||
List<PageData> listSignFinishMeasures(PageData pd) throws Exception;
|
||||
|
||||
|
||||
List<PageData> getFlowList(PageData pd)throws Exception;
|
||||
|
||||
ReturnMap getMapList()throws Exception;
|
||||
}
|
|
@ -0,0 +1,83 @@
|
|||
package com.zcloud.service.eightwork.impl;
|
||||
|
||||
import com.zcloud.entity.Page;
|
||||
import com.zcloud.entity.PageData;
|
||||
import com.zcloud.mapper.datasource.eightwork.BlindBoardInfoMapper;
|
||||
import com.zcloud.service.eightwork.BlindBoardInfoService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 说明:盲板信息
|
||||
* 作者:luoxiaobao
|
||||
* 时间:2021-08-23
|
||||
* 官网:www.zcloudchina.com
|
||||
*/
|
||||
@Service
|
||||
@Transactional //开启事物
|
||||
public class BlindBoardInfoServiceImpl implements BlindBoardInfoService {
|
||||
|
||||
@Autowired
|
||||
private BlindBoardInfoMapper blindboardinfoMapper;
|
||||
|
||||
/**新增
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public void save(PageData pd)throws Exception{
|
||||
blindboardinfoMapper.save(pd);
|
||||
}
|
||||
|
||||
/**删除
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public void delete(PageData pd)throws Exception{
|
||||
blindboardinfoMapper.delete(pd);
|
||||
}
|
||||
|
||||
/**修改
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public void edit(PageData pd)throws Exception{
|
||||
blindboardinfoMapper.edit(pd);
|
||||
}
|
||||
|
||||
/**列表
|
||||
* @param page
|
||||
* @throws Exception
|
||||
*/
|
||||
public List<PageData> list(Page page)throws Exception{
|
||||
return blindboardinfoMapper.datalistPage(page);
|
||||
}
|
||||
|
||||
/**列表(全部)
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public List<PageData> listAll(PageData pd)throws Exception{
|
||||
return blindboardinfoMapper.listAll(pd);
|
||||
}
|
||||
|
||||
/**通过id获取数据
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public PageData findById(PageData pd)throws Exception{
|
||||
return blindboardinfoMapper.findById(pd);
|
||||
}
|
||||
|
||||
/**批量删除
|
||||
* @param ArrayDATA_IDS
|
||||
* @throws Exception
|
||||
*/
|
||||
public void deleteAll(String[] ArrayDATA_IDS)throws Exception{
|
||||
blindboardinfoMapper.deleteAll(ArrayDATA_IDS);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,439 @@
|
|||
package com.zcloud.service.eightwork.impl;
|
||||
|
||||
import com.alibaba.fastjson.JSON;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.zcloud.entity.Page;
|
||||
import com.zcloud.entity.PageData;
|
||||
import com.zcloud.mapper.datasource.eightwork.*;
|
||||
import com.zcloud.service.eightwork.BlindBoardService;
|
||||
import com.zcloud.util.*;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
|
||||
import java.text.DecimalFormat;
|
||||
import java.util.*;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* @author fangjiakai
|
||||
* @date 2024/01/17 11:30
|
||||
*/
|
||||
@Service
|
||||
@Transactional //开启事物
|
||||
public class BlindBoardServiceImpl implements BlindBoardService {
|
||||
|
||||
@Autowired
|
||||
private BlindBoardMapper blindboardMapper;
|
||||
@Autowired
|
||||
private BlindBoardInfoMapper blindboardinfoMapper;
|
||||
@Autowired
|
||||
private EightWorkTaskFlowMapper eightWorkTaskFlowMapper;
|
||||
@Autowired
|
||||
private EightWorkFlowLogMapper eightWorkFlowLogMapper;
|
||||
@Autowired
|
||||
private BlindBoardSignMapper blindboardSignMapper;
|
||||
@Autowired
|
||||
private BlindBoardToMeasuresMapper blindboardToMeasuresMapper;
|
||||
@Autowired
|
||||
private com.zcloud.mapper.datasource.eightWork.EightWorkVideoManagerMapper eightworkvideomanagerMapper;
|
||||
@Autowired
|
||||
private Smb smb;
|
||||
@Autowired
|
||||
private SendMessageUtil sendMessageUtil;
|
||||
|
||||
private final String primary_key = "BLINDBOARD_ID";
|
||||
private final String work_type = "BLINDBOARD";
|
||||
@Override
|
||||
@Transactional
|
||||
public void save(PageData pd) throws Exception {
|
||||
PageData pd2 = new PageData();
|
||||
Calendar calendar = Calendar.getInstance();
|
||||
DecimalFormat dft=new DecimalFormat("00");
|
||||
int year = calendar.get(Calendar.YEAR);
|
||||
String month = dft.format(calendar.get(Calendar.MONTH) + 1);
|
||||
String day = dft.format(calendar.get(Calendar.DAY_OF_MONTH));
|
||||
pd2.put("CREATDATE",year + "-" + month + "-" + day);
|
||||
pd2.put("CORPINFO_ID",pd.get("CORPINFO_ID"));
|
||||
pd2 = blindboardMapper.getCode(pd2); //根据ID读取
|
||||
String code = "MB" + year + month + day + dft.format((Integer.parseInt(pd2.get("code").toString()) + 1));
|
||||
pd.put("CHECK_NO", code);
|
||||
pd.put(primary_key, UuidUtil.get32UUID()); //主键
|
||||
pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间
|
||||
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
|
||||
pd.put("ISDELETE", "0"); //是否删除 1-是 0-否
|
||||
blindboardMapper.save(pd);
|
||||
if(pd.get("boardList")!=null){
|
||||
blindboardinfoMapper.delete(pd);
|
||||
List<JSONObject> list = (List<JSONObject>) JSON.parse(pd.get("boardList").toString());
|
||||
for (JSONObject json : list) {
|
||||
PageData board = new PageData();
|
||||
board.put("BLINDBOARDINFO_ID", UuidUtil.get32UUID()); // 主键
|
||||
board.put("BLINDBOARD_ID", pd.get("BLINDBOARD_ID"));
|
||||
board.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间
|
||||
board.put("BOARD_MATERIAL", json.get("BOARD_MATERIAL"));
|
||||
board.put("BOARD_SPECIFICATION", json.get("BOARD_SPECIFICATION"));
|
||||
board.put("BOARD_NO", json.get("BOARD_NO"));
|
||||
board.put("ISDELETE", 0);
|
||||
blindboardinfoMapper.save(board);
|
||||
}
|
||||
}
|
||||
|
||||
if (pd.get("APPLY_STATUS").equals("1")) {
|
||||
PageData flow = getStep(pd.get("TASK_ID"),"1");
|
||||
saveLog(pd,pd.getString("CREATOR"),"1");
|
||||
saveNextSigner(pd,flow);
|
||||
setPosition(pd);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional
|
||||
public void edit(PageData pd) throws Exception {
|
||||
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
|
||||
blindboardMapper.edit(pd);
|
||||
|
||||
if (pd.get("APPLY_STATUS").equals("1")) {
|
||||
pd.put("STEP_ID", 1);
|
||||
blindboardMapper.editStep(pd);
|
||||
PageData flow = getStep(pd.get("TASK_ID"),"1");
|
||||
saveLog(pd,pd.getString("CREATOR"),"1");
|
||||
saveNextSigner(pd,flow);
|
||||
setPosition(pd);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void delete(PageData pd) throws Exception {
|
||||
blindboardMapper.delete(pd);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<PageData> list(Page page) throws Exception {
|
||||
return blindboardMapper.datalistPage(page);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* 下一步
|
||||
*/
|
||||
@Override
|
||||
@Transactional
|
||||
public void nextStep(PageData pd, MultipartFile[] files) throws Exception {
|
||||
PageData work = this.findById(pd);
|
||||
work.putAll(pd);
|
||||
List<String> filePaths = new ArrayList<>();
|
||||
for (int i = 0; i < files.length; i++) {
|
||||
//保存签名文件
|
||||
String ffile = DateUtil.getDays();
|
||||
String fileName = UuidUtil.get32UUID() + files[i].getOriginalFilename().substring(files[i].getOriginalFilename().lastIndexOf("."));
|
||||
smb.sshSftp(files[i], fileName, Const.FILEPATHFILE + work.getString("CORPINFO_ID") + "/" + ffile);
|
||||
filePaths.add(Const.FILEPATHFILE + work.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
|
||||
}
|
||||
PageData flow = getStep(work.get("TASK_ID"), work.get("STEP_ID"));
|
||||
work.put("STEP_ID", flow.get("NEXT_STEP_ID"));
|
||||
blindboardMapper.editVideo(work);
|
||||
|
||||
//保存签名信息
|
||||
PageData sign = new PageData();
|
||||
if(work.getString("IMG_PATH") != ""){
|
||||
sign.put("IMG_PATH", work.get("IMG_PATH"));
|
||||
}
|
||||
sign.put(primary_key, work.get(primary_key));
|
||||
sign.put("STEP_ID", work.get("STEP_ID"));
|
||||
sign.put("SIGN_USER_ID", work.get("USER_ID"));
|
||||
sign.put("SIGN_TIME", work.getString("SIGNTIME"));
|
||||
sign.put("SIGN_PATH", String.join(",",filePaths));
|
||||
sign.put("DESCR", work.get("DESCR"));
|
||||
|
||||
blindboardSignMapper.edit(sign);
|
||||
//保存缩略图信息
|
||||
if(work.get("CONIMG_PATH") != null && !work.get("CONIMG_PATH").equals("")){
|
||||
PageData content = new PageData();
|
||||
content.put("BOARD_PATH", work.get("CONIMG_PATH"));
|
||||
content.put("BLINDBOARD_ID",work.get("BLINDBOARD_ID"));
|
||||
blindboardMapper.editContent(content);
|
||||
}
|
||||
|
||||
|
||||
if (work.get("MEASURES") != null && !work.get("MEASURES").equals("")) { //安全措施确认步骤
|
||||
saveMeasures(work);
|
||||
}
|
||||
|
||||
List<PageData> unsignedList = blindboardSignMapper.checkUnsigned(sign);//当前步骤未签名人列表
|
||||
if((unsignedList == null || unsignedList.size() == 0) && pd.getString("APPLY_STATUS").equals("1")){//如果没有未签人 则跳转下一步
|
||||
blindboardMapper.editStep(work);
|
||||
PageData currentflow = getStep(work.get("TASK_ID"), work.get("STEP_ID"));
|
||||
|
||||
//保存日志
|
||||
saveLog(work,work.getString("USER_ID"),"1");
|
||||
|
||||
if("99".equals(currentflow.getString("NEXT_STEP_ID"))){
|
||||
eightworkvideomanagerMapper.editStatus(work);
|
||||
sendMessageForFinished(work.getString("CORPINFO_ID"),work.getString("CREATOR"),"EIGHTWORK_ACCEPT",work.getString("CHECK_NO"));
|
||||
return;
|
||||
}
|
||||
if (work.get("PREPARERS") != null && !work.get("PREPARERS").equals("")) { //如果是设置安全措施确认人步骤
|
||||
savePreparers(work,currentflow);
|
||||
}
|
||||
saveNextSigner(work,currentflow);
|
||||
}else if(pd.getString("APPLY_STATUS").equals("-1")){
|
||||
//保存日志
|
||||
saveLog(work,work.getString("USER_ID"),"-1");
|
||||
eightworkvideomanagerMapper.editStatus(work);
|
||||
|
||||
work.put("STEP_ID",-1);
|
||||
blindboardMapper.editStep(work);
|
||||
sendMessageForFinished(work.getString("CORPINFO_ID"),work.getString("CREATOR"),"EIGHTWORK_REJECT",work.getString("CHECK_NO"));
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
private void sendMessageForFinished(String corpinfo_id,String userId,String template,String number) throws Exception {
|
||||
PageData mes = new PageData();
|
||||
mes.put("RECEIVER_ID", userId);// 收信人userid
|
||||
mes.put("templateCode", template);// 短信模板编码
|
||||
mes.put("CORPINFO_ID", corpinfo_id);// 企业id
|
||||
|
||||
// 参数集合
|
||||
List<PageData> paramsList = new ArrayList<PageData>();
|
||||
// 第1个参数
|
||||
PageData params1 = new PageData();
|
||||
params1.put("name", "number");// 存入短信模板中的参数名称
|
||||
params1.put("value", number);// 存入上面参数名称所传递的值
|
||||
paramsList.add(params1);
|
||||
|
||||
PageData params2 = new PageData();
|
||||
params2.put("name", "type");// 存入短信模板中的参数名称
|
||||
params2.put("value", "盲板作业");// 存入上面参数名称所传递的值
|
||||
paramsList.add(params2);
|
||||
|
||||
try {
|
||||
sendMessageUtil.sendMessages(mes, paramsList);
|
||||
} catch (Exception e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
}
|
||||
@Override
|
||||
public PageData findById(PageData pd) throws Exception {
|
||||
PageData pageData = blindboardMapper.findById(pd);
|
||||
PageData cpd = new PageData();
|
||||
if(pageData.getString("BOARD_PATH") != null || "".equals(pageData.getString("BOARD_PATH"))){
|
||||
cpd.put("BOARD_PATH", pageData.getString("BOARD_PATH").split(","));
|
||||
}
|
||||
pageData.putAll(cpd);
|
||||
return pageData;
|
||||
}
|
||||
|
||||
@Override
|
||||
public PageData listSignFinished(PageData pd) throws Exception {
|
||||
Map<String,List<PageData>> rmap = new HashMap<>();
|
||||
List<PageData> varList = blindboardSignMapper.listAll(pd);
|
||||
if (varList != null && !varList.isEmpty()) {
|
||||
varList.stream().forEach(item -> {
|
||||
PageData sign = new PageData();
|
||||
sign.put("SIGN_PATH", item.getString("SIGN_PATH").split(","));
|
||||
sign.put("SIGN_TIME", item.getString("SIGN_TIME").split(","));
|
||||
|
||||
sign.put("DESCR", item.getString("DESCR") != null ? item.getString("DESCR") : "无");
|
||||
if(rmap.containsKey(item.getString("CODE"))){
|
||||
rmap.get(item.getString("CODE")).add(sign);
|
||||
}else{
|
||||
List<PageData> signs = new ArrayList<>();
|
||||
signs.add(sign);
|
||||
rmap.put(item.getString("CODE"),signs);
|
||||
}
|
||||
});
|
||||
}
|
||||
PageData rpd = new PageData();
|
||||
if (rmap != null && !rmap.isEmpty()) {
|
||||
rpd.putAll(rmap);
|
||||
}
|
||||
return rpd;
|
||||
}
|
||||
|
||||
@Override
|
||||
public PageData checkWorkCount(PageData pd) {
|
||||
PageData rpd = new PageData();
|
||||
List<PageData> varList = blindboardMapper.checkWorkCount(pd);
|
||||
|
||||
if (varList != null && !varList.isEmpty()) {
|
||||
Map<String, String> newMap = varList.stream()
|
||||
.collect(Collectors.toMap(map -> map.getString("CODE"), map -> map.getString("COUNT")));
|
||||
|
||||
rpd.putAll(newMap);
|
||||
}
|
||||
return rpd;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<PageData> listAllMeasures() throws Exception {
|
||||
return blindboardMapper.listAllMeasures();
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<PageData> listAllMeasuresForSign(PageData pd) throws Exception {
|
||||
return blindboardToMeasuresMapper.listAllMeasuresForSign(pd);
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<PageData> listSignFinishMeasures(PageData pd) throws Exception {
|
||||
return blindboardToMeasuresMapper.listSignFinishMeasures(pd);
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public List<PageData> getFlowList(PageData pd) throws Exception {
|
||||
pd=findById(pd);
|
||||
return blindboardMapper.getFlowList(pd);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ReturnMap getMapList() throws Exception {
|
||||
ReturnMap returnMap = new ReturnMap();
|
||||
PageData pd = new PageData();
|
||||
pd.put("CORPINFO_ID",Jurisdiction.getCORPINFO_ID());
|
||||
returnMap.put("varList",blindboardMapper.getMapList(pd));
|
||||
return returnMap;
|
||||
}
|
||||
private void saveNextSigner(PageData pd,PageData flow) throws Exception {
|
||||
|
||||
pd.put("STEP_ID",flow.get("NEXT_STEP_ID"));
|
||||
|
||||
if(pd.get(flow.get("NEXT_ACTOR_FIELD")) == null || pd.get(flow.get("NEXT_ACTOR_FIELD")).equals("")){
|
||||
return;
|
||||
}
|
||||
//提前保存下一步签字人
|
||||
List<PageData> signers = new ArrayList<>();
|
||||
PageData signer = new PageData();
|
||||
signer.put("BLINDBOARD_SIGN_ID", UuidUtil.get32UUID()); // 主键
|
||||
signer.put(primary_key, pd.get(primary_key));
|
||||
signer.put("CORPINFO_ID", pd.get("CORPINFO_ID"));
|
||||
signer.put("SIGN_USER_ID", pd.get(flow.get("NEXT_ACTOR_FIELD")));
|
||||
signer.put("STEP_ID", flow.get("NEXT_STEP_ID"));
|
||||
signers.add(signer);
|
||||
blindboardSignMapper.saveBatch(signers);
|
||||
sendMessageForNext(pd.getString("CORPINFO_ID"),pd.getString(flow.get("NEXT_ACTOR_FIELD")),pd.getString("CHECK_NO"),flow.getString("NEXT_STEP_NAME"));
|
||||
|
||||
}
|
||||
private void sendMessageForNext(String corpinfo_id,String userId,String number,String flow_name) throws Exception {
|
||||
PageData mes = new PageData();
|
||||
mes.put("RECEIVER_ID", userId);// 收信人userid
|
||||
mes.put("templateCode", "EIGHTWORK_REMINDER");// 短信模板编码
|
||||
mes.put("CORPINFO_ID", corpinfo_id);// 企业id
|
||||
|
||||
// 参数集合
|
||||
List<PageData> paramsList = new ArrayList<PageData>();
|
||||
// 第1个参数
|
||||
PageData params1 = new PageData();
|
||||
params1.put("name", "number");// 存入短信模板中的参数名称
|
||||
params1.put("value", number);// 存入上面参数名称所传递的值
|
||||
paramsList.add(params1);
|
||||
|
||||
PageData params2 = new PageData();
|
||||
params2.put("name", "type");// 存入短信模板中的参数名称
|
||||
params2.put("value", "盲板作业");// 存入上面参数名称所传递的值
|
||||
paramsList.add(params2);
|
||||
|
||||
PageData params3 = new PageData();
|
||||
params3.put("name", "flow");// 存入短信模板中的参数名称
|
||||
params3.put("value", flow_name);// 存入上面参数名称所传递的值
|
||||
paramsList.add(params3);
|
||||
try {
|
||||
sendMessageUtil.sendMessages(mes, paramsList);
|
||||
} catch (Exception e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
private void saveMeasures(PageData pd) {
|
||||
List<JSONObject> list = (List<JSONObject>) JSON.parse(pd.get("MEASURES").toString());
|
||||
for (JSONObject json : list) {
|
||||
PageData measure = new PageData();
|
||||
measure.put("BLINDBOARDTOMEASURES_ID",json.get("BLINDBOARDTOMEASURES_ID"));
|
||||
measure.put("STATUS", json.get("STATUS"));
|
||||
measure.put("SIGN_PATH", json.get("SIGN_PATH"));
|
||||
measure.put("SIGN_TIME", json.get("SIGN_TIME"));
|
||||
measure.put("IMG_PATH", json.get("IMG_PATH"));
|
||||
blindboardToMeasuresMapper.edit(measure);
|
||||
}
|
||||
}
|
||||
|
||||
private void savePreparers(PageData pd,PageData flow) {
|
||||
List<PageData> signers = new ArrayList<>();
|
||||
List<JSONObject> list = (List<JSONObject>) JSON.parse(pd.get("PREPARERS").toString());
|
||||
for (JSONObject json : list) {
|
||||
PageData preparer = new PageData();
|
||||
preparer.put("BLINDBOARDTOMEASURES_ID", UuidUtil.get32UUID()); // 主键
|
||||
preparer.put("BLINDBOARD_ID", pd.get("BLINDBOARD_ID"));
|
||||
preparer.put("BUS_BLINDBOARD_MEASURES_ID", json.get("BUS_BLINDBOARD_MEASURES_ID"));
|
||||
preparer.put("CONFIRM_ID", json.get("USER_ID"));
|
||||
signers.add(preparer);
|
||||
}
|
||||
if(signers.size() > 0){
|
||||
blindboardToMeasuresMapper.saveBatch(signers);
|
||||
|
||||
//获取所有需要签名人
|
||||
List<String> fieldList = signers.stream()
|
||||
.map(map -> map.getString("CONFIRM_ID"))
|
||||
.collect(Collectors.toList());
|
||||
Set<String > fieldSet = new HashSet<>(fieldList); //去重
|
||||
|
||||
List<String> uniqueList = new ArrayList<>(fieldSet);
|
||||
List<PageData> nextSigners = new ArrayList<>();
|
||||
uniqueList.forEach(item -> { // 保存下一步需要签名的人
|
||||
PageData signer = new PageData();
|
||||
signer.put("BLINDBOARD_SIGN_ID", UuidUtil.get32UUID()); // 主键
|
||||
signer.put(primary_key, pd.get(primary_key));
|
||||
signer.put("CORPINFO_ID", pd.get("CORPINFO_ID"));
|
||||
signer.put("SIGN_USER_ID", item);
|
||||
signer.put("STEP_ID", flow.get("NEXT_STEP_ID"));
|
||||
nextSigners.add(signer);
|
||||
try {
|
||||
sendMessageForNext(pd.getString("CORPINFO_ID"),item,pd.getString("CHECK_NO"),flow.getString("NEXT_STEP_NAME"));
|
||||
} catch (Exception e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
});
|
||||
|
||||
blindboardSignMapper.saveBatch(nextSigners);
|
||||
}
|
||||
}
|
||||
|
||||
private PageData getStep(Object TASK_ID, Object STEP_ID) throws Exception {
|
||||
PageData flow = new PageData();
|
||||
flow.put("TASK_ID", TASK_ID);
|
||||
flow.put("STEP_ID", STEP_ID);
|
||||
flow = eightWorkTaskFlowMapper.getStep(flow);
|
||||
return flow;
|
||||
}
|
||||
|
||||
private void saveLog(PageData pd,String act_user,String status) throws Exception {
|
||||
PageData log = new PageData();
|
||||
log.put("LOG_ID", UuidUtil.get32UUID());
|
||||
log.put("WORK_ID", pd.get(primary_key));
|
||||
log.put("TASK_ID", pd.get("TASK_ID"));
|
||||
log.put("STEP_ID", pd.get("STEP_ID"));
|
||||
log.put("CORPINFO_ID", pd.get("CORPINFO_ID"));
|
||||
log.put("CHECK_NO", pd.get("CHECK_NO"));
|
||||
log.put("ACT_USER", act_user);
|
||||
log.put("ACT_TIME", DateUtil.date2Str(new Date()));
|
||||
log.put("STATUS", status);
|
||||
log.put("WORK_TYPE",work_type);
|
||||
eightWorkFlowLogMapper.save(log);
|
||||
}
|
||||
|
||||
|
||||
private void setPosition(PageData pd) throws Exception {
|
||||
JSONObject body = PLSUtil.getRyRegionInfo(pd.getString("CORPINFO_ID"),Integer.parseInt(pd.getString("PLS_ID")));
|
||||
List pointList = (List)((Map) body.get("data")).get("list");
|
||||
List<String> positions = PLSUtil.getRandomPointInPolygon(pointList);
|
||||
pd.put("WORK_POSITION", String.join(",",positions));
|
||||
blindboardMapper.setPosition(pd);
|
||||
}
|
||||
|
||||
}
|
|
@ -0,0 +1,422 @@
|
|||
package com.zcloud.service.eightwork.impl;
|
||||
|
||||
import com.alibaba.fastjson.JSON;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.zcloud.entity.Page;
|
||||
import com.zcloud.entity.PageData;
|
||||
import com.zcloud.mapper.datasource.eightwork.*;
|
||||
import com.zcloud.service.eightwork.BreakGroundService;
|
||||
import com.zcloud.util.*;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
|
||||
import java.text.DecimalFormat;
|
||||
import java.util.*;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* @author fangjiakai
|
||||
* @date 2024/01/17 11:30
|
||||
*/
|
||||
@Service
|
||||
@Transactional //开启事物
|
||||
public class BreakGroundServiceImpl implements BreakGroundService {
|
||||
|
||||
@Autowired
|
||||
private BreakGroundMapper breakgroundMapper;
|
||||
@Autowired
|
||||
private EightWorkTaskFlowMapper eightWorkTaskFlowMapper;
|
||||
@Autowired
|
||||
private EightWorkFlowLogMapper eightWorkFlowLogMapper;
|
||||
@Autowired
|
||||
private BreakGroundSignMapper breakgroundSignMapper;
|
||||
@Autowired
|
||||
private BreakGroundToMeasuresMapper breakgroundToMeasuresMapper;
|
||||
@Autowired
|
||||
private com.zcloud.mapper.datasource.eightWork.EightWorkVideoManagerMapper eightworkvideomanagerMapper;
|
||||
@Autowired
|
||||
private Smb smb;
|
||||
@Autowired
|
||||
private SendMessageUtil sendMessageUtil;
|
||||
|
||||
private final String primary_key = "BREAKGROUND_ID";
|
||||
private final String work_type = "BREAKGROUND";
|
||||
@Override
|
||||
@Transactional
|
||||
public void save(PageData pd) throws Exception {
|
||||
PageData pd2 = new PageData();
|
||||
Calendar calendar = Calendar.getInstance();
|
||||
DecimalFormat dft=new DecimalFormat("00");
|
||||
int year = calendar.get(Calendar.YEAR);
|
||||
String month = dft.format(calendar.get(Calendar.MONTH) + 1);
|
||||
String day = dft.format(calendar.get(Calendar.DAY_OF_MONTH));
|
||||
pd2.put("CREATDATE",year + "-" + month + "-" + day);
|
||||
pd2.put("CORPINFO_ID",pd.get("CORPINFO_ID"));
|
||||
pd2 = breakgroundMapper.getCode(pd2); //根据ID读取
|
||||
String code = "DT" + year + month + day + dft.format((Integer.parseInt(pd2.get("code").toString()) + 1));
|
||||
pd.put("CHECK_NO", code);
|
||||
pd.put(primary_key, UuidUtil.get32UUID()); //主键
|
||||
pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间
|
||||
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
|
||||
pd.put("ISDELETE", "0"); //是否删除 1-是 0-否
|
||||
breakgroundMapper.save(pd);
|
||||
|
||||
if (pd.get("APPLY_STATUS").equals("1")) {
|
||||
PageData flow = getStep(pd.get("TASK_ID"),"1");
|
||||
saveLog(pd,pd.getString("CREATOR"),"1");
|
||||
saveNextSigner(pd,flow);
|
||||
setPosition(pd);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional
|
||||
public void edit(PageData pd) throws Exception {
|
||||
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
|
||||
breakgroundMapper.edit(pd);
|
||||
|
||||
if (pd.get("APPLY_STATUS").equals("1")) {
|
||||
pd.put("STEP_ID", 1);
|
||||
breakgroundMapper.editStep(pd);
|
||||
PageData flow = getStep(pd.get("TASK_ID"),"1");
|
||||
saveLog(pd,pd.getString("CREATOR"),"1");
|
||||
saveNextSigner(pd,flow);
|
||||
setPosition(pd);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void delete(PageData pd) throws Exception {
|
||||
breakgroundMapper.delete(pd);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<PageData> list(Page page) throws Exception {
|
||||
return breakgroundMapper.datalistPage(page);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* 下一步
|
||||
*/
|
||||
@Override
|
||||
@Transactional
|
||||
public void nextStep(PageData pd, MultipartFile[] files) throws Exception {
|
||||
PageData work = this.findById(pd);
|
||||
work.putAll(pd);
|
||||
List<String> filePaths = new ArrayList<>();
|
||||
for (int i = 0; i < files.length; i++) {
|
||||
//保存签名文件
|
||||
String ffile = DateUtil.getDays();
|
||||
String fileName = UuidUtil.get32UUID() + files[i].getOriginalFilename().substring(files[i].getOriginalFilename().lastIndexOf("."));
|
||||
smb.sshSftp(files[i], fileName, Const.FILEPATHFILE + work.getString("CORPINFO_ID") + "/" + ffile);
|
||||
filePaths.add(Const.FILEPATHFILE + work.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
|
||||
}
|
||||
PageData flow = getStep(work.get("TASK_ID"), work.get("STEP_ID"));
|
||||
work.put("STEP_ID", flow.get("NEXT_STEP_ID"));
|
||||
breakgroundMapper.editVideo(work);
|
||||
|
||||
//保存签名信息
|
||||
PageData sign = new PageData();
|
||||
if(work.getString("IMG_PATH") != ""){
|
||||
sign.put("IMG_PATH", work.get("IMG_PATH"));
|
||||
}
|
||||
sign.put(primary_key, work.get(primary_key));
|
||||
sign.put("STEP_ID", work.get("STEP_ID"));
|
||||
sign.put("SIGN_USER_ID", work.get("USER_ID"));
|
||||
sign.put("SIGN_TIME", work.getString("SIGNTIME"));
|
||||
sign.put("SIGN_PATH", String.join(",",filePaths));
|
||||
sign.put("DESCR", work.get("DESCR"));
|
||||
|
||||
breakgroundSignMapper.edit(sign);
|
||||
//保存缩略图信息
|
||||
if(work.get("CONIMG_PATH") != null && !work.get("CONIMG_PATH").equals("")){
|
||||
PageData content = new PageData();
|
||||
content.put("CONTENT_IMG_PATH", work.get("CONIMG_PATH"));
|
||||
content.put("WORK_CONTENT",work.get("WORK_CONTENT"));
|
||||
content.put("BREAKGROUND_ID",work.get("BREAKGROUND_ID"));
|
||||
breakgroundMapper.editContent(content);
|
||||
}
|
||||
|
||||
|
||||
if (work.get("MEASURES") != null && !work.get("MEASURES").equals("")) { //安全措施确认步骤
|
||||
saveMeasures(work);
|
||||
}
|
||||
|
||||
List<PageData> unsignedList = breakgroundSignMapper.checkUnsigned(sign);//当前步骤未签名人列表
|
||||
if((unsignedList == null || unsignedList.size() == 0) && pd.getString("APPLY_STATUS").equals("1")){//如果没有未签人 则跳转下一步
|
||||
breakgroundMapper.editStep(work);
|
||||
PageData currentflow = getStep(work.get("TASK_ID"), work.get("STEP_ID"));
|
||||
|
||||
//保存日志
|
||||
saveLog(work,work.getString("USER_ID"),"1");
|
||||
|
||||
if("99".equals(currentflow.getString("NEXT_STEP_ID"))){
|
||||
eightworkvideomanagerMapper.editStatus(work);
|
||||
sendMessageForFinished(work.getString("CORPINFO_ID"),work.getString("CREATOR"),"EIGHTWORK_ACCEPT",work.getString("CHECK_NO"));
|
||||
return;
|
||||
}
|
||||
if (work.get("PREPARERS") != null && !work.get("PREPARERS").equals("")) { //如果是设置安全措施确认人步骤
|
||||
savePreparers(work,currentflow);
|
||||
}
|
||||
saveNextSigner(work,currentflow);
|
||||
}else if(pd.getString("APPLY_STATUS").equals("-1")){
|
||||
//保存日志
|
||||
saveLog(work,work.getString("USER_ID"),"-1");
|
||||
eightworkvideomanagerMapper.editStatus(work);
|
||||
|
||||
work.put("STEP_ID",-1);
|
||||
breakgroundMapper.editStep(work);
|
||||
sendMessageForFinished(work.getString("CORPINFO_ID"),work.getString("CREATOR"),"EIGHTWORK_ACCEPT",work.getString("CHECK_NO"));
|
||||
|
||||
}
|
||||
}
|
||||
private void sendMessageForFinished(String corpinfo_id,String userId,String template,String number) throws Exception {
|
||||
PageData mes = new PageData();
|
||||
mes.put("RECEIVER_ID", userId);// 收信人userid
|
||||
mes.put("templateCode", template);// 短信模板编码
|
||||
mes.put("CORPINFO_ID", corpinfo_id);// 企业id
|
||||
|
||||
// 参数集合
|
||||
List<PageData> paramsList = new ArrayList<PageData>();
|
||||
// 第1个参数
|
||||
PageData params1 = new PageData();
|
||||
params1.put("name", "number");// 存入短信模板中的参数名称
|
||||
params1.put("value", number);// 存入上面参数名称所传递的值
|
||||
paramsList.add(params1);
|
||||
|
||||
PageData params2 = new PageData();
|
||||
params2.put("name", "type");// 存入短信模板中的参数名称
|
||||
params2.put("value", "动土作业");// 存入上面参数名称所传递的值
|
||||
paramsList.add(params2);
|
||||
|
||||
try {
|
||||
sendMessageUtil.sendMessages(mes, paramsList);
|
||||
} catch (Exception e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public PageData findById(PageData pd) throws Exception {
|
||||
PageData pageData = breakgroundMapper.findById(pd);
|
||||
PageData cpd = new PageData();
|
||||
if(pageData.getString("CONTENT_IMG_PATH") != null || "".equals(pageData.getString("CONTENT_IMG_PATH"))){
|
||||
cpd.put("CONTENT_IMG_PATH", pageData.getString("CONTENT_IMG_PATH").split(","));
|
||||
}
|
||||
pageData.putAll(cpd);
|
||||
return pageData;
|
||||
}
|
||||
|
||||
@Override
|
||||
public PageData listSignFinished(PageData pd) throws Exception {
|
||||
Map<String,List<PageData>> rmap = new HashMap<>();
|
||||
List<PageData> varList = breakgroundSignMapper.listAll(pd);
|
||||
if (varList != null && !varList.isEmpty()) {
|
||||
varList.stream().forEach(item -> {
|
||||
PageData sign = new PageData();
|
||||
sign.put("SIGN_PATH", item.getString("SIGN_PATH").split(","));
|
||||
sign.put("SIGN_TIME", item.getString("SIGN_TIME").split(","));
|
||||
|
||||
sign.put("DESCR", item.getString("DESCR") != null ? item.getString("DESCR") : "无");
|
||||
if(rmap.containsKey(item.getString("CODE"))){
|
||||
rmap.get(item.getString("CODE")).add(sign);
|
||||
}else{
|
||||
List<PageData> signs = new ArrayList<>();
|
||||
signs.add(sign);
|
||||
rmap.put(item.getString("CODE"),signs);
|
||||
}
|
||||
});
|
||||
}
|
||||
PageData rpd = new PageData();
|
||||
if (rmap != null && !rmap.isEmpty()) {
|
||||
rpd.putAll(rmap);
|
||||
}
|
||||
return rpd;
|
||||
}
|
||||
|
||||
@Override
|
||||
public PageData checkWorkCount(PageData pd) {
|
||||
PageData rpd = new PageData();
|
||||
List<PageData> varList = breakgroundMapper.checkWorkCount(pd);
|
||||
|
||||
if (varList != null && !varList.isEmpty()) {
|
||||
Map<String, String> newMap = varList.stream()
|
||||
.collect(Collectors.toMap(map -> map.getString("CODE"), map -> map.getString("COUNT")));
|
||||
|
||||
rpd.putAll(newMap);
|
||||
}
|
||||
return rpd;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<PageData> listAllMeasures() throws Exception {
|
||||
return breakgroundMapper.listAllMeasures();
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<PageData> listAllMeasuresForSign(PageData pd) throws Exception {
|
||||
return breakgroundToMeasuresMapper.listAllMeasuresForSign(pd);
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<PageData> listSignFinishMeasures(PageData pd) throws Exception {
|
||||
return breakgroundToMeasuresMapper.listSignFinishMeasures(pd);
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public List<PageData> getFlowList(PageData pd) throws Exception {
|
||||
pd=findById(pd);
|
||||
return breakgroundMapper.getFlowList(pd);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ReturnMap getMapList() throws Exception {
|
||||
ReturnMap returnMap = new ReturnMap();
|
||||
PageData pd = new PageData();
|
||||
pd.put("CORPINFO_ID",Jurisdiction.getCORPINFO_ID());
|
||||
returnMap.put("varList",breakgroundMapper.getMapList(pd));
|
||||
return returnMap;
|
||||
}
|
||||
private void saveNextSigner(PageData pd,PageData flow) throws Exception {
|
||||
|
||||
pd.put("STEP_ID",flow.get("NEXT_STEP_ID"));
|
||||
|
||||
if(pd.get(flow.get("NEXT_ACTOR_FIELD")) == null || pd.get(flow.get("NEXT_ACTOR_FIELD")).equals("")){
|
||||
return;
|
||||
}
|
||||
//提前保存下一步签字人
|
||||
List<PageData> signers = new ArrayList<>();
|
||||
PageData signer = new PageData();
|
||||
signer.put("BREAKGROUND_SIGN_ID", UuidUtil.get32UUID()); // 主键
|
||||
signer.put(primary_key, pd.get(primary_key));
|
||||
signer.put("CORPINFO_ID", pd.get("CORPINFO_ID"));
|
||||
signer.put("SIGN_USER_ID", pd.get(flow.get("NEXT_ACTOR_FIELD")));
|
||||
signer.put("STEP_ID", flow.get("NEXT_STEP_ID"));
|
||||
signers.add(signer);
|
||||
breakgroundSignMapper.saveBatch(signers);
|
||||
sendMessageForNext(pd.getString("CORPINFO_ID"),pd.getString(flow.get("NEXT_ACTOR_FIELD")),pd.getString("CHECK_NO"),flow.getString("NEXT_STEP_NAME"));
|
||||
|
||||
}
|
||||
private void sendMessageForNext(String corpinfo_id,String userId,String number,String flow_name) throws Exception {
|
||||
PageData mes = new PageData();
|
||||
mes.put("RECEIVER_ID", userId);// 收信人userid
|
||||
mes.put("templateCode", "EIGHTWORK_REMINDER");// 短信模板编码
|
||||
mes.put("CORPINFO_ID", corpinfo_id);// 企业id
|
||||
|
||||
// 参数集合
|
||||
List<PageData> paramsList = new ArrayList<PageData>();
|
||||
// 第1个参数
|
||||
PageData params1 = new PageData();
|
||||
params1.put("name", "number");// 存入短信模板中的参数名称
|
||||
params1.put("value", number);// 存入上面参数名称所传递的值
|
||||
paramsList.add(params1);
|
||||
|
||||
PageData params2 = new PageData();
|
||||
params2.put("name", "type");// 存入短信模板中的参数名称
|
||||
params2.put("value", "动土作业");// 存入上面参数名称所传递的值
|
||||
paramsList.add(params2);
|
||||
|
||||
PageData params3 = new PageData();
|
||||
params3.put("name", "flow");// 存入短信模板中的参数名称
|
||||
params3.put("value", flow_name);// 存入上面参数名称所传递的值
|
||||
paramsList.add(params3);
|
||||
try {
|
||||
sendMessageUtil.sendMessages(mes, paramsList);
|
||||
} catch (Exception e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
}
|
||||
|
||||
private void saveMeasures(PageData pd) {
|
||||
List<JSONObject> list = (List<JSONObject>) JSON.parse(pd.get("MEASURES").toString());
|
||||
for (JSONObject json : list) {
|
||||
PageData measure = new PageData();
|
||||
measure.put("BREAKGROUNDTOMEASURES_ID",json.get("BREAKGROUNDTOMEASURES_ID"));
|
||||
measure.put("STATUS", json.get("STATUS"));
|
||||
measure.put("SIGN_PATH", json.get("SIGN_PATH"));
|
||||
measure.put("SIGN_TIME", json.get("SIGN_TIME"));
|
||||
measure.put("IMG_PATH", json.get("IMG_PATH"));
|
||||
breakgroundToMeasuresMapper.edit(measure);
|
||||
}
|
||||
}
|
||||
|
||||
private void savePreparers(PageData pd,PageData flow) {
|
||||
List<PageData> signers = new ArrayList<>();
|
||||
List<JSONObject> list = (List<JSONObject>) JSON.parse(pd.get("PREPARERS").toString());
|
||||
for (JSONObject json : list) {
|
||||
PageData preparer = new PageData();
|
||||
preparer.put("BREAKGROUNDTOMEASURES_ID", UuidUtil.get32UUID()); // 主键
|
||||
preparer.put("BREAKGROUND_ID", pd.get("BREAKGROUND_ID"));
|
||||
preparer.put("BUS_BREAKGROUND_MEASURES_ID", json.get("BUS_BREAKGROUND_MEASURES_ID"));
|
||||
preparer.put("CONFIRM_ID", json.get("USER_ID"));
|
||||
signers.add(preparer);
|
||||
}
|
||||
if(signers.size() > 0){
|
||||
breakgroundToMeasuresMapper.saveBatch(signers);
|
||||
|
||||
//获取所有需要签名人
|
||||
List<String> fieldList = signers.stream()
|
||||
.map(map -> map.getString("CONFIRM_ID"))
|
||||
.collect(Collectors.toList());
|
||||
Set<String > fieldSet = new HashSet<>(fieldList); //去重
|
||||
|
||||
List<String> uniqueList = new ArrayList<>(fieldSet);
|
||||
List<PageData> nextSigners = new ArrayList<>();
|
||||
uniqueList.forEach(item -> { // 保存下一步需要签名的人
|
||||
PageData signer = new PageData();
|
||||
signer.put("BREAKGROUND_SIGN_ID", UuidUtil.get32UUID()); // 主键
|
||||
signer.put(primary_key, pd.get(primary_key));
|
||||
signer.put("CORPINFO_ID", pd.get("CORPINFO_ID"));
|
||||
signer.put("SIGN_USER_ID", item);
|
||||
signer.put("STEP_ID", flow.get("NEXT_STEP_ID"));
|
||||
nextSigners.add(signer);
|
||||
try {
|
||||
sendMessageForNext(pd.getString("CORPINFO_ID"),item,pd.getString("CHECK_NO"),flow.getString("NEXT_STEP_NAME"));
|
||||
} catch (Exception e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
});
|
||||
|
||||
breakgroundSignMapper.saveBatch(nextSigners);
|
||||
}
|
||||
}
|
||||
|
||||
private PageData getStep(Object TASK_ID, Object STEP_ID) throws Exception {
|
||||
PageData flow = new PageData();
|
||||
flow.put("TASK_ID", TASK_ID);
|
||||
flow.put("STEP_ID", STEP_ID);
|
||||
flow = eightWorkTaskFlowMapper.getStep(flow);
|
||||
return flow;
|
||||
}
|
||||
|
||||
private void saveLog(PageData pd,String act_user,String status) throws Exception {
|
||||
PageData log = new PageData();
|
||||
log.put("LOG_ID", UuidUtil.get32UUID());
|
||||
log.put("WORK_ID", pd.get(primary_key));
|
||||
log.put("TASK_ID", pd.get("TASK_ID"));
|
||||
log.put("STEP_ID", pd.get("STEP_ID"));
|
||||
log.put("CORPINFO_ID", pd.get("CORPINFO_ID"));
|
||||
log.put("CHECK_NO", pd.get("CHECK_NO"));
|
||||
log.put("ACT_USER", act_user);
|
||||
log.put("ACT_TIME", DateUtil.date2Str(new Date()));
|
||||
log.put("STATUS", status);
|
||||
log.put("WORK_TYPE",work_type);
|
||||
eightWorkFlowLogMapper.save(log);
|
||||
}
|
||||
|
||||
|
||||
private void setPosition(PageData pd) throws Exception {
|
||||
JSONObject body = PLSUtil.getRyRegionInfo(pd.getString("CORPINFO_ID"),Integer.parseInt(pd.getString("PLS_ID")));
|
||||
List pointList = (List)((Map) body.get("data")).get("list");
|
||||
List<String> positions = PLSUtil.getRandomPointInPolygon(pointList);
|
||||
pd.put("WORK_POSITION", String.join(",",positions));
|
||||
breakgroundMapper.setPosition(pd);
|
||||
}
|
||||
|
||||
}
|
|
@ -40,6 +40,8 @@ public class ConfinedspaceServiceImpl implements ConfinedspaceService {
|
|||
private com.zcloud.mapper.datasource.eightWork.EightWorkVideoManagerMapper eightworkvideomanagerMapper;
|
||||
@Autowired
|
||||
private Smb smb;
|
||||
@Autowired
|
||||
private SendMessageUtil sendMessageUtil;
|
||||
|
||||
private final String primary_key = "CONFINEDSPACE_ID";
|
||||
private final String work_type = "CONFINEDSPACE";
|
||||
|
@ -116,7 +118,7 @@ public class ConfinedspaceServiceImpl implements ConfinedspaceService {
|
|||
}
|
||||
PageData flow = getStep(work.get("TASK_ID"), work.get("STEP_ID"));
|
||||
work.put("STEP_ID", flow.get("NEXT_STEP_ID"));
|
||||
|
||||
confinedspaceMapper.editVideo(work);
|
||||
|
||||
//保存签名信息
|
||||
PageData sign = new PageData();
|
||||
|
@ -146,6 +148,7 @@ public class ConfinedspaceServiceImpl implements ConfinedspaceService {
|
|||
|
||||
if("99".equals(currentflow.getString("NEXT_STEP_ID"))){
|
||||
eightworkvideomanagerMapper.editStatus(work);
|
||||
sendMessageForFinished(work.getString("CORPINFO_ID"),work.getString("CREATOR"),"EIGHTWORK_ACCEPT",work.getString("CHECK_NO"));
|
||||
|
||||
return;
|
||||
}
|
||||
|
@ -160,6 +163,33 @@ public class ConfinedspaceServiceImpl implements ConfinedspaceService {
|
|||
|
||||
work.put("STEP_ID",-1);
|
||||
confinedspaceMapper.editStep(work);
|
||||
sendMessageForFinished(work.getString("CORPINFO_ID"),work.getString("CREATOR"),"EIGHTWORK_ACCEPT",work.getString("CHECK_NO"));
|
||||
|
||||
}
|
||||
}
|
||||
private void sendMessageForFinished(String corpinfo_id,String userId,String template,String number) throws Exception {
|
||||
PageData mes = new PageData();
|
||||
mes.put("RECEIVER_ID", userId);// 收信人userid
|
||||
mes.put("templateCode", template);// 短信模板编码
|
||||
mes.put("CORPINFO_ID", corpinfo_id);// 企业id
|
||||
|
||||
// 参数集合
|
||||
List<PageData> paramsList = new ArrayList<PageData>();
|
||||
// 第1个参数
|
||||
PageData params1 = new PageData();
|
||||
params1.put("name", "number");// 存入短信模板中的参数名称
|
||||
params1.put("value", number);// 存入上面参数名称所传递的值
|
||||
paramsList.add(params1);
|
||||
|
||||
PageData params2 = new PageData();
|
||||
params2.put("name", "type");// 存入短信模板中的参数名称
|
||||
params2.put("value", "受限作业");// 存入上面参数名称所传递的值
|
||||
paramsList.add(params2);
|
||||
|
||||
try {
|
||||
sendMessageUtil.sendMessages(mes, paramsList);
|
||||
} catch (Exception e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -285,7 +315,7 @@ public class ConfinedspaceServiceImpl implements ConfinedspaceService {
|
|||
saveLog(work,pd.getString("USER_ID"),"-2");
|
||||
work.put("STEP_ID",-1);
|
||||
confinedspaceMapper.editStep(work);
|
||||
|
||||
sendMessageForFinished(work.getString("CORPINFO_ID"),work.getString("CREATOR"),"EIGHTWORK_REJECT",work.getString("CHECK_NO"));
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -321,6 +351,37 @@ public class ConfinedspaceServiceImpl implements ConfinedspaceService {
|
|||
signer.put("STEP_ID", flow.get("NEXT_STEP_ID"));
|
||||
signers.add(signer);
|
||||
confinedspaceSignMapper.saveBatch(signers);
|
||||
sendMessageForNext(pd.getString("CORPINFO_ID"),pd.getString(flow.get("NEXT_ACTOR_FIELD")),pd.getString("CHECK_NO"),flow.getString("NEXT_STEP_NAME"));
|
||||
|
||||
}
|
||||
private void sendMessageForNext(String corpinfo_id,String userId,String number,String flow_name) throws Exception {
|
||||
PageData mes = new PageData();
|
||||
mes.put("RECEIVER_ID", userId);// 收信人userid
|
||||
mes.put("templateCode", "EIGHTWORK_REMINDER");// 短信模板编码
|
||||
mes.put("CORPINFO_ID", corpinfo_id);// 企业id
|
||||
|
||||
// 参数集合
|
||||
List<PageData> paramsList = new ArrayList<PageData>();
|
||||
// 第1个参数
|
||||
PageData params1 = new PageData();
|
||||
params1.put("name", "number");// 存入短信模板中的参数名称
|
||||
params1.put("value", number);// 存入上面参数名称所传递的值
|
||||
paramsList.add(params1);
|
||||
|
||||
PageData params2 = new PageData();
|
||||
params2.put("name", "type");// 存入短信模板中的参数名称
|
||||
params2.put("value", "受限作业");// 存入上面参数名称所传递的值
|
||||
paramsList.add(params2);
|
||||
|
||||
PageData params3 = new PageData();
|
||||
params3.put("name", "flow");// 存入短信模板中的参数名称
|
||||
params3.put("value", flow_name);// 存入上面参数名称所传递的值
|
||||
paramsList.add(params3);
|
||||
try {
|
||||
sendMessageUtil.sendMessages(mes, paramsList);
|
||||
} catch (Exception e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
}
|
||||
|
||||
private void saveMeasures(PageData pd) {
|
||||
|
@ -369,6 +430,11 @@ public class ConfinedspaceServiceImpl implements ConfinedspaceService {
|
|||
signer.put("SIGN_USER_ID", item);
|
||||
signer.put("STEP_ID", flow.get("NEXT_STEP_ID"));
|
||||
nextSigners.add(signer);
|
||||
try {
|
||||
sendMessageForNext(pd.getString("CORPINFO_ID"),item,pd.getString("CHECK_NO"),flow.getString("NEXT_STEP_NAME"));
|
||||
} catch (Exception e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
});
|
||||
|
||||
confinedspaceSignMapper.saveBatch(nextSigners);
|
||||
|
|
|
@ -0,0 +1,423 @@
|
|||
package com.zcloud.service.eightwork.impl;
|
||||
|
||||
import com.alibaba.fastjson.JSON;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.zcloud.entity.Page;
|
||||
import com.zcloud.entity.PageData;
|
||||
import com.zcloud.mapper.datasource.eightwork.*;
|
||||
import com.zcloud.service.eightwork.CutRoadService;
|
||||
import com.zcloud.util.*;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
|
||||
import java.text.DecimalFormat;
|
||||
import java.util.*;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* @author fangjiakai
|
||||
* @date 2024/01/17 11:30
|
||||
*/
|
||||
@Service
|
||||
@Transactional //开启事物
|
||||
public class CutRoadServiceImpl implements CutRoadService {
|
||||
|
||||
@Autowired
|
||||
private CutRoadMapper cutroadMapper;
|
||||
@Autowired
|
||||
private EightWorkTaskFlowMapper eightWorkTaskFlowMapper;
|
||||
@Autowired
|
||||
private EightWorkFlowLogMapper eightWorkFlowLogMapper;
|
||||
@Autowired
|
||||
private CutRoadSignMapper cutroadSignMapper;
|
||||
@Autowired
|
||||
private CutRoadToMeasuresMapper cutroadToMeasuresMapper;
|
||||
@Autowired
|
||||
private com.zcloud.mapper.datasource.eightWork.EightWorkVideoManagerMapper eightworkvideomanagerMapper;
|
||||
@Autowired
|
||||
private Smb smb;
|
||||
@Autowired
|
||||
private SendMessageUtil sendMessageUtil;
|
||||
|
||||
private final String primary_key = "CUTROAD_ID";
|
||||
private final String work_type = "CUTROAD";
|
||||
@Override
|
||||
@Transactional
|
||||
public void save(PageData pd) throws Exception {
|
||||
PageData pd2 = new PageData();
|
||||
Calendar calendar = Calendar.getInstance();
|
||||
DecimalFormat dft=new DecimalFormat("00");
|
||||
int year = calendar.get(Calendar.YEAR);
|
||||
String month = dft.format(calendar.get(Calendar.MONTH) + 1);
|
||||
String day = dft.format(calendar.get(Calendar.DAY_OF_MONTH));
|
||||
pd2.put("CREATDATE",year + "-" + month + "-" + day);
|
||||
pd2.put("CORPINFO_ID",pd.get("CORPINFO_ID"));
|
||||
pd2 = cutroadMapper.getCode(pd2); //根据ID读取
|
||||
String code = "DL" + year + month + day + dft.format((Integer.parseInt(pd2.get("code").toString()) + 1));
|
||||
pd.put("CHECK_NO", code);
|
||||
pd.put(primary_key, UuidUtil.get32UUID()); //主键
|
||||
pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间
|
||||
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
|
||||
pd.put("ISDELETE", "0"); //是否删除 1-是 0-否
|
||||
cutroadMapper.save(pd);
|
||||
|
||||
if (pd.get("APPLY_STATUS").equals("1")) {
|
||||
PageData flow = getStep(pd.get("TASK_ID"),"1");
|
||||
saveLog(pd,pd.getString("CREATOR"),"1");
|
||||
saveNextSigner(pd,flow);
|
||||
setPosition(pd);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional
|
||||
public void edit(PageData pd) throws Exception {
|
||||
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
|
||||
cutroadMapper.edit(pd);
|
||||
|
||||
if (pd.get("APPLY_STATUS").equals("1")) {
|
||||
pd.put("STEP_ID", 1);
|
||||
cutroadMapper.editStep(pd);
|
||||
PageData flow = getStep(pd.get("TASK_ID"),"1");
|
||||
saveLog(pd,pd.getString("CREATOR"),"1");
|
||||
saveNextSigner(pd,flow);
|
||||
setPosition(pd);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void delete(PageData pd) throws Exception {
|
||||
cutroadMapper.delete(pd);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<PageData> list(Page page) throws Exception {
|
||||
return cutroadMapper.datalistPage(page);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* 下一步
|
||||
*/
|
||||
@Override
|
||||
@Transactional
|
||||
public void nextStep(PageData pd, MultipartFile[] files) throws Exception {
|
||||
PageData work = this.findById(pd);
|
||||
work.putAll(pd);
|
||||
List<String> filePaths = new ArrayList<>();
|
||||
for (int i = 0; i < files.length; i++) {
|
||||
//保存签名文件
|
||||
String ffile = DateUtil.getDays();
|
||||
String fileName = UuidUtil.get32UUID() + files[i].getOriginalFilename().substring(files[i].getOriginalFilename().lastIndexOf("."));
|
||||
smb.sshSftp(files[i], fileName, Const.FILEPATHFILE + work.getString("CORPINFO_ID") + "/" + ffile);
|
||||
filePaths.add(Const.FILEPATHFILE + work.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
|
||||
}
|
||||
PageData flow = getStep(work.get("TASK_ID"), work.get("STEP_ID"));
|
||||
work.put("STEP_ID", flow.get("NEXT_STEP_ID"));
|
||||
cutroadMapper.editVideo(work);
|
||||
|
||||
//保存签名信息
|
||||
PageData sign = new PageData();
|
||||
if(work.getString("IMG_PATH") != ""){
|
||||
sign.put("IMG_PATH", work.get("IMG_PATH"));
|
||||
}
|
||||
sign.put(primary_key, work.get(primary_key));
|
||||
sign.put("STEP_ID", work.get("STEP_ID"));
|
||||
sign.put("SIGN_USER_ID", work.get("USER_ID"));
|
||||
sign.put("SIGN_TIME", work.getString("SIGNTIME"));
|
||||
sign.put("SIGN_PATH", String.join(",",filePaths));
|
||||
sign.put("DESCR", work.get("DESCR"));
|
||||
|
||||
cutroadSignMapper.edit(sign);
|
||||
//保存缩略图信息
|
||||
if(work.get("CONIMG_PATH") != null && !work.get("CONIMG_PATH").equals("")){
|
||||
PageData content = new PageData();
|
||||
content.put("CONTENT_IMG_PATH", work.get("CONIMG_PATH"));
|
||||
content.put("WORK_CONTENT",work.get("WORK_CONTENT"));
|
||||
content.put("CUTROAD_ID",work.get("CUTROAD_ID"));
|
||||
cutroadMapper.editContent(content);
|
||||
}
|
||||
|
||||
|
||||
if (work.get("MEASURES") != null && !work.get("MEASURES").equals("")) { //安全措施确认步骤
|
||||
saveMeasures(work);
|
||||
}
|
||||
|
||||
List<PageData> unsignedList = cutroadSignMapper.checkUnsigned(sign);//当前步骤未签名人列表
|
||||
if((unsignedList == null || unsignedList.size() == 0) && pd.getString("APPLY_STATUS").equals("1")){//如果没有未签人 则跳转下一步
|
||||
cutroadMapper.editStep(work);
|
||||
PageData currentflow = getStep(work.get("TASK_ID"), work.get("STEP_ID"));
|
||||
|
||||
//保存日志
|
||||
saveLog(work,work.getString("USER_ID"),"1");
|
||||
|
||||
if("99".equals(currentflow.getString("NEXT_STEP_ID"))){
|
||||
eightworkvideomanagerMapper.editStatus(work);
|
||||
sendMessageForFinished(work.getString("CORPINFO_ID"),work.getString("CREATOR"),"EIGHTWORK_REJECT",work.getString("CHECK_NO"));
|
||||
|
||||
return;
|
||||
}
|
||||
if (work.get("PREPARERS") != null && !work.get("PREPARERS").equals("")) { //如果是设置安全措施确认人步骤
|
||||
savePreparers(work,currentflow);
|
||||
}
|
||||
saveNextSigner(work,currentflow);
|
||||
}else if(pd.getString("APPLY_STATUS").equals("-1")){
|
||||
//保存日志
|
||||
saveLog(work,work.getString("USER_ID"),"-1");
|
||||
eightworkvideomanagerMapper.editStatus(work);
|
||||
|
||||
work.put("STEP_ID",-1);
|
||||
cutroadMapper.editStep(work);
|
||||
sendMessageForFinished(work.getString("CORPINFO_ID"),work.getString("CREATOR"),"EIGHTWORK_REJECT",work.getString("CHECK_NO"));
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public PageData findById(PageData pd) throws Exception {
|
||||
PageData pageData = cutroadMapper.findById(pd);
|
||||
PageData cpd = new PageData();
|
||||
if(pageData.getString("CONTENT_IMG_PATH") != null || "".equals(pageData.getString("CONTENT_IMG_PATH"))){
|
||||
cpd.put("CONTENT_IMG_PATH", pageData.getString("CONTENT_IMG_PATH").split(","));
|
||||
}
|
||||
pageData.putAll(cpd);
|
||||
return pageData;
|
||||
}
|
||||
|
||||
@Override
|
||||
public PageData listSignFinished(PageData pd) throws Exception {
|
||||
Map<String,List<PageData>> rmap = new HashMap<>();
|
||||
List<PageData> varList = cutroadSignMapper.listAll(pd);
|
||||
if (varList != null && !varList.isEmpty()) {
|
||||
varList.stream().forEach(item -> {
|
||||
PageData sign = new PageData();
|
||||
sign.put("SIGN_PATH", item.getString("SIGN_PATH").split(","));
|
||||
sign.put("SIGN_TIME", item.getString("SIGN_TIME").split(","));
|
||||
|
||||
sign.put("DESCR", item.getString("DESCR") != null ? item.getString("DESCR") : "无");
|
||||
if(rmap.containsKey(item.getString("CODE"))){
|
||||
rmap.get(item.getString("CODE")).add(sign);
|
||||
}else{
|
||||
List<PageData> signs = new ArrayList<>();
|
||||
signs.add(sign);
|
||||
rmap.put(item.getString("CODE"),signs);
|
||||
}
|
||||
});
|
||||
}
|
||||
PageData rpd = new PageData();
|
||||
if (rmap != null && !rmap.isEmpty()) {
|
||||
rpd.putAll(rmap);
|
||||
}
|
||||
return rpd;
|
||||
}
|
||||
|
||||
@Override
|
||||
public PageData checkWorkCount(PageData pd) {
|
||||
PageData rpd = new PageData();
|
||||
List<PageData> varList = cutroadMapper.checkWorkCount(pd);
|
||||
|
||||
if (varList != null && !varList.isEmpty()) {
|
||||
Map<String, String> newMap = varList.stream()
|
||||
.collect(Collectors.toMap(map -> map.getString("CODE"), map -> map.getString("COUNT")));
|
||||
|
||||
rpd.putAll(newMap);
|
||||
}
|
||||
return rpd;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<PageData> listAllMeasures() throws Exception {
|
||||
return cutroadMapper.listAllMeasures();
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<PageData> listAllMeasuresForSign(PageData pd) throws Exception {
|
||||
return cutroadToMeasuresMapper.listAllMeasuresForSign(pd);
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<PageData> listSignFinishMeasures(PageData pd) throws Exception {
|
||||
return cutroadToMeasuresMapper.listSignFinishMeasures(pd);
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public List<PageData> getFlowList(PageData pd) throws Exception {
|
||||
pd=findById(pd);
|
||||
return cutroadMapper.getFlowList(pd);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ReturnMap getMapList() throws Exception {
|
||||
ReturnMap returnMap = new ReturnMap();
|
||||
PageData pd = new PageData();
|
||||
pd.put("CORPINFO_ID",Jurisdiction.getCORPINFO_ID());
|
||||
returnMap.put("varList",cutroadMapper.getMapList(pd));
|
||||
return returnMap;
|
||||
}
|
||||
private void saveNextSigner(PageData pd,PageData flow) throws Exception {
|
||||
|
||||
pd.put("STEP_ID",flow.get("NEXT_STEP_ID"));
|
||||
|
||||
if(pd.get(flow.get("NEXT_ACTOR_FIELD")) == null || pd.get(flow.get("NEXT_ACTOR_FIELD")).equals("")){
|
||||
return;
|
||||
}
|
||||
//提前保存下一步签字人
|
||||
List<PageData> signers = new ArrayList<>();
|
||||
PageData signer = new PageData();
|
||||
signer.put("CUTROAD_SIGN_ID", UuidUtil.get32UUID()); // 主键
|
||||
signer.put(primary_key, pd.get(primary_key));
|
||||
signer.put("CORPINFO_ID", pd.get("CORPINFO_ID"));
|
||||
signer.put("SIGN_USER_ID", pd.get(flow.get("NEXT_ACTOR_FIELD")));
|
||||
signer.put("STEP_ID", flow.get("NEXT_STEP_ID"));
|
||||
signers.add(signer);
|
||||
cutroadSignMapper.saveBatch(signers);
|
||||
sendMessageForNext(pd.getString("CORPINFO_ID"),pd.getString(flow.get("NEXT_ACTOR_FIELD")),pd.getString("CHECK_NO"),flow.getString("NEXT_STEP_NAME"));
|
||||
|
||||
}
|
||||
|
||||
private void saveMeasures(PageData pd) {
|
||||
List<JSONObject> list = (List<JSONObject>) JSON.parse(pd.get("MEASURES").toString());
|
||||
for (JSONObject json : list) {
|
||||
PageData measure = new PageData();
|
||||
measure.put("CUTROADTOMEASURES_ID",json.get("CUTROADTOMEASURES_ID"));
|
||||
measure.put("STATUS", json.get("STATUS"));
|
||||
measure.put("SIGN_PATH", json.get("SIGN_PATH"));
|
||||
measure.put("SIGN_TIME", json.get("SIGN_TIME"));
|
||||
measure.put("IMG_PATH", json.get("IMG_PATH"));
|
||||
cutroadToMeasuresMapper.edit(measure);
|
||||
}
|
||||
}
|
||||
|
||||
private void savePreparers(PageData pd,PageData flow) {
|
||||
List<PageData> signers = new ArrayList<>();
|
||||
List<JSONObject> list = (List<JSONObject>) JSON.parse(pd.get("PREPARERS").toString());
|
||||
for (JSONObject json : list) {
|
||||
PageData preparer = new PageData();
|
||||
preparer.put("CUTROADTOMEASURES_ID", UuidUtil.get32UUID()); // 主键
|
||||
preparer.put("CUTROAD_ID", pd.get("CUTROAD_ID"));
|
||||
preparer.put("BUS_CUTROAD_MEASURES_ID", json.get("BUS_CUTROAD_MEASURES_ID"));
|
||||
preparer.put("CONFIRM_ID", json.get("USER_ID"));
|
||||
signers.add(preparer);
|
||||
}
|
||||
if(signers.size() > 0){
|
||||
cutroadToMeasuresMapper.saveBatch(signers);
|
||||
|
||||
//获取所有需要签名人
|
||||
List<String> fieldList = signers.stream()
|
||||
.map(map -> map.getString("CONFIRM_ID"))
|
||||
.collect(Collectors.toList());
|
||||
Set<String > fieldSet = new HashSet<>(fieldList); //去重
|
||||
|
||||
List<String> uniqueList = new ArrayList<>(fieldSet);
|
||||
List<PageData> nextSigners = new ArrayList<>();
|
||||
uniqueList.forEach(item -> { // 保存下一步需要签名的人
|
||||
PageData signer = new PageData();
|
||||
signer.put("CUTROAD_SIGN_ID", UuidUtil.get32UUID()); // 主键
|
||||
signer.put(primary_key, pd.get(primary_key));
|
||||
signer.put("CORPINFO_ID", pd.get("CORPINFO_ID"));
|
||||
signer.put("SIGN_USER_ID", item);
|
||||
signer.put("STEP_ID", flow.get("NEXT_STEP_ID"));
|
||||
nextSigners.add(signer);
|
||||
try {
|
||||
sendMessageForNext(pd.getString("CORPINFO_ID"),item,pd.getString("CHECK_NO"),flow.getString("NEXT_STEP_NAME"));
|
||||
} catch (Exception e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
});
|
||||
|
||||
cutroadSignMapper.saveBatch(nextSigners);
|
||||
}
|
||||
}
|
||||
|
||||
private PageData getStep(Object TASK_ID, Object STEP_ID) throws Exception {
|
||||
PageData flow = new PageData();
|
||||
flow.put("TASK_ID", TASK_ID);
|
||||
flow.put("STEP_ID", STEP_ID);
|
||||
flow = eightWorkTaskFlowMapper.getStep(flow);
|
||||
return flow;
|
||||
}
|
||||
|
||||
private void saveLog(PageData pd,String act_user,String status) throws Exception {
|
||||
PageData log = new PageData();
|
||||
log.put("LOG_ID", UuidUtil.get32UUID());
|
||||
log.put("WORK_ID", pd.get(primary_key));
|
||||
log.put("TASK_ID", pd.get("TASK_ID"));
|
||||
log.put("STEP_ID", pd.get("STEP_ID"));
|
||||
log.put("CORPINFO_ID", pd.get("CORPINFO_ID"));
|
||||
log.put("CHECK_NO", pd.get("CHECK_NO"));
|
||||
log.put("ACT_USER", act_user);
|
||||
log.put("ACT_TIME", DateUtil.date2Str(new Date()));
|
||||
log.put("STATUS", status);
|
||||
log.put("WORK_TYPE",work_type);
|
||||
eightWorkFlowLogMapper.save(log);
|
||||
}
|
||||
|
||||
|
||||
private void setPosition(PageData pd) throws Exception {
|
||||
JSONObject body = PLSUtil.getRyRegionInfo(pd.getString("CORPINFO_ID"),Integer.parseInt(pd.getString("PLS_ID")));
|
||||
List pointList = (List)((Map) body.get("data")).get("list");
|
||||
List<String> positions = PLSUtil.getRandomPointInPolygon(pointList);
|
||||
pd.put("WORK_POSITION", String.join(",",positions));
|
||||
cutroadMapper.setPosition(pd);
|
||||
}
|
||||
private void sendMessageForNext(String corpinfo_id,String userId,String number,String flow_name) throws Exception {
|
||||
PageData mes = new PageData();
|
||||
mes.put("RECEIVER_ID", userId);// 收信人userid
|
||||
mes.put("templateCode", "EIGHTWORK_REMINDER");// 短信模板编码
|
||||
mes.put("CORPINFO_ID", corpinfo_id);// 企业id
|
||||
|
||||
// 参数集合
|
||||
List<PageData> paramsList = new ArrayList<PageData>();
|
||||
// 第1个参数
|
||||
PageData params1 = new PageData();
|
||||
params1.put("name", "number");// 存入短信模板中的参数名称
|
||||
params1.put("value", number);// 存入上面参数名称所传递的值
|
||||
paramsList.add(params1);
|
||||
|
||||
PageData params2 = new PageData();
|
||||
params2.put("name", "type");// 存入短信模板中的参数名称
|
||||
params2.put("value", "断路作业");// 存入上面参数名称所传递的值
|
||||
paramsList.add(params2);
|
||||
|
||||
PageData params3 = new PageData();
|
||||
params3.put("name", "flow");// 存入短信模板中的参数名称
|
||||
params3.put("value", flow_name);// 存入上面参数名称所传递的值
|
||||
paramsList.add(params3);
|
||||
try {
|
||||
sendMessageUtil.sendMessages(mes, paramsList);
|
||||
} catch (Exception e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
}
|
||||
|
||||
private void sendMessageForFinished(String corpinfo_id,String userId,String template,String number) throws Exception {
|
||||
PageData mes = new PageData();
|
||||
mes.put("RECEIVER_ID", userId);// 收信人userid
|
||||
mes.put("templateCode", template);// 短信模板编码
|
||||
mes.put("CORPINFO_ID", corpinfo_id);// 企业id
|
||||
|
||||
// 参数集合
|
||||
List<PageData> paramsList = new ArrayList<PageData>();
|
||||
// 第1个参数
|
||||
PageData params1 = new PageData();
|
||||
params1.put("name", "number");// 存入短信模板中的参数名称
|
||||
params1.put("value", number);// 存入上面参数名称所传递的值
|
||||
paramsList.add(params1);
|
||||
|
||||
PageData params2 = new PageData();
|
||||
params2.put("name", "type");// 存入短信模板中的参数名称
|
||||
params2.put("value", "断路作业");// 存入上面参数名称所传递的值
|
||||
paramsList.add(params2);
|
||||
|
||||
try {
|
||||
sendMessageUtil.sendMessages(mes, paramsList);
|
||||
} catch (Exception e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
}
|
||||
}
|
|
@ -66,9 +66,10 @@ public class EightWorkServiceImpl implements EightWorkService {
|
|||
if(eightworks != null && eightworks.size() > 0){
|
||||
eightworks.stream().forEach(e -> {
|
||||
staMap.get("total").add(e);
|
||||
if(e.getString("NEXT_STEP_ID").equals("99")){
|
||||
if("99".equals(e.getString("NEXT_STEP_ID"))){
|
||||
staMap.get("finished").add(e);
|
||||
}else if(!e.getString("STATUS").equals("-1") && Integer.parseInt(e.getString("NEXT_STEP_ID")) > 1){
|
||||
// 被打回 也统计 被删除与暂存 不计入 申请中
|
||||
}else if(Integer.parseInt(e.getString("NEXT_STEP_ID")) > 1){
|
||||
staMap.get("flowing").add(e);
|
||||
}
|
||||
|
||||
|
@ -106,6 +107,14 @@ public class EightWorkServiceImpl implements EightWorkService {
|
|||
}).collect(Collectors.toList());
|
||||
return returnList;
|
||||
}
|
||||
public List<PageData> listAllForDiagnosis(PageData pd)throws Exception{
|
||||
return eightworkMapper.listAllForDiagnosis(pd);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<PageData> getEightWorksByType(PageData pageData) {
|
||||
return eightworkMapper.getEightWorksByType(pageData);
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -40,6 +40,8 @@ public class ElectricityServiceImpl implements ElectricityService {
|
|||
private com.zcloud.mapper.datasource.eightWork.EightWorkVideoManagerMapper eightworkvideomanagerMapper;
|
||||
@Autowired
|
||||
private Smb smb;
|
||||
@Autowired
|
||||
private SendMessageUtil sendMessageUtil;
|
||||
|
||||
private final String primary_key = "ELECTRICITY_ID";
|
||||
private final String work_type = "ELECTRICITY";
|
||||
|
@ -121,7 +123,7 @@ public class ElectricityServiceImpl implements ElectricityService {
|
|||
}
|
||||
PageData flow = getStep(work.get("TASK_ID"), work.get("STEP_ID"));
|
||||
work.put("STEP_ID", flow.get("NEXT_STEP_ID"));
|
||||
|
||||
electricityMapper.editVideo(work);
|
||||
|
||||
//保存签名信息
|
||||
PageData sign = new PageData();
|
||||
|
@ -151,7 +153,7 @@ public class ElectricityServiceImpl implements ElectricityService {
|
|||
|
||||
if("99".equals(currentflow.getString("NEXT_STEP_ID"))){
|
||||
eightworkvideomanagerMapper.editStatus(work);
|
||||
|
||||
sendMessageForFinished(work.getString("CORPINFO_ID"),work.getString("CREATOR"),"EIGHTWORK_ACCEPT",work.getString("CHECK_NO"));
|
||||
return;
|
||||
}
|
||||
if (work.get("PREPARERS") != null && !work.get("PREPARERS").equals("")) { //如果是设置安全措施确认人步骤
|
||||
|
@ -165,6 +167,8 @@ public class ElectricityServiceImpl implements ElectricityService {
|
|||
|
||||
work.put("STEP_ID",-1);
|
||||
electricityMapper.editStep(work);
|
||||
sendMessageForFinished(work.getString("CORPINFO_ID"),work.getString("CREATOR"),"EIGHTWORK_ACCEPT",work.getString("CHECK_NO"));
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -290,6 +294,7 @@ public class ElectricityServiceImpl implements ElectricityService {
|
|||
saveLog(work,pd.getString("USER_ID"),"-2");
|
||||
work.put("STEP_ID",-1);
|
||||
electricityMapper.editStep(work);
|
||||
sendMessageForFinished(work.getString("CORPINFO_ID"),work.getString("CREATOR"),"EIGHTWORK_REJECT",work.getString("CHECK_NO"));
|
||||
|
||||
}
|
||||
}
|
||||
|
@ -326,6 +331,8 @@ public class ElectricityServiceImpl implements ElectricityService {
|
|||
signer.put("STEP_ID", flow.get("NEXT_STEP_ID"));
|
||||
signers.add(signer);
|
||||
electricitySignMapper.saveBatch(signers);
|
||||
sendMessageForNext(pd.getString("CORPINFO_ID"),pd.getString(flow.get("NEXT_ACTOR_FIELD")),pd.getString("CHECK_NO"),flow.getString("NEXT_STEP_NAME"));
|
||||
|
||||
}
|
||||
|
||||
private void saveMeasures(PageData pd) {
|
||||
|
@ -374,6 +381,12 @@ public class ElectricityServiceImpl implements ElectricityService {
|
|||
signer.put("SIGN_USER_ID", item);
|
||||
signer.put("STEP_ID", flow.get("NEXT_STEP_ID"));
|
||||
nextSigners.add(signer);
|
||||
|
||||
try {
|
||||
sendMessageForNext(pd.getString("CORPINFO_ID"),item,pd.getString("CHECK_NO"),flow.getString("NEXT_STEP_NAME"));
|
||||
} catch (Exception e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
});
|
||||
|
||||
electricitySignMapper.saveBatch(nextSigners);
|
||||
|
@ -424,5 +437,59 @@ public class ElectricityServiceImpl implements ElectricityService {
|
|||
pd.put("WORK_POSITION", String.join(",",positions));
|
||||
electricityMapper.setPosition(pd);
|
||||
}
|
||||
private void sendMessageForNext(String corpinfo_id,String userId,String number,String flow_name) throws Exception {
|
||||
PageData mes = new PageData();
|
||||
mes.put("RECEIVER_ID", userId);// 收信人userid
|
||||
mes.put("templateCode", "EIGHTWORK_REMINDER");// 短信模板编码
|
||||
mes.put("CORPINFO_ID", corpinfo_id);// 企业id
|
||||
|
||||
// 参数集合
|
||||
List<PageData> paramsList = new ArrayList<PageData>();
|
||||
// 第1个参数
|
||||
PageData params1 = new PageData();
|
||||
params1.put("name", "number");// 存入短信模板中的参数名称
|
||||
params1.put("value", number);// 存入上面参数名称所传递的值
|
||||
paramsList.add(params1);
|
||||
|
||||
PageData params2 = new PageData();
|
||||
params2.put("name", "type");// 存入短信模板中的参数名称
|
||||
params2.put("value", "临时用电作业");// 存入上面参数名称所传递的值
|
||||
paramsList.add(params2);
|
||||
|
||||
PageData params3 = new PageData();
|
||||
params3.put("name", "flow");// 存入短信模板中的参数名称
|
||||
params3.put("value", flow_name);// 存入上面参数名称所传递的值
|
||||
paramsList.add(params3);
|
||||
try {
|
||||
sendMessageUtil.sendMessages(mes, paramsList);
|
||||
} catch (Exception e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
}
|
||||
|
||||
private void sendMessageForFinished(String corpinfo_id,String userId,String template,String number) throws Exception {
|
||||
PageData mes = new PageData();
|
||||
mes.put("RECEIVER_ID", userId);// 收信人userid
|
||||
mes.put("templateCode", template);// 短信模板编码
|
||||
mes.put("CORPINFO_ID", corpinfo_id);// 企业id
|
||||
|
||||
// 参数集合
|
||||
List<PageData> paramsList = new ArrayList<PageData>();
|
||||
// 第1个参数
|
||||
PageData params1 = new PageData();
|
||||
params1.put("name", "number");// 存入短信模板中的参数名称
|
||||
params1.put("value", number);// 存入上面参数名称所传递的值
|
||||
paramsList.add(params1);
|
||||
|
||||
PageData params2 = new PageData();
|
||||
params2.put("name", "type");// 存入短信模板中的参数名称
|
||||
params2.put("value", "临时用电作业");// 存入上面参数名称所传递的值
|
||||
paramsList.add(params2);
|
||||
|
||||
try {
|
||||
sendMessageUtil.sendMessages(mes, paramsList);
|
||||
} catch (Exception e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -39,6 +39,8 @@ public class HighworkServiceImpl implements HighworkService {
|
|||
private com.zcloud.mapper.datasource.eightWork.EightWorkVideoManagerMapper eightworkvideomanagerMapper;
|
||||
@Autowired
|
||||
private Smb smb;
|
||||
@Autowired
|
||||
private SendMessageUtil sendMessageUtil;
|
||||
|
||||
private final String primary_key = "HIGHWORK_ID";
|
||||
private final String work_type = "HIGHWORK";
|
||||
|
@ -115,6 +117,7 @@ public class HighworkServiceImpl implements HighworkService {
|
|||
}
|
||||
PageData flow = getStep(work.get("TASK_ID"), work.get("STEP_ID"));
|
||||
work.put("STEP_ID", flow.get("NEXT_STEP_ID"));
|
||||
highworkMapper.editVideo(work);
|
||||
|
||||
//保存签名信息
|
||||
PageData sign = new PageData();
|
||||
|
@ -141,6 +144,7 @@ public class HighworkServiceImpl implements HighworkService {
|
|||
|
||||
if("99".equals(currentflow.getString("NEXT_STEP_ID"))){
|
||||
eightworkvideomanagerMapper.editStatus(work);
|
||||
sendMessageForFinished(work.getString("CORPINFO_ID"),work.getString("CREATOR"),"EIGHTWORK_ACCEPT",work.getString("CHECK_NO"));
|
||||
|
||||
return;
|
||||
}
|
||||
|
@ -155,6 +159,8 @@ public class HighworkServiceImpl implements HighworkService {
|
|||
|
||||
work.put("STEP_ID",-1);
|
||||
highworkMapper.editStep(work);
|
||||
sendMessageForFinished(work.getString("CORPINFO_ID"),work.getString("CREATOR"),"EIGHTWORK_ACCEPT",work.getString("CHECK_NO"));
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -254,6 +260,8 @@ public class HighworkServiceImpl implements HighworkService {
|
|||
signer.put("STEP_ID", flow.get("NEXT_STEP_ID"));
|
||||
signers.add(signer);
|
||||
highworkSignMapper.saveBatch(signers);
|
||||
sendMessageForNext(pd.getString("CORPINFO_ID"),pd.getString(flow.get("NEXT_ACTOR_FIELD")),pd.getString("CHECK_NO"),flow.getString("NEXT_STEP_NAME"));
|
||||
|
||||
}
|
||||
|
||||
private void saveMeasures(PageData pd) {
|
||||
|
@ -299,6 +307,11 @@ public class HighworkServiceImpl implements HighworkService {
|
|||
signer.put("SIGN_USER_ID", item);
|
||||
signer.put("STEP_ID", flow.get("NEXT_STEP_ID"));
|
||||
nextSigners.add(signer);
|
||||
try {
|
||||
sendMessageForNext(pd.getString("CORPINFO_ID"),item,pd.getString("CHECK_NO"),flow.getString("NEXT_STEP_NAME"));
|
||||
} catch (Exception e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
});
|
||||
|
||||
highworkSignMapper.saveBatch(nextSigners);
|
||||
|
@ -336,5 +349,59 @@ public class HighworkServiceImpl implements HighworkService {
|
|||
pd.put("WORK_POSITION", String.join(",",positions));
|
||||
highworkMapper.setPosition(pd);
|
||||
}
|
||||
private void sendMessageForNext(String corpinfo_id,String userId,String number,String flow_name) throws Exception {
|
||||
PageData mes = new PageData();
|
||||
mes.put("RECEIVER_ID", userId);// 收信人userid
|
||||
mes.put("templateCode", "EIGHTWORK_REMINDER");// 短信模板编码
|
||||
mes.put("CORPINFO_ID", corpinfo_id);// 企业id
|
||||
|
||||
// 参数集合
|
||||
List<PageData> paramsList = new ArrayList<PageData>();
|
||||
// 第1个参数
|
||||
PageData params1 = new PageData();
|
||||
params1.put("name", "number");// 存入短信模板中的参数名称
|
||||
params1.put("value", number);// 存入上面参数名称所传递的值
|
||||
paramsList.add(params1);
|
||||
|
||||
PageData params2 = new PageData();
|
||||
params2.put("name", "type");// 存入短信模板中的参数名称
|
||||
params2.put("value", "高处作业");// 存入上面参数名称所传递的值
|
||||
paramsList.add(params2);
|
||||
|
||||
PageData params3 = new PageData();
|
||||
params3.put("name", "flow");// 存入短信模板中的参数名称
|
||||
params3.put("value", flow_name);// 存入上面参数名称所传递的值
|
||||
paramsList.add(params3);
|
||||
try {
|
||||
sendMessageUtil.sendMessages(mes, paramsList);
|
||||
} catch (Exception e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
}
|
||||
|
||||
private void sendMessageForFinished(String corpinfo_id,String userId,String template,String number) throws Exception {
|
||||
PageData mes = new PageData();
|
||||
mes.put("RECEIVER_ID", userId);// 收信人userid
|
||||
mes.put("templateCode", template);// 短信模板编码
|
||||
mes.put("CORPINFO_ID", corpinfo_id);// 企业id
|
||||
|
||||
// 参数集合
|
||||
List<PageData> paramsList = new ArrayList<PageData>();
|
||||
// 第1个参数
|
||||
PageData params1 = new PageData();
|
||||
params1.put("name", "number");// 存入短信模板中的参数名称
|
||||
params1.put("value", number);// 存入上面参数名称所传递的值
|
||||
paramsList.add(params1);
|
||||
|
||||
PageData params2 = new PageData();
|
||||
params2.put("name", "type");// 存入短信模板中的参数名称
|
||||
params2.put("value", "高处作业");// 存入上面参数名称所传递的值
|
||||
paramsList.add(params2);
|
||||
|
||||
try {
|
||||
sendMessageUtil.sendMessages(mes, paramsList);
|
||||
} catch (Exception e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -0,0 +1,407 @@
|
|||
package com.zcloud.service.eightwork.impl;
|
||||
|
||||
import com.alibaba.fastjson.JSON;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.zcloud.entity.Page;
|
||||
import com.zcloud.entity.PageData;
|
||||
import com.zcloud.mapper.datasource.eightwork.*;
|
||||
import com.zcloud.service.eightwork.HoistingService;
|
||||
import com.zcloud.util.*;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
|
||||
import java.text.DecimalFormat;
|
||||
import java.util.*;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* @author fangjiakai
|
||||
* @date 2024/01/17 11:30
|
||||
*/
|
||||
@Service
|
||||
@Transactional //开启事物
|
||||
public class HoistingServiceImpl implements HoistingService {
|
||||
|
||||
@Autowired
|
||||
private HoistingMapper hoistingMapper;
|
||||
@Autowired
|
||||
private EightWorkTaskFlowMapper eightWorkTaskFlowMapper;
|
||||
@Autowired
|
||||
private EightWorkFlowLogMapper eightWorkFlowLogMapper;
|
||||
@Autowired
|
||||
private HoistingSignMapper hoistingSignMapper;
|
||||
@Autowired
|
||||
private HoistingToMeasuresMapper hoistingToMeasuresMapper;
|
||||
@Autowired
|
||||
private com.zcloud.mapper.datasource.eightWork.EightWorkVideoManagerMapper eightworkvideomanagerMapper;
|
||||
@Autowired
|
||||
private Smb smb;
|
||||
@Autowired
|
||||
private SendMessageUtil sendMessageUtil;
|
||||
|
||||
private final String primary_key = "HOISTING_ID";
|
||||
private final String work_type = "HOISTING";
|
||||
@Override
|
||||
@Transactional
|
||||
public void save(PageData pd) throws Exception {
|
||||
PageData pd2 = new PageData();
|
||||
Calendar calendar = Calendar.getInstance();
|
||||
DecimalFormat dft=new DecimalFormat("00");
|
||||
int year = calendar.get(Calendar.YEAR);
|
||||
String month = dft.format(calendar.get(Calendar.MONTH) + 1);
|
||||
String day = dft.format(calendar.get(Calendar.DAY_OF_MONTH));
|
||||
pd2.put("CREATDATE",year + "-" + month + "-" + day);
|
||||
pd2.put("CORPINFO_ID",pd.get("CORPINFO_ID"));
|
||||
pd2 = hoistingMapper.getCode(pd2); //根据ID读取
|
||||
String code = "DZ" + year + month + day + dft.format((Integer.parseInt(pd2.get("code").toString()) + 1));
|
||||
pd.put("CHECK_NO", code);
|
||||
pd.put(primary_key, UuidUtil.get32UUID()); //主键
|
||||
pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间
|
||||
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
|
||||
pd.put("ISDELETE", "0"); //是否删除 1-是 0-否
|
||||
hoistingMapper.save(pd);
|
||||
|
||||
if (pd.get("APPLY_STATUS").equals("1")) {
|
||||
PageData flow = getStep(pd.get("TASK_ID"),"1");
|
||||
saveLog(pd,pd.getString("CREATOR"),"1");
|
||||
saveNextSigner(pd,flow);
|
||||
setPosition(pd);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional
|
||||
public void edit(PageData pd) throws Exception {
|
||||
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
|
||||
hoistingMapper.edit(pd);
|
||||
|
||||
if (pd.get("APPLY_STATUS").equals("1")) {
|
||||
pd.put("STEP_ID", 1);
|
||||
hoistingMapper.editStep(pd);
|
||||
PageData flow = getStep(pd.get("TASK_ID"),"1");
|
||||
saveLog(pd,pd.getString("CREATOR"),"1");
|
||||
saveNextSigner(pd,flow);
|
||||
setPosition(pd);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void delete(PageData pd) throws Exception {
|
||||
hoistingMapper.delete(pd);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<PageData> list(Page page) throws Exception {
|
||||
return hoistingMapper.datalistPage(page);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* 下一步
|
||||
*/
|
||||
@Override
|
||||
@Transactional
|
||||
public void nextStep(PageData pd, MultipartFile[] files) throws Exception {
|
||||
PageData work = this.findById(pd);
|
||||
work.putAll(pd);
|
||||
List<String> filePaths = new ArrayList<>();
|
||||
for (int i = 0; i < files.length; i++) {
|
||||
//保存签名文件
|
||||
String ffile = DateUtil.getDays();
|
||||
String fileName = UuidUtil.get32UUID() + files[i].getOriginalFilename().substring(files[i].getOriginalFilename().lastIndexOf("."));
|
||||
smb.sshSftp(files[i], fileName, Const.FILEPATHFILE + work.getString("CORPINFO_ID") + "/" + ffile);
|
||||
filePaths.add(Const.FILEPATHFILE + work.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
|
||||
}
|
||||
PageData flow = getStep(work.get("TASK_ID"), work.get("STEP_ID"));
|
||||
work.put("STEP_ID", flow.get("NEXT_STEP_ID"));
|
||||
hoistingMapper.editVideo(work);
|
||||
|
||||
//保存签名信息
|
||||
PageData sign = new PageData();
|
||||
sign.put(primary_key, work.get(primary_key));
|
||||
sign.put("STEP_ID", work.get("STEP_ID"));
|
||||
sign.put("SIGN_USER_ID", work.get("USER_ID"));
|
||||
sign.put("SIGN_TIME", work.getString("SIGNTIME"));
|
||||
sign.put("SIGN_PATH", String.join(",",filePaths));
|
||||
sign.put("DESCR", work.get("DESCR"));
|
||||
|
||||
hoistingSignMapper.edit(sign);
|
||||
|
||||
if (work.get("MEASURES") != null && !work.get("MEASURES").equals("")) { //安全措施确认步骤
|
||||
saveMeasures(work);
|
||||
}
|
||||
|
||||
List<PageData> unsignedList = hoistingSignMapper.checkUnsigned(sign);//当前步骤未签名人列表
|
||||
if((unsignedList == null || unsignedList.size() == 0) && pd.getString("APPLY_STATUS").equals("1")){//如果没有未签人 则跳转下一步
|
||||
hoistingMapper.editStep(work);
|
||||
PageData currentflow = getStep(work.get("TASK_ID"), work.get("STEP_ID"));
|
||||
|
||||
//保存日志
|
||||
saveLog(work,work.getString("USER_ID"),"1");
|
||||
|
||||
if("99".equals(currentflow.getString("NEXT_STEP_ID"))){
|
||||
eightworkvideomanagerMapper.editStatus(work);
|
||||
sendMessageForFinished(work.getString("CORPINFO_ID"),work.getString("CREATOR"),"EIGHTWORK_REJECT",work.getString("CHECK_NO"));
|
||||
|
||||
return;
|
||||
}
|
||||
if (work.get("PREPARERS") != null && !work.get("PREPARERS").equals("")) { //如果是设置安全措施确认人步骤
|
||||
savePreparers(work,currentflow);
|
||||
}
|
||||
saveNextSigner(work,currentflow);
|
||||
}else if(pd.getString("APPLY_STATUS").equals("-1")){
|
||||
//保存日志
|
||||
saveLog(work,work.getString("USER_ID"),"-1");
|
||||
eightworkvideomanagerMapper.editStatus(work);
|
||||
|
||||
work.put("STEP_ID",-1);
|
||||
hoistingMapper.editStep(work);
|
||||
sendMessageForFinished(work.getString("CORPINFO_ID"),work.getString("CREATOR"),"EIGHTWORK_REJECT",work.getString("CHECK_NO"));
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public PageData findById(PageData pd) throws Exception {
|
||||
PageData pageData = hoistingMapper.findById(pd);
|
||||
return pageData;
|
||||
}
|
||||
|
||||
@Override
|
||||
public PageData listSignFinished(PageData pd) throws Exception {
|
||||
Map<String,List<PageData>> rmap = new HashMap<>();
|
||||
List<PageData> varList = hoistingSignMapper.listAll(pd);
|
||||
if (varList != null && !varList.isEmpty()) {
|
||||
varList.stream().forEach(item -> {
|
||||
PageData sign = new PageData();
|
||||
sign.put("SIGN_PATH", item.getString("SIGN_PATH").split(","));
|
||||
sign.put("SIGN_TIME", item.getString("SIGN_TIME").split(","));
|
||||
|
||||
sign.put("DESCR", item.getString("DESCR") != null ? item.getString("DESCR") : "无");
|
||||
if(rmap.containsKey(item.getString("CODE"))){
|
||||
rmap.get(item.getString("CODE")).add(sign);
|
||||
}else{
|
||||
List<PageData> signs = new ArrayList<>();
|
||||
signs.add(sign);
|
||||
rmap.put(item.getString("CODE"),signs);
|
||||
}
|
||||
});
|
||||
}
|
||||
PageData rpd = new PageData();
|
||||
if (rmap != null && !rmap.isEmpty()) {
|
||||
rpd.putAll(rmap);
|
||||
}
|
||||
return rpd;
|
||||
}
|
||||
|
||||
@Override
|
||||
public PageData checkWorkCount(PageData pd) {
|
||||
PageData rpd = new PageData();
|
||||
List<PageData> varList = hoistingMapper.checkWorkCount(pd);
|
||||
|
||||
if (varList != null && !varList.isEmpty()) {
|
||||
Map<String, String> newMap = varList.stream()
|
||||
.collect(Collectors.toMap(map -> map.getString("CODE"), map -> map.getString("COUNT")));
|
||||
|
||||
rpd.putAll(newMap);
|
||||
}
|
||||
return rpd;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<PageData> listAllMeasures() throws Exception {
|
||||
return hoistingMapper.listAllMeasures();
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<PageData> listAllMeasuresForSign(PageData pd) throws Exception {
|
||||
return hoistingToMeasuresMapper.listAllMeasuresForSign(pd);
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<PageData> listSignFinishMeasures(PageData pd) throws Exception {
|
||||
return hoistingToMeasuresMapper.listSignFinishMeasures(pd);
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public List<PageData> getFlowList(PageData pd) throws Exception {
|
||||
pd=findById(pd);
|
||||
return hoistingMapper.getFlowList(pd);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ReturnMap getMapList() throws Exception {
|
||||
ReturnMap returnMap = new ReturnMap();
|
||||
PageData pd = new PageData();
|
||||
pd.put("CORPINFO_ID",Jurisdiction.getCORPINFO_ID());
|
||||
returnMap.put("varList",hoistingMapper.getMapList(pd));
|
||||
return returnMap;
|
||||
}
|
||||
private void saveNextSigner(PageData pd,PageData flow) throws Exception {
|
||||
|
||||
pd.put("STEP_ID",flow.get("NEXT_STEP_ID"));
|
||||
|
||||
if(pd.get(flow.get("NEXT_ACTOR_FIELD")) == null || pd.get(flow.get("NEXT_ACTOR_FIELD")).equals("")){
|
||||
return;
|
||||
}
|
||||
//提前保存下一步签字人
|
||||
List<PageData> signers = new ArrayList<>();
|
||||
PageData signer = new PageData();
|
||||
signer.put("HOISTING_SIGN_ID", UuidUtil.get32UUID()); // 主键
|
||||
signer.put(primary_key, pd.get(primary_key));
|
||||
signer.put("CORPINFO_ID", pd.get("CORPINFO_ID"));
|
||||
signer.put("SIGN_USER_ID", pd.get(flow.get("NEXT_ACTOR_FIELD")));
|
||||
signer.put("STEP_ID", flow.get("NEXT_STEP_ID"));
|
||||
signers.add(signer);
|
||||
hoistingSignMapper.saveBatch(signers);
|
||||
sendMessageForNext(pd.getString("CORPINFO_ID"),pd.getString(flow.get("NEXT_ACTOR_FIELD")),pd.getString("CHECK_NO"),flow.getString("NEXT_STEP_NAME"));
|
||||
|
||||
}
|
||||
|
||||
private void saveMeasures(PageData pd) {
|
||||
List<JSONObject> list = (List<JSONObject>) JSON.parse(pd.get("MEASURES").toString());
|
||||
for (JSONObject json : list) {
|
||||
PageData measure = new PageData();
|
||||
measure.put("HOISTINGTOMEASURES_ID",json.get("HOISTINGTOMEASURES_ID"));
|
||||
measure.put("STATUS", json.get("STATUS"));
|
||||
measure.put("SIGN_PATH", json.get("SIGN_PATH"));
|
||||
measure.put("SIGN_TIME", json.get("SIGN_TIME"));
|
||||
measure.put("ANSWER1", json.get("ANSWER1"));
|
||||
measure.put("IMG_PATH", json.get("IMG_PATH"));
|
||||
hoistingToMeasuresMapper.edit(measure);
|
||||
}
|
||||
}
|
||||
|
||||
private void savePreparers(PageData pd,PageData flow) {
|
||||
List<PageData> signers = new ArrayList<>();
|
||||
List<JSONObject> list = (List<JSONObject>) JSON.parse(pd.get("PREPARERS").toString());
|
||||
for (JSONObject json : list) {
|
||||
PageData preparer = new PageData();
|
||||
preparer.put("HOISTINGTOMEASURES_ID", UuidUtil.get32UUID()); // 主键
|
||||
preparer.put("HOISTING_ID", pd.get("HOISTING_ID"));
|
||||
preparer.put("BUS_HOISTING_MEASURES_ID", json.get("BUS_HOISTING_MEASURES_ID"));
|
||||
preparer.put("CONFIRM_ID", json.get("USER_ID"));
|
||||
signers.add(preparer);
|
||||
}
|
||||
if(signers.size() > 0){
|
||||
hoistingToMeasuresMapper.saveBatch(signers);
|
||||
|
||||
//获取所有需要签名人
|
||||
List<String> fieldList = signers.stream()
|
||||
.map(map -> map.getString("CONFIRM_ID"))
|
||||
.collect(Collectors.toList());
|
||||
Set<String > fieldSet = new HashSet<>(fieldList); //去重
|
||||
|
||||
List<String> uniqueList = new ArrayList<>(fieldSet);
|
||||
List<PageData> nextSigners = new ArrayList<>();
|
||||
uniqueList.forEach(item -> { // 保存下一步需要签名的人
|
||||
PageData signer = new PageData();
|
||||
signer.put("HOISTING_SIGN_ID", UuidUtil.get32UUID()); // 主键
|
||||
signer.put(primary_key, pd.get(primary_key));
|
||||
signer.put("CORPINFO_ID", pd.get("CORPINFO_ID"));
|
||||
signer.put("SIGN_USER_ID", item);
|
||||
signer.put("STEP_ID", flow.get("NEXT_STEP_ID"));
|
||||
nextSigners.add(signer);
|
||||
try {
|
||||
sendMessageForNext(pd.getString("CORPINFO_ID"),item,pd.getString("CHECK_NO"),flow.getString("NEXT_STEP_NAME"));
|
||||
} catch (Exception e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
});
|
||||
|
||||
hoistingSignMapper.saveBatch(nextSigners);
|
||||
}
|
||||
}
|
||||
|
||||
private PageData getStep(Object TASK_ID, Object STEP_ID) throws Exception {
|
||||
PageData flow = new PageData();
|
||||
flow.put("TASK_ID", TASK_ID);
|
||||
flow.put("STEP_ID", STEP_ID);
|
||||
flow = eightWorkTaskFlowMapper.getStep(flow);
|
||||
return flow;
|
||||
}
|
||||
|
||||
private void saveLog(PageData pd,String act_user,String status) throws Exception {
|
||||
PageData log = new PageData();
|
||||
log.put("LOG_ID", UuidUtil.get32UUID());
|
||||
log.put("WORK_ID", pd.get(primary_key));
|
||||
log.put("TASK_ID", pd.get("TASK_ID"));
|
||||
log.put("STEP_ID", pd.get("STEP_ID"));
|
||||
log.put("CORPINFO_ID", pd.get("CORPINFO_ID"));
|
||||
log.put("CHECK_NO", pd.get("CHECK_NO"));
|
||||
log.put("ACT_USER", act_user);
|
||||
log.put("ACT_TIME", DateUtil.date2Str(new Date()));
|
||||
log.put("STATUS", status);
|
||||
log.put("WORK_TYPE",work_type);
|
||||
eightWorkFlowLogMapper.save(log);
|
||||
}
|
||||
|
||||
|
||||
private void setPosition(PageData pd) throws Exception {
|
||||
JSONObject body = PLSUtil.getRyRegionInfo(pd.getString("CORPINFO_ID"),Integer.parseInt(pd.getString("PLS_ID")));
|
||||
List pointList = (List)((Map) body.get("data")).get("list");
|
||||
List<String> positions = PLSUtil.getRandomPointInPolygon(pointList);
|
||||
pd.put("WORK_POSITION", String.join(",",positions));
|
||||
hoistingMapper.setPosition(pd);
|
||||
}
|
||||
private void sendMessageForNext(String corpinfo_id,String userId,String number,String flow_name) throws Exception {
|
||||
PageData mes = new PageData();
|
||||
mes.put("RECEIVER_ID", userId);// 收信人userid
|
||||
mes.put("templateCode", "EIGHTWORK_REMINDER");// 短信模板编码
|
||||
mes.put("CORPINFO_ID", corpinfo_id);// 企业id
|
||||
|
||||
// 参数集合
|
||||
List<PageData> paramsList = new ArrayList<PageData>();
|
||||
// 第1个参数
|
||||
PageData params1 = new PageData();
|
||||
params1.put("name", "number");// 存入短信模板中的参数名称
|
||||
params1.put("value", number);// 存入上面参数名称所传递的值
|
||||
paramsList.add(params1);
|
||||
|
||||
PageData params2 = new PageData();
|
||||
params2.put("name", "type");// 存入短信模板中的参数名称
|
||||
params2.put("value", "动火作业");// 存入上面参数名称所传递的值
|
||||
paramsList.add(params2);
|
||||
|
||||
PageData params3 = new PageData();
|
||||
params3.put("name", "flow");// 存入短信模板中的参数名称
|
||||
params3.put("value", flow_name);// 存入上面参数名称所传递的值
|
||||
paramsList.add(params3);
|
||||
try {
|
||||
sendMessageUtil.sendMessages(mes, paramsList);
|
||||
} catch (Exception e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
}
|
||||
|
||||
private void sendMessageForFinished(String corpinfo_id,String userId,String template,String number) throws Exception {
|
||||
PageData mes = new PageData();
|
||||
mes.put("RECEIVER_ID", userId);// 收信人userid
|
||||
mes.put("templateCode", template);// 短信模板编码
|
||||
mes.put("CORPINFO_ID", corpinfo_id);// 企业id
|
||||
|
||||
// 参数集合
|
||||
List<PageData> paramsList = new ArrayList<PageData>();
|
||||
// 第1个参数
|
||||
PageData params1 = new PageData();
|
||||
params1.put("name", "number");// 存入短信模板中的参数名称
|
||||
params1.put("value", number);// 存入上面参数名称所传递的值
|
||||
paramsList.add(params1);
|
||||
|
||||
PageData params2 = new PageData();
|
||||
params2.put("name", "type");// 存入短信模板中的参数名称
|
||||
params2.put("value", "动火作业");// 存入上面参数名称所传递的值
|
||||
paramsList.add(params2);
|
||||
|
||||
try {
|
||||
sendMessageUtil.sendMessages(mes, paramsList);
|
||||
} catch (Exception e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
}
|
||||
}
|
|
@ -155,6 +155,7 @@ public class HotworkServiceImpl implements HotworkService {
|
|||
|
||||
if("99".equals(currentflow.getString("NEXT_STEP_ID"))){
|
||||
eightworkvideomanagerMapper.editStatus(work);
|
||||
sendMessageForFinished(work.getString("CORPINFO_ID"),work.getString("CREATOR"),"EIGHTWORK_ACCEPT",work.getString("CHECK_NO"));
|
||||
return;
|
||||
}
|
||||
if (work.get("PREPARERS") != null && !work.get("PREPARERS").equals("")) { //如果是设置安全措施确认人步骤
|
||||
|
@ -292,7 +293,7 @@ public class HotworkServiceImpl implements HotworkService {
|
|||
saveLog(work,pd.getString("USER_ID"),"-2");
|
||||
work.put("STEP_ID",-1);
|
||||
hotworkMapper.editStep(work);
|
||||
|
||||
sendMessageForFinished(work.getString("CORPINFO_ID"),work.getString("CREATOR"),"EIGHTWORK_REJECT",work.getString("CHECK_NO"));
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -315,10 +316,6 @@ public class HotworkServiceImpl implements HotworkService {
|
|||
pd.put("STEP_ID",flow.get("NEXT_STEP_ID"));
|
||||
|
||||
if(pd.get(flow.get("NEXT_ACTOR_FIELD")) == null || pd.get(flow.get("NEXT_ACTOR_FIELD")).equals("")){
|
||||
if(flow.get("NEXT_STEP_ID").equals("99")){
|
||||
sendMessageForFinished(pd.getString("CORPINFO_ID"),pd.getString("CREATOR"),"EIGHTWORK_ACCEPT",pd.getString("CHECK_NO"));
|
||||
|
||||
}
|
||||
return;
|
||||
}
|
||||
//提前保存下一步签字人
|
||||
|
|
|
@ -0,0 +1,79 @@
|
|||
package com.zcloud.service.freighttrailer;
|
||||
|
||||
import com.zcloud.entity.Page;
|
||||
import com.zcloud.entity.PageData;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 企业信息管理-货运挂车
|
||||
*/
|
||||
public interface FreightTrailerService {
|
||||
|
||||
/**
|
||||
* 新增
|
||||
*
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public void save(PageData pd) throws Exception;
|
||||
|
||||
/**
|
||||
* 删除
|
||||
*
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public void delete(PageData pd) throws Exception;
|
||||
|
||||
/**
|
||||
* 修改
|
||||
*
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public void edit(PageData pd) throws Exception;
|
||||
|
||||
/**
|
||||
* 列表
|
||||
*
|
||||
* @param page
|
||||
* @throws Exception
|
||||
*/
|
||||
public List<PageData> list(Page page) throws Exception;
|
||||
|
||||
|
||||
/**
|
||||
* 通过id获取数据
|
||||
*
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public PageData findById(PageData pd) throws Exception;
|
||||
|
||||
/**
|
||||
* 列表
|
||||
*
|
||||
* @param
|
||||
* @throws Exception
|
||||
*/
|
||||
public List<PageData> corpList(String corpId) throws Exception;
|
||||
|
||||
/**
|
||||
* 列表
|
||||
*
|
||||
* @param
|
||||
* @throws Exception
|
||||
*/
|
||||
public List<PageData> trailerList(String corpId) throws Exception;
|
||||
|
||||
/**
|
||||
* 列表
|
||||
*
|
||||
* @param
|
||||
* @throws Exception
|
||||
*/
|
||||
public List<PageData> vehicleList(PageData pd) throws Exception;
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,107 @@
|
|||
package com.zcloud.service.freighttrailer.impl;
|
||||
|
||||
import com.zcloud.entity.Page;
|
||||
import com.zcloud.entity.PageData;
|
||||
import com.zcloud.mapper.datasource.freighttrailer.FreightTrailerMapper;
|
||||
import com.zcloud.service.freighttrailer.FreightTrailerService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 企业信息管理-货运挂车
|
||||
*/
|
||||
@Service
|
||||
@Transactional
|
||||
public class FreightTrailerServiceImpl implements FreightTrailerService {
|
||||
|
||||
@Autowired
|
||||
private FreightTrailerMapper freightTrailerMapper;
|
||||
|
||||
/**
|
||||
* 新增
|
||||
*
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public void save(PageData pd) throws Exception {
|
||||
freightTrailerMapper.save(pd);
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除
|
||||
*e
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public void delete(PageData pd) throws Exception {
|
||||
freightTrailerMapper.delete(pd);
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改
|
||||
*
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public void edit(PageData pd) throws Exception {
|
||||
freightTrailerMapper.edit(pd);
|
||||
}
|
||||
|
||||
/**
|
||||
* 列表
|
||||
*
|
||||
* @param page
|
||||
* @throws Exception
|
||||
*/
|
||||
public List<PageData> list(Page page) throws Exception {
|
||||
return freightTrailerMapper.datalistPage(page);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 通过id获取数据
|
||||
*
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public PageData findById(PageData pd) throws Exception {
|
||||
return freightTrailerMapper.findById(pd);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 列表
|
||||
*
|
||||
* @param
|
||||
* @throws Exception
|
||||
*/
|
||||
public List<PageData> corpList(String corpId) throws Exception {
|
||||
return freightTrailerMapper.corpList(corpId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 列表
|
||||
*
|
||||
* @param
|
||||
* @throws Exception
|
||||
*/
|
||||
public List<PageData> trailerList(String corpId) throws Exception {
|
||||
return freightTrailerMapper.trailerList(corpId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 列表
|
||||
*
|
||||
* @param
|
||||
* @throws Exception
|
||||
*/
|
||||
public List<PageData> vehicleList(PageData pd) throws Exception {
|
||||
return freightTrailerMapper.vehicleList(pd);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,64 @@
|
|||
package com.zcloud.service.inspectAnnually;
|
||||
|
||||
import com.zcloud.entity.Page;
|
||||
import com.zcloud.entity.PageData;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 企业信息管理-货运挂车
|
||||
*/
|
||||
public interface InspectAnnuallyService {
|
||||
|
||||
/**
|
||||
* 新增
|
||||
*
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public void save(PageData pd) throws Exception;
|
||||
|
||||
/**
|
||||
* 删除
|
||||
*
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public void delete(PageData pd) throws Exception;
|
||||
|
||||
/**
|
||||
* 修改
|
||||
*
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public void edit(PageData pd) throws Exception;
|
||||
|
||||
/**
|
||||
* 修改
|
||||
*
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public void edit2(PageData pd) throws Exception;
|
||||
|
||||
/**
|
||||
* 列表
|
||||
*
|
||||
* @param page
|
||||
* @throws Exception
|
||||
*/
|
||||
public List<PageData> list(Page page) throws Exception;
|
||||
|
||||
|
||||
/**
|
||||
* 通过id获取数据
|
||||
*
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public PageData findById(PageData pd) throws Exception;
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,88 @@
|
|||
package com.zcloud.service.inspectAnnually.impl;
|
||||
|
||||
import com.zcloud.entity.Page;
|
||||
import com.zcloud.entity.PageData;
|
||||
import com.zcloud.mapper.datasource.inspectAnnually.InspectAnnuallyMapper;
|
||||
import com.zcloud.service.inspectAnnually.InspectAnnuallyService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 企业信息管理-货运挂车
|
||||
*/
|
||||
@Service
|
||||
@Transactional
|
||||
public class InspectAnnuallyServiceImpl implements InspectAnnuallyService {
|
||||
|
||||
@Autowired
|
||||
private InspectAnnuallyMapper inspectAnnuallyMapper;
|
||||
|
||||
/**
|
||||
* 新增
|
||||
*
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public void save(PageData pd) throws Exception {
|
||||
inspectAnnuallyMapper.save(pd);
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除
|
||||
*
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public void delete(PageData pd) throws Exception {
|
||||
inspectAnnuallyMapper.delete(pd);
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改
|
||||
*
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public void edit(PageData pd) throws Exception {
|
||||
inspectAnnuallyMapper.edit(pd);
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改
|
||||
*
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public void edit2(PageData pd) throws Exception {
|
||||
inspectAnnuallyMapper.edit2(pd);
|
||||
}
|
||||
|
||||
/**
|
||||
* 列表
|
||||
*
|
||||
* @param page
|
||||
* @throws Exception
|
||||
*/
|
||||
public List<PageData> list(Page page) throws Exception {
|
||||
return inspectAnnuallyMapper.datalistPage(page);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 通过id获取数据
|
||||
*
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public PageData findById(PageData pd) throws Exception {
|
||||
return inspectAnnuallyMapper.findById(pd);
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -409,7 +409,7 @@ public class SafetyEnvironmentalServiceImpl implements SafetyEnvironmentalServic
|
|||
hidden.put("HIDDENTYPE2", lists.get(1)); //隐患类型2
|
||||
hidden.put("HIDDENTYPE3", lists.get(2)); //隐患类型3
|
||||
}
|
||||
hidden.put("HIDDENTYPE_NAME", json.getString("HIDDENTYPE_NAME"));//隐患类型名称
|
||||
hidden.put("HIDDENTYPE_NAME", StringUtils.isNotBlank(json.getString("HIDDENTYPENAME")) ? json.getString("HIDDENTYPENAME") : json.getString("HIDDENTYPE_NAME"));//隐患类型名称
|
||||
hidden.put("LONGITUDE", json.getString("LONGITUDE")); //隐患位置经度
|
||||
hidden.put("LATITUDE", json.getString("LATITUDE")); //隐患位置纬度
|
||||
hidden.put("DISCOVERYTIME", json.getString("DISCOVERYTIME")); //隐患发现时间
|
||||
|
|
|
@ -32,4 +32,8 @@ public interface OperatingVehiclesService {
|
|||
public PageData findById(PageData pd)throws Exception;
|
||||
|
||||
public List<PageData> list(Page page);
|
||||
|
||||
List<PageData> operationVehicleList(String corpId);
|
||||
|
||||
|
||||
}
|
||||
|
|
|
@ -41,4 +41,9 @@ public class OperatingVehiclesServiceImpl implements OperatingVehiclesService {
|
|||
public List<PageData> list(Page page) {
|
||||
return operatingVehiclesMapper.datalistPage(page);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<PageData> operationVehicleList(String corpId) {
|
||||
return operatingVehiclesMapper.operationVehicleList(corpId);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -199,4 +199,6 @@ public interface DictionariesService {
|
|||
List<Dictionaries> listgetAssignedVehicleModel(String parentId);
|
||||
|
||||
List<Dictionaries> listgetAssignedVehicle(String parentId);
|
||||
|
||||
List<Dictionaries> listgetVehicleType(String parentId);
|
||||
}
|
||||
|
|
|
@ -496,4 +496,9 @@ public class DictionariesServiceImpl implements DictionariesService {
|
|||
public List<Dictionaries> listgetAssignedVehicle(String parentId) {
|
||||
return dictionariesMapper.listgetAssignedVehicle(parentId);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<Dictionaries> listgetVehicleType(String parentId) {
|
||||
return dictionariesMapper.listgetVehicleType(parentId);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -0,0 +1,37 @@
|
|||
package com.zcloud.service.taxationManage;
|
||||
|
||||
import com.zcloud.entity.Page;
|
||||
import com.zcloud.entity.PageData;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public interface TaxationManageService {
|
||||
|
||||
/**新增
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public void save(PageData pd)throws Exception;
|
||||
|
||||
/**删除
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public void delete(PageData pd)throws Exception;
|
||||
|
||||
/**修改
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public void edit(PageData pd)throws Exception;
|
||||
|
||||
/**通过id获取数据
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public PageData findById(PageData pd)throws Exception;
|
||||
|
||||
public List<PageData> list(Page page);
|
||||
|
||||
public List<PageData> taxationList(String corpId) throws Exception;
|
||||
}
|
|
@ -0,0 +1,51 @@
|
|||
package com.zcloud.service.taxationManage.impl;
|
||||
|
||||
import com.zcloud.entity.Page;
|
||||
import com.zcloud.entity.PageData;
|
||||
import com.zcloud.mapper.datasource.operatingvehicles.OperatingVehiclesMapper;
|
||||
import com.zcloud.mapper.datasource.taxationManage.TaxationManageMapper;
|
||||
import com.zcloud.service.operatingvehicles.OperatingVehiclesService;
|
||||
import com.zcloud.service.taxationManage.TaxationManageService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Service
|
||||
@Transactional //开启事物
|
||||
public class TaxationManageServiceImpl implements TaxationManageService {
|
||||
|
||||
@Autowired
|
||||
private TaxationManageMapper taxationManageMapper;
|
||||
|
||||
@Override
|
||||
public void save(PageData pd) throws Exception {
|
||||
taxationManageMapper.save(pd);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void delete(PageData pd) throws Exception {
|
||||
taxationManageMapper.delete(pd);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void edit(PageData pd) throws Exception {
|
||||
taxationManageMapper.edit(pd);
|
||||
}
|
||||
|
||||
@Override
|
||||
public PageData findById(PageData pd) throws Exception {
|
||||
return taxationManageMapper.findById(pd);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<PageData> list(Page page) {
|
||||
return taxationManageMapper.datalistPage(page);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<PageData> taxationList(String corpId) throws Exception {
|
||||
return taxationManageMapper.taxationList(corpId);
|
||||
}
|
||||
}
|
|
@ -27,19 +27,19 @@ public class Const {
|
|||
public static final String SYSNAME = "sysName"; //系统名称
|
||||
public static final String SHOWCOUNT = "showCount"; //每页条数
|
||||
|
||||
public static final String FILEPATHFILE = "/uploadFiles/file/"; //文件上传路径
|
||||
public static final String BIFILEPATHFILE = "/uploadFiles/Bfile/"; //文件上传路径
|
||||
public static final String FILEPATHIMG = "/uploadFiles/imgs/"; //图片上传路径
|
||||
public static final String FILEPATHIMGSPECIAL = "/uploadFiles/imgs/special/"; //图片上传路径(特种装备)
|
||||
public static final String FILEPATHDZJM = "/uploadFiles/dzjm/"; //图片上传路径
|
||||
public static final String FILEPATHYHTP = "/uploadFiles/yhtp/"; //图片上传路径
|
||||
public static final String FILEPATHFXSST = "/uploadFiles/fxsst/"; //图片上传路径 风险四色图
|
||||
public static final String FILEPATHPHOTO = "/uploadFiles/photo/"; //图片上传路径 风险四色图
|
||||
public static final String FILEPATH_USER_SIGN = "/uploadFiles/userSign/"; //图片上传路径 用户签字信息
|
||||
public static final String FILEPATHFILE = "/TrafficFile/uploadFiles/file/"; //文件上传路径
|
||||
public static final String BIFILEPATHFILE = "/TrafficFile/uploadFiles/Bfile/"; //文件上传路径
|
||||
public static final String FILEPATHIMG = "/TrafficFile/uploadFiles/imgs/"; //图片上传路径
|
||||
public static final String FILEPATHIMGSPECIAL = "/TrafficFile/uploadFiles/imgs/special/"; //图片上传路径(特种装备)
|
||||
public static final String FILEPATHDZJM = "/TrafficFile/uploadFiles/dzjm/"; //图片上传路径
|
||||
public static final String FILEPATHYHTP = "/TrafficFile/uploadFiles/yhtp/"; //图片上传路径
|
||||
public static final String FILEPATHFXSST = "/TrafficFile/uploadFiles/fxsst/"; //图片上传路径 风险四色图
|
||||
public static final String FILEPATHPHOTO = "/TrafficFile/uploadFiles/photo/"; //图片上传路径 风险四色图
|
||||
public static final String FILEPATH_USER_SIGN = "/TrafficFile/uploadFiles/userSign/"; //图片上传路径 用户签字信息
|
||||
|
||||
public static final String FILEPATHFXGFGL = "/uploadFiles/xgfgl/"; //上传路径 相关方管理
|
||||
public static final String FILEPATHFXGFGL = "/TrafficFile/uploadFiles/xgfgl/"; //上传路径 相关方管理
|
||||
|
||||
public static final String FILEACTIVITI = "/uploadFiles/activitiFile/"; //工作流生成XML和PNG目录
|
||||
public static final String FILEACTIVITI = "/TrafficFile/uploadFiles/activitiFile/"; //工作流生成XML和PNG目录
|
||||
|
||||
public static final String DEPARTMENT_IDS = "DEPARTMENT_IDS"; //当前用户拥有的最高部门权限集合
|
||||
public static final String DEPARTMENT_ID = "DEPARTMENT_ID"; //当前用户拥有的最高部门权限
|
||||
|
|
|
@ -39,7 +39,7 @@ public class PLSUtil {
|
|||
headers.set("Authorization", getToken(CORPINFO_ID));
|
||||
HttpEntity<JSONObject> httpEntity = new HttpEntity<>(headers);
|
||||
ResponseEntity<JSONObject> exchange = restTemplate.exchange(
|
||||
PLSUtil.BAKEADDR.get(CORPINFO_ID) + "/deploy/card/list?sortThePowerLevel=1&pageNum=" +
|
||||
getBakeAddr(CORPINFO_ID) + "/deploy/card/list?sortThePowerLevel=1&pageNum=" +
|
||||
currentPage +
|
||||
"&pageSize=" + showCount,
|
||||
HttpMethod.GET, httpEntity,
|
||||
|
@ -52,7 +52,7 @@ public class PLSUtil {
|
|||
headers.set("Authorization", getToken(CORPINFO_ID));
|
||||
HttpEntity<JSONObject> httpEntity = new HttpEntity<>(headers);
|
||||
ResponseEntity<JSONObject> exchange = restTemplate.exchange(
|
||||
PLSUtil.BAKEADDR.get(CORPINFO_ID) + url,
|
||||
getBakeAddr(CORPINFO_ID) + url,
|
||||
HttpMethod.GET, httpEntity,
|
||||
JSONObject.class);
|
||||
return exchange.getBody();
|
||||
|
@ -77,7 +77,7 @@ public class PLSUtil {
|
|||
headers.set("Authorization", getToken(CORPINFO_ID));
|
||||
HttpEntity<JSONObject> httpEntity = new HttpEntity<>(headers);
|
||||
ResponseEntity<JSONObject> exchange = restTemplate.exchange(
|
||||
PLSUtil.BAKEADDR.get(CORPINFO_ID) + "/region/alarm/alarmStatistics?type=day",
|
||||
getBakeAddr(CORPINFO_ID) + "/region/alarm/alarmStatistics?type=day",
|
||||
HttpMethod.GET, httpEntity,
|
||||
JSONObject.class);
|
||||
return exchange.getBody();
|
||||
|
@ -88,7 +88,7 @@ public class PLSUtil {
|
|||
HttpHeaders headers = new HttpHeaders();
|
||||
headers.set("Authorization", getToken(CORPINFO_ID));
|
||||
HttpEntity<JSONObject> httpEntity = new HttpEntity<>(uriVariables, headers);
|
||||
ResponseEntity<JSONObject> exchange = restTemplate.exchange(PLSUtil.BAKEADDR.get(CORPINFO_ID) + Url,
|
||||
ResponseEntity<JSONObject> exchange = restTemplate.exchange(getBakeAddr(CORPINFO_ID) + Url,
|
||||
HttpMethod.POST,
|
||||
httpEntity,
|
||||
JSONObject.class);
|
||||
|
@ -99,7 +99,7 @@ public class PLSUtil {
|
|||
HttpHeaders headers = new HttpHeaders();
|
||||
headers.set("Authorization", getToken(CORPINFO_ID));
|
||||
HttpEntity<JSONObject> httpEntity = new HttpEntity<>(headers);
|
||||
ResponseEntity<JSONObject> exchange = restTemplate.exchange(PLSUtil.BAKEADDR.get(CORPINFO_ID) + Url + id,
|
||||
ResponseEntity<JSONObject> exchange = restTemplate.exchange(getBakeAddr(CORPINFO_ID) + Url + id,
|
||||
HttpMethod.GET,
|
||||
httpEntity,
|
||||
JSONObject.class);
|
||||
|
@ -112,7 +112,7 @@ public class PLSUtil {
|
|||
HttpHeaders headers = new HttpHeaders();
|
||||
headers.set("Authorization", getToken(CORPINFO_ID));
|
||||
HttpEntity<JSONObject> httpEntity = new HttpEntity<>(headers);
|
||||
ResponseEntity<JSONObject> exchange = restTemplate.exchange(PLSUtil.BAKEADDR.get(CORPINFO_ID) + Url + params,
|
||||
ResponseEntity<JSONObject> exchange = restTemplate.exchange(getBakeAddr(CORPINFO_ID) + Url + params,
|
||||
HttpMethod.GET,
|
||||
httpEntity,
|
||||
JSONObject.class);
|
||||
|
@ -124,7 +124,7 @@ public class PLSUtil {
|
|||
HttpHeaders headers = new HttpHeaders();
|
||||
headers.set("Authorization", getToken(CORPINFO_ID));
|
||||
HttpEntity<JSONObject> httpEntity = new HttpEntity<>(uriVariables, headers);
|
||||
ResponseEntity<JSONObject> exchange = restTemplate.exchange(PLSUtil.BAKEADDR.get(CORPINFO_ID) + Url,
|
||||
ResponseEntity<JSONObject> exchange = restTemplate.exchange(getBakeAddr(CORPINFO_ID) + Url,
|
||||
HttpMethod.PUT,
|
||||
httpEntity,
|
||||
JSONObject.class);
|
||||
|
@ -135,7 +135,7 @@ public class PLSUtil {
|
|||
HttpHeaders headers = new HttpHeaders();
|
||||
headers.set("Authorization", getToken(CORPINFO_ID));
|
||||
HttpEntity<JSONObject> httpEntity = new HttpEntity<>(headers);
|
||||
ResponseEntity<JSONObject> exchange = restTemplate.exchange(PLSUtil.BAKEADDR.get(CORPINFO_ID) + Url + id,
|
||||
ResponseEntity<JSONObject> exchange = restTemplate.exchange(getBakeAddr(CORPINFO_ID) + Url + id,
|
||||
HttpMethod.DELETE,
|
||||
httpEntity,
|
||||
JSONObject.class);
|
||||
|
@ -158,7 +158,7 @@ public class PLSUtil {
|
|||
if (Tools.notEmpty(keywords)) {
|
||||
url = url + keywords;
|
||||
}
|
||||
ResponseEntity<JSONObject> exchange = restTemplate.exchange(PLSUtil.BAKEADDR.get(CORPINFO_ID) + url
|
||||
ResponseEntity<JSONObject> exchange = restTemplate.exchange(getBakeAddr(CORPINFO_ID) + url
|
||||
, HttpMethod.GET, httpEntity, JSONObject.class);
|
||||
return exchange.getBody();
|
||||
}
|
||||
|
@ -177,7 +177,7 @@ public class PLSUtil {
|
|||
// "/region/alarm/list?pageNum=" +
|
||||
// currentPage + "&pageSize=" + showCount +"&str=" + "&eleType="+eleType+ "&status="+status
|
||||
HttpEntity<JSONObject> httpEntity = new HttpEntity<>(headers);
|
||||
ResponseEntity<JSONObject> exchange = restTemplate.exchange(PLSUtil.BAKEADDR.get(CORPINFO_ID) +
|
||||
ResponseEntity<JSONObject> exchange = restTemplate.exchange(getBakeAddr(CORPINFO_ID) +
|
||||
"/region/alarm/list?eleType=" + eleType + "+&status=" + status + "&pageNum=" + currentPage + "&pageSize=" + showCount + "&str="
|
||||
, HttpMethod.GET, httpEntity, JSONObject.class);
|
||||
return exchange.getBody();
|
||||
|
@ -200,7 +200,7 @@ public class PLSUtil {
|
|||
url = url + keywords;
|
||||
}
|
||||
HttpEntity<JSONObject> httpEntity = new HttpEntity<>(headers);
|
||||
ResponseEntity<JSONObject> exchange = restTemplate.exchange(PLSUtil.BAKEADDR.get(CORPINFO_ID) + url
|
||||
ResponseEntity<JSONObject> exchange = restTemplate.exchange(getBakeAddr(CORPINFO_ID) + url
|
||||
, HttpMethod.GET, httpEntity, JSONObject.class);
|
||||
return exchange.getBody();
|
||||
}
|
||||
|
@ -217,7 +217,7 @@ public class PLSUtil {
|
|||
HttpHeaders headers = new HttpHeaders();
|
||||
headers.set("Authorization", getToken(CORPINFO_ID));
|
||||
HttpEntity<JSONObject> httpEntity = new HttpEntity<>(headers);
|
||||
ResponseEntity<JSONObject> exchange = restTemplate.exchange(PLSUtil.BAKEADDR.get(CORPINFO_ID) +
|
||||
ResponseEntity<JSONObject> exchange = restTemplate.exchange(getBakeAddr(CORPINFO_ID) +
|
||||
"/device/camera/list?pageNum=1&pageSize=100000&str=", HttpMethod.GET, httpEntity, JSONObject.class);
|
||||
return exchange.getBody();
|
||||
}
|
||||
|
@ -246,11 +246,11 @@ public class PLSUtil {
|
|||
uriVariables.put("alt", "");
|
||||
HttpEntity<JSONObject> httpEntity = new HttpEntity<>(uriVariables, headers);
|
||||
// HttpEntity<JSONObject> httpEntity = new HttpEntity<>(uriVariables,headers);
|
||||
// ResponseEntity<JSONObject> jsonObjectResponseEntity = restTemplate.postForEntity(PLSUtil.BAKEADDR.get(CORPINFO_ID) + "/device/camera",
|
||||
// ResponseEntity<JSONObject> jsonObjectResponseEntity = restTemplate.postForEntity(getBakeAddr(CORPINFO_ID) + "/device/camera",
|
||||
// httpEntity, JSONObject.class);
|
||||
|
||||
|
||||
ResponseEntity<JSONObject> exchange = restTemplate.exchange(PLSUtil.BAKEADDR.get(CORPINFO_ID) + "/device/camera",
|
||||
ResponseEntity<JSONObject> exchange = restTemplate.exchange(getBakeAddr(CORPINFO_ID) + "/device/camera",
|
||||
HttpMethod.POST,
|
||||
httpEntity,
|
||||
JSONObject.class);
|
||||
|
@ -273,7 +273,7 @@ public class PLSUtil {
|
|||
uriVariables.put("camName", camera.getString("VIDEONAME"));
|
||||
uriVariables.put("camId", camera.getString("PLS_ID"));
|
||||
HttpEntity<JSONObject> httpEntity = new HttpEntity<>(uriVariables, headers);
|
||||
ResponseEntity<JSONObject> exchange = restTemplate.exchange(PLSUtil.BAKEADDR.get(CORPINFO_ID) + "/device/camera",
|
||||
ResponseEntity<JSONObject> exchange = restTemplate.exchange(getBakeAddr(CORPINFO_ID) + "/device/camera",
|
||||
HttpMethod.PUT, httpEntity,
|
||||
JSONObject.class, uriVariables);
|
||||
return exchange.getBody();
|
||||
|
@ -290,7 +290,7 @@ public class PLSUtil {
|
|||
HttpHeaders headers = new HttpHeaders();
|
||||
headers.set("Authorization", getToken(CORPINFO_ID));
|
||||
HttpEntity<JSONObject> httpEntity = new HttpEntity<>(headers);
|
||||
ResponseEntity<JSONObject> exchange = restTemplate.exchange(PLSUtil.BAKEADDR.get(CORPINFO_ID) + "/device/camera/" + Integer.parseInt(camera.getString("PLS_ID")), HttpMethod.DELETE, httpEntity, JSONObject.class);
|
||||
ResponseEntity<JSONObject> exchange = restTemplate.exchange(getBakeAddr(CORPINFO_ID) + "/device/camera/" + Integer.parseInt(camera.getString("PLS_ID")), HttpMethod.DELETE, httpEntity, JSONObject.class);
|
||||
return exchange.getBody();
|
||||
}
|
||||
|
||||
|
@ -311,7 +311,7 @@ public class PLSUtil {
|
|||
if (Tools.notEmpty(keywords)) url += keywords;
|
||||
headers.set("Authorization", getToken(CORPINFO_ID));
|
||||
HttpEntity<JSONObject> httpEntity = new HttpEntity<>(headers);
|
||||
ResponseEntity<JSONObject> exchange = restTemplate.exchange(PLSUtil.BAKEADDR.get(CORPINFO_ID) + url, HttpMethod.GET, httpEntity, JSONObject.class);
|
||||
ResponseEntity<JSONObject> exchange = restTemplate.exchange(getBakeAddr(CORPINFO_ID) + url, HttpMethod.GET, httpEntity, JSONObject.class);
|
||||
return exchange.getBody();
|
||||
}
|
||||
|
||||
|
@ -325,7 +325,7 @@ public class PLSUtil {
|
|||
|
||||
headers.set("Authorization", getToken(CORPINFO_ID));
|
||||
HttpEntity<JSONObject> httpEntity = new HttpEntity<>(headers);
|
||||
ResponseEntity<JSONObject> exchange = restTemplate.exchange(PLSUtil.BAKEADDR.get(CORPINFO_ID) + "/region/region/list?pageNum=" +
|
||||
ResponseEntity<JSONObject> exchange = restTemplate.exchange(getBakeAddr(CORPINFO_ID) + "/region/region/list?pageNum=" +
|
||||
currentPage +
|
||||
"&pageSize=" + showCount, HttpMethod.GET, httpEntity, JSONObject.class);
|
||||
return exchange.getBody();
|
||||
|
@ -341,7 +341,7 @@ public class PLSUtil {
|
|||
|
||||
headers.set("Authorization", getToken(CORPINFO_ID));
|
||||
HttpEntity<JSONObject> httpEntity = new HttpEntity<>(headers);
|
||||
ResponseEntity<JSONObject> exchange = restTemplate.exchange(PLSUtil.BAKEADDR.get(CORPINFO_ID) + "/region/region/" +
|
||||
ResponseEntity<JSONObject> exchange = restTemplate.exchange(getBakeAddr(CORPINFO_ID) + "/region/region/" +
|
||||
id, HttpMethod.GET, httpEntity, JSONObject.class);
|
||||
return exchange.getBody();
|
||||
}
|
||||
|
@ -355,7 +355,7 @@ public class PLSUtil {
|
|||
|
||||
headers.set("Authorization", getToken(CORPINFO_ID));
|
||||
HttpEntity<JSONObject> httpEntity = new HttpEntity<>(headers);
|
||||
ResponseEntity<JSONObject> exchange = restTemplate.exchange(PLSUtil.BAKEADDR.get(CORPINFO_ID) + "/location/loca/personnelTrajectories",HttpMethod.GET, httpEntity, JSONObject.class);
|
||||
ResponseEntity<JSONObject> exchange = restTemplate.exchange(getBakeAddr(CORPINFO_ID) + "/location/loca/personnelTrajectories",HttpMethod.GET, httpEntity, JSONObject.class);
|
||||
return exchange.getBody();
|
||||
}
|
||||
|
||||
|
@ -375,7 +375,7 @@ public class PLSUtil {
|
|||
uriVariables.put("type", type);
|
||||
HttpEntity<JSONObject> httpEntity = new HttpEntity<>(uriVariables, headers);
|
||||
|
||||
ResponseEntity<JSONObject> exchange = restTemplate.exchange(PLSUtil.BAKEADDR.get(CORPINFO_ID) + "/location/loca/characterTrajectories",
|
||||
ResponseEntity<JSONObject> exchange = restTemplate.exchange(getBakeAddr(CORPINFO_ID) + "/location/loca/characterTrajectories",
|
||||
HttpMethod.POST,
|
||||
httpEntity,
|
||||
JSONObject.class);
|
||||
|
@ -393,7 +393,7 @@ public class PLSUtil {
|
|||
|
||||
headers.set("Authorization", getToken(CORPINFO_ID));
|
||||
HttpEntity<JSONObject> httpEntity = new HttpEntity<>(headers);
|
||||
ResponseEntity<JSONObject> exchange = restTemplate.exchange(PLSUtil.BAKEADDR.get(CORPINFO_ID) + "/api/prod-api/coordinate/realTime/data", HttpMethod.GET, httpEntity, JSONObject.class);
|
||||
ResponseEntity<JSONObject> exchange = restTemplate.exchange(getBakeAddr(CORPINFO_ID) + "/location/loca", HttpMethod.GET, httpEntity, JSONObject.class);
|
||||
return exchange.getBody();
|
||||
}
|
||||
|
||||
|
@ -408,21 +408,30 @@ public class PLSUtil {
|
|||
HttpHeaders headers = new HttpHeaders();
|
||||
headers.set("Authorization", getToken(CORPINFO_ID));
|
||||
HttpEntity<JSONObject> httpEntity = new HttpEntity<>(headers);
|
||||
ResponseEntity<Boolean> exchange = restTemplate.exchange(PLSUtil.BAKEADDR.get(CORPINFO_ID) + "/region/api/electronicFence/determineWhetherThePersonIsInTheElectronicFence2?psn=" +
|
||||
ResponseEntity<Boolean> exchange = restTemplate.exchange(getBakeAddr(CORPINFO_ID) + "/region/api/electronicFence/determineWhetherThePersonIsInTheElectronicFence2?psn=" +
|
||||
PLS_ID +
|
||||
"&id=" + ELECTRONIC_FENCE_ID, HttpMethod.GET, httpEntity, Boolean.class);
|
||||
return exchange.getBody();
|
||||
}
|
||||
|
||||
|
||||
@PostConstruct
|
||||
private void initBakeAddr() throws Exception {
|
||||
List<PageData> dataList = corpplsinfoService.listAll(new PageData());
|
||||
private static void initBakeAddr(){
|
||||
List<PageData> dataList = null;
|
||||
try {
|
||||
dataList = corpplsinfoService.listAll(new PageData());
|
||||
} catch (Exception e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
dataList.forEach(item -> {
|
||||
BAKEADDR.put(item.getString("CORPINFO_ID"), item.getString("POST_URL"));
|
||||
});
|
||||
}
|
||||
|
||||
private static String getBakeAddr(String CORPINFO_ID) throws Exception {
|
||||
return BAKEADDR.computeIfAbsent(CORPINFO_ID, key -> {
|
||||
initBakeAddr();
|
||||
return BAKEADDR.get(CORPINFO_ID);
|
||||
});
|
||||
}
|
||||
/**
|
||||
* @Description: 获取token
|
||||
* @Author: dearLin
|
||||
|
@ -449,7 +458,7 @@ public class PLSUtil {
|
|||
if (response != null) {
|
||||
PageData valueData = JSONObject.parseObject(response.getString("data"), PageData.class);
|
||||
token = valueData.getString("access_token");
|
||||
String newExpireTime = DateUtil.getAfterHourDate("12");
|
||||
String newExpireTime = DateUtil.getAfterHourDate("24");
|
||||
pd.put("TOKEN", token);
|
||||
pd.put("EXPIRE_TIME", newExpireTime);
|
||||
corpplsinfoService.edit(pd);
|
||||
|
@ -472,7 +481,7 @@ public class PLSUtil {
|
|||
public static boolean hasCardNumber(PageData user) throws Exception {
|
||||
if (Tools.isEmpty(user.getString("CARDNO"))) {return true;}
|
||||
// 根据 定位卡号获取对应的人
|
||||
String url = BAKEADDR.get(Jurisdiction.getCORPINFO_ID()) + "/deploy/card/peopleDisplay/" + user.getString("CARDNO");
|
||||
String url = getBakeAddr(Jurisdiction.getCORPINFO_ID()) + "/deploy/card/peopleDisplay/" + user.getString("CARDNO");
|
||||
PageData response = sendGetHttpRequest(url, null, getToken(Jurisdiction.getCORPINFO_ID()));
|
||||
if (response != null) {
|
||||
if (!"200".equals(response.getString("code"))) {
|
||||
|
@ -493,7 +502,7 @@ public class PLSUtil {
|
|||
*/
|
||||
public static PageData getCardNumberPeople(PageData user) throws Exception {
|
||||
// 根据 定位卡号获取对应的人
|
||||
String url = BAKEADDR.get(Jurisdiction.getCORPINFO_ID()) + "/deploy/card/peopleDisplay/" + user.getString("CARDNO");
|
||||
String url = getBakeAddr(Jurisdiction.getCORPINFO_ID()) + "/deploy/card/peopleDisplay/" + user.getString("CARDNO");
|
||||
PageData response = sendGetHttpRequest(url, null, getToken(Jurisdiction.getCORPINFO_ID()));
|
||||
if (response != null) {
|
||||
if (!"200".equals(response.getString("code"))) {
|
||||
|
@ -513,7 +522,7 @@ public class PLSUtil {
|
|||
* @Return: void
|
||||
*/
|
||||
public static PageData saveUser(PageData user) throws Exception {
|
||||
String url = BAKEADDR.get(Jurisdiction.getCORPINFO_ID()) + "/deploy/psnmgt/insertPsnIfon";
|
||||
String url = getBakeAddr(Jurisdiction.getCORPINFO_ID()) + "/deploy/psnmgt/insertPsnIfon";
|
||||
JSONObject loginPayload = new JSONObject();
|
||||
loginPayload.put("name", user.getString("NAME"));
|
||||
loginPayload.put("cardNo", user.getString("CARDNO"));
|
||||
|
@ -555,7 +564,7 @@ public class PLSUtil {
|
|||
}
|
||||
return false;
|
||||
}
|
||||
String url = BAKEADDR.get(Jurisdiction.getCORPINFO_ID()) + "/deploy/psnmgt/updPsnInfoById";
|
||||
String url = getBakeAddr(Jurisdiction.getCORPINFO_ID()) + "/deploy/psnmgt/updPsnInfoById";
|
||||
JSONObject loginPayload = new JSONObject();
|
||||
loginPayload.put("name", user.getString("NAME"));
|
||||
loginPayload.put("psnId", user.getString("PLS_ID"));
|
||||
|
@ -582,7 +591,7 @@ public class PLSUtil {
|
|||
}
|
||||
|
||||
public static boolean removeUser(PageData user) throws Exception {
|
||||
String url = BAKEADDR.get(Jurisdiction.getCORPINFO_ID()) + "/deploy/psnmgt";
|
||||
String url = getBakeAddr(Jurisdiction.getCORPINFO_ID()) + "/deploy/psnmgt";
|
||||
PageData removeUser = usersService.findById(user);
|
||||
PageData response = sendDeleteHttpRequest(url, Long.parseLong(removeUser.getString("PLS_ID")), getToken(Jurisdiction.getCORPINFO_ID()));
|
||||
return "200".equals(response.getString("code"));
|
||||
|
|
|
@ -0,0 +1,472 @@
|
|||
<?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.assignedManage.AssignedManageMapper">
|
||||
|
||||
<!--表名 -->
|
||||
<sql id="tableName">
|
||||
BUS_TRAFFIC_ASSIGNED
|
||||
</sql>
|
||||
|
||||
<!--数据字典表名 -->
|
||||
<sql id="dicTableName">
|
||||
SYS_DICTIONARIES
|
||||
</sql>
|
||||
|
||||
<!-- 字段 -->
|
||||
<sql id="Field">
|
||||
f.ASSIGNED_ID,
|
||||
f.RECORD_NUMBER,
|
||||
f.CORPINFO_ID,
|
||||
f.ASSIGNED_TYPE,
|
||||
f.RAW_PLATE_NUMBER,
|
||||
f.NOW_PLATE_NUMBER,
|
||||
f.RAW_OWNERS,
|
||||
f.NOW_OWNERS,
|
||||
f.ASSIGNED_DATE,
|
||||
f.REGISTRANT,
|
||||
f.RAW_TRANSPORT_ENTERPRISES,
|
||||
f.ASSIGNED_VEHICLE_MODEL,
|
||||
f.ASSIGNED_VEHICLE,
|
||||
f.RAW_OWNERS_NUMBER,
|
||||
f.RAW_VEHICLE_OPERATION_CERTIFICATE,
|
||||
f.FRAMES_NUMBER,
|
||||
f.RAW_DRIVINGLICENSE_IMG,
|
||||
f.ASSIGNED_WAY,
|
||||
f.TRANSACTION_DATE,
|
||||
f.NOW_OWNERS_NUMBER,
|
||||
f.NOW_DRIVINGLICENSE_IMG,
|
||||
f.NOW_VEHICLE_OPERATION_CERTIFICATE,
|
||||
f.ASSIGNED_MATERIAL,
|
||||
f.REMARK,
|
||||
f.VEHICLE_TYPE,
|
||||
f.VEHICLE_BRAND,
|
||||
f.VEHICLE_MODEL,
|
||||
f.ENGINE_NUMBER,
|
||||
f.POWER_TYPE,
|
||||
f.EMISSION_STANDARD,
|
||||
f.RAW_CONTACT_NUMBER,
|
||||
f.NOW_CONTACT_NUMBER,
|
||||
f.RAW_OPERATION_CERTIFICATE,
|
||||
f.NOW_OPERATION_CERTIFICATE,
|
||||
f.TRANSPORT_ENTERPRISES,
|
||||
f.ISDELETE,
|
||||
f.CREATOR,
|
||||
f.CREATORNAME,
|
||||
f.CREATTIME,
|
||||
f.OPERATOR,
|
||||
f.OPERATORNAME,
|
||||
f.OPERATTIME,
|
||||
f.DELETOR,
|
||||
f.DELETORNAME,
|
||||
f.DELETTIME
|
||||
</sql>
|
||||
|
||||
<!-- 字段用于新增 -->
|
||||
<sql id="Field2">
|
||||
ASSIGNED_ID,
|
||||
RECORD_NUMBER,
|
||||
CORPINFO_ID,
|
||||
ASSIGNED_TYPE,
|
||||
RAW_PLATE_NUMBER,
|
||||
NOW_PLATE_NUMBER,
|
||||
RAW_OWNERS,
|
||||
NOW_OWNERS,
|
||||
ASSIGNED_DATE,
|
||||
REGISTRANT,
|
||||
RAW_TRANSPORT_ENTERPRISES,
|
||||
ASSIGNED_VEHICLE_MODEL,
|
||||
ASSIGNED_VEHICLE,
|
||||
RAW_OWNERS_NUMBER,
|
||||
RAW_VEHICLE_OPERATION_CERTIFICATE,
|
||||
FRAMES_NUMBER,
|
||||
RAW_DRIVINGLICENSE_IMG,
|
||||
ASSIGNED_WAY,
|
||||
TRANSACTION_DATE,
|
||||
NOW_OWNERS_NUMBER,
|
||||
NOW_DRIVINGLICENSE_IMG,
|
||||
NOW_VEHICLE_OPERATION_CERTIFICATE,
|
||||
ASSIGNED_MATERIAL,
|
||||
REMARK,
|
||||
VEHICLE_TYPE,
|
||||
VEHICLE_BRAND,
|
||||
VEHICLE_MODEL,
|
||||
ENGINE_NUMBER,
|
||||
POWER_TYPE,
|
||||
EMISSION_STANDARD,
|
||||
RAW_CONTACT_NUMBER,
|
||||
NOW_CONTACT_NUMBER,
|
||||
RAW_OPERATION_CERTIFICATE,
|
||||
NOW_OPERATION_CERTIFICATE,
|
||||
TRANSPORT_ENTERPRISES,
|
||||
ISDELETE,
|
||||
CREATOR,
|
||||
CREATORNAME,
|
||||
CREATTIME,
|
||||
OPERATOR,
|
||||
OPERATORNAME,
|
||||
OPERATTIME,
|
||||
DELETOR,
|
||||
DELETORNAME,
|
||||
DELETTIME
|
||||
</sql>
|
||||
|
||||
<!-- 字段值 -->
|
||||
<sql id="FieldValue">
|
||||
#{ASSIGNED_ID},
|
||||
#{RECORD_NUMBER},
|
||||
#{CORPINFO_ID},
|
||||
#{ASSIGNED_TYPE},
|
||||
#{RAW_PLATE_NUMBER},
|
||||
#{NOW_PLATE_NUMBER},
|
||||
#{RAW_OWNERS},
|
||||
#{NOW_OWNERS},
|
||||
#{ASSIGNED_DATE},
|
||||
#{REGISTRANT},
|
||||
#{RAW_TRANSPORT_ENTERPRISES},
|
||||
#{ASSIGNED_VEHICLE_MODEL},
|
||||
#{ASSIGNED_VEHICLE},
|
||||
#{RAW_OWNERS_NUMBER},
|
||||
#{RAW_VEHICLE_OPERATION_CERTIFICATE},
|
||||
#{FRAMES_NUMBER},
|
||||
#{RAW_DRIVINGLICENSE_IMG},
|
||||
#{ASSIGNED_WAY},
|
||||
#{TRANSACTION_DATE},
|
||||
#{NOW_OWNERS_NUMBER},
|
||||
#{NOW_DRIVINGLICENSE_IMG},
|
||||
#{NOW_VEHICLE_OPERATION_CERTIFICATE},
|
||||
#{ASSIGNED_MATERIAL},
|
||||
#{REMARK},
|
||||
#{VEHICLE_TYPE},
|
||||
#{VEHICLE_BRAND},
|
||||
#{VEHICLE_MODEL},
|
||||
#{ENGINE_NUMBER},
|
||||
#{POWER_TYPE},
|
||||
#{EMISSION_STANDARD},
|
||||
#{RAW_CONTACT_NUMBER},
|
||||
#{NOW_CONTACT_NUMBER},
|
||||
#{RAW_OPERATION_CERTIFICATE},
|
||||
#{NOW_OPERATION_CERTIFICATE},
|
||||
#{TRANSPORT_ENTERPRISES},
|
||||
#{ISDELETE},
|
||||
#{CREATOR},
|
||||
#{CREATORNAME},
|
||||
#{CREATTIME},
|
||||
#{OPERATOR},
|
||||
#{OPERATORNAME},
|
||||
#{OPERATTIME},
|
||||
#{DELETOR},
|
||||
#{DELETORNAME},
|
||||
#{DELETTIME}
|
||||
</sql>
|
||||
|
||||
<!-- 新增-->
|
||||
<insert id="save" parameterType="pd">
|
||||
insert into
|
||||
<include refid="tableName"></include>
|
||||
(
|
||||
<include refid="Field2"></include>
|
||||
) values (
|
||||
<include refid="FieldValue"></include>
|
||||
)
|
||||
</insert>
|
||||
|
||||
<!-- 删除-->
|
||||
<delete id="delete" parameterType="pd">
|
||||
update
|
||||
<include refid="tableName"></include>
|
||||
set
|
||||
ISDELETE = '1'
|
||||
where
|
||||
ASSIGNED_ID = #{ASSIGNED_ID}
|
||||
</delete>
|
||||
|
||||
<!-- 修改 -->
|
||||
<update id="edit" parameterType="pd">
|
||||
update
|
||||
<include refid="tableName"></include>
|
||||
set
|
||||
ASSIGNED_ID = #{ASSIGNED_ID},
|
||||
RECORD_NUMBER = #{RECORD_NUMBER},
|
||||
CORPINFO_ID = #{CORPINFO_ID},
|
||||
ASSIGNED_TYPE = #{ASSIGNED_TYPE},
|
||||
RAW_PLATE_NUMBER = #{RAW_PLATE_NUMBER},
|
||||
NOW_PLATE_NUMBER = #{NOW_PLATE_NUMBER},
|
||||
RAW_OWNERS = #{RAW_OWNERS},
|
||||
NOW_OWNERS = #{NOW_OWNERS},
|
||||
ASSIGNED_DATE = #{ASSIGNED_DATE},
|
||||
REGISTRANT = #{REGISTRANT},
|
||||
REGISTRANT = #{REGISTRANT},
|
||||
ASSIGNED_VEHICLE_MODEL = #{ASSIGNED_VEHICLE_MODEL},
|
||||
ASSIGNED_VEHICLE = #{ASSIGNED_VEHICLE},
|
||||
RAW_OWNERS_NUMBER = #{RAW_OWNERS_NUMBER},
|
||||
RAW_VEHICLE_OPERATION_CERTIFICATE = #{RAW_VEHICLE_OPERATION_CERTIFICATE},
|
||||
FRAMES_NUMBER = #{FRAMES_NUMBER},
|
||||
RAW_DRIVINGLICENSE_IMG = #{RAW_DRIVINGLICENSE_IMG},
|
||||
ASSIGNED_WAY = #{ASSIGNED_WAY},
|
||||
TRANSACTION_DATE = #{TRANSACTION_DATE},
|
||||
NOW_OWNERS_NUMBER = #{NOW_OWNERS_NUMBER},
|
||||
NOW_DRIVINGLICENSE_IMG = #{NOW_DRIVINGLICENSE_IMG},
|
||||
NOW_VEHICLE_OPERATION_CERTIFICATE = #{NOW_VEHICLE_OPERATION_CERTIFICATE},
|
||||
ASSIGNED_MATERIAL = #{ASSIGNED_MATERIAL},
|
||||
REMARK = #{REMARK},
|
||||
VEHICLE_TYPE = #{VEHICLE_TYPE},
|
||||
VEHICLE_BRAND = #{VEHICLE_BRAND},
|
||||
VEHICLE_MODEL = #{VEHICLE_MODEL},
|
||||
ENGINE_NUMBER = #{ENGINE_NUMBER},
|
||||
POWER_TYPE = #{POWER_TYPE},
|
||||
EMISSION_STANDARD = #{EMISSION_STANDARD},
|
||||
RAW_CONTACT_NUMBER = #{RAW_CONTACT_NUMBER},
|
||||
NOW_CONTACT_NUMBER = #{NOW_CONTACT_NUMBER},
|
||||
RAW_OPERATION_CERTIFICATE = #{RAW_OPERATION_CERTIFICATE},
|
||||
NOW_OPERATION_CERTIFICATE = #{NOW_OPERATION_CERTIFICATE},
|
||||
TRANSPORT_ENTERPRISES = #{TRANSPORT_ENTERPRISES},
|
||||
ISDELETE = #{ISDELETE},
|
||||
CREATOR = #{CREATOR},
|
||||
CREATORNAME = #{CREATORNAME},
|
||||
CREATTIME = #{CREATTIME},
|
||||
OPERATOR = #{OPERATOR},
|
||||
OPERATORNAME = #{OPERATORNAME},
|
||||
OPERATTIME = #{OPERATTIME},
|
||||
DELETOR = #{DELETOR},
|
||||
DELETORNAME = #{DELETORNAME},
|
||||
DELETTIME = #{DELETTIME}
|
||||
where
|
||||
ASSIGNED_ID = #{ASSIGNED_ID}
|
||||
</update>
|
||||
|
||||
<!-- 通过ID获取数据 -->
|
||||
<select id="findById" parameterType="pd" resultType="pd">
|
||||
select
|
||||
<include refid="Field"></include>
|
||||
from
|
||||
<include refid="tableName"></include> f
|
||||
where
|
||||
f.ASSIGNED_ID = #{ASSIGNED_ID}
|
||||
</select>
|
||||
|
||||
<!-- 列表 -->
|
||||
<!--<select id="datalistPage" parameterType="page" resultType="pd">
|
||||
select
|
||||
<include refid="Field"></include>
|
||||
from
|
||||
<include refid="tableName"></include> f
|
||||
left join sys_user u on u.USER_ID = f.USER_ID
|
||||
left join oa_department d on d.DEPARTMENT_ID = u.DEPARTMENT_ID
|
||||
left join sys_post p on p.POST_ID = u.POST_ID
|
||||
left join sys_user ru on ru.USER_ID = f.REVIEW_USER_ID
|
||||
left join oa_department rd on rd.DEPARTMENT_ID = ru.DEPARTMENT_ID
|
||||
where (f.ISDELETE = '0' or (f.ISDELETE = '1' and f.REVIEW_STATUS = '-1'))
|
||||
and f.CORPINFO_ID = #{pd.CORPINFO_ID}
|
||||
<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!– 关键词检索 –>
|
||||
and
|
||||
(
|
||||
u.NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
|
||||
)
|
||||
</if>
|
||||
<if test="pd.REVIEW_STATUS != null and pd.REVIEW_STATUS != ''"><!– 关键词检索 –>
|
||||
<choose>
|
||||
<when test="pd.REVIEW_STATUS == 0">
|
||||
and f.REVIEW_STATUS = '0'
|
||||
</when>
|
||||
<when test="pd.REVIEW_STATUS == 1">
|
||||
and f.REVIEW_STATUS = '1'
|
||||
</when>
|
||||
<when test="pd.REVIEW_STATUS == 2">
|
||||
and f.REVIEW_STATUS = '2'
|
||||
</when>
|
||||
<when test="pd.REVIEW_STATUS == -1">
|
||||
and f.ISDELETE = '0' and f.REVIEW_STATUS = '-1'
|
||||
</when>
|
||||
<when test="pd.REVIEW_STATUS == 3">
|
||||
and f.CREATOR = f.OPERATOR and f.ISDELETE = '1' and f.REVIEW_STATUS = '-1'
|
||||
</when>
|
||||
<when test="pd.REVIEW_STATUS == 4">
|
||||
and f.CREATOR != f.OPERATOR and f.ISDELETE = '1' and f.REVIEW_STATUS = '-1'
|
||||
</when>
|
||||
</choose>
|
||||
</if>
|
||||
<if test="pd.REVIEW_USER_NAME != null and pd.REVIEW_USER_NAME != ''"><!– 关键词检索 –>
|
||||
and ru.NAME LIKE CONCAT(CONCAT('%', #{pd.REVIEW_USER_NAME}),'%')
|
||||
</if>
|
||||
<if test="pd.DEPT_DOWN_ARR != null and pd.DEPT_DOWN_ARR.size() > 0">
|
||||
AND d.DEPARTMENT_ID IN
|
||||
<foreach item="item" collection="pd.DEPT_DOWN_ARR" open="(" separator="," close=")">
|
||||
'${item}'
|
||||
</foreach>
|
||||
</if>
|
||||
<!– <if test="pd.DEPARTMENT_ID != null and pd.DEPARTMENT_ID != ''">关键词检索
|
||||
and d.DEPARTMENT_ID = #{pd.DEPARTMENT_ID}
|
||||
</if>
|
||||
–>
|
||||
|
||||
<choose>
|
||||
<when test='pd.ISMAIN != null and pd.ISMAIN != "" and pd.ISMAIN == "1"'>
|
||||
<if test="pd.DEPT_IDS != null and pd.DEPT_IDS != ''">
|
||||
and
|
||||
d.DEPARTMENT_ID in
|
||||
<foreach item="item" index="index"
|
||||
collection="pd.DEPT_IDS" open="(" separator="," close=")">
|
||||
'${item}'
|
||||
</foreach>
|
||||
</if>
|
||||
</when>
|
||||
<otherwise>
|
||||
<choose>
|
||||
<when test='pd.ISSUPERVISE != null and pd.ISSUPERVISE != "" and pd.ISSUPERVISE == "1"'>
|
||||
<choose>
|
||||
<when test='pd.ISLEADER != null and pd.ISLEADER != "" and pd.ISLEADER == "1"'>
|
||||
<choose>
|
||||
<when test="pd.DEPT_IDS != null and pd.DEPT_IDS != ''">
|
||||
and
|
||||
d.DEPARTMENT_ID in
|
||||
<foreach item="item" index="index"
|
||||
collection="pd.DEPT_IDS" open="(" separator="," close=")">
|
||||
'${item}'
|
||||
</foreach>
|
||||
</when>
|
||||
<otherwise>
|
||||
and
|
||||
((d.DEPARTMENT_ID in (
|
||||
select
|
||||
SUB_DEPARTMENT_ID
|
||||
from
|
||||
oa_supervision_department osd
|
||||
where
|
||||
osd.SUP_DEPARTMENT_ID = #{pd.DEPARTMENT_ID}
|
||||
and osd.ISDELETE = '0'
|
||||
and osd.CORPINFO_ID = #{pd.CORPINFO_ID}
|
||||
)) or (
|
||||
d.DEPARTMENT_ID in
|
||||
<foreach item="item" index="index"
|
||||
collection="pd.DEPARTMENT_IDS" open="(" separator="," close=")">
|
||||
'${item}'
|
||||
</foreach>
|
||||
))
|
||||
</otherwise>
|
||||
</choose>
|
||||
</when>
|
||||
<when test="pd.DEPT_IDS != null and pd.DEPT_IDS != ''">
|
||||
or f.REVIEW_USER_ID = #{pd.USER_ID}
|
||||
and
|
||||
d.DEPARTMENT_ID in
|
||||
<foreach item="item" index="index"
|
||||
collection="pd.DEPT_IDS" open="(" separator="," close=")">
|
||||
'${item}'
|
||||
</foreach>
|
||||
</when>
|
||||
<otherwise>
|
||||
|
||||
and
|
||||
d.DEPARTMENT_ID in (
|
||||
select
|
||||
SUB_DEPARTMENT_ID
|
||||
from
|
||||
oa_supervision_department osd
|
||||
where
|
||||
osd.SUP_DEPARTMENT_ID = #{pd.DEPARTMENT_ID}
|
||||
and osd.ISDELETE = '0'
|
||||
and osd.CORPINFO_ID = #{pd.CORPINFO_ID})
|
||||
or f.REVIEW_USER_ID = #{pd.USER_ID}
|
||||
</otherwise>
|
||||
</choose>
|
||||
</when>
|
||||
<when test='pd.ISLEADER != null and pd.ISLEADER != "" and pd.ISLEADER == "1"'>
|
||||
<choose>
|
||||
<when test="pd.DEPT_IDS != null and pd.DEPT_IDS != ''">
|
||||
and
|
||||
d.DEPARTMENT_ID in
|
||||
<foreach item="item" index="index"
|
||||
collection="pd.DEPT_IDS" open="(" separator="," close=")">
|
||||
'${item}'
|
||||
</foreach>
|
||||
</when>
|
||||
<otherwise>
|
||||
and
|
||||
d.DEPARTMENT_ID in
|
||||
<foreach item="item" index="index"
|
||||
collection="pd.DEPARTMENT_IDS" open="(" separator="," close=")">
|
||||
'${item}'
|
||||
</foreach>
|
||||
</otherwise>
|
||||
</choose>
|
||||
</when>
|
||||
<when test="pd.DEPARTMENT_ID != null and pd.DEPARTMENT_ID != ''">
|
||||
and d.DEPARTMENT_ID=#{pd.DEPARTMENT_ID}
|
||||
and f.REVIEW_USER_ID = #{pd.USER_ID}
|
||||
</when>
|
||||
<otherwise>
|
||||
</otherwise>
|
||||
</choose>
|
||||
</otherwise>
|
||||
</choose>
|
||||
<choose>
|
||||
<when test="pd.STARTTIME != null and pd.STARTTIME != '' and pd.ENDTIME != null and pd.ENDTIME != ''">
|
||||
and DATE_FORMAT(#{pd.STARTTIME},'%Y-%m-%d %H:%i:%s') <= DATE_FORMAT(f.STARTTIME,'%Y-%m-%d %H:%i:%s')
|
||||
and DATE_FORMAT(#{pd.ENDTIME},'%Y-%m-%d %H:%i:%s') >= DATE_FORMAT(f.ENDTIME,'%Y-%m-%d %H:%i:%s')
|
||||
</when>
|
||||
<otherwise>
|
||||
<if test="pd.STARTTIME != null and pd.STARTTIME != ''">
|
||||
and DATE_FORMAT(#{pd.STARTTIME},'%Y-%m-%d %H:%i:%s') <= DATE_FORMAT(f.ENDTIME,'%Y-%m-%d %H:%i:%s')
|
||||
</if>
|
||||
<if test="pd.ENDTIME != null and pd.ENDTIME != ''">
|
||||
and DATE_FORMAT(#{pd.ENDTIME},'%Y-%m-%d %H:%i:%s') >= DATE_FORMAT(f.STARTTIME,'%Y-%m-%d %H:%i:%s')
|
||||
</if>
|
||||
</otherwise>
|
||||
</choose>
|
||||
order by f.OPERATTIME desc
|
||||
</select>-->
|
||||
|
||||
<!-- 列表(全部) -->
|
||||
<select id="datalistPage" parameterType="page" resultType="pd">
|
||||
select
|
||||
<include refid="Field"></include>
|
||||
from
|
||||
<include refid="tableName"></include> f
|
||||
where f.ISDELETE = '0'
|
||||
<if test="pd.ASSIGNED_TYPE != null and pd.ASSIGNED_TYPE != ''"><!-- 关键词检索 -->
|
||||
and f.ASSIGNED_TYPE = #{pd.ASSIGNED_TYPE}
|
||||
</if>
|
||||
<if test="pd.ASSIGNED_WAY != null and pd.ASSIGNED_WAY != ''"><!-- 关键词检索 -->
|
||||
and f.ASSIGNED_WAY = #{pd.ASSIGNED_WAY}
|
||||
</if>
|
||||
<if test="pd.ASSIGNED_VEHICLE_MODEL != null and pd.ASSIGNED_VEHICLE_MODEL != ''"><!-- 关键词检索 -->
|
||||
and f.ASSIGNED_VEHICLE_MODEL = #{pd.ASSIGNED_VEHICLE_MODEL}
|
||||
</if>
|
||||
<if test="pd.RAW_PLATE_NUMBER != null and pd.RAW_PLATE_NUMBER != ''"><!-- 关键词检索 -->
|
||||
and f.RAW_PLATE_NUMBER LIKE CONCAT(CONCAT('%', #{pd.RAW_PLATE_NUMBER}),'%')
|
||||
</if>
|
||||
<if test="pd.NOW_PLATE_NUMBER != null and pd.NOW_PLATE_NUMBER != ''"><!-- 关键词检索 -->
|
||||
and f.NOW_PLATE_NUMBER LIKE CONCAT(CONCAT('%', #{pd.NOW_PLATE_NUMBER}),'%')
|
||||
</if>
|
||||
<if test="pd.NOW_OWNERS != null and pd.NOW_OWNERS != ''"><!-- 关键词检索 -->
|
||||
and f.NOW_OWNERS LIKE CONCAT(CONCAT('%', #{pd.NOW_OWNERS}),'%')
|
||||
</if>
|
||||
<if test="pd.REGISTRANT != null and pd.REGISTRANT != ''"><!-- 关键词检索 -->
|
||||
and f.REGISTRANT LIKE CONCAT(CONCAT('%', #{pd.REGISTRANT}),'%')
|
||||
</if>
|
||||
<if test="pd.ASSIGNED_DATE != null and pd.ASSIGNED_DATE != ''"><!-- 关键词检索 -->
|
||||
and f.ASSIGNED_DATE LIKE CONCAT(CONCAT('%', #{pd.ASSIGNED_DATE}),'%')
|
||||
</if>
|
||||
<if test="pd.TRANSPORT_ENTERPRISES != null and pd.TRANSPORT_ENTERPRISES != ''"><!-- 关键词检索 -->
|
||||
and f.TRANSPORT_ENTERPRISES = #{pd.TRANSPORT_ENTERPRISES}
|
||||
</if>
|
||||
</select>
|
||||
|
||||
<select id="listAll" parameterType="pd" resultType="pd">
|
||||
select
|
||||
<include refid="Field"></include>
|
||||
from
|
||||
<include refid="tableName"></include> f
|
||||
where f.ASSIGNED_ID = '0'
|
||||
</select>
|
||||
|
||||
<select id="operationvehicleList" parameterType="page" resultType="pd">
|
||||
select
|
||||
*
|
||||
from
|
||||
<include refid="tableName"></include> f
|
||||
where f.CORPINFO_ID = #{corpId}
|
||||
</select>
|
||||
|
||||
|
||||
</mapper>
|
|
@ -144,6 +144,7 @@
|
|||
<include refid="tableName"></include> f
|
||||
left join sys_user su on f.UPLOAD_USER = su.USER_ID
|
||||
left join bus_corp_info bci on bci.CORPINFO_ID = su.CORPINFO_ID
|
||||
left join bus_library_labels b ON b.BUS_TEXT_LIBRARY_ID = f.BUS_TEXT_LIBRARY_ID
|
||||
where f.ISDELETE = '0'
|
||||
<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
|
||||
and f.REMARKS LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
|
||||
|
@ -166,12 +167,10 @@
|
|||
</foreach>)
|
||||
</if>
|
||||
<if test="pd.CATEGORY_ID != null and pd.CATEGORY_ID != ''">
|
||||
and (exists(select 1 from bus_library_labels b where b.BUS_TEXT_LIBRARY_ID = f.BUS_TEXT_LIBRARY_ID and b.CATEGORY_ID = #{pd.CATEGORY_ID})
|
||||
or exists(select 1 from bus_library_labels b where b.BUS_TEXT_LIBRARY_ID = f.BUS_TEXT_LIBRARY_ID and b.CATEGORY_ID = #{pd.TYPE_ONE}))
|
||||
and b.CATEGORY_ID in (#{pd.CATEGORY_ID}, #{pd.TYPE_ONE})
|
||||
</if>
|
||||
<if test="pd.plan != null and pd.plan != ''">
|
||||
and (exists(select 1 from bus_library_labels b where b.BUS_TEXT_LIBRARY_ID = f.BUS_TEXT_LIBRARY_ID and b.CATEGORY_ID = #{pd.plan})
|
||||
and exists(select 1 from bus_library_labels b where b.BUS_TEXT_LIBRARY_ID = f.BUS_TEXT_LIBRARY_ID and b.CATEGORY_ID = #{pd.TYPE_ONE}))
|
||||
and b.CATEGORY_ID in ( #{pd.plan}, #{pd.TYPE_ONE})
|
||||
</if>
|
||||
<if test="pd.CORPINFO_ID != null and pd.CORPINFO_ID != ''">
|
||||
and f.CORPINFO_ID = #{pd.CORPINFO_ID}
|
||||
|
|
|
@ -0,0 +1,183 @@
|
|||
<?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.eightwork.BlindBoardInfoMapper">
|
||||
|
||||
<!--表名 -->
|
||||
<sql id="tableName">
|
||||
BUS_BLINDBOARDINFO
|
||||
</sql>
|
||||
|
||||
<!--数据字典表名 -->
|
||||
<sql id="dicTableName">
|
||||
SYS_DICTIONARIES
|
||||
</sql>
|
||||
|
||||
<!-- 字段 -->
|
||||
<sql id="Field">
|
||||
f.ISDELETE,
|
||||
f.CREATTIME,
|
||||
f.CREATOR,
|
||||
f.OPERATTIME,
|
||||
f.OPERATOR,
|
||||
f.BOARD_MATERIAL,
|
||||
f.BOARD_SPECIFICATION,
|
||||
f.BOARD_NO,
|
||||
f.BOARD_INSTALL_TIME,
|
||||
f.BOARD_DISASSEMBLE_TIME,
|
||||
f.BOARD_INSTALL_USER,
|
||||
f.BOARD_DISASSEMBLE_USER,
|
||||
f.BOARD_PATH,
|
||||
f.BOARD_HARM,
|
||||
f.BOARD_MEASURES,
|
||||
f.BOARD_SIGNER_PATH,
|
||||
f.BOARD_SIGNER_TIME,
|
||||
f.BLINDBOARD_ID,
|
||||
f.BLINDBOARDINFO_ID
|
||||
</sql>
|
||||
|
||||
<!-- 字段用于新增 -->
|
||||
<sql id="Field2">
|
||||
ISDELETE,
|
||||
CREATTIME,
|
||||
CREATOR,
|
||||
OPERATTIME,
|
||||
OPERATOR,
|
||||
BOARD_MATERIAL,
|
||||
BOARD_SPECIFICATION,
|
||||
BOARD_NO,
|
||||
BOARD_INSTALL_TIME,
|
||||
BOARD_DISASSEMBLE_TIME,
|
||||
BOARD_INSTALL_USER,
|
||||
BOARD_DISASSEMBLE_USER,
|
||||
BOARD_PATH,
|
||||
BOARD_HARM,
|
||||
BOARD_MEASURES,
|
||||
BOARD_SIGNER_PATH,
|
||||
BOARD_SIGNER_TIME,
|
||||
BLINDBOARD_ID,
|
||||
BLINDBOARDINFO_ID
|
||||
</sql>
|
||||
|
||||
<!-- 字段值 -->
|
||||
<sql id="FieldValue">
|
||||
#{ISDELETE},
|
||||
#{CREATTIME},
|
||||
#{CREATOR},
|
||||
#{OPERATTIME},
|
||||
#{OPERATOR},
|
||||
#{BOARD_MATERIAL},
|
||||
#{BOARD_SPECIFICATION},
|
||||
#{BOARD_NO},
|
||||
#{BOARD_INSTALL_TIME},
|
||||
#{BOARD_DISASSEMBLE_TIME},
|
||||
#{BOARD_INSTALL_USER},
|
||||
#{BOARD_DISASSEMBLE_USER},
|
||||
#{BOARD_PATH},
|
||||
#{BOARD_HARM},
|
||||
#{BOARD_MEASURES},
|
||||
#{BOARD_SIGNER_PATH},
|
||||
#{BOARD_SIGNER_TIME},
|
||||
#{BLINDBOARD_ID},
|
||||
#{BLINDBOARDINFO_ID}
|
||||
</sql>
|
||||
|
||||
<!-- 新增-->
|
||||
<insert id="save" parameterType="pd">
|
||||
insert into
|
||||
<include refid="tableName"></include>
|
||||
(
|
||||
<include refid="Field2"></include>
|
||||
) values (
|
||||
<include refid="FieldValue"></include>
|
||||
)
|
||||
</insert>
|
||||
|
||||
<!-- 删除-->
|
||||
<delete id="delete" parameterType="pd">
|
||||
delete from
|
||||
<include refid="tableName"></include>
|
||||
where
|
||||
BLINDBOARD_ID = #{BLINDBOARD_ID}
|
||||
</delete>
|
||||
|
||||
<!-- 修改 -->
|
||||
<update id="edit" parameterType="pd">
|
||||
update
|
||||
<include refid="tableName"></include>
|
||||
set
|
||||
ISDELETE = #{ISDELETE},
|
||||
CREATTIME = #{CREATTIME},
|
||||
CREATOR = #{CREATOR},
|
||||
OPERATTIME = #{OPERATTIME},
|
||||
OPERATOR = #{OPERATOR},
|
||||
BOARD_MATERIAL = #{BOARD_MATERIAL},
|
||||
BOARD_SPECIFICATION = #{BOARD_SPECIFICATION},
|
||||
BOARD_NO = #{BOARD_NO},
|
||||
BOARD_INSTALL_TIME = #{BOARD_INSTALL_TIME},
|
||||
BOARD_DISASSEMBLE_TIME = #{BOARD_DISASSEMBLE_TIME},
|
||||
BOARD_INSTALL_USER = #{BOARD_INSTALL_USER},
|
||||
BOARD_DISASSEMBLE_USER = #{BOARD_DISASSEMBLE_USER},
|
||||
BOARD_PATH = #{BOARD_PATH},
|
||||
BOARD_HARM = #{BOARD_HARM},
|
||||
BOARD_MEASURES = #{BOARD_MEASURES},
|
||||
BOARD_SIGNER_PATH = #{BOARD_SIGNER_PATH},
|
||||
BOARD_SIGNER_TIME = #{BOARD_SIGNER_TIME},
|
||||
BLINDBOARD_ID = #{BLINDBOARD_ID},
|
||||
BLINDBOARDINFO_ID = BLINDBOARDINFO_ID
|
||||
where
|
||||
BLINDBOARDINFO_ID = #{BLINDBOARDINFO_ID}
|
||||
</update>
|
||||
|
||||
<!-- 通过ID获取数据 -->
|
||||
<select id="findById" parameterType="pd" resultType="pd">
|
||||
select
|
||||
<include refid="Field"></include>
|
||||
from
|
||||
<include refid="tableName"></include> f
|
||||
where
|
||||
f.BLINDBOARDINFO_ID = #{BLINDBOARDINFO_ID}
|
||||
</select>
|
||||
|
||||
<!-- 列表 -->
|
||||
<select id="datalistPage" parameterType="page" resultType="pd">
|
||||
select
|
||||
<include refid="Field"></include>
|
||||
from
|
||||
<include refid="tableName"></include> f
|
||||
where f.ISDELETE = '0'
|
||||
<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
|
||||
and
|
||||
(
|
||||
<!-- 根据需求自己加检索条件
|
||||
字段1 LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
|
||||
or
|
||||
字段2 LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
|
||||
-->
|
||||
)
|
||||
</if>
|
||||
</select>
|
||||
|
||||
<!-- 列表(全部) -->
|
||||
<select id="listAll" parameterType="pd" resultType="pd">
|
||||
select
|
||||
<include refid="Field"></include>
|
||||
from
|
||||
<include refid="tableName"></include> f
|
||||
where f.BLINDBOARD_ID = #{BLINDBOARD_ID}
|
||||
order by f.BOARD_NO
|
||||
</select>
|
||||
|
||||
<!-- 批量删除 -->
|
||||
<delete id="deleteAll" parameterType="String">
|
||||
update
|
||||
<include refid="tableName"></include>
|
||||
set
|
||||
ISDELETE = '1'
|
||||
where
|
||||
BLINDBOARDINFO_ID in
|
||||
<foreach item="item" index="index" collection="ArrayDATA_IDS" open="(" separator="," close=")">
|
||||
#{item}
|
||||
</foreach>
|
||||
</delete>
|
||||
|
||||
</mapper>
|
|
@ -0,0 +1,497 @@
|
|||
<?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.eightwork.BlindBoardMapper">
|
||||
<!--表名 -->
|
||||
<sql id="tableName">
|
||||
BUS_BLINDBOARD
|
||||
</sql>
|
||||
|
||||
<!-- 字段 -->
|
||||
<sql id="Field">
|
||||
f.BLINDBOARD_ID,
|
||||
f.CORPINFO_ID,
|
||||
f.TASK_ID,
|
||||
f.STEP_ID,
|
||||
f.ISDELETE,
|
||||
f.CREATTIME,
|
||||
f.CREATOR,
|
||||
f.OPERATTIME,
|
||||
f.OPERATOR,
|
||||
f.CHECK_NO,
|
||||
f.WORK_TYPE,
|
||||
f.NAME,
|
||||
f.APPLY_DEPARTMENT_ID,
|
||||
f.APPLY_USER_ID,
|
||||
f.WORK_START_DATE,
|
||||
f.MEDIUM,
|
||||
f.TEMPERATURE,
|
||||
f.PRESSURE,
|
||||
f.SPECIAL_WORK,
|
||||
f.RISK_IDENTIFICATION,
|
||||
f.CONFESS_DEPARTMENT_ID,
|
||||
f.CONFESS_USER_ID,
|
||||
f.ACCEPT_CONFESS_DEPARTMENT_ID,
|
||||
f.ACCEPT_CONFESS_USER_ID,
|
||||
f.GUARDIAN_DEPARTMENT_ID,
|
||||
f.GUARDIAN_USER_ID,
|
||||
f.WORK_USER_DEPARTMENT_ID,
|
||||
f.WORK_USER_ID,
|
||||
f.CONFIRM_DEPARTMENT_ID,
|
||||
f.CONFIRM_USER_ID,
|
||||
f.LEADER_DEPARTMENT_ID,
|
||||
f.LEADER_USER_ID,
|
||||
f.ACCEPT_DEPARTMENT_ID,
|
||||
f.ACCEPT_USER_ID,
|
||||
f.WORK_START_DEPARTMENT_ID,
|
||||
f.WORK_START_USER_ID,
|
||||
f.ACCEPT_TIME,
|
||||
f.PLS_ID,
|
||||
f.PLS_NAME,
|
||||
f.WORK_POSITION,
|
||||
f.VIDEO_PATH,
|
||||
f.BOARD_PATH,
|
||||
f.WORKSHOP_DEPARTMENT_ID,
|
||||
f.WORKSHOP_USER_ID
|
||||
</sql>
|
||||
|
||||
<!-- 字段用于新增 -->
|
||||
<sql id="Field2">
|
||||
BLINDBOARD_ID,
|
||||
CORPINFO_ID,
|
||||
TASK_ID,
|
||||
STEP_ID,
|
||||
ISDELETE,
|
||||
CREATTIME,
|
||||
CREATOR,
|
||||
OPERATTIME,
|
||||
OPERATOR,
|
||||
CHECK_NO,
|
||||
WORK_TYPE,
|
||||
NAME,
|
||||
APPLY_DEPARTMENT_ID,
|
||||
APPLY_USER_ID,
|
||||
WORK_START_DATE,
|
||||
MEDIUM,
|
||||
TEMPERATURE,
|
||||
PRESSURE,
|
||||
SPECIAL_WORK,
|
||||
RISK_IDENTIFICATION,
|
||||
CONFESS_DEPARTMENT_ID,
|
||||
CONFESS_USER_ID,
|
||||
ACCEPT_CONFESS_DEPARTMENT_ID,
|
||||
ACCEPT_CONFESS_USER_ID,
|
||||
GUARDIAN_DEPARTMENT_ID,
|
||||
GUARDIAN_USER_ID,
|
||||
WORK_USER_DEPARTMENT_ID,
|
||||
WORK_USER_ID,
|
||||
CONFIRM_DEPARTMENT_ID,
|
||||
CONFIRM_USER_ID,
|
||||
LEADER_DEPARTMENT_ID,
|
||||
LEADER_USER_ID,
|
||||
ACCEPT_DEPARTMENT_ID,
|
||||
ACCEPT_USER_ID,
|
||||
WORK_START_DEPARTMENT_ID,
|
||||
WORK_START_USER_ID,
|
||||
ACCEPT_TIME,
|
||||
PLS_ID,
|
||||
PLS_NAME,
|
||||
WORK_POSITION,
|
||||
VIDEO_PATH,
|
||||
BOARD_PATH,
|
||||
WORKSHOP_DEPARTMENT_ID,
|
||||
WORKSHOP_USER_ID
|
||||
</sql>
|
||||
|
||||
<!-- 字段值 -->
|
||||
<sql id="FieldValue">
|
||||
#{BLINDBOARD_ID},
|
||||
#{CORPINFO_ID},
|
||||
#{TASK_ID},
|
||||
#{STEP_ID},
|
||||
#{ISDELETE},
|
||||
#{CREATTIME},
|
||||
#{CREATOR},
|
||||
#{OPERATTIME},
|
||||
#{OPERATOR},
|
||||
#{CHECK_NO},
|
||||
#{WORK_TYPE},
|
||||
#{NAME},
|
||||
#{APPLY_DEPARTMENT_ID},
|
||||
#{APPLY_USER_ID},
|
||||
#{WORK_START_DATE},
|
||||
#{MEDIUM},
|
||||
#{TEMPERATURE},
|
||||
#{PRESSURE},
|
||||
#{SPECIAL_WORK},
|
||||
#{RISK_IDENTIFICATION},
|
||||
#{CONFESS_DEPARTMENT_ID},
|
||||
#{CONFESS_USER_ID},
|
||||
#{ACCEPT_CONFESS_DEPARTMENT_ID},
|
||||
#{ACCEPT_CONFESS_USER_ID},
|
||||
#{GUARDIAN_DEPARTMENT_ID},
|
||||
#{GUARDIAN_USER_ID},
|
||||
#{WORK_USER_DEPARTMENT_ID},
|
||||
#{WORK_USER_ID},
|
||||
#{CONFIRM_DEPARTMENT_ID},
|
||||
#{CONFIRM_USER_ID},
|
||||
#{LEADER_DEPARTMENT_ID},
|
||||
#{LEADER_USER_ID},
|
||||
#{ACCEPT_DEPARTMENT_ID},
|
||||
#{ACCEPT_USER_ID},
|
||||
#{WORK_START_DEPARTMENT_ID},
|
||||
#{WORK_START_USER_ID},
|
||||
#{ACCEPT_TIME},
|
||||
#{PLS_ID},
|
||||
#{PLS_NAME},
|
||||
#{WORK_POSITION},
|
||||
#{VIDEO_PATH},
|
||||
#{BOARD_PATH},
|
||||
#{WORKSHOP_DEPARTMENT_ID},
|
||||
#{WORKSHOP_USER_ID}
|
||||
</sql>
|
||||
|
||||
<!-- 获取编码 -->
|
||||
<select id="getCode" parameterType="pd" resultType="pd">
|
||||
SELECT
|
||||
COUNT(1) as code
|
||||
FROM <include refid="tableName"></include> f
|
||||
WHERE f.CORPINFO_ID = #{CORPINFO_ID}
|
||||
and f.CREATTIME LIKE CONCAT(#{CREATDATE},'%')
|
||||
</select>
|
||||
|
||||
<!-- 新增-->
|
||||
<insert id="save" parameterType="pd">
|
||||
insert into
|
||||
<include refid="tableName"></include>
|
||||
(
|
||||
<include refid="Field2"></include>
|
||||
) values (
|
||||
<include refid="FieldValue"></include>
|
||||
)
|
||||
</insert>
|
||||
|
||||
<!-- 删除-->
|
||||
<delete id="delete" parameterType="pd">
|
||||
update
|
||||
<include refid="tableName"></include>
|
||||
set
|
||||
ISDELETE = '1'
|
||||
where
|
||||
BLINDBOARD_ID = #{BLINDBOARD_ID}
|
||||
</delete>
|
||||
|
||||
<!-- 修改 -->
|
||||
<update id="edit" parameterType="pd">
|
||||
update
|
||||
<include refid="tableName"></include>
|
||||
set
|
||||
BLINDBOARD_ID = #{BLINDBOARD_ID},
|
||||
CORPINFO_ID = #{CORPINFO_ID},
|
||||
TASK_ID = #{TASK_ID},
|
||||
STEP_ID = #{STEP_ID},
|
||||
ISDELETE = #{ISDELETE},
|
||||
CREATTIME = #{CREATTIME},
|
||||
CREATOR = #{CREATOR},
|
||||
OPERATTIME = #{OPERATTIME},
|
||||
OPERATOR = #{OPERATOR},
|
||||
CHECK_NO = #{CHECK_NO},
|
||||
WORK_TYPE = #{WORK_TYPE},
|
||||
NAME = #{NAME},
|
||||
APPLY_DEPARTMENT_ID = #{APPLY_DEPARTMENT_ID},
|
||||
APPLY_USER_ID = #{APPLY_USER_ID},
|
||||
WORK_START_DATE = #{WORK_START_DATE},
|
||||
MEDIUM = #{MEDIUM},
|
||||
TEMPERATURE = #{TEMPERATURE},
|
||||
PRESSURE = #{PRESSURE},
|
||||
SPECIAL_WORK = #{SPECIAL_WORK},
|
||||
RISK_IDENTIFICATION = #{RISK_IDENTIFICATION},
|
||||
CONFESS_DEPARTMENT_ID = #{CONFESS_DEPARTMENT_ID},
|
||||
CONFESS_USER_ID = #{CONFESS_USER_ID},
|
||||
ACCEPT_CONFESS_DEPARTMENT_ID = #{ACCEPT_CONFESS_DEPARTMENT_ID},
|
||||
ACCEPT_CONFESS_USER_ID = #{ACCEPT_CONFESS_USER_ID},
|
||||
GUARDIAN_DEPARTMENT_ID = #{GUARDIAN_DEPARTMENT_ID},
|
||||
GUARDIAN_USER_ID = #{GUARDIAN_USER_ID},
|
||||
WORK_USER_DEPARTMENT_ID = #{WORK_USER_DEPARTMENT_ID},
|
||||
WORK_USER_ID = #{WORK_USER_ID},
|
||||
CONFIRM_DEPARTMENT_ID = #{CONFIRM_DEPARTMENT_ID},
|
||||
CONFIRM_USER_ID = #{CONFIRM_USER_ID},
|
||||
LEADER_DEPARTMENT_ID = #{LEADER_DEPARTMENT_ID},
|
||||
LEADER_USER_ID = #{LEADER_USER_ID},
|
||||
ACCEPT_DEPARTMENT_ID = #{ACCEPT_DEPARTMENT_ID},
|
||||
ACCEPT_USER_ID = #{ACCEPT_USER_ID},
|
||||
WORK_START_DEPARTMENT_ID = #{WORK_START_DEPARTMENT_ID},
|
||||
WORK_START_USER_ID = #{WORK_START_USER_ID},
|
||||
ACCEPT_TIME = #{ACCEPT_TIME},
|
||||
PLS_ID = #{PLS_ID},
|
||||
PLS_NAME = #{PLS_NAME},
|
||||
WORK_POSITION = #{WORK_POSITION},
|
||||
VIDEO_PATH = #{VIDEO_PATH},
|
||||
WORKSHOP_DEPARTMENT_ID = #{WORKSHOP_DEPARTMENT_ID},
|
||||
WORKSHOP_USER_ID = #{WORKSHOP_USER_ID}
|
||||
where
|
||||
BLINDBOARD_ID = #{BLINDBOARD_ID}
|
||||
</update>
|
||||
|
||||
|
||||
<select id="findById" parameterType="pd" resultType="pd">
|
||||
SELECT
|
||||
<include refid="Field"></include>,
|
||||
appo.`NAME` as APPLY_DEPARTMENT_NAME,
|
||||
appu.`NAME` as APPLY_USER_NAME,
|
||||
f.WORK_START_DATE,
|
||||
f.SPECIAL_WORK,
|
||||
f.RISK_IDENTIFICATION,
|
||||
worko.`NAME` as WORKSHOP_DEPARTMENT_NAME,
|
||||
worku.`NAME` as WORKSHOP_USER_NAME,
|
||||
woro.`NAME` as WORK_USER_DEPARTMENT_NAME,
|
||||
woru.`NAME` as WORK_USER_USER_NAME,
|
||||
cono.`NAME` as CONFESS_DEPARTMENT_NAME,
|
||||
conu.`NAME` as CONFESS_USER_NAME,
|
||||
acco.`NAME` as ACCEPT_CONFESS_DEPARTMENT_NAME,
|
||||
accu.`NAME` as ACCEPT_CONFESS_USER_NAME,
|
||||
guao.`NAME` as GUARDIAN_DEPARTMENT_NAME,
|
||||
guau.`NAME` as GUARDIAN_USER_NAME,
|
||||
confo.`NAME` as CONFIRM_DEPARTMENT_NAME,
|
||||
confu.`NAME` as CONFIRM_USER_NAME,
|
||||
leao.`NAME` as LEADER_DEPARTMENT_NAME,
|
||||
leau.`NAME` as LEADER_USER_NAME,
|
||||
acceo.`NAME` as ACCEPT_DEPARTMENT_NAME,
|
||||
acceu.`NAME` as ACCEPT_USER_NAME,
|
||||
stao.`NAME` as WORK_START_DEPARTMENT_NAME,
|
||||
stau.`NAME` as WORK_START_USER_NAME
|
||||
FROM
|
||||
bus_blindboard AS f
|
||||
left join oa_department as appo on f.APPLY_DEPARTMENT_ID = appo.DEPARTMENT_ID
|
||||
left join sys_user as appu on f.APPLY_USER_ID = appu.USER_ID
|
||||
|
||||
left join oa_department as worko on f.WORKSHOP_DEPARTMENT_ID = worko.DEPARTMENT_ID
|
||||
left join sys_user as worku on f.WORKSHOP_USER_ID = worku.USER_ID
|
||||
|
||||
left join oa_department as woro on f.WORK_USER_DEPARTMENT_ID = woro.DEPARTMENT_ID
|
||||
left join sys_user as woru on f.WORK_USER_ID = woru.USER_ID
|
||||
|
||||
left join oa_department as cono on f.CONFESS_DEPARTMENT_ID = cono.DEPARTMENT_ID
|
||||
left join sys_user as conu on f.CONFESS_USER_ID = conu.USER_ID
|
||||
|
||||
left join oa_department as acco on f.ACCEPT_CONFESS_DEPARTMENT_ID = acco.DEPARTMENT_ID
|
||||
left join sys_user as accu on f.ACCEPT_CONFESS_USER_ID = accu.USER_ID
|
||||
|
||||
left join oa_department as guao on f.GUARDIAN_DEPARTMENT_ID = guao.DEPARTMENT_ID
|
||||
left join sys_user as guau on f.GUARDIAN_USER_ID = guau.USER_ID
|
||||
|
||||
left join oa_department as confo on f.CONFIRM_DEPARTMENT_ID = confo.DEPARTMENT_ID
|
||||
left join sys_user as confu on f.CONFIRM_USER_ID = confu.USER_ID
|
||||
|
||||
left join oa_department as leao on f.LEADER_DEPARTMENT_ID = leao.DEPARTMENT_ID
|
||||
left join sys_user as leau on f.LEADER_USER_ID = leau.USER_ID
|
||||
|
||||
left join oa_department as acceo on f.ACCEPT_DEPARTMENT_ID = acceo.DEPARTMENT_ID
|
||||
left join sys_user as acceu on f.ACCEPT_USER_ID = acceu.USER_ID
|
||||
|
||||
left join oa_department as stao on f.WORK_START_DEPARTMENT_ID = stao.DEPARTMENT_ID
|
||||
left join sys_user as stau on f.WORK_START_USER_ID = stau.USER_ID
|
||||
|
||||
WHERE f.BLINDBOARD_ID = #{BLINDBOARD_ID}
|
||||
</select>
|
||||
|
||||
<!-- 修改 -->
|
||||
<update id="editStep" parameterType="pd">
|
||||
update
|
||||
<include refid="tableName"></include>
|
||||
set
|
||||
<if test="WORK_START_DATE != null and WORK_START_DATE != ''"><!-- 关键词检索 -->
|
||||
WORK_START_DATE = #{WORK_START_DATE},
|
||||
</if>
|
||||
|
||||
<if test="ACCEPT_TIME != null and ACCEPT_TIME != ''"><!-- 关键词检索 -->
|
||||
ACCEPT_TIME = #{ACCEPT_TIME},
|
||||
</if>
|
||||
STEP_ID = #{STEP_ID}
|
||||
where
|
||||
BLINDBOARD_ID = #{BLINDBOARD_ID}
|
||||
</update>
|
||||
|
||||
<!-- 修改 -->
|
||||
<update id="editContent" parameterType="pd">
|
||||
update
|
||||
<include refid="tableName"></include>
|
||||
set
|
||||
BOARD_PATH = #{BOARD_PATH}
|
||||
where
|
||||
BLINDBOARD_ID = #{BLINDBOARD_ID}
|
||||
</update>
|
||||
|
||||
<update id="editVideo" parameterType="pd">
|
||||
update
|
||||
<include refid="tableName"></include>
|
||||
set
|
||||
VIDEO_PATH = #{VIDEO_PATH}
|
||||
where
|
||||
BLINDBOARD_ID = #{BLINDBOARD_ID}
|
||||
</update>
|
||||
|
||||
<!-- 列表 -->
|
||||
<select id="datalistPage" parameterType="page" resultType="pd">
|
||||
select
|
||||
<include refid="Field"></include>,
|
||||
appo.`NAME` as APPLY_DEPARTMENT_NAME,
|
||||
appu.`NAME` as APPLY_USER_NAME,
|
||||
cono.`NAME` as CONFESS_DEPARTMENT_NAME,
|
||||
conu.`NAME` as CONFESS_USER_NAME,
|
||||
acco.`NAME` as ACCEPT_CONFESS_DEPARTMENT_NAME,
|
||||
accu.`NAME` as ACCEPT_CONFESS_USER_NAME,
|
||||
guao.`NAME` as GUARDIAN_DEPARTMENT_NAME,
|
||||
guau.`NAME` as GUARDIAN_USER_NAME,
|
||||
confo.`NAME` as CONFIRM_DEPARTMENT_NAME,
|
||||
confu.`NAME` as CONFIRM_USER_NAME,
|
||||
leao.`NAME` as LEADER_DEPARTMENT_NAME,
|
||||
leau.`NAME` as LEADER_USER_NAME,
|
||||
acceo.`NAME` as ACCEPT_DEPARTMENT_NAME,
|
||||
acceu.`NAME` as ACCEPT_USER_NAME,
|
||||
stao.`NAME` as WORK_START_DEPARTMENT_NAME,
|
||||
stau.`NAME` as WORK_START_USER_NAME,
|
||||
woro.`NAME` as WORK_USER_DEPARTMENT_NAME,
|
||||
woru.`NAME` as WORK_USER_USER_NAME,
|
||||
worko.`NAME` as WORKSHOP_DEPARTMENT_NAME,
|
||||
worku.`NAME` as WORKSHOP_USER_NAME,
|
||||
log.STEP_NAME,
|
||||
log.NEXT_STEP_ID,
|
||||
log.NEXT_STEP_NAME,
|
||||
log.STATUS
|
||||
from
|
||||
<include refid="tableName"></include> f
|
||||
left join oa_department as appo on f.APPLY_DEPARTMENT_ID = appo.DEPARTMENT_ID
|
||||
left join sys_user as appu on f.APPLY_USER_ID = appu.USER_ID
|
||||
|
||||
left join oa_department as worko on f.WORKSHOP_DEPARTMENT_ID = worko.DEPARTMENT_ID
|
||||
left join sys_user as worku on f.WORKSHOP_USER_ID = worku.USER_ID
|
||||
|
||||
left join oa_department as woro on f.WORK_USER_DEPARTMENT_ID = woro.DEPARTMENT_ID
|
||||
left join sys_user as woru on f.WORK_USER_ID = woru.USER_ID
|
||||
|
||||
left join oa_department as cono on f.CONFESS_DEPARTMENT_ID = cono.DEPARTMENT_ID
|
||||
left join sys_user as conu on f.CONFESS_USER_ID = conu.USER_ID
|
||||
|
||||
left join oa_department as acco on f.ACCEPT_CONFESS_DEPARTMENT_ID = acco.DEPARTMENT_ID
|
||||
left join sys_user as accu on f.ACCEPT_CONFESS_USER_ID = accu.USER_ID
|
||||
|
||||
left join oa_department as guao on f.GUARDIAN_DEPARTMENT_ID = guao.DEPARTMENT_ID
|
||||
left join sys_user as guau on f.GUARDIAN_USER_ID = guau.USER_ID
|
||||
|
||||
left join oa_department as confo on f.CONFIRM_DEPARTMENT_ID = confo.DEPARTMENT_ID
|
||||
left join sys_user as confu on f.CONFIRM_USER_ID = confu.USER_ID
|
||||
|
||||
left join oa_department as leao on f.LEADER_DEPARTMENT_ID = leao.DEPARTMENT_ID
|
||||
left join sys_user as leau on f.LEADER_USER_ID = leau.USER_ID
|
||||
|
||||
left join oa_department as acceo on f.ACCEPT_DEPARTMENT_ID = acceo.DEPARTMENT_ID
|
||||
left join sys_user as acceu on f.ACCEPT_USER_ID = acceu.USER_ID
|
||||
|
||||
left join oa_department as stao on f.WORK_START_DEPARTMENT_ID = stao.DEPARTMENT_ID
|
||||
left join sys_user as stau on f.WORK_START_USER_ID = stau.USER_ID
|
||||
|
||||
left join (select * from(select * from vi_eightwork_flow_log log having 1 order by log.ACT_TIME desc
|
||||
) tmp group by tmp.WORK_ID) log on log.WORK_ID = f.BLINDBOARD_ID
|
||||
where f.ISDELETE = '0'
|
||||
<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
|
||||
and f.CHECK_NO LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
|
||||
</if>
|
||||
<if test="pd.STEP_NAME != null and pd.STEP_NAME != ''"><!-- 关键词检索 -->
|
||||
and exists (
|
||||
select 1 from bus_blindboard_sign sign
|
||||
left join bus_eightwork_step step on step.STEP_ID = sign.STEP_ID
|
||||
where sign.BLINDBOARD_ID = f.BLINDBOARD_ID
|
||||
and sign.SIGN_TIME is null
|
||||
and sign.SIGN_USER_ID = #{pd.USER_ID}
|
||||
and step.STEP_NAME = #{pd.STEP_NAME}
|
||||
and f.STEP_ID != -1
|
||||
)
|
||||
</if>
|
||||
<if test="pd.STEP_ID != null and pd.STEP_ID != ''"><!-- 关键词检索 -->
|
||||
and log.NEXT_STEP_ID = #{pd.STEP_ID} and f.STEP_ID != -1
|
||||
</if>
|
||||
<if test="pd.CREATOR != null and pd.CREATOR != ''"><!-- 关键词检索 -->
|
||||
and f.CREATOR = #{pd.CREATOR}
|
||||
</if>
|
||||
order by f.STEP_ID,f.CREATTIME desc
|
||||
|
||||
</select>
|
||||
|
||||
<select id="checkWorkCount" parameterType="pd" resultType="pd" >
|
||||
select
|
||||
step.CODE,count(1) COUNT
|
||||
from
|
||||
bus_blindboard_sign sign
|
||||
left join bus_eightwork_step step on step.STEP_ID = sign.STEP_ID
|
||||
left join bus_blindboard work on work.BLINDBOARD_ID = sign.BLINDBOARD_ID
|
||||
where
|
||||
sign.SIGN_TIME is null
|
||||
and work.STEP_ID != '-1'
|
||||
and
|
||||
sign.SIGN_USER_ID = #{USER_ID}
|
||||
group by step.CODE
|
||||
</select>
|
||||
|
||||
<select id="listAllMeasures" resultType="pd">
|
||||
select
|
||||
*
|
||||
from
|
||||
BUS_BLINDBOARD_MEASURES
|
||||
</select>
|
||||
|
||||
<select id="getFlowList" resultType="pd">
|
||||
select
|
||||
flow.CAN_SKIP,
|
||||
flow.ACTOR_FIELD,
|
||||
step.STEP_NAME,
|
||||
user.NAME as ACT_USER_NAME,
|
||||
log.ACT_TIME,
|
||||
log.STATUS,
|
||||
cu.SIGN_USER,
|
||||
cu.FINISHED_SIGN_USER,
|
||||
cu.STEP_ID as CURRENT_STEP
|
||||
from
|
||||
bus_eightwork_task_flow flow
|
||||
left join bus_eightwork_step step on step.STEP_ID = flow.STEP_ID
|
||||
left join bus_eightwork_flow_log log on log.STEP_ID = flow.STEP_ID and
|
||||
log.WORK_ID = #{BLINDBOARD_ID}
|
||||
left join sys_user user on user.USER_ID = log.ACT_USER
|
||||
left join (select sign.STEP_ID,
|
||||
GROUP_CONCAT( if(sign.SIGN_TIME IS NULL,signer.NAME,null) ) sign_user,
|
||||
GROUP_CONCAT( if(sign.SIGN_TIME IS not NULL,signer.NAME,null) ) finished_sign_user
|
||||
from bus_blindboard_sign sign
|
||||
left join sys_user signer on signer.USER_ID = sign.SIGN_USER_ID where sign.BLINDBOARD_ID = #{BLINDBOARD_ID}
|
||||
GROUP BY sign.STEP_ID) cu on cu.STEP_ID = step.STEP_ID
|
||||
where
|
||||
flow.TASK_ID = #{TASK_ID}
|
||||
and
|
||||
flow.STEP_ID != 0
|
||||
order by
|
||||
flow.ORDER_BY
|
||||
</select>
|
||||
|
||||
|
||||
<!-- 修改位置 -->
|
||||
<update id="setPosition" parameterType="pd">
|
||||
update
|
||||
<include refid="tableName"></include>
|
||||
set
|
||||
WORK_POSITION = #{WORK_POSITION}
|
||||
where
|
||||
BLINDBOARD_ID = #{BLINDBOARD_ID}
|
||||
</update>
|
||||
|
||||
<select id="getMapList" resultType="pd">
|
||||
select
|
||||
f.BLINDBOARD_ID,
|
||||
f.CHECK_NO,
|
||||
f.WORK_POSITION
|
||||
from
|
||||
<include refid="tableName"></include> f
|
||||
left join (select * from(select * from vi_eightwork_flow_log log having 1 order by log.ACT_TIME desc
|
||||
) tmp group by tmp.WORK_ID) log on log.WORK_ID = f.BLINDBOARD_ID
|
||||
where f.ISDELETE = '0' and f.WORK_POSITION is not null
|
||||
and f.CORPINFO_ID = #{CORPINFO_ID}
|
||||
and f.STEP_ID > 0 and log.NEXT_STEP_ID != 99
|
||||
</select>
|
||||
</mapper>
|
|
@ -0,0 +1,140 @@
|
|||
<?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.eightwork.BlindBoardSignMapper">
|
||||
|
||||
<!--表名 -->
|
||||
<sql id="tableName">
|
||||
BUS_BLINDBOARD_SIGN
|
||||
</sql>
|
||||
|
||||
<!--数据字典表名 -->
|
||||
<sql id="dicTableName">
|
||||
SYS_DICTIONARIES
|
||||
</sql>
|
||||
|
||||
<!-- 字段 -->
|
||||
<sql id="Field">
|
||||
f.BLINDBOARD_SIGN_ID,
|
||||
f.BLINDBOARD_ID,
|
||||
f.CORPINFO_ID,
|
||||
f.SIGN_USER_ID,
|
||||
f.SIGN_PATH,
|
||||
f.SIGN_TIME,
|
||||
f.DESCR,
|
||||
f.STEP_ID,
|
||||
f.IMG_PATH
|
||||
</sql>
|
||||
|
||||
<!-- 字段用于新增 -->
|
||||
<sql id="Field2">
|
||||
BLINDBOARD_SIGN_ID,
|
||||
BLINDBOARD_ID,
|
||||
CORPINFO_ID,
|
||||
SIGN_USER_ID,
|
||||
SIGN_PATH,
|
||||
SIGN_TIME,
|
||||
DESCR,
|
||||
STEP_ID,
|
||||
IMG_PATH
|
||||
</sql>
|
||||
|
||||
<!-- 字段值 -->
|
||||
<sql id="FieldValue">
|
||||
#{BLINDBOARD_SIGN_ID},
|
||||
#{BLINDBOARD_ID},
|
||||
#{CORPINFO_ID},
|
||||
#{SIGN_USER_ID},
|
||||
#{SIGN_PATH},
|
||||
#{SIGN_TIME},
|
||||
#{DESCR},
|
||||
#{STEP_ID},
|
||||
#{IMG_PATH}
|
||||
</sql>
|
||||
|
||||
<!-- 新增-->
|
||||
<insert id="save" parameterType="pd">
|
||||
insert into
|
||||
<include refid="tableName"></include>
|
||||
(
|
||||
<include refid="Field2"></include>
|
||||
) values (
|
||||
<include refid="FieldValue"></include>
|
||||
)
|
||||
</insert>
|
||||
|
||||
<insert id="saveBatch" parameterType="pd">
|
||||
insert into
|
||||
<include refid="tableName"></include>
|
||||
(
|
||||
BLINDBOARD_SIGN_ID,
|
||||
BLINDBOARD_ID,
|
||||
CORPINFO_ID,
|
||||
SIGN_USER_ID,
|
||||
STEP_ID
|
||||
) values
|
||||
<foreach collection="list" item="item" index="index" separator="," >
|
||||
(#{item.BLINDBOARD_SIGN_ID},
|
||||
#{item.BLINDBOARD_ID},
|
||||
#{item.CORPINFO_ID},
|
||||
#{item.SIGN_USER_ID},
|
||||
#{item.STEP_ID})
|
||||
</foreach>
|
||||
</insert>
|
||||
|
||||
<!-- 修改 -->
|
||||
<update id="edit" parameterType="pd">
|
||||
update
|
||||
<include refid="tableName"></include>
|
||||
set
|
||||
DESCR = #{DESCR},
|
||||
SIGN_PATH = #{SIGN_PATH},
|
||||
SIGN_TIME= #{SIGN_TIME},
|
||||
IMG_PATH = #{IMG_PATH}
|
||||
where
|
||||
BLINDBOARD_ID = #{BLINDBOARD_ID} and SIGN_USER_ID = #{SIGN_USER_ID} and STEP_ID = #{STEP_ID}
|
||||
</update>
|
||||
|
||||
<select id="listById" parameterType="pd" resultType="pd">
|
||||
select
|
||||
<include refid="Field"></include>
|
||||
from
|
||||
<include refid="tableName"></include> f
|
||||
where
|
||||
f.BLINDBOARD_ID = #{pd.BLINDBOARD_ID}
|
||||
order by f.SIGN_TIME desc
|
||||
</select>
|
||||
|
||||
<select id="listAll" parameterType="pd" resultType="pd">
|
||||
select
|
||||
f.BLINDBOARD_SIGN_ID,
|
||||
f.BLINDBOARD_ID,
|
||||
f.CORPINFO_ID,
|
||||
f.SIGN_USER_ID,
|
||||
f.SIGN_PATH,
|
||||
f.SIGN_TIME,
|
||||
f.STEP_ID,
|
||||
f.IMG_PATH,
|
||||
IFNULL(f.DESCR,'无') as DESCR,
|
||||
step.CODE
|
||||
from
|
||||
<include refid="tableName"></include> f
|
||||
left join bus_eightwork_step step on step.STEP_ID = f.STEP_ID
|
||||
where
|
||||
f.BLINDBOARD_ID = #{BLINDBOARD_ID}
|
||||
and
|
||||
f.SIGN_TIME is not null
|
||||
</select>
|
||||
|
||||
<select id="checkUnsigned" parameterType="pd" resultType="pd">
|
||||
select
|
||||
<include refid="Field"></include>
|
||||
from
|
||||
<include refid="tableName"></include> f
|
||||
where
|
||||
f.BLINDBOARD_ID = #{BLINDBOARD_ID}
|
||||
and
|
||||
f.SIGN_TIME is null
|
||||
</select>
|
||||
|
||||
|
||||
</mapper>
|
|
@ -0,0 +1,156 @@
|
|||
<?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.eightwork.BlindBoardToMeasuresMapper">
|
||||
|
||||
<!--表名 -->
|
||||
<sql id="tableName">
|
||||
BUS_BLINDBOARDTOMEASURES
|
||||
</sql>
|
||||
|
||||
<!--数据字典表名 -->
|
||||
<sql id="dicTableName">
|
||||
SYS_DICTIONARIES
|
||||
</sql>
|
||||
|
||||
<!-- 字段 -->
|
||||
<sql id="Field">
|
||||
f.BLINDBOARD_ID,
|
||||
f.BUS_BLINDBOARD_MEASURES_ID,
|
||||
f.STATUS,
|
||||
f.BLINDBOARDTOMEASURES_ID,
|
||||
f.CONFIRM_ID,
|
||||
f.SIGN_PATH,
|
||||
f.SIGN_TIME,
|
||||
f.IMG_PATH
|
||||
</sql>
|
||||
|
||||
<!-- 字段用于新增 -->
|
||||
<sql id="Field2">
|
||||
BLINDBOARD_ID,
|
||||
BUS_BLINDBOARD_MEASURES_ID,
|
||||
STATUS,
|
||||
BLINDBOARDTOMEASURES_ID,
|
||||
CONFIRM_ID,
|
||||
SIGN_PATH,
|
||||
SIGN_TIME,
|
||||
IMG_PATH
|
||||
</sql>
|
||||
|
||||
<!-- 字段值 -->
|
||||
<sql id="FieldValue">
|
||||
#{BLINDBOARD_ID},
|
||||
#{BUS_BLINDBOARD_MEASURES_ID},
|
||||
#{STATUS},
|
||||
#{BLINDBOARDTOMEASURES_ID},
|
||||
#{CONFIRM_ID},
|
||||
#{SIGN_PATH},
|
||||
#{SIGN_TIME},
|
||||
#{IMG_PATH}
|
||||
</sql>
|
||||
|
||||
<!-- 新增-->
|
||||
<insert id="save" parameterType="pd">
|
||||
insert into
|
||||
<include refid="tableName"></include>
|
||||
(
|
||||
<include refid="Field2"></include>
|
||||
) values (
|
||||
<include refid="FieldValue"></include>
|
||||
)
|
||||
</insert>
|
||||
|
||||
<insert id="saveBatch" parameterType="pd">
|
||||
insert into
|
||||
<include refid="tableName"></include>
|
||||
(
|
||||
BLINDBOARD_ID,
|
||||
BUS_BLINDBOARD_MEASURES_ID,
|
||||
BLINDBOARDTOMEASURES_ID,
|
||||
CONFIRM_ID
|
||||
) values
|
||||
<foreach collection="list" item="item" index="index" separator="," >
|
||||
(
|
||||
#{item.BLINDBOARD_ID},
|
||||
#{item.BUS_BLINDBOARD_MEASURES_ID},
|
||||
#{item.BLINDBOARDTOMEASURES_ID},
|
||||
#{item.CONFIRM_ID}
|
||||
)
|
||||
</foreach>
|
||||
</insert>
|
||||
|
||||
<!-- 删除-->
|
||||
<delete id="delete" parameterType="pd">
|
||||
delete from
|
||||
<include refid="tableName"></include>
|
||||
where
|
||||
BLINDBOARD_ID = #{BLINDBOARD_ID}
|
||||
</delete>
|
||||
|
||||
<!-- 修改 -->
|
||||
<update id="edit" parameterType="pd">
|
||||
update
|
||||
<include refid="tableName"></include>
|
||||
set
|
||||
STATUS = #{STATUS},
|
||||
SIGN_PATH = #{SIGN_PATH},
|
||||
IMG_PATH = #{IMG_PATH},
|
||||
SIGN_TIME = #{SIGN_TIME}
|
||||
where
|
||||
BLINDBOARDTOMEASURES_ID = #{BLINDBOARDTOMEASURES_ID}
|
||||
</update>
|
||||
|
||||
<!-- 通过ID获取数据 -->
|
||||
<select id="findById" parameterType="pd" resultType="pd">
|
||||
select
|
||||
<include refid="Field"></include>
|
||||
from
|
||||
<include refid="tableName"></include> f
|
||||
where
|
||||
f.BLINDBOARDTOMEASURES_ID = #{BLINDBOARDTOMEASURES_ID}
|
||||
</select>
|
||||
|
||||
<!-- 列表(全部) -->
|
||||
<select id="listAll" parameterType="pd" resultType="pd">
|
||||
select
|
||||
<include refid="Field"></include>
|
||||
from
|
||||
<include refid="tableName"></include> f
|
||||
</select>
|
||||
|
||||
<!-- 批量删除 -->
|
||||
<delete id="deleteAll" parameterType="String">
|
||||
update
|
||||
<include refid="tableName"></include>
|
||||
set
|
||||
ISDELETE = '1'
|
||||
where
|
||||
BLINDBOARDTOMEASURES_ID in
|
||||
<foreach item="item" index="index" collection="ArrayDATA_IDS" open="(" separator="," close=")">
|
||||
#{item}
|
||||
</foreach>
|
||||
</delete>
|
||||
|
||||
|
||||
<select id="listAllMeasuresForSign" parameterType="pd" resultType="pd">
|
||||
select
|
||||
f.BLINDBOARDTOMEASURES_ID,
|
||||
m.*
|
||||
from
|
||||
<include refid="tableName"></include> f
|
||||
left join bus_blindboard_measures m on f.BUS_BLINDBOARD_MEASURES_ID = m.BUS_BLINDBOARD_MEASURES_ID
|
||||
where
|
||||
f.BLINDBOARD_ID = #{BLINDBOARD_ID} and f.CONFIRM_ID = #{CONFIRM_ID}
|
||||
</select>
|
||||
|
||||
<select id="listSignFinishMeasures" parameterType="pd" resultType="pd">
|
||||
select
|
||||
<include refid="Field"></include>,
|
||||
m.*
|
||||
from
|
||||
<include refid="tableName"></include> f
|
||||
left join bus_blindboard_measures m on f.BUS_BLINDBOARD_MEASURES_ID = m.BUS_BLINDBOARD_MEASURES_ID
|
||||
where
|
||||
f.BLINDBOARD_ID = #{BLINDBOARD_ID}
|
||||
</select>
|
||||
|
||||
</mapper>
|
|
@ -0,0 +1,532 @@
|
|||
<?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.eightwork.BreakGroundMapper">
|
||||
<!--表名 -->
|
||||
<sql id="tableName">
|
||||
BUS_BREAKGROUND
|
||||
</sql>
|
||||
|
||||
<!-- 字段 -->
|
||||
<sql id="Field">
|
||||
f.BREAKGROUND_ID,
|
||||
f.CORPINFO_ID,
|
||||
f.TASK_ID,
|
||||
f.STEP_ID,
|
||||
f.ISDELETE,
|
||||
f.CREATTIME,
|
||||
f.CREATOR,
|
||||
f.OPERATTIME,
|
||||
f.OPERATOR,
|
||||
f.CHECK_NO,
|
||||
f.WORK_CONTENT,
|
||||
f.WORK_PLACE,
|
||||
f.JOB_CONTENT,
|
||||
f.APPLY_DEPARTMENT_ID,
|
||||
f.APPLY_USER_ID,
|
||||
f.WORK_START_DATE,
|
||||
f.WORK_END_DATE,
|
||||
f.SPECIAL_WORK,
|
||||
f.RISK_IDENTIFICATION,
|
||||
f.CONFESS_DEPARTMENT_ID,
|
||||
f.CONFESS_USER_ID,
|
||||
f.ACCEPT_CONFESS_DEPARTMENT_ID,
|
||||
f.ACCEPT_CONFESS_USER_ID,
|
||||
f.GUARDIAN_DEPARTMENT_ID,
|
||||
f.GUARDIAN_USER_ID,
|
||||
f.WORK_USER_DEPARTMENT_ID,
|
||||
f.WORK_USER_ID,
|
||||
f.CONFIRM_DEPARTMENT_ID,
|
||||
f.CONFIRM_USER_ID,
|
||||
f.LEADER_DEPARTMENT_ID,
|
||||
f.LEADER_USER_ID,
|
||||
f.SAFETY_DEPARTMENT_ID,
|
||||
f.SAFETY_USER_ID,
|
||||
f.APPROVE_DEPARTMENT_ID,
|
||||
f.APPROVE_USER_ID,
|
||||
f.ACCEPT_DEPARTMENT_ID,
|
||||
f.ACCEPT_USER_ID,
|
||||
f.WORK_START_DEPARTMENT_ID,
|
||||
f.WORK_START_USER_ID,
|
||||
f.WORK_END_DEPARTMENT_ID,
|
||||
f.WORK_END_USER_ID,
|
||||
f.ACCEPT_TIME,
|
||||
f.PLS_ID,
|
||||
f.PLS_NAME,
|
||||
f.WORK_POSITION,
|
||||
f.VIDEO_PATH,
|
||||
f.CONTENT_IMG_PATH
|
||||
</sql>
|
||||
|
||||
<!-- 字段用于新增 -->
|
||||
<sql id="Field2">
|
||||
BREAKGROUND_ID,
|
||||
CORPINFO_ID,
|
||||
TASK_ID,
|
||||
STEP_ID,
|
||||
ISDELETE,
|
||||
CREATTIME,
|
||||
CREATOR,
|
||||
OPERATTIME,
|
||||
OPERATOR,
|
||||
CHECK_NO,
|
||||
WORK_CONTENT,
|
||||
WORK_PLACE,
|
||||
JOB_CONTENT,
|
||||
APPLY_DEPARTMENT_ID,
|
||||
APPLY_USER_ID,
|
||||
WORK_START_DATE,
|
||||
WORK_END_DATE,
|
||||
SPECIAL_WORK,
|
||||
RISK_IDENTIFICATION,
|
||||
CONFESS_DEPARTMENT_ID,
|
||||
CONFESS_USER_ID,
|
||||
ACCEPT_CONFESS_DEPARTMENT_ID,
|
||||
ACCEPT_CONFESS_USER_ID,
|
||||
GUARDIAN_DEPARTMENT_ID,
|
||||
GUARDIAN_USER_ID,
|
||||
WORK_USER_DEPARTMENT_ID,
|
||||
WORK_USER_ID,
|
||||
CONFIRM_DEPARTMENT_ID,
|
||||
CONFIRM_USER_ID,
|
||||
LEADER_DEPARTMENT_ID,
|
||||
LEADER_USER_ID,
|
||||
SAFETY_DEPARTMENT_ID,
|
||||
SAFETY_USER_ID,
|
||||
APPROVE_DEPARTMENT_ID,
|
||||
APPROVE_USER_ID,
|
||||
ACCEPT_DEPARTMENT_ID,
|
||||
ACCEPT_USER_ID,
|
||||
WORK_START_DEPARTMENT_ID,
|
||||
WORK_START_USER_ID,
|
||||
WORK_END_DEPARTMENT_ID,
|
||||
WORK_END_USER_ID,
|
||||
ACCEPT_TIME,
|
||||
PLS_ID,
|
||||
PLS_NAME,
|
||||
WORK_POSITION,
|
||||
VIDEO_PATH,
|
||||
CONTENT_IMG_PATH
|
||||
</sql>
|
||||
|
||||
<!-- 字段值 -->
|
||||
<sql id="FieldValue">
|
||||
#{BREAKGROUND_ID},
|
||||
#{CORPINFO_ID},
|
||||
#{TASK_ID},
|
||||
#{STEP_ID},
|
||||
#{ISDELETE},
|
||||
#{CREATTIME},
|
||||
#{CREATOR},
|
||||
#{OPERATTIME},
|
||||
#{OPERATOR},
|
||||
#{CHECK_NO},
|
||||
#{WORK_CONTENT},
|
||||
#{WORK_PLACE},
|
||||
#{JOB_CONTENT},
|
||||
#{APPLY_DEPARTMENT_ID},
|
||||
#{APPLY_USER_ID},
|
||||
#{WORK_START_DATE},
|
||||
#{WORK_END_DATE},
|
||||
#{SPECIAL_WORK},
|
||||
#{RISK_IDENTIFICATION},
|
||||
#{CONFESS_DEPARTMENT_ID},
|
||||
#{CONFESS_USER_ID},
|
||||
#{ACCEPT_CONFESS_DEPARTMENT_ID},
|
||||
#{ACCEPT_CONFESS_USER_ID},
|
||||
#{GUARDIAN_DEPARTMENT_ID},
|
||||
#{GUARDIAN_USER_ID},
|
||||
#{WORK_USER_DEPARTMENT_ID},
|
||||
#{WORK_USER_ID},
|
||||
#{CONFIRM_DEPARTMENT_ID},
|
||||
#{CONFIRM_USER_ID},
|
||||
#{LEADER_DEPARTMENT_ID},
|
||||
#{LEADER_USER_ID},
|
||||
#{SAFETY_DEPARTMENT_ID},
|
||||
#{SAFETY_USER_ID},
|
||||
#{APPROVE_DEPARTMENT_ID},
|
||||
#{APPROVE_USER_ID},
|
||||
#{ACCEPT_DEPARTMENT_ID},
|
||||
#{ACCEPT_USER_ID},
|
||||
#{WORK_START_DEPARTMENT_ID},
|
||||
#{WORK_START_USER_ID},
|
||||
#{WORK_END_DEPARTMENT_ID},
|
||||
#{WORK_END_USER_ID},
|
||||
#{ACCEPT_TIME},
|
||||
#{PLS_ID},
|
||||
#{PLS_NAME},
|
||||
#{WORK_POSITION},
|
||||
#{VIDEO_PATH},
|
||||
#{CONTENT_IMG_PATH}
|
||||
</sql>
|
||||
|
||||
<!-- 获取编码 -->
|
||||
<select id="getCode" parameterType="pd" resultType="pd">
|
||||
SELECT
|
||||
COUNT(1) as code
|
||||
FROM <include refid="tableName"></include> f
|
||||
WHERE f.CORPINFO_ID = #{CORPINFO_ID}
|
||||
and f.CREATTIME LIKE CONCAT(#{CREATDATE},'%')
|
||||
</select>
|
||||
|
||||
<!-- 新增-->
|
||||
<insert id="save" parameterType="pd">
|
||||
insert into
|
||||
<include refid="tableName"></include>
|
||||
(
|
||||
<include refid="Field2"></include>
|
||||
) values (
|
||||
<include refid="FieldValue"></include>
|
||||
)
|
||||
</insert>
|
||||
|
||||
<!-- 删除-->
|
||||
<delete id="delete" parameterType="pd">
|
||||
update
|
||||
<include refid="tableName"></include>
|
||||
set
|
||||
ISDELETE = '1'
|
||||
where
|
||||
BREAKGROUND_ID = #{BREAKGROUND_ID}
|
||||
</delete>
|
||||
|
||||
<!-- 修改 -->
|
||||
<update id="edit" parameterType="pd">
|
||||
update
|
||||
<include refid="tableName"></include>
|
||||
set
|
||||
BREAKGROUND_ID = #{BREAKGROUND_ID},
|
||||
CORPINFO_ID = #{CORPINFO_ID},
|
||||
TASK_ID = #{TASK_ID},
|
||||
STEP_ID = #{STEP_ID},
|
||||
ISDELETE = #{ISDELETE},
|
||||
CREATTIME = #{CREATTIME},
|
||||
CREATOR = #{CREATOR},
|
||||
OPERATTIME = #{OPERATTIME},
|
||||
OPERATOR = #{OPERATOR},
|
||||
CHECK_NO = #{CHECK_NO},
|
||||
WORK_CONTENT = #{WORK_CONTENT},
|
||||
WORK_PLACE = #{WORK_PLACE},
|
||||
JOB_CONTENT = #{JOB_CONTENT},
|
||||
APPLY_DEPARTMENT_ID = #{APPLY_DEPARTMENT_ID},
|
||||
APPLY_USER_ID = #{APPLY_USER_ID},
|
||||
WORK_START_DATE = #{WORK_START_DATE},
|
||||
WORK_END_DATE = #{WORK_END_DATE},
|
||||
SPECIAL_WORK = #{SPECIAL_WORK},
|
||||
RISK_IDENTIFICATION = #{RISK_IDENTIFICATION},
|
||||
CONFESS_DEPARTMENT_ID = #{CONFESS_DEPARTMENT_ID},
|
||||
CONFESS_USER_ID = #{CONFESS_USER_ID},
|
||||
ACCEPT_CONFESS_DEPARTMENT_ID = #{ACCEPT_CONFESS_DEPARTMENT_ID},
|
||||
ACCEPT_CONFESS_USER_ID = #{ACCEPT_CONFESS_USER_ID},
|
||||
GUARDIAN_DEPARTMENT_ID = #{GUARDIAN_DEPARTMENT_ID},
|
||||
GUARDIAN_USER_ID = #{GUARDIAN_USER_ID},
|
||||
WORK_USER_DEPARTMENT_ID = #{WORK_USER_DEPARTMENT_ID},
|
||||
WORK_USER_ID = #{WORK_USER_ID},
|
||||
CONFIRM_DEPARTMENT_ID = #{CONFIRM_DEPARTMENT_ID},
|
||||
CONFIRM_USER_ID = #{CONFIRM_USER_ID},
|
||||
LEADER_DEPARTMENT_ID = #{LEADER_DEPARTMENT_ID},
|
||||
LEADER_USER_ID = #{LEADER_USER_ID},
|
||||
SAFETY_DEPARTMENT_ID = #{SAFETY_DEPARTMENT_ID},
|
||||
SAFETY_USER_ID = #{SAFETY_USER_ID},
|
||||
APPROVE_DEPARTMENT_ID = #{APPROVE_DEPARTMENT_ID},
|
||||
APPROVE_USER_ID = #{APPROVE_USER_ID},
|
||||
ACCEPT_DEPARTMENT_ID = #{ACCEPT_DEPARTMENT_ID},
|
||||
ACCEPT_USER_ID = #{ACCEPT_USER_ID},
|
||||
WORK_START_DEPARTMENT_ID = #{WORK_START_DEPARTMENT_ID},
|
||||
WORK_START_USER_ID = #{WORK_START_USER_ID},
|
||||
WORK_END_DEPARTMENT_ID = #{WORK_END_DEPARTMENT_ID},
|
||||
WORK_END_USER_ID = #{WORK_END_USER_ID},
|
||||
ACCEPT_TIME = #{ACCEPT_TIME},
|
||||
PLS_ID = #{PLS_ID},
|
||||
PLS_NAME = #{PLS_NAME},
|
||||
WORK_POSITION = #{WORK_POSITION},
|
||||
VIDEO_PATH = #{VIDEO_PATH}
|
||||
where
|
||||
BREAKGROUND_ID = #{BREAKGROUND_ID}
|
||||
</update>
|
||||
|
||||
|
||||
<select id="findById" parameterType="pd" resultType="pd">
|
||||
SELECT
|
||||
<include refid="Field"></include>,
|
||||
appo.`NAME` as APPLY_DEPARTMENT_NAME,
|
||||
appu.`NAME` as APPLY_USER_NAME,
|
||||
f.WORK_START_DATE,
|
||||
f.WORK_END_DATE,
|
||||
f.SPECIAL_WORK,
|
||||
f.RISK_IDENTIFICATION,
|
||||
woro.`NAME` as WORK_USER_DEPARTMENT_NAME,
|
||||
woru.`NAME` as WORK_USER_USER_NAME,
|
||||
cono.`NAME` as CONFESS_DEPARTMENT_NAME,
|
||||
conu.`NAME` as CONFESS_USER_NAME,
|
||||
acco.`NAME` as ACCEPT_CONFESS_DEPARTMENT_NAME,
|
||||
accu.`NAME` as ACCEPT_CONFESS_USER_NAME,
|
||||
guao.`NAME` as GUARDIAN_DEPARTMENT_NAME,
|
||||
guau.`NAME` as GUARDIAN_USER_NAME,
|
||||
confo.`NAME` as CONFIRM_DEPARTMENT_NAME,
|
||||
confu.`NAME` as CONFIRM_USER_NAME,
|
||||
leao.`NAME` as LEADER_DEPARTMENT_NAME,
|
||||
leau.`NAME` as LEADER_USER_NAME,
|
||||
audo.`NAME` as SAFETY_DEPARTMENT_NAME,
|
||||
audu.`NAME` as SAFETY_USER_NAME,
|
||||
appro.`NAME` as APPROVE_DEPARTMENT_NAME,
|
||||
appru.`NAME` as APPROVE_USER_NAME,
|
||||
acceo.`NAME` as ACCEPT_DEPARTMENT_NAME,
|
||||
acceu.`NAME` as ACCEPT_USER_NAME,
|
||||
stao.`NAME` as WORK_START_DEPARTMENT_NAME,
|
||||
stau.`NAME` as WORK_START_USER_NAME,
|
||||
endo.`NAME` as WORK_END_DEPARTMENT_NAME,
|
||||
endu.`NAME` as WORK_END_USER_NAME
|
||||
FROM
|
||||
bus_breakground AS f
|
||||
left join oa_department as appo on f.APPLY_DEPARTMENT_ID = appo.DEPARTMENT_ID
|
||||
left join sys_user as appu on f.APPLY_USER_ID = appu.USER_ID
|
||||
|
||||
left join oa_department as woro on f.WORK_USER_DEPARTMENT_ID = woro.DEPARTMENT_ID
|
||||
left join sys_user as woru on f.WORK_USER_ID = woru.USER_ID
|
||||
|
||||
left join oa_department as cono on f.CONFESS_DEPARTMENT_ID = cono.DEPARTMENT_ID
|
||||
left join sys_user as conu on f.CONFESS_USER_ID = conu.USER_ID
|
||||
|
||||
left join oa_department as acco on f.ACCEPT_CONFESS_DEPARTMENT_ID = acco.DEPARTMENT_ID
|
||||
left join sys_user as accu on f.ACCEPT_CONFESS_USER_ID = accu.USER_ID
|
||||
|
||||
left join oa_department as guao on f.GUARDIAN_DEPARTMENT_ID = guao.DEPARTMENT_ID
|
||||
left join sys_user as guau on f.GUARDIAN_USER_ID = guau.USER_ID
|
||||
|
||||
left join oa_department as confo on f.CONFIRM_DEPARTMENT_ID = confo.DEPARTMENT_ID
|
||||
left join sys_user as confu on f.CONFIRM_USER_ID = confu.USER_ID
|
||||
|
||||
left join oa_department as leao on f.LEADER_DEPARTMENT_ID = leao.DEPARTMENT_ID
|
||||
left join sys_user as leau on f.LEADER_USER_ID = leau.USER_ID
|
||||
|
||||
left join oa_department as audo on f.SAFETY_DEPARTMENT_ID = audo.DEPARTMENT_ID
|
||||
left join sys_user as audu on f.SAFETY_USER_ID = audu.USER_ID
|
||||
|
||||
left join oa_department as appro on f.APPROVE_DEPARTMENT_ID = appro.DEPARTMENT_ID
|
||||
left join sys_user as appru on f.APPROVE_USER_ID = appru.USER_ID
|
||||
|
||||
left join oa_department as acceo on f.ACCEPT_DEPARTMENT_ID = acceo.DEPARTMENT_ID
|
||||
left join sys_user as acceu on f.ACCEPT_USER_ID = acceu.USER_ID
|
||||
|
||||
left join oa_department as stao on f.WORK_START_DEPARTMENT_ID = stao.DEPARTMENT_ID
|
||||
left join sys_user as stau on f.WORK_START_USER_ID = stau.USER_ID
|
||||
|
||||
left join oa_department as endo on f.WORK_END_DEPARTMENT_ID = endo.DEPARTMENT_ID
|
||||
left join sys_user as endu on f.WORK_END_USER_ID = endu.USER_ID
|
||||
|
||||
WHERE f.BREAKGROUND_ID = #{BREAKGROUND_ID}
|
||||
</select>
|
||||
|
||||
<!-- 修改 -->
|
||||
<update id="editStep" parameterType="pd">
|
||||
update
|
||||
<include refid="tableName"></include>
|
||||
set
|
||||
<if test="WORK_START_DATE != null and WORK_START_DATE != ''"><!-- 关键词检索 -->
|
||||
WORK_START_DATE = #{WORK_START_DATE},
|
||||
</if>
|
||||
<if test="WORK_END_DATE != null and WORK_END_DATE != ''"><!-- 关键词检索 -->
|
||||
WORK_END_DATE = #{WORK_END_DATE},
|
||||
</if>
|
||||
<if test="ACCEPT_TIME != null and ACCEPT_TIME != ''"><!-- 关键词检索 -->
|
||||
ACCEPT_TIME = #{ACCEPT_TIME},
|
||||
</if>
|
||||
STEP_ID = #{STEP_ID}
|
||||
where
|
||||
BREAKGROUND_ID = #{BREAKGROUND_ID}
|
||||
</update>
|
||||
|
||||
<!-- 修改 -->
|
||||
<update id="editContent" parameterType="pd">
|
||||
update
|
||||
<include refid="tableName"></include>
|
||||
set
|
||||
CONTENT_IMG_PATH = #{CONTENT_IMG_PATH},
|
||||
WORK_CONTENT = #{WORK_CONTENT}
|
||||
where
|
||||
BREAKGROUND_ID = #{BREAKGROUND_ID}
|
||||
</update>
|
||||
<update id="editVideo" parameterType="pd">
|
||||
update
|
||||
<include refid="tableName"></include>
|
||||
set
|
||||
VIDEO_PATH = #{VIDEO_PATH}
|
||||
where
|
||||
BREAKGROUND_ID = #{BREAKGROUND_ID}
|
||||
</update>
|
||||
|
||||
<!-- 列表 -->
|
||||
<select id="datalistPage" parameterType="page" resultType="pd">
|
||||
select
|
||||
<include refid="Field"></include>,
|
||||
appo.`NAME` as APPLY_DEPARTMENT_NAME,
|
||||
appu.`NAME` as APPLY_USER_NAME,
|
||||
cono.`NAME` as CONFESS_DEPARTMENT_NAME,
|
||||
conu.`NAME` as CONFESS_USER_NAME,
|
||||
acco.`NAME` as ACCEPT_CONFESS_DEPARTMENT_NAME,
|
||||
accu.`NAME` as ACCEPT_CONFESS_USER_NAME,
|
||||
guao.`NAME` as GUARDIAN_DEPARTMENT_NAME,
|
||||
guau.`NAME` as GUARDIAN_USER_NAME,
|
||||
confo.`NAME` as CONFIRM_DEPARTMENT_NAME,
|
||||
confu.`NAME` as CONFIRM_USER_NAME,
|
||||
leao.`NAME` as LEADER_DEPARTMENT_NAME,
|
||||
leau.`NAME` as LEADER_USER_NAME,
|
||||
audo.`NAME` as SAFETY_DEPARTMENT_NAME,
|
||||
audu.`NAME` as SAFETY_USER_NAME,
|
||||
appro.`NAME` as APPROVE_DEPARTMENT_NAME,
|
||||
appru.`NAME` as APPROVE_USER_NAME,
|
||||
acceo.`NAME` as ACCEPT_DEPARTMENT_NAME,
|
||||
acceu.`NAME` as ACCEPT_USER_NAME,
|
||||
stao.`NAME` as WORK_START_DEPARTMENT_NAME,
|
||||
stau.`NAME` as WORK_START_USER_NAME,
|
||||
endo.`NAME` as WORK_END_DEPARTMENT_NAME,
|
||||
endu.`NAME` as WORK_END_USER_NAME,
|
||||
woro.`NAME` as WORK_USER_DEPARTMENT_NAME,
|
||||
woru.`NAME` as WORK_USER_USER_NAME,
|
||||
log.STEP_NAME,
|
||||
log.NEXT_STEP_ID,
|
||||
log.NEXT_STEP_NAME,
|
||||
log.STATUS
|
||||
from
|
||||
<include refid="tableName"></include> f
|
||||
left join oa_department as appo on f.APPLY_DEPARTMENT_ID = appo.DEPARTMENT_ID
|
||||
left join sys_user as appu on f.APPLY_USER_ID = appu.USER_ID
|
||||
|
||||
left join oa_department as woro on f.WORK_USER_DEPARTMENT_ID = woro.DEPARTMENT_ID
|
||||
left join sys_user as woru on f.WORK_USER_ID = woru.USER_ID
|
||||
|
||||
left join oa_department as cono on f.CONFESS_DEPARTMENT_ID = cono.DEPARTMENT_ID
|
||||
left join sys_user as conu on f.CONFESS_USER_ID = conu.USER_ID
|
||||
|
||||
left join oa_department as acco on f.ACCEPT_CONFESS_DEPARTMENT_ID = acco.DEPARTMENT_ID
|
||||
left join sys_user as accu on f.ACCEPT_CONFESS_USER_ID = accu.USER_ID
|
||||
|
||||
left join oa_department as guao on f.GUARDIAN_DEPARTMENT_ID = guao.DEPARTMENT_ID
|
||||
left join sys_user as guau on f.GUARDIAN_USER_ID = guau.USER_ID
|
||||
|
||||
left join oa_department as confo on f.CONFIRM_DEPARTMENT_ID = confo.DEPARTMENT_ID
|
||||
left join sys_user as confu on f.CONFIRM_USER_ID = confu.USER_ID
|
||||
|
||||
left join oa_department as leao on f.LEADER_DEPARTMENT_ID = leao.DEPARTMENT_ID
|
||||
left join sys_user as leau on f.LEADER_USER_ID = leau.USER_ID
|
||||
|
||||
left join oa_department as audo on f.SAFETY_DEPARTMENT_ID = audo.DEPARTMENT_ID
|
||||
left join sys_user as audu on f.SAFETY_USER_ID = audu.USER_ID
|
||||
|
||||
left join oa_department as appro on f.APPROVE_DEPARTMENT_ID = appro.DEPARTMENT_ID
|
||||
left join sys_user as appru on f.APPROVE_USER_ID = appru.USER_ID
|
||||
|
||||
left join oa_department as acceo on f.ACCEPT_DEPARTMENT_ID = acceo.DEPARTMENT_ID
|
||||
left join sys_user as acceu on f.ACCEPT_USER_ID = acceu.USER_ID
|
||||
|
||||
left join oa_department as stao on f.WORK_START_DEPARTMENT_ID = stao.DEPARTMENT_ID
|
||||
left join sys_user as stau on f.WORK_START_USER_ID = stau.USER_ID
|
||||
|
||||
left join oa_department as endo on f.WORK_END_DEPARTMENT_ID = endo.DEPARTMENT_ID
|
||||
left join sys_user as endu on f.WORK_END_USER_ID = endu.USER_ID
|
||||
|
||||
left join (select * from(select * from vi_eightwork_flow_log log having 1 order by log.ACT_TIME desc
|
||||
) tmp group by tmp.WORK_ID) log on log.WORK_ID = f.BREAKGROUND_ID
|
||||
where f.ISDELETE = '0'
|
||||
<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
|
||||
and f.CHECK_NO LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
|
||||
</if>
|
||||
<if test="pd.STEP_NAME != null and pd.STEP_NAME != ''"><!-- 关键词检索 -->
|
||||
and exists (
|
||||
select 1 from bus_breakground_sign sign
|
||||
left join bus_eightwork_step step on step.STEP_ID = sign.STEP_ID
|
||||
where sign.BREAKGROUND_ID = f.BREAKGROUND_ID
|
||||
and sign.SIGN_TIME is null
|
||||
and sign.SIGN_USER_ID = #{pd.USER_ID}
|
||||
and step.STEP_NAME = #{pd.STEP_NAME}
|
||||
and f.STEP_ID != -1
|
||||
)
|
||||
</if>
|
||||
<if test="pd.STEP_ID != null and pd.STEP_ID != ''"><!-- 关键词检索 -->
|
||||
and log.NEXT_STEP_ID = #{pd.STEP_ID} and f.STEP_ID != -1
|
||||
</if>
|
||||
<if test="pd.CREATOR != null and pd.CREATOR != ''"><!-- 关键词检索 -->
|
||||
and f.CREATOR = #{pd.CREATOR}
|
||||
</if>
|
||||
order by f.STEP_ID,f.CREATTIME desc
|
||||
|
||||
</select>
|
||||
|
||||
<select id="checkWorkCount" parameterType="pd" resultType="pd" >
|
||||
select
|
||||
step.CODE,count(1) COUNT
|
||||
from
|
||||
bus_breakground_sign sign
|
||||
left join bus_eightwork_step step on step.STEP_ID = sign.STEP_ID
|
||||
left join bus_breakground work on work.BREAKGROUND_ID = sign.BREAKGROUND_ID
|
||||
where
|
||||
sign.SIGN_TIME is null
|
||||
and work.STEP_ID != '-1'
|
||||
and
|
||||
sign.SIGN_USER_ID = #{USER_ID}
|
||||
group by step.CODE
|
||||
</select>
|
||||
|
||||
<select id="listAllMeasures" resultType="pd">
|
||||
select
|
||||
*
|
||||
from
|
||||
BUS_BREAKGROUND_MEASURES
|
||||
</select>
|
||||
|
||||
<select id="getFlowList" resultType="pd">
|
||||
select
|
||||
flow.CAN_SKIP,
|
||||
flow.ACTOR_FIELD,
|
||||
step.STEP_NAME,
|
||||
user.NAME as ACT_USER_NAME,
|
||||
log.ACT_TIME,
|
||||
log.STATUS,
|
||||
cu.SIGN_USER,
|
||||
cu.FINISHED_SIGN_USER,
|
||||
cu.STEP_ID as CURRENT_STEP
|
||||
from
|
||||
bus_eightwork_task_flow flow
|
||||
left join bus_eightwork_step step on step.STEP_ID = flow.STEP_ID
|
||||
left join bus_eightwork_flow_log log on log.STEP_ID = flow.STEP_ID and
|
||||
log.WORK_ID = #{BREAKGROUND_ID}
|
||||
left join sys_user user on user.USER_ID = log.ACT_USER
|
||||
left join (select sign.STEP_ID,
|
||||
GROUP_CONCAT( if(sign.SIGN_TIME IS NULL,signer.NAME,null) ) sign_user,
|
||||
GROUP_CONCAT( if(sign.SIGN_TIME IS not NULL,signer.NAME,null) ) finished_sign_user
|
||||
from bus_breakground_sign sign
|
||||
left join sys_user signer on signer.USER_ID = sign.SIGN_USER_ID where sign.BREAKGROUND_ID = #{BREAKGROUND_ID}
|
||||
GROUP BY sign.STEP_ID) cu on cu.STEP_ID = step.STEP_ID
|
||||
where
|
||||
flow.TASK_ID = #{TASK_ID}
|
||||
and
|
||||
flow.STEP_ID != 0
|
||||
order by
|
||||
flow.ORDER_BY
|
||||
</select>
|
||||
|
||||
|
||||
<!-- 修改位置 -->
|
||||
<update id="setPosition" parameterType="pd">
|
||||
update
|
||||
<include refid="tableName"></include>
|
||||
set
|
||||
WORK_POSITION = #{WORK_POSITION}
|
||||
where
|
||||
BREAKGROUND_ID = #{BREAKGROUND_ID}
|
||||
</update>
|
||||
|
||||
<select id="getMapList" resultType="pd">
|
||||
select
|
||||
f.BREAKGROUND_ID,
|
||||
f.CHECK_NO,
|
||||
f.WORK_POSITION
|
||||
from
|
||||
<include refid="tableName"></include> f
|
||||
left join (select * from(select * from vi_eightwork_flow_log log having 1 order by log.ACT_TIME desc
|
||||
) tmp group by tmp.WORK_ID) log on log.WORK_ID = f.BREAKGROUND_ID
|
||||
where f.ISDELETE = '0' and f.WORK_POSITION is not null
|
||||
and f.CORPINFO_ID = #{CORPINFO_ID}
|
||||
and f.STEP_ID > 0 and log.NEXT_STEP_ID != 99
|
||||
</select>
|
||||
</mapper>
|
|
@ -0,0 +1,140 @@
|
|||
<?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.eightwork.BreakGroundSignMapper">
|
||||
|
||||
<!--表名 -->
|
||||
<sql id="tableName">
|
||||
BUS_BREAKGROUND_SIGN
|
||||
</sql>
|
||||
|
||||
<!--数据字典表名 -->
|
||||
<sql id="dicTableName">
|
||||
SYS_DICTIONARIES
|
||||
</sql>
|
||||
|
||||
<!-- 字段 -->
|
||||
<sql id="Field">
|
||||
f.BREAKGROUND_SIGN_ID,
|
||||
f.BREAKGROUND_ID,
|
||||
f.CORPINFO_ID,
|
||||
f.SIGN_USER_ID,
|
||||
f.SIGN_PATH,
|
||||
f.SIGN_TIME,
|
||||
f.DESCR,
|
||||
f.STEP_ID,
|
||||
f.IMG_PATH
|
||||
</sql>
|
||||
|
||||
<!-- 字段用于新增 -->
|
||||
<sql id="Field2">
|
||||
BREAKGROUND_SIGN_ID,
|
||||
BREAKGROUND_ID,
|
||||
CORPINFO_ID,
|
||||
SIGN_USER_ID,
|
||||
SIGN_PATH,
|
||||
SIGN_TIME,
|
||||
DESCR,
|
||||
STEP_ID,
|
||||
IMG_PATH
|
||||
</sql>
|
||||
|
||||
<!-- 字段值 -->
|
||||
<sql id="FieldValue">
|
||||
#{BREAKGROUND_SIGN_ID},
|
||||
#{BREAKGROUND_ID},
|
||||
#{CORPINFO_ID},
|
||||
#{SIGN_USER_ID},
|
||||
#{SIGN_PATH},
|
||||
#{SIGN_TIME},
|
||||
#{DESCR},
|
||||
#{STEP_ID},
|
||||
#{IMG_PATH}
|
||||
</sql>
|
||||
|
||||
<!-- 新增-->
|
||||
<insert id="save" parameterType="pd">
|
||||
insert into
|
||||
<include refid="tableName"></include>
|
||||
(
|
||||
<include refid="Field2"></include>
|
||||
) values (
|
||||
<include refid="FieldValue"></include>
|
||||
)
|
||||
</insert>
|
||||
|
||||
<insert id="saveBatch" parameterType="pd">
|
||||
insert into
|
||||
<include refid="tableName"></include>
|
||||
(
|
||||
BREAKGROUND_SIGN_ID,
|
||||
BREAKGROUND_ID,
|
||||
CORPINFO_ID,
|
||||
SIGN_USER_ID,
|
||||
STEP_ID
|
||||
) values
|
||||
<foreach collection="list" item="item" index="index" separator="," >
|
||||
(#{item.BREAKGROUND_SIGN_ID},
|
||||
#{item.BREAKGROUND_ID},
|
||||
#{item.CORPINFO_ID},
|
||||
#{item.SIGN_USER_ID},
|
||||
#{item.STEP_ID})
|
||||
</foreach>
|
||||
</insert>
|
||||
|
||||
<!-- 修改 -->
|
||||
<update id="edit" parameterType="pd">
|
||||
update
|
||||
<include refid="tableName"></include>
|
||||
set
|
||||
DESCR = #{DESCR},
|
||||
SIGN_PATH = #{SIGN_PATH},
|
||||
SIGN_TIME= #{SIGN_TIME},
|
||||
IMG_PATH = #{IMG_PATH}
|
||||
where
|
||||
BREAKGROUND_ID = #{BREAKGROUND_ID} and SIGN_USER_ID = #{SIGN_USER_ID} and STEP_ID = #{STEP_ID}
|
||||
</update>
|
||||
|
||||
<select id="listById" parameterType="pd" resultType="pd">
|
||||
select
|
||||
<include refid="Field"></include>
|
||||
from
|
||||
<include refid="tableName"></include> f
|
||||
where
|
||||
f.BREAKGROUND_ID = #{pd.BREAKGROUND_ID}
|
||||
order by f.SIGN_TIME desc
|
||||
</select>
|
||||
|
||||
<select id="listAll" parameterType="pd" resultType="pd">
|
||||
select
|
||||
f.BREAKGROUND_SIGN_ID,
|
||||
f.BREAKGROUND_ID,
|
||||
f.CORPINFO_ID,
|
||||
f.SIGN_USER_ID,
|
||||
f.SIGN_PATH,
|
||||
f.SIGN_TIME,
|
||||
f.STEP_ID,
|
||||
f.IMG_PATH,
|
||||
IFNULL(f.DESCR,'无') as DESCR,
|
||||
step.CODE
|
||||
from
|
||||
<include refid="tableName"></include> f
|
||||
left join bus_eightwork_step step on step.STEP_ID = f.STEP_ID
|
||||
where
|
||||
f.BREAKGROUND_ID = #{BREAKGROUND_ID}
|
||||
and
|
||||
f.SIGN_TIME is not null
|
||||
</select>
|
||||
|
||||
<select id="checkUnsigned" parameterType="pd" resultType="pd">
|
||||
select
|
||||
<include refid="Field"></include>
|
||||
from
|
||||
<include refid="tableName"></include> f
|
||||
where
|
||||
f.BREAKGROUND_ID = #{BREAKGROUND_ID}
|
||||
and
|
||||
f.SIGN_TIME is null
|
||||
</select>
|
||||
|
||||
|
||||
</mapper>
|
|
@ -0,0 +1,156 @@
|
|||
<?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.eightwork.BreakGroundToMeasuresMapper">
|
||||
|
||||
<!--表名 -->
|
||||
<sql id="tableName">
|
||||
BUS_BREAKGROUNDTOMEASURES
|
||||
</sql>
|
||||
|
||||
<!--数据字典表名 -->
|
||||
<sql id="dicTableName">
|
||||
SYS_DICTIONARIES
|
||||
</sql>
|
||||
|
||||
<!-- 字段 -->
|
||||
<sql id="Field">
|
||||
f.BREAKGROUND_ID,
|
||||
f.BUS_BREAKGROUND_MEASURES_ID,
|
||||
f.STATUS,
|
||||
f.BREAKGROUNDTOMEASURES_ID,
|
||||
f.CONFIRM_ID,
|
||||
f.SIGN_PATH,
|
||||
f.SIGN_TIME,
|
||||
f.IMG_PATH
|
||||
</sql>
|
||||
|
||||
<!-- 字段用于新增 -->
|
||||
<sql id="Field2">
|
||||
BREAKGROUND_ID,
|
||||
BUS_BREAKGROUND_MEASURES_ID,
|
||||
STATUS,
|
||||
BREAKGROUNDTOMEASURES_ID,
|
||||
CONFIRM_ID,
|
||||
SIGN_PATH,
|
||||
SIGN_TIME,
|
||||
IMG_PATH
|
||||
</sql>
|
||||
|
||||
<!-- 字段值 -->
|
||||
<sql id="FieldValue">
|
||||
#{BREAKGROUND_ID},
|
||||
#{BUS_BREAKGROUND_MEASURES_ID},
|
||||
#{STATUS},
|
||||
#{BREAKGROUNDTOMEASURES_ID},
|
||||
#{CONFIRM_ID},
|
||||
#{SIGN_PATH},
|
||||
#{SIGN_TIME},
|
||||
#{IMG_PATH}
|
||||
</sql>
|
||||
|
||||
<!-- 新增-->
|
||||
<insert id="save" parameterType="pd">
|
||||
insert into
|
||||
<include refid="tableName"></include>
|
||||
(
|
||||
<include refid="Field2"></include>
|
||||
) values (
|
||||
<include refid="FieldValue"></include>
|
||||
)
|
||||
</insert>
|
||||
|
||||
<insert id="saveBatch" parameterType="pd">
|
||||
insert into
|
||||
<include refid="tableName"></include>
|
||||
(
|
||||
BREAKGROUND_ID,
|
||||
BUS_BREAKGROUND_MEASURES_ID,
|
||||
BREAKGROUNDTOMEASURES_ID,
|
||||
CONFIRM_ID
|
||||
) values
|
||||
<foreach collection="list" item="item" index="index" separator="," >
|
||||
(
|
||||
#{item.BREAKGROUND_ID},
|
||||
#{item.BUS_BREAKGROUND_MEASURES_ID},
|
||||
#{item.BREAKGROUNDTOMEASURES_ID},
|
||||
#{item.CONFIRM_ID}
|
||||
)
|
||||
</foreach>
|
||||
</insert>
|
||||
|
||||
<!-- 删除-->
|
||||
<delete id="delete" parameterType="pd">
|
||||
delete from
|
||||
<include refid="tableName"></include>
|
||||
where
|
||||
BREAKGROUND_ID = #{BREAKGROUND_ID}
|
||||
</delete>
|
||||
|
||||
<!-- 修改 -->
|
||||
<update id="edit" parameterType="pd">
|
||||
update
|
||||
<include refid="tableName"></include>
|
||||
set
|
||||
STATUS = #{STATUS},
|
||||
SIGN_PATH = #{SIGN_PATH},
|
||||
IMG_PATH = #{IMG_PATH},
|
||||
SIGN_TIME = #{SIGN_TIME}
|
||||
where
|
||||
BREAKGROUNDTOMEASURES_ID = #{BREAKGROUNDTOMEASURES_ID}
|
||||
</update>
|
||||
|
||||
<!-- 通过ID获取数据 -->
|
||||
<select id="findById" parameterType="pd" resultType="pd">
|
||||
select
|
||||
<include refid="Field"></include>
|
||||
from
|
||||
<include refid="tableName"></include> f
|
||||
where
|
||||
f.BREAKGROUNDTOMEASURES_ID = #{BREAKGROUNDTOMEASURES_ID}
|
||||
</select>
|
||||
|
||||
<!-- 列表(全部) -->
|
||||
<select id="listAll" parameterType="pd" resultType="pd">
|
||||
select
|
||||
<include refid="Field"></include>
|
||||
from
|
||||
<include refid="tableName"></include> f
|
||||
</select>
|
||||
|
||||
<!-- 批量删除 -->
|
||||
<delete id="deleteAll" parameterType="String">
|
||||
update
|
||||
<include refid="tableName"></include>
|
||||
set
|
||||
ISDELETE = '1'
|
||||
where
|
||||
BREAKGROUNDTOMEASURES_ID in
|
||||
<foreach item="item" index="index" collection="ArrayDATA_IDS" open="(" separator="," close=")">
|
||||
#{item}
|
||||
</foreach>
|
||||
</delete>
|
||||
|
||||
|
||||
<select id="listAllMeasuresForSign" parameterType="pd" resultType="pd">
|
||||
select
|
||||
f.BREAKGROUNDTOMEASURES_ID,
|
||||
m.*
|
||||
from
|
||||
<include refid="tableName"></include> f
|
||||
left join bus_breakground_measures m on f.BUS_BREAKGROUND_MEASURES_ID = m.BUS_BREAKGROUND_MEASURES_ID
|
||||
where
|
||||
f.BREAKGROUND_ID = #{BREAKGROUND_ID} and f.CONFIRM_ID = #{CONFIRM_ID}
|
||||
</select>
|
||||
|
||||
<select id="listSignFinishMeasures" parameterType="pd" resultType="pd">
|
||||
select
|
||||
<include refid="Field"></include>,
|
||||
m.*
|
||||
from
|
||||
<include refid="tableName"></include> f
|
||||
left join bus_breakground_measures m on f.BUS_BREAKGROUND_MEASURES_ID = m.BUS_BREAKGROUND_MEASURES_ID
|
||||
where
|
||||
f.BREAKGROUND_ID = #{BREAKGROUND_ID}
|
||||
</select>
|
||||
|
||||
</mapper>
|
|
@ -227,8 +227,7 @@
|
|||
MEDIUM_NAME = #{MEDIUM_NAME},
|
||||
LIMITSPACE_ID = #{LIMITSPACE_ID},
|
||||
WORK_USER_DEPARTMENT_ID =#{WORK_USER_DEPARTMENT_ID},
|
||||
LONGITUDE =#{LONGITUDE},
|
||||
LATITUDE =#{LATITUDE},
|
||||
WORK_POSITION =#{WORK_POSITION},
|
||||
VIDEO_PATH = #{VIDEO_PATH}
|
||||
where
|
||||
CONFINEDSPACE_ID = #{CONFINEDSPACE_ID}
|
||||
|
@ -254,7 +253,7 @@
|
|||
f.SPECIAL_WORK,
|
||||
f.RISK_IDENTIFICATION,
|
||||
woro.`NAME` as WORK_USER_DEPARTMENT_NAME,
|
||||
woru.`NAME` as WORK_USER_NAME,
|
||||
woru.`NAME` as WORK_USER_USER_NAME,
|
||||
anao.`NAME` as ANALYZE_DEPARTMENT_NAME,
|
||||
anau.`NAME` as ANALYZE_USER_NAME,
|
||||
cono.`NAME` as CONFESS_DEPARTMENT_NAME,
|
||||
|
@ -315,7 +314,14 @@
|
|||
|
||||
WHERE f.CONFINEDSPACE_ID = #{CONFINEDSPACE_ID}
|
||||
</select>
|
||||
|
||||
<update id="editVideo" parameterType="pd">
|
||||
update
|
||||
<include refid="tableName"></include>
|
||||
set
|
||||
VIDEO_PATH = #{VIDEO_PATH}
|
||||
where
|
||||
CONFINEDSPACE_ID = #{CONFINEDSPACE_ID}
|
||||
</update>
|
||||
<!-- 修改 -->
|
||||
<update id="editStep" parameterType="pd">
|
||||
update
|
||||
|
@ -350,7 +356,7 @@
|
|||
select
|
||||
<include refid="Field"></include>,
|
||||
woro.`NAME` as WORK_USER_DEPARTMENT_NAME,
|
||||
woru.`NAME` as WORK_USER_NAME,
|
||||
woru.`NAME` as WORK_USER_USER_NAME,
|
||||
appo.`NAME` as APPLY_DEPARTMENT_NAME,
|
||||
appu.`NAME` as APPLY_USER_NAME,
|
||||
anao.`NAME` as ANALYZE_DEPARTMENT_NAME,
|
||||
|
@ -436,7 +442,7 @@
|
|||
<if test="pd.GASCHECK != null and pd.GASCHECK != ''"><!-- 关键词检索 -->
|
||||
and f.STEP_ID > 0 and f.STEP_ID != 15 and f.ANALYZE_USER_ID = #{pd.GASCHECK}
|
||||
</if>
|
||||
order by f.STEP_ID,f.CREATTIME
|
||||
order by f.STEP_ID,f.CREATTIME desc
|
||||
</select>
|
||||
|
||||
<select id="checkWorkCount" parameterType="pd" resultType="pd" >
|
||||
|
|
|
@ -21,7 +21,10 @@
|
|||
f.CONFIRM_ID,
|
||||
f.SIGN_PATH,
|
||||
f.SIGN_TIME,
|
||||
f.IMG_PATH
|
||||
f.IMG_PATH,
|
||||
f.ANSWER1,
|
||||
f.ANSWER2,
|
||||
f.ANSWER3
|
||||
</sql>
|
||||
|
||||
<!-- 字段用于新增 -->
|
||||
|
@ -32,7 +35,10 @@
|
|||
CONFINEDSPACETOMEASURES_ID,
|
||||
CONFIRM_ID,
|
||||
SIGN_PATH,
|
||||
IMG_PATH
|
||||
IMG_PATH,
|
||||
ANSWER1,
|
||||
ANSWER2,
|
||||
ANSWER3
|
||||
</sql>
|
||||
|
||||
<!-- 字段值 -->
|
||||
|
@ -43,7 +49,10 @@
|
|||
#{CONFINEDSPACETOMEASURES_ID},
|
||||
#{CONFIRM_ID},
|
||||
#{SIGN_PATH},
|
||||
#{IMG_PATH}
|
||||
#{IMG_PATH},
|
||||
#{ANSWER1},
|
||||
#{ANSWER2},
|
||||
#{ANSWER3}
|
||||
</sql>
|
||||
|
||||
<!-- 新增-->
|
||||
|
|
|
@ -0,0 +1,533 @@
|
|||
<?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.eightwork.CutRoadMapper">
|
||||
<!--表名 -->
|
||||
<sql id="tableName">
|
||||
BUS_CUTROAD
|
||||
</sql>
|
||||
|
||||
<!-- 字段 -->
|
||||
<sql id="Field">
|
||||
f.CUTROAD_ID,
|
||||
f.CORPINFO_ID,
|
||||
f.TASK_ID,
|
||||
f.STEP_ID,
|
||||
f.ISDELETE,
|
||||
f.CREATTIME,
|
||||
f.CREATOR,
|
||||
f.OPERATTIME,
|
||||
f.OPERATOR,
|
||||
f.CHECK_NO,
|
||||
f.APPLY_DEPARTMENT_ID,
|
||||
f.APPLY_USER_ID,
|
||||
f.OTHER_DEPT,
|
||||
f.WORK_REASON,
|
||||
f.WORK_CONTENT,
|
||||
f.WORK_START_DATE,
|
||||
f.WORK_END_DATE,
|
||||
f.SPECIAL_WORK,
|
||||
f.RISK_IDENTIFICATION,
|
||||
f.PROJECT_MANAGER_USER_ID,
|
||||
f.PROJECT_MANAGER_DEPARTMENT_ID,
|
||||
f.CONFESS_DEPARTMENT_ID,
|
||||
f.CONFESS_USER_ID,
|
||||
f.ACCEPT_CONFESS_DEPARTMENT_ID,
|
||||
f.ACCEPT_CONFESS_USER_ID,
|
||||
f.GUARDIAN_DEPARTMENT_ID,
|
||||
f.GUARDIAN_USER_ID,
|
||||
f.CONFIRM_DEPARTMENT_ID,
|
||||
f.CONFIRM_USER_ID,
|
||||
f.LEADER_DEPARTMENT_ID,
|
||||
f.LEADER_USER_ID,
|
||||
f.AUDIT_DEPARTMENT_ID,
|
||||
f.AUDIT_USER_ID,
|
||||
f.APPROVE_DEPARTMENT_ID,
|
||||
f.APPROVE_USER_ID,
|
||||
f.ACCEPT_DEPARTMENT_ID,
|
||||
f.ACCEPT_USER_ID,
|
||||
f.WORK_START_DEPARTMENT_ID,
|
||||
f.WORK_START_USER_ID,
|
||||
f.WORK_END_DEPARTMENT_ID,
|
||||
f.WORK_END_USER_ID,
|
||||
f.ACCEPT_TIME,
|
||||
f.PLS_ID,
|
||||
f.PLS_NAME,
|
||||
f.WORK_POSITION,
|
||||
f.VIDEO_PATH,
|
||||
f.CONTENT_IMG_PATH
|
||||
</sql>
|
||||
|
||||
<!-- 字段用于新增 -->
|
||||
<sql id="Field2">
|
||||
CUTROAD_ID,
|
||||
CORPINFO_ID,
|
||||
TASK_ID,
|
||||
STEP_ID,
|
||||
ISDELETE,
|
||||
CREATTIME,
|
||||
CREATOR,
|
||||
OPERATTIME,
|
||||
OPERATOR,
|
||||
CHECK_NO,
|
||||
APPLY_DEPARTMENT_ID,
|
||||
APPLY_USER_ID,
|
||||
OTHER_DEPT,
|
||||
WORK_REASON,
|
||||
WORK_CONTENT,
|
||||
WORK_START_DATE,
|
||||
WORK_END_DATE,
|
||||
SPECIAL_WORK,
|
||||
RISK_IDENTIFICATION,
|
||||
PROJECT_MANAGER_USER_ID,
|
||||
PROJECT_MANAGER_DEPARTMENT_ID,
|
||||
CONFESS_DEPARTMENT_ID,
|
||||
CONFESS_USER_ID,
|
||||
ACCEPT_CONFESS_DEPARTMENT_ID,
|
||||
ACCEPT_CONFESS_USER_ID,
|
||||
GUARDIAN_DEPARTMENT_ID,
|
||||
GUARDIAN_USER_ID,
|
||||
CONFIRM_DEPARTMENT_ID,
|
||||
CONFIRM_USER_ID,
|
||||
LEADER_DEPARTMENT_ID,
|
||||
LEADER_USER_ID,
|
||||
AUDIT_DEPARTMENT_ID,
|
||||
AUDIT_USER_ID,
|
||||
APPROVE_DEPARTMENT_ID,
|
||||
APPROVE_USER_ID,
|
||||
ACCEPT_DEPARTMENT_ID,
|
||||
ACCEPT_USER_ID,
|
||||
WORK_START_DEPARTMENT_ID,
|
||||
WORK_START_USER_ID,
|
||||
WORK_END_DEPARTMENT_ID,
|
||||
WORK_END_USER_ID,
|
||||
ACCEPT_TIME,
|
||||
PLS_ID,
|
||||
PLS_NAME,
|
||||
WORK_POSITION,
|
||||
VIDEO_PATH,
|
||||
CONTENT_IMG_PATH
|
||||
</sql>
|
||||
|
||||
<!-- 字段值 -->
|
||||
<sql id="FieldValue">
|
||||
#{CUTROAD_ID},
|
||||
#{CORPINFO_ID},
|
||||
#{TASK_ID},
|
||||
#{STEP_ID},
|
||||
#{ISDELETE},
|
||||
#{CREATTIME},
|
||||
#{CREATOR},
|
||||
#{OPERATTIME},
|
||||
#{OPERATOR},
|
||||
#{CHECK_NO},
|
||||
#{APPLY_DEPARTMENT_ID},
|
||||
#{APPLY_USER_ID},
|
||||
#{OTHER_DEPT},
|
||||
#{WORK_REASON},
|
||||
#{WORK_CONTENT},
|
||||
#{WORK_START_DATE},
|
||||
#{WORK_END_DATE},
|
||||
#{SPECIAL_WORK},
|
||||
#{RISK_IDENTIFICATION},
|
||||
#{PROJECT_MANAGER_USER_ID},
|
||||
#{PROJECT_MANAGER_DEPARTMENT_ID},
|
||||
#{CONFESS_DEPARTMENT_ID},
|
||||
#{CONFESS_USER_ID},
|
||||
#{ACCEPT_CONFESS_DEPARTMENT_ID},
|
||||
#{ACCEPT_CONFESS_USER_ID},
|
||||
#{GUARDIAN_DEPARTMENT_ID},
|
||||
#{GUARDIAN_USER_ID},
|
||||
#{CONFIRM_DEPARTMENT_ID},
|
||||
#{CONFIRM_USER_ID},
|
||||
#{LEADER_DEPARTMENT_ID},
|
||||
#{LEADER_USER_ID},
|
||||
#{AUDIT_DEPARTMENT_ID},
|
||||
#{AUDIT_USER_ID},
|
||||
#{APPROVE_DEPARTMENT_ID},
|
||||
#{APPROVE_USER_ID},
|
||||
#{ACCEPT_DEPARTMENT_ID},
|
||||
#{ACCEPT_USER_ID},
|
||||
#{WORK_START_DEPARTMENT_ID},
|
||||
#{WORK_START_USER_ID},
|
||||
#{WORK_END_DEPARTMENT_ID},
|
||||
#{WORK_END_USER_ID},
|
||||
#{ACCEPT_TIME},
|
||||
#{PLS_ID},
|
||||
#{PLS_NAME},
|
||||
#{WORK_POSITION},
|
||||
#{VIDEO_PATH},
|
||||
#{CONTENT_IMG_PATH}
|
||||
</sql>
|
||||
|
||||
<!-- 获取编码 -->
|
||||
<select id="getCode" parameterType="pd" resultType="pd">
|
||||
SELECT
|
||||
COUNT(1) as code
|
||||
FROM <include refid="tableName"></include> f
|
||||
WHERE f.CORPINFO_ID = #{CORPINFO_ID}
|
||||
and f.CREATTIME LIKE CONCAT(#{CREATDATE},'%')
|
||||
</select>
|
||||
|
||||
<!-- 新增-->
|
||||
<insert id="save" parameterType="pd">
|
||||
insert into
|
||||
<include refid="tableName"></include>
|
||||
(
|
||||
<include refid="Field2"></include>
|
||||
) values (
|
||||
<include refid="FieldValue"></include>
|
||||
)
|
||||
</insert>
|
||||
|
||||
<!-- 删除-->
|
||||
<delete id="delete" parameterType="pd">
|
||||
update
|
||||
<include refid="tableName"></include>
|
||||
set
|
||||
ISDELETE = '1'
|
||||
where
|
||||
CUTROAD_ID = #{CUTROAD_ID}
|
||||
</delete>
|
||||
|
||||
<!-- 修改 -->
|
||||
<update id="edit" parameterType="pd">
|
||||
update
|
||||
<include refid="tableName"></include>
|
||||
set
|
||||
CUTROAD_ID = #{CUTROAD_ID},
|
||||
CORPINFO_ID = #{CORPINFO_ID},
|
||||
TASK_ID = #{TASK_ID},
|
||||
STEP_ID = #{STEP_ID},
|
||||
ISDELETE = #{ISDELETE},
|
||||
CREATTIME = #{CREATTIME},
|
||||
CREATOR = #{CREATOR},
|
||||
OPERATTIME = #{OPERATTIME},
|
||||
OPERATOR = #{OPERATOR},
|
||||
CHECK_NO = #{CHECK_NO},
|
||||
APPLY_DEPARTMENT_ID = #{APPLY_DEPARTMENT_ID},
|
||||
APPLY_USER_ID = #{APPLY_USER_ID},
|
||||
OTHER_DEPT = #{OTHER_DEPT},
|
||||
WORK_REASON = #{WORK_REASON},
|
||||
WORK_CONTENT = #{WORK_CONTENT},
|
||||
WORK_START_DATE = #{WORK_START_DATE},
|
||||
WORK_END_DATE = #{WORK_END_DATE},
|
||||
SPECIAL_WORK = #{SPECIAL_WORK},
|
||||
RISK_IDENTIFICATION = #{RISK_IDENTIFICATION},
|
||||
PROJECT_MANAGER_USER_ID = #{PROJECT_MANAGER_USER_ID},
|
||||
PROJECT_MANAGER_DEPARTMENT_ID = #{PROJECT_MANAGER_DEPARTMENT_ID},
|
||||
CONFESS_DEPARTMENT_ID = #{CONFESS_DEPARTMENT_ID},
|
||||
CONFESS_USER_ID = #{CONFESS_USER_ID},
|
||||
ACCEPT_CONFESS_DEPARTMENT_ID = #{ACCEPT_CONFESS_DEPARTMENT_ID},
|
||||
ACCEPT_CONFESS_USER_ID = #{ACCEPT_CONFESS_USER_ID},
|
||||
GUARDIAN_DEPARTMENT_ID = #{GUARDIAN_DEPARTMENT_ID},
|
||||
GUARDIAN_USER_ID = #{GUARDIAN_USER_ID},
|
||||
CONFIRM_DEPARTMENT_ID = #{CONFIRM_DEPARTMENT_ID},
|
||||
CONFIRM_USER_ID = #{CONFIRM_USER_ID},
|
||||
LEADER_DEPARTMENT_ID = #{LEADER_DEPARTMENT_ID},
|
||||
LEADER_USER_ID = #{LEADER_USER_ID},
|
||||
AUDIT_DEPARTMENT_ID = #{AUDIT_DEPARTMENT_ID},
|
||||
AUDIT_USER_ID = #{AUDIT_USER_ID},
|
||||
APPROVE_DEPARTMENT_ID = #{APPROVE_DEPARTMENT_ID},
|
||||
APPROVE_USER_ID = #{APPROVE_USER_ID},
|
||||
ACCEPT_DEPARTMENT_ID = #{ACCEPT_DEPARTMENT_ID},
|
||||
ACCEPT_USER_ID = #{ACCEPT_USER_ID},
|
||||
WORK_START_DEPARTMENT_ID = #{WORK_START_DEPARTMENT_ID},
|
||||
WORK_START_USER_ID = #{WORK_START_USER_ID},
|
||||
WORK_END_DEPARTMENT_ID = #{WORK_END_DEPARTMENT_ID},
|
||||
WORK_END_USER_ID = #{WORK_END_USER_ID},
|
||||
ACCEPT_TIME = #{ACCEPT_TIME},
|
||||
PLS_ID = #{PLS_ID},
|
||||
PLS_NAME = #{PLS_NAME},
|
||||
WORK_POSITION = #{WORK_POSITION},
|
||||
VIDEO_PATH = #{VIDEO_PATH}
|
||||
where
|
||||
CUTROAD_ID = #{CUTROAD_ID}
|
||||
</update>
|
||||
|
||||
|
||||
<select id="findById" parameterType="pd" resultType="pd">
|
||||
SELECT
|
||||
<include refid="Field"></include>,
|
||||
appo.`NAME` as APPLY_DEPARTMENT_NAME,
|
||||
appu.`NAME` as APPLY_USER_NAME,
|
||||
f.WORK_START_DATE,
|
||||
f.WORK_END_DATE,
|
||||
f.SPECIAL_WORK,
|
||||
f.RISK_IDENTIFICATION,
|
||||
cono.`NAME` as CONFESS_DEPARTMENT_NAME,
|
||||
conu.`NAME` as CONFESS_USER_NAME,
|
||||
acco.`NAME` as ACCEPT_CONFESS_DEPARTMENT_NAME,
|
||||
accu.`NAME` as ACCEPT_CONFESS_USER_NAME,
|
||||
guao.`NAME` as GUARDIAN_DEPARTMENT_NAME,
|
||||
guau.`NAME` as GUARDIAN_USER_NAME,
|
||||
confo.`NAME` as CONFIRM_DEPARTMENT_NAME,
|
||||
confu.`NAME` as CONFIRM_USER_NAME,
|
||||
leao.`NAME` as LEADER_DEPARTMENT_NAME,
|
||||
leau.`NAME` as LEADER_USER_NAME,
|
||||
audo.`NAME` as AUDIT_DEPARTMENT_NAME,
|
||||
audu.`NAME` as AUDIT_USER_NAME,
|
||||
appro.`NAME` as APPROVE_DEPARTMENT_NAME,
|
||||
appru.`NAME` as APPROVE_USER_NAME,
|
||||
acceo.`NAME` as ACCEPT_DEPARTMENT_NAME,
|
||||
acceu.`NAME` as ACCEPT_USER_NAME,
|
||||
stao.`NAME` as WORK_START_DEPARTMENT_NAME,
|
||||
stau.`NAME` as WORK_START_USER_NAME,
|
||||
endo.`NAME` as WORK_END_DEPARTMENT_NAME,
|
||||
endu.`NAME` as WORK_END_USER_NAME,
|
||||
proo.`NAME` as PROJECT_MANAGER_DEPARTMENT_NAME,
|
||||
prou.`NAME` as PROJECT_MANAGER_USER_NAME
|
||||
FROM
|
||||
bus_cutroad AS f
|
||||
left join oa_department as appo on f.APPLY_DEPARTMENT_ID = appo.DEPARTMENT_ID
|
||||
left join sys_user as appu on f.APPLY_USER_ID = appu.USER_ID
|
||||
|
||||
left join oa_department as proo on f.PROJECT_MANAGER_DEPARTMENT_ID = proo.DEPARTMENT_ID
|
||||
left join sys_user as prou on f.PROJECT_MANAGER_USER_ID = prou.USER_ID
|
||||
|
||||
left join oa_department as cono on f.CONFESS_DEPARTMENT_ID = cono.DEPARTMENT_ID
|
||||
left join sys_user as conu on f.CONFESS_USER_ID = conu.USER_ID
|
||||
|
||||
left join oa_department as acco on f.ACCEPT_CONFESS_DEPARTMENT_ID = acco.DEPARTMENT_ID
|
||||
left join sys_user as accu on f.ACCEPT_CONFESS_USER_ID = accu.USER_ID
|
||||
|
||||
left join oa_department as guao on f.GUARDIAN_DEPARTMENT_ID = guao.DEPARTMENT_ID
|
||||
left join sys_user as guau on f.GUARDIAN_USER_ID = guau.USER_ID
|
||||
|
||||
left join oa_department as confo on f.CONFIRM_DEPARTMENT_ID = confo.DEPARTMENT_ID
|
||||
left join sys_user as confu on f.CONFIRM_USER_ID = confu.USER_ID
|
||||
|
||||
left join oa_department as leao on f.LEADER_DEPARTMENT_ID = leao.DEPARTMENT_ID
|
||||
left join sys_user as leau on f.LEADER_USER_ID = leau.USER_ID
|
||||
|
||||
left join oa_department as audo on f.AUDIT_DEPARTMENT_ID = audo.DEPARTMENT_ID
|
||||
left join sys_user as audu on f.AUDIT_USER_ID = audu.USER_ID
|
||||
|
||||
left join oa_department as appro on f.APPROVE_DEPARTMENT_ID = appro.DEPARTMENT_ID
|
||||
left join sys_user as appru on f.APPROVE_USER_ID = appru.USER_ID
|
||||
|
||||
left join oa_department as acceo on f.ACCEPT_DEPARTMENT_ID = acceo.DEPARTMENT_ID
|
||||
left join sys_user as acceu on f.ACCEPT_USER_ID = acceu.USER_ID
|
||||
|
||||
left join oa_department as stao on f.WORK_START_DEPARTMENT_ID = stao.DEPARTMENT_ID
|
||||
left join sys_user as stau on f.WORK_START_USER_ID = stau.USER_ID
|
||||
|
||||
left join oa_department as endo on f.WORK_END_DEPARTMENT_ID = endo.DEPARTMENT_ID
|
||||
left join sys_user as endu on f.WORK_END_USER_ID = endu.USER_ID
|
||||
|
||||
WHERE f.CUTROAD_ID = #{CUTROAD_ID}
|
||||
</select>
|
||||
|
||||
<!-- 修改 -->
|
||||
<update id="editStep" parameterType="pd">
|
||||
update
|
||||
<include refid="tableName"></include>
|
||||
set
|
||||
<if test="WORK_START_DATE != null and WORK_START_DATE != ''"><!-- 关键词检索 -->
|
||||
WORK_START_DATE = #{WORK_START_DATE},
|
||||
</if>
|
||||
<if test="WORK_END_DATE != null and WORK_END_DATE != ''"><!-- 关键词检索 -->
|
||||
WORK_END_DATE = #{WORK_END_DATE},
|
||||
</if>
|
||||
<if test="ACCEPT_TIME != null and ACCEPT_TIME != ''"><!-- 关键词检索 -->
|
||||
ACCEPT_TIME = #{ACCEPT_TIME},
|
||||
</if>
|
||||
STEP_ID = #{STEP_ID}
|
||||
where
|
||||
CUTROAD_ID = #{CUTROAD_ID}
|
||||
</update>
|
||||
|
||||
<!-- 修改 -->
|
||||
<update id="editContent" parameterType="pd">
|
||||
update
|
||||
<include refid="tableName"></include>
|
||||
set
|
||||
CONTENT_IMG_PATH = #{CONTENT_IMG_PATH},
|
||||
WORK_CONTENT = #{WORK_CONTENT}
|
||||
where
|
||||
CUTROAD_ID = #{CUTROAD_ID}
|
||||
</update>
|
||||
|
||||
<update id="editVideo" parameterType="pd">
|
||||
update
|
||||
<include refid="tableName"></include>
|
||||
set
|
||||
VIDEO_PATH = #{VIDEO_PATH}
|
||||
where
|
||||
CUTROAD_ID = #{CUTROAD_ID}
|
||||
</update>
|
||||
|
||||
<!-- 列表 -->
|
||||
<select id="datalistPage" parameterType="page" resultType="pd">
|
||||
select
|
||||
<include refid="Field"></include>,
|
||||
appo.`NAME` as APPLY_DEPARTMENT_NAME,
|
||||
appu.`NAME` as APPLY_USER_NAME,
|
||||
cono.`NAME` as CONFESS_DEPARTMENT_NAME,
|
||||
conu.`NAME` as CONFESS_USER_NAME,
|
||||
acco.`NAME` as ACCEPT_CONFESS_DEPARTMENT_NAME,
|
||||
accu.`NAME` as ACCEPT_CONFESS_USER_NAME,
|
||||
guao.`NAME` as GUARDIAN_DEPARTMENT_NAME,
|
||||
guau.`NAME` as GUARDIAN_USER_NAME,
|
||||
confo.`NAME` as CONFIRM_DEPARTMENT_NAME,
|
||||
confu.`NAME` as CONFIRM_USER_NAME,
|
||||
leao.`NAME` as LEADER_DEPARTMENT_NAME,
|
||||
leau.`NAME` as LEADER_USER_NAME,
|
||||
audo.`NAME` as AUDIT_DEPARTMENT_NAME,
|
||||
audu.`NAME` as AUDIT_USER_NAME,
|
||||
appro.`NAME` as APPROVE_DEPARTMENT_NAME,
|
||||
appru.`NAME` as APPROVE_USER_NAME,
|
||||
acceo.`NAME` as ACCEPT_DEPARTMENT_NAME,
|
||||
acceu.`NAME` as ACCEPT_USER_NAME,
|
||||
stao.`NAME` as WORK_START_DEPARTMENT_NAME,
|
||||
stau.`NAME` as WORK_START_USER_NAME,
|
||||
endo.`NAME` as WORK_END_DEPARTMENT_NAME,
|
||||
endu.`NAME` as WORK_END_USER_NAME,
|
||||
proo.`NAME` as PROJECT_MANAGER_DEPARTMENT_NAME,
|
||||
prou.`NAME` as PROJECT_MANAGER_USER_NAME,
|
||||
log.STEP_NAME,
|
||||
log.NEXT_STEP_ID,
|
||||
log.NEXT_STEP_NAME,
|
||||
log.STATUS
|
||||
from
|
||||
<include refid="tableName"></include> f
|
||||
left join oa_department as appo on f.APPLY_DEPARTMENT_ID = appo.DEPARTMENT_ID
|
||||
left join sys_user as appu on f.APPLY_USER_ID = appu.USER_ID
|
||||
|
||||
left join oa_department as proo on f.PROJECT_MANAGER_DEPARTMENT_ID = proo.DEPARTMENT_ID
|
||||
left join sys_user as prou on f.PROJECT_MANAGER_USER_ID = prou.USER_ID
|
||||
|
||||
left join oa_department as cono on f.CONFESS_DEPARTMENT_ID = cono.DEPARTMENT_ID
|
||||
left join sys_user as conu on f.CONFESS_USER_ID = conu.USER_ID
|
||||
|
||||
left join oa_department as acco on f.ACCEPT_CONFESS_DEPARTMENT_ID = acco.DEPARTMENT_ID
|
||||
left join sys_user as accu on f.ACCEPT_CONFESS_USER_ID = accu.USER_ID
|
||||
|
||||
left join oa_department as guao on f.GUARDIAN_DEPARTMENT_ID = guao.DEPARTMENT_ID
|
||||
left join sys_user as guau on f.GUARDIAN_USER_ID = guau.USER_ID
|
||||
|
||||
left join oa_department as confo on f.CONFIRM_DEPARTMENT_ID = confo.DEPARTMENT_ID
|
||||
left join sys_user as confu on f.CONFIRM_USER_ID = confu.USER_ID
|
||||
|
||||
left join oa_department as leao on f.LEADER_DEPARTMENT_ID = leao.DEPARTMENT_ID
|
||||
left join sys_user as leau on f.LEADER_USER_ID = leau.USER_ID
|
||||
|
||||
left join oa_department as audo on f.AUDIT_DEPARTMENT_ID = audo.DEPARTMENT_ID
|
||||
left join sys_user as audu on f.AUDIT_USER_ID = audu.USER_ID
|
||||
|
||||
left join oa_department as appro on f.APPROVE_DEPARTMENT_ID = appro.DEPARTMENT_ID
|
||||
left join sys_user as appru on f.APPROVE_USER_ID = appru.USER_ID
|
||||
|
||||
left join oa_department as acceo on f.ACCEPT_DEPARTMENT_ID = acceo.DEPARTMENT_ID
|
||||
left join sys_user as acceu on f.ACCEPT_USER_ID = acceu.USER_ID
|
||||
|
||||
left join oa_department as stao on f.WORK_START_DEPARTMENT_ID = stao.DEPARTMENT_ID
|
||||
left join sys_user as stau on f.WORK_START_USER_ID = stau.USER_ID
|
||||
|
||||
left join oa_department as endo on f.WORK_END_DEPARTMENT_ID = endo.DEPARTMENT_ID
|
||||
left join sys_user as endu on f.WORK_END_USER_ID = endu.USER_ID
|
||||
|
||||
left join (select * from(select * from vi_eightwork_flow_log log having 1 order by log.ACT_TIME desc
|
||||
) tmp group by tmp.WORK_ID) log on log.WORK_ID = f.CUTROAD_ID
|
||||
where f.ISDELETE = '0'
|
||||
<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
|
||||
and f.CHECK_NO LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
|
||||
</if>
|
||||
<if test="pd.STEP_NAME != null and pd.STEP_NAME != ''"><!-- 关键词检索 -->
|
||||
and exists (
|
||||
select 1 from bus_cutroad_sign sign
|
||||
left join bus_eightwork_step step on step.STEP_ID = sign.STEP_ID
|
||||
where sign.CUTROAD_ID = f.CUTROAD_ID
|
||||
and sign.SIGN_TIME is null
|
||||
and sign.SIGN_USER_ID = #{pd.USER_ID}
|
||||
and step.STEP_NAME = #{pd.STEP_NAME}
|
||||
and f.STEP_ID != -1
|
||||
)
|
||||
</if>
|
||||
<if test="pd.STEP_ID != null and pd.STEP_ID != ''"><!-- 关键词检索 -->
|
||||
and log.NEXT_STEP_ID = #{pd.STEP_ID} and f.STEP_ID != -1
|
||||
</if>
|
||||
<if test="pd.CREATOR != null and pd.CREATOR != ''"><!-- 关键词检索 -->
|
||||
and f.CREATOR = #{pd.CREATOR}
|
||||
</if>
|
||||
order by f.STEP_ID,f.CREATTIME desc
|
||||
|
||||
</select>
|
||||
|
||||
<select id="checkWorkCount" parameterType="pd" resultType="pd" >
|
||||
select
|
||||
step.CODE,count(1) COUNT
|
||||
from
|
||||
bus_cutroad_sign sign
|
||||
left join bus_eightwork_step step on step.STEP_ID = sign.STEP_ID
|
||||
left join bus_cutroad work on work.CUTROAD_ID = sign.CUTROAD_ID
|
||||
where
|
||||
sign.SIGN_TIME is null
|
||||
and work.STEP_ID != '-1'
|
||||
and
|
||||
sign.SIGN_USER_ID = #{USER_ID}
|
||||
group by step.CODE
|
||||
</select>
|
||||
|
||||
<select id="listAllMeasures" resultType="pd">
|
||||
select
|
||||
*
|
||||
from
|
||||
BUS_CUTROAD_MEASURES
|
||||
</select>
|
||||
|
||||
<select id="getFlowList" resultType="pd">
|
||||
select
|
||||
flow.CAN_SKIP,
|
||||
flow.ACTOR_FIELD,
|
||||
step.STEP_NAME,
|
||||
user.NAME as ACT_USER_NAME,
|
||||
log.ACT_TIME,
|
||||
log.STATUS,
|
||||
cu.SIGN_USER,
|
||||
cu.FINISHED_SIGN_USER,
|
||||
cu.STEP_ID as CURRENT_STEP
|
||||
from
|
||||
bus_eightwork_task_flow flow
|
||||
left join bus_eightwork_step step on step.STEP_ID = flow.STEP_ID
|
||||
left join bus_eightwork_flow_log log on log.STEP_ID = flow.STEP_ID and
|
||||
log.WORK_ID = #{CUTROAD_ID}
|
||||
left join sys_user user on user.USER_ID = log.ACT_USER
|
||||
left join (select sign.STEP_ID,
|
||||
GROUP_CONCAT( if(sign.SIGN_TIME IS NULL,signer.NAME,null) ) sign_user,
|
||||
GROUP_CONCAT( if(sign.SIGN_TIME IS not NULL,signer.NAME,null) ) finished_sign_user
|
||||
from bus_cutroad_sign sign
|
||||
left join sys_user signer on signer.USER_ID = sign.SIGN_USER_ID where sign.CUTROAD_ID = #{CUTROAD_ID}
|
||||
GROUP BY sign.STEP_ID) cu on cu.STEP_ID = step.STEP_ID
|
||||
where
|
||||
flow.TASK_ID = #{TASK_ID}
|
||||
and
|
||||
flow.STEP_ID != 0
|
||||
order by
|
||||
flow.ORDER_BY
|
||||
</select>
|
||||
|
||||
|
||||
<!-- 修改位置 -->
|
||||
<update id="setPosition" parameterType="pd">
|
||||
update
|
||||
<include refid="tableName"></include>
|
||||
set
|
||||
WORK_POSITION = #{WORK_POSITION}
|
||||
where
|
||||
CUTROAD_ID = #{CUTROAD_ID}
|
||||
</update>
|
||||
|
||||
<select id="getMapList" resultType="pd">
|
||||
select
|
||||
f.CUTROAD_ID,
|
||||
f.CHECK_NO,
|
||||
f.WORK_POSITION
|
||||
from
|
||||
<include refid="tableName"></include> f
|
||||
left join (select * from(select * from vi_eightwork_flow_log log having 1 order by log.ACT_TIME desc
|
||||
) tmp group by tmp.WORK_ID) log on log.WORK_ID = f.CUTROAD_ID
|
||||
where f.ISDELETE = '0' and f.WORK_POSITION is not null
|
||||
and f.CORPINFO_ID = #{CORPINFO_ID}
|
||||
and f.STEP_ID > 0 and log.NEXT_STEP_ID != 99
|
||||
</select>
|
||||
</mapper>
|
|
@ -0,0 +1,140 @@
|
|||
<?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.eightwork.CutRoadSignMapper">
|
||||
|
||||
<!--表名 -->
|
||||
<sql id="tableName">
|
||||
BUS_CUTROAD_SIGN
|
||||
</sql>
|
||||
|
||||
<!--数据字典表名 -->
|
||||
<sql id="dicTableName">
|
||||
SYS_DICTIONARIES
|
||||
</sql>
|
||||
|
||||
<!-- 字段 -->
|
||||
<sql id="Field">
|
||||
f.CUTROAD_SIGN_ID,
|
||||
f.CUTROAD_ID,
|
||||
f.CORPINFO_ID,
|
||||
f.SIGN_USER_ID,
|
||||
f.SIGN_PATH,
|
||||
f.SIGN_TIME,
|
||||
f.DESCR,
|
||||
f.STEP_ID,
|
||||
f.IMG_PATH
|
||||
</sql>
|
||||
|
||||
<!-- 字段用于新增 -->
|
||||
<sql id="Field2">
|
||||
CUTROAD_SIGN_ID,
|
||||
CUTROAD_ID,
|
||||
CORPINFO_ID,
|
||||
SIGN_USER_ID,
|
||||
SIGN_PATH,
|
||||
SIGN_TIME,
|
||||
DESCR,
|
||||
STEP_ID,
|
||||
IMG_PATH
|
||||
</sql>
|
||||
|
||||
<!-- 字段值 -->
|
||||
<sql id="FieldValue">
|
||||
#{CUTROAD_SIGN_ID},
|
||||
#{CUTROAD_ID},
|
||||
#{CORPINFO_ID},
|
||||
#{SIGN_USER_ID},
|
||||
#{SIGN_PATH},
|
||||
#{SIGN_TIME},
|
||||
#{DESCR},
|
||||
#{STEP_ID},
|
||||
#{IMG_PATH}
|
||||
</sql>
|
||||
|
||||
<!-- 新增-->
|
||||
<insert id="save" parameterType="pd">
|
||||
insert into
|
||||
<include refid="tableName"></include>
|
||||
(
|
||||
<include refid="Field2"></include>
|
||||
) values (
|
||||
<include refid="FieldValue"></include>
|
||||
)
|
||||
</insert>
|
||||
|
||||
<insert id="saveBatch" parameterType="pd">
|
||||
insert into
|
||||
<include refid="tableName"></include>
|
||||
(
|
||||
CUTROAD_SIGN_ID,
|
||||
CUTROAD_ID,
|
||||
CORPINFO_ID,
|
||||
SIGN_USER_ID,
|
||||
STEP_ID
|
||||
) values
|
||||
<foreach collection="list" item="item" index="index" separator="," >
|
||||
(#{item.CUTROAD_SIGN_ID},
|
||||
#{item.CUTROAD_ID},
|
||||
#{item.CORPINFO_ID},
|
||||
#{item.SIGN_USER_ID},
|
||||
#{item.STEP_ID})
|
||||
</foreach>
|
||||
</insert>
|
||||
|
||||
<!-- 修改 -->
|
||||
<update id="edit" parameterType="pd">
|
||||
update
|
||||
<include refid="tableName"></include>
|
||||
set
|
||||
DESCR = #{DESCR},
|
||||
SIGN_PATH = #{SIGN_PATH},
|
||||
SIGN_TIME= #{SIGN_TIME},
|
||||
IMG_PATH = #{IMG_PATH}
|
||||
where
|
||||
CUTROAD_ID = #{CUTROAD_ID} and SIGN_USER_ID = #{SIGN_USER_ID} and STEP_ID = #{STEP_ID}
|
||||
</update>
|
||||
|
||||
<select id="listById" parameterType="pd" resultType="pd">
|
||||
select
|
||||
<include refid="Field"></include>
|
||||
from
|
||||
<include refid="tableName"></include> f
|
||||
where
|
||||
f.CUTROAD_ID = #{pd.CUTROAD_ID}
|
||||
order by f.SIGN_TIME desc
|
||||
</select>
|
||||
|
||||
<select id="listAll" parameterType="pd" resultType="pd">
|
||||
select
|
||||
f.CUTROAD_SIGN_ID,
|
||||
f.CUTROAD_ID,
|
||||
f.CORPINFO_ID,
|
||||
f.SIGN_USER_ID,
|
||||
f.SIGN_PATH,
|
||||
f.SIGN_TIME,
|
||||
f.STEP_ID,
|
||||
f.IMG_PATH,
|
||||
IFNULL(f.DESCR,'无') as DESCR,
|
||||
step.CODE
|
||||
from
|
||||
<include refid="tableName"></include> f
|
||||
left join bus_eightwork_step step on step.STEP_ID = f.STEP_ID
|
||||
where
|
||||
f.CUTROAD_ID = #{CUTROAD_ID}
|
||||
and
|
||||
f.SIGN_TIME is not null
|
||||
</select>
|
||||
|
||||
<select id="checkUnsigned" parameterType="pd" resultType="pd">
|
||||
select
|
||||
<include refid="Field"></include>
|
||||
from
|
||||
<include refid="tableName"></include> f
|
||||
where
|
||||
f.CUTROAD_ID = #{CUTROAD_ID}
|
||||
and
|
||||
f.SIGN_TIME is null
|
||||
</select>
|
||||
|
||||
|
||||
</mapper>
|
|
@ -0,0 +1,156 @@
|
|||
<?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.eightwork.CutRoadToMeasuresMapper">
|
||||
|
||||
<!--表名 -->
|
||||
<sql id="tableName">
|
||||
BUS_CUTROADTOMEASURES
|
||||
</sql>
|
||||
|
||||
<!--数据字典表名 -->
|
||||
<sql id="dicTableName">
|
||||
SYS_DICTIONARIES
|
||||
</sql>
|
||||
|
||||
<!-- 字段 -->
|
||||
<sql id="Field">
|
||||
f.CUTROAD_ID,
|
||||
f.BUS_CUTROAD_MEASURES_ID,
|
||||
f.STATUS,
|
||||
f.CUTROADTOMEASURES_ID,
|
||||
f.CONFIRM_ID,
|
||||
f.SIGN_PATH,
|
||||
f.SIGN_TIME,
|
||||
f.IMG_PATH
|
||||
</sql>
|
||||
|
||||
<!-- 字段用于新增 -->
|
||||
<sql id="Field2">
|
||||
CUTROAD_ID,
|
||||
BUS_CUTROAD_MEASURES_ID,
|
||||
STATUS,
|
||||
CUTROADTOMEASURES_ID,
|
||||
CONFIRM_ID,
|
||||
SIGN_PATH,
|
||||
SIGN_TIME,
|
||||
IMG_PATH
|
||||
</sql>
|
||||
|
||||
<!-- 字段值 -->
|
||||
<sql id="FieldValue">
|
||||
#{CUTROAD_ID},
|
||||
#{BUS_CUTROAD_MEASURES_ID},
|
||||
#{STATUS},
|
||||
#{CUTROADTOMEASURES_ID},
|
||||
#{CONFIRM_ID},
|
||||
#{SIGN_PATH},
|
||||
#{SIGN_TIME},
|
||||
#{IMG_PATH}
|
||||
</sql>
|
||||
|
||||
<!-- 新增-->
|
||||
<insert id="save" parameterType="pd">
|
||||
insert into
|
||||
<include refid="tableName"></include>
|
||||
(
|
||||
<include refid="Field2"></include>
|
||||
) values (
|
||||
<include refid="FieldValue"></include>
|
||||
)
|
||||
</insert>
|
||||
|
||||
<insert id="saveBatch" parameterType="pd">
|
||||
insert into
|
||||
<include refid="tableName"></include>
|
||||
(
|
||||
CUTROAD_ID,
|
||||
BUS_CUTROAD_MEASURES_ID,
|
||||
CUTROADTOMEASURES_ID,
|
||||
CONFIRM_ID
|
||||
) values
|
||||
<foreach collection="list" item="item" index="index" separator="," >
|
||||
(
|
||||
#{item.CUTROAD_ID},
|
||||
#{item.BUS_CUTROAD_MEASURES_ID},
|
||||
#{item.CUTROADTOMEASURES_ID},
|
||||
#{item.CONFIRM_ID}
|
||||
)
|
||||
</foreach>
|
||||
</insert>
|
||||
|
||||
<!-- 删除-->
|
||||
<delete id="delete" parameterType="pd">
|
||||
delete from
|
||||
<include refid="tableName"></include>
|
||||
where
|
||||
CUTROAD_ID = #{CUTROAD_ID}
|
||||
</delete>
|
||||
|
||||
<!-- 修改 -->
|
||||
<update id="edit" parameterType="pd">
|
||||
update
|
||||
<include refid="tableName"></include>
|
||||
set
|
||||
STATUS = #{STATUS},
|
||||
SIGN_PATH = #{SIGN_PATH},
|
||||
IMG_PATH = #{IMG_PATH},
|
||||
SIGN_TIME = #{SIGN_TIME}
|
||||
where
|
||||
CUTROADTOMEASURES_ID = #{CUTROADTOMEASURES_ID}
|
||||
</update>
|
||||
|
||||
<!-- 通过ID获取数据 -->
|
||||
<select id="findById" parameterType="pd" resultType="pd">
|
||||
select
|
||||
<include refid="Field"></include>
|
||||
from
|
||||
<include refid="tableName"></include> f
|
||||
where
|
||||
f.CUTROADTOMEASURES_ID = #{CUTROADTOMEASURES_ID}
|
||||
</select>
|
||||
|
||||
<!-- 列表(全部) -->
|
||||
<select id="listAll" parameterType="pd" resultType="pd">
|
||||
select
|
||||
<include refid="Field"></include>
|
||||
from
|
||||
<include refid="tableName"></include> f
|
||||
</select>
|
||||
|
||||
<!-- 批量删除 -->
|
||||
<delete id="deleteAll" parameterType="String">
|
||||
update
|
||||
<include refid="tableName"></include>
|
||||
set
|
||||
ISDELETE = '1'
|
||||
where
|
||||
CUTROADTOMEASURES_ID in
|
||||
<foreach item="item" index="index" collection="ArrayDATA_IDS" open="(" separator="," close=")">
|
||||
#{item}
|
||||
</foreach>
|
||||
</delete>
|
||||
|
||||
|
||||
<select id="listAllMeasuresForSign" parameterType="pd" resultType="pd">
|
||||
select
|
||||
f.CUTROADTOMEASURES_ID,
|
||||
m.*
|
||||
from
|
||||
<include refid="tableName"></include> f
|
||||
left join bus_cutroad_measures m on f.BUS_CUTROAD_MEASURES_ID = m.BUS_CUTROAD_MEASURES_ID
|
||||
where
|
||||
f.CUTROAD_ID = #{CUTROAD_ID} and f.CONFIRM_ID = #{CONFIRM_ID}
|
||||
</select>
|
||||
|
||||
<select id="listSignFinishMeasures" parameterType="pd" resultType="pd">
|
||||
select
|
||||
<include refid="Field"></include>,
|
||||
m.*
|
||||
from
|
||||
<include refid="tableName"></include> f
|
||||
left join bus_cutroad_measures m on f.BUS_CUTROAD_MEASURES_ID = m.BUS_CUTROAD_MEASURES_ID
|
||||
where
|
||||
f.CUTROAD_ID = #{CUTROAD_ID}
|
||||
</select>
|
||||
|
||||
</mapper>
|
|
@ -8,10 +8,96 @@
|
|||
DATE_FORMAT(tmp.ACT_TIME,'%Y-%m') WORK_MONTH
|
||||
FROM
|
||||
( SELECT * FROM vi_eightwork_flow_log log
|
||||
where log.CORPINFO_ID=#{CORPINFO_ID} HAVING 1 ORDER BY log.ACT_TIME DESC ) tmp
|
||||
where log.CORPINFO_ID=#{CORPINFO_ID} and log.WORK_ID IN (
|
||||
SELECT
|
||||
f.BLINDBOARD_ID id
|
||||
FROM
|
||||
BUS_BLINDBOARD f
|
||||
WHERE
|
||||
ISDELETE = 0
|
||||
AND CORPINFO_ID = #{CORPINFO_ID} UNION ALL
|
||||
SELECT
|
||||
f.BREAKGROUND_ID id
|
||||
FROM
|
||||
BUS_BREAKGROUND f
|
||||
WHERE
|
||||
ISDELETE = 0
|
||||
AND CORPINFO_ID = #{CORPINFO_ID} UNION ALL
|
||||
SELECT
|
||||
f.CONFINEDSPACE_ID id
|
||||
FROM
|
||||
BUS_CONFINEDSPACE f
|
||||
WHERE
|
||||
ISDELETE = 0
|
||||
AND CORPINFO_ID = #{CORPINFO_ID} UNION ALL
|
||||
SELECT
|
||||
f.ELECTRICITY_ID id
|
||||
FROM
|
||||
BUS_ELECTRICITY f
|
||||
WHERE
|
||||
ISDELETE = 0
|
||||
AND CORPINFO_ID = #{CORPINFO_ID} UNION ALL
|
||||
SELECT
|
||||
f.CUTROAD_ID id
|
||||
FROM
|
||||
BUS_CUTROAD f
|
||||
WHERE
|
||||
ISDELETE = 0
|
||||
AND CORPINFO_ID = #{CORPINFO_ID} UNION ALL
|
||||
SELECT
|
||||
f.HIGHWORK_ID id
|
||||
FROM
|
||||
BUS_HIGHWORK f
|
||||
WHERE
|
||||
ISDELETE = 0
|
||||
AND CORPINFO_ID = #{CORPINFO_ID} UNION ALL
|
||||
SELECT
|
||||
f.HOISTING_ID id
|
||||
FROM
|
||||
BUS_HOISTING f
|
||||
WHERE
|
||||
ISDELETE = 0
|
||||
AND CORPINFO_ID = #{CORPINFO_ID} UNION ALL
|
||||
SELECT
|
||||
f.HOTWORK_ID id
|
||||
FROM
|
||||
BUS_HOTWORK f
|
||||
WHERE
|
||||
ISDELETE = 0
|
||||
AND CORPINFO_ID = #{CORPINFO_ID}) HAVING 1 ORDER BY log.ACT_TIME DESC ) tmp
|
||||
GROUP BY
|
||||
tmp.WORK_ID
|
||||
order by tmp.ACT_TIME DESC
|
||||
</select>
|
||||
|
||||
<select id="listAllForDiagnosis" parameterType="pd" resultType="pd">
|
||||
select count(1) as count,sum(case when f.STEP_ID=15 then 1 else 0 end) as pass_count from BUS_BLINDBOARD f where DATE_FORMAT(f.CREATTIME,'%Y-%m')=#{MONTH} and f.CORPINFO_ID = #{CORPINFO_ID} and ISDELETE = 0
|
||||
union all
|
||||
select count(1) as count,sum(case when f.STEP_ID=15 then 1 else 0 end) as pass_count from BUS_BREAKGROUND f where DATE_FORMAT(f.CREATTIME,'%Y-%m')=#{MONTH} and f.CORPINFO_ID = #{CORPINFO_ID} and ISDELETE = 0
|
||||
union all
|
||||
select count(1) as count,sum(case when f.STEP_ID=15 then 1 else 0 end) as pass_count from BUS_CONFINEDSPACE f where DATE_FORMAT(f.CREATTIME,'%Y-%m')=#{MONTH} and f.CORPINFO_ID = #{CORPINFO_ID} and ISDELETE = 0
|
||||
union all
|
||||
select count(1) as count,sum(case when f.STEP_ID=15 then 1 else 0 end) as pass_count from BUS_ELECTRICITY f where DATE_FORMAT(f.CREATTIME,'%Y-%m')=#{MONTH} and f.CORPINFO_ID = #{CORPINFO_ID} and ISDELETE = 0
|
||||
union all
|
||||
select count(1) as count,sum(case when f.STEP_ID=15 then 1 else 0 end) as pass_count from BUS_CUTROAD f where DATE_FORMAT(f.CREATTIME,'%Y-%m')=#{MONTH} and f.CORPINFO_ID = #{CORPINFO_ID} and ISDELETE = 0
|
||||
union all
|
||||
select count(1) as count,sum(case when f.STEP_ID=15 then 1 else 0 end) as pass_count from BUS_HIGHWORK f where DATE_FORMAT(f.CREATTIME,'%Y-%m')=#{MONTH} and f.CORPINFO_ID = #{CORPINFO_ID} and ISDELETE = 0
|
||||
union all
|
||||
select count(1) as count,sum(case when f.STEP_ID=15 then 1 else 0 end) as pass_count from BUS_HOISTING f where DATE_FORMAT(f.CREATTIME,'%Y-%m')=#{MONTH} and f.CORPINFO_ID = #{CORPINFO_ID} and ISDELETE = 0
|
||||
union all
|
||||
select count(1) as count,sum(case when f.STEP_ID=15 then 1 else 0 end) as pass_count from BUS_HOTWORK f where DATE_FORMAT(f.CREATTIME,'%Y-%m')=#{MONTH} and f.CORPINFO_ID = #{CORPINFO_ID} and ISDELETE = 0
|
||||
</select>
|
||||
<select id="getEightWorksByType" resultType="com.zcloud.entity.PageData">
|
||||
select
|
||||
f.${TYPE}_ID ID,
|
||||
f.CHECK_NO,
|
||||
f.WORK_POSITION
|
||||
from
|
||||
BUS_${TYPE} f
|
||||
left join (select * from(select * from vi_eightwork_flow_log log having 1 order by log.ACT_TIME desc
|
||||
) tmp group by tmp.WORK_ID) log on log.WORK_ID = f.${TYPE}_ID
|
||||
where f.ISDELETE = '0' and f.WORK_POSITION is not null
|
||||
and f.CORPINFO_ID = #{CORPINFO_ID}
|
||||
-- and f.STEP_ID > 0 and log.NEXT_STEP_ID != 99
|
||||
</select>
|
||||
</mapper>
|
||||
|
|
|
@ -53,7 +53,19 @@
|
|||
where sign.SIGN_TIME is null and sign.SIGN_USER_ID = #{USER_ID} and work.STEP_ID != '-1') HIGHWORK_COUNT,
|
||||
(select count(1) COUNT from bus_electricity_sign sign
|
||||
left join bus_electricity work on work.ELECTRICITY_ID = sign.ELECTRICITY_ID
|
||||
where sign.SIGN_TIME is null and sign.SIGN_USER_ID = #{USER_ID} and work.STEP_ID != '-1') ELECTRICITY_COUNT
|
||||
where sign.SIGN_TIME is null and sign.SIGN_USER_ID = #{USER_ID} and work.STEP_ID != '-1') ELECTRICITY_COUNT,
|
||||
(select count(1) COUNT from bus_breakground_sign sign
|
||||
left join bus_breakground work on work.BREAKGROUND_ID = sign.BREAKGROUND_ID
|
||||
where sign.SIGN_TIME is null and sign.SIGN_USER_ID = #{USER_ID} and work.STEP_ID != '-1') BREAKGROUND_COUNT,
|
||||
(select count(1) COUNT from bus_hoisting_sign sign
|
||||
left join bus_hoisting work on work.HOISTING_ID = sign.HOISTING_ID
|
||||
where sign.SIGN_TIME is null and sign.SIGN_USER_ID = #{USER_ID} and work.STEP_ID != '-1') HOISTING_COUNT,
|
||||
(select count(1) COUNT from bus_cutroad_sign sign
|
||||
left join bus_cutroad work on work.CUTROAD_ID = sign.CUTROAD_ID
|
||||
where sign.SIGN_TIME is null and sign.SIGN_USER_ID = #{USER_ID} and work.STEP_ID != '-1') OPEN_CIRCUIT_COUNT,
|
||||
(select count(1) COUNT from bus_blindboard_sign sign
|
||||
left join bus_blindboard work on work.BLINDBOARD_ID = sign.BLINDBOARD_ID
|
||||
where sign.SIGN_TIME is null and sign.SIGN_USER_ID = #{USER_ID} and work.STEP_ID != '-1') BLIND_BOARD_COUNT
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue