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

BUG优化

dev
xiepeng 2024-04-22 17:56:11 +08:00
parent 26f80f9a68
commit 4f772602b8
29 changed files with 310 additions and 276 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/com/zcloud/controller/assignedManage/AssignedManageController.java
View File

@ -51,7 +51,7 @@ public class AssignedManageController extends BaseController {
pd.put("ASSIGNED_ID", this.get32UUID()); //车船税主键 pd.put("ASSIGNED_ID", this.get32UUID()); //车船税主键
pd.put("ISDELETE", "0"); //是否删除(0:有效 1：删除) pd.put("ISDELETE", "0"); //是否删除(0:有效 1：删除)
pd.put("CREATOR", Jurisdiction.getUSER_ID()); //添加人id pd.put("CREATOR", Jurisdiction.getUSER_ID()); //添加人id
pd.put("CREATORNAME", Jurisdiction.getUsername()); //添加人名字 pd.put("CREATORNAME", Jurisdiction.getName()); //添加人名字
pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间 pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间
pd.put("ASSIGNED_DATE", pd.get("TRANSACTION_DATE")); pd.put("ASSIGNED_DATE", pd.get("TRANSACTION_DATE"));
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
@ -98,7 +98,7 @@ public class AssignedManageController extends BaseController {
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
pd.put("DELETOR", Jurisdiction.getUSER_ID()); pd.put("DELETOR", Jurisdiction.getUSER_ID());
pd.put("DELETORNAME", Jurisdiction.getUsername()); pd.put("DELETORNAME", Jurisdiction.getName());
pd.put("DELETTIME", DateUtil.date2Str(new Date())); pd.put("DELETTIME", DateUtil.date2Str(new Date()));
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
PageData assignedInfo = new PageData(); PageData assignedInfo = new PageData();
@ -145,15 +145,14 @@ public class AssignedManageController extends BaseController {
pd = this.getPageData(); pd = this.getPageData();
pd.put("ISDELETE", "0"); //是否删除(0:有效 1：删除) pd.put("ISDELETE", "0"); //是否删除(0:有效 1：删除)
pd.put("CREATOR", Jurisdiction.getUSER_ID()); //添加人id pd.put("CREATOR", Jurisdiction.getUSER_ID()); //添加人id
pd.put("CREATORNAME", Jurisdiction.getUsername()); //添加人名字 pd.put("CREATORNAME", Jurisdiction.getName()); //添加人名字
pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间 pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间
pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id
pd.put("OPERATORNAME", Jurisdiction.getUsername()); // 修改人名字 pd.put("OPERATORNAME", Jurisdiction.getName()); // 修改人名字
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间
String expireDate = pd.getString("EXPIRE_DATE"); String expireDate = pd.getString("EXPIRE_DATE");
String day = DateUtil.getDay(); String day = DateUtil.getDay();
boolean flag = DateUtil.compareDate(expireDate, day); if (DateUtil.compareDate(expireDate, day)) {
if (flag) {
pd.put("EXPIRE_STATUS", "expirestatus_01"); pd.put("EXPIRE_STATUS", "expirestatus_01");
} else { } else {
pd.put("EXPIRE_STATUS", "expirestatus_02"); pd.put("EXPIRE_STATUS", "expirestatus_02");

88
src/main/java/com/zcloud/controller/beidou/BeidouController.java
View File

@ -58,7 +58,7 @@ public class BeidouController extends BaseController {
// @RequiresPermissions( value = {"question:add" , "courseware:add"}, logical = Logical.OR) // @RequiresPermissions( value = {"question:add" , "courseware:add"}, logical = Logical.OR)
@ResponseBody @ResponseBody
@LogAnno(menuType = "机务档案", menuServer = "北斗管理", instructionsOperate = "北斗管理", instructionsType = "新增") @LogAnno(menuType = "机务档案", menuServer = "北斗管理", instructionsOperate = "北斗管理", instructionsType = "新增")
public Object add(@RequestParam(value="FFILE",required=false) MultipartFile file) throws Exception { public Object add(@RequestParam(value = "FFILE", required = false) MultipartFile file) throws Exception {
Map<String, Object> map = new HashMap<String, Object>(); Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
@ -73,8 +73,8 @@ public class BeidouController extends BaseController {
pd.put("ARCHIVES_TYPE", "0"); //档案状态 pd.put("ARCHIVES_TYPE", "0"); //档案状态
pd.put("VEHICLE", pd.get("PLATE_NUMBER")); //档案状态 pd.put("VEHICLE", pd.get("PLATE_NUMBER")); //档案状态
String ffile = DateUtil.getDays(); String ffile = DateUtil.getDays();
if (file != null && StringUtils.isNotBlank(pd.getString("CREATORNAME"))){ if (file != null && StringUtils.isNotBlank(pd.getString("CREATORNAME"))) {
String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".") + 1).toLowerCase();
if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName)) { if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName)) {
errInfo = "fail"; errInfo = "fail";
map.put("result", errInfo); map.put("result", errInfo);
@ -84,22 +84,22 @@ public class BeidouController extends BaseController {
String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("TRANSPORTATIONCOMPANY") + "/" + ffile); smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("TRANSPORTATIONCOMPANY") + "/" + ffile);
pd.put("CONTRACT", Const.FILEPATHFILE + pd.getString("TRANSPORTATIONCOMPANY") + "/" + ffile + "/" + fileName); pd.put("CONTRACT", Const.FILEPATHFILE + pd.getString("TRANSPORTATIONCOMPANY") + "/" + ffile + "/" + fileName);
pd.put("ATTACHMENT_NAME",pd.getString("CREATORNAME")); pd.put("ATTACHMENT_NAME", pd.getString("CREATORNAME"));
pd.put("CONFIRM_MESSAGE_TIME",DateUtil.date2Str(new Date())); pd.put("CONFIRM_MESSAGE_TIME", DateUtil.date2Str(new Date()));
} }
PageData operationData = new PageData(); PageData operationData = new PageData();
operationData.put("OPERATING_ID", pd.get("VEHICLE")); operationData.put("OPERATING_ID", pd.get("VEHICLE"));
operationData.put("CORPINFO_ID", pd.get("CORPINFO_ID")); operationData.put("CORPINFO_ID", pd.get("CORPINFO_ID"));
PageData resData = operatingVehiclesService.findById(operationData); PageData resData = operatingVehiclesService.findById(operationData);
if(!ObjectUtils.isEmpty(resData)) { if (!ObjectUtils.isEmpty(resData)) {
if(StringUtils.isNotBlank(pd.getString("DUE_DATE"))) { if (StringUtils.isNotBlank(pd.getString("DUE_DATE"))) {
String expireDate = pd.getString("DUE_DATE"); String expireDate = pd.getString("DUE_DATE");
String day = DateUtil.getDay(); String day = DateUtil.getDay();
if(DateUtil.compareDate(expireDate, day)) { if (DateUtil.compareDate(expireDate, day)) {
resData.put("NETWORK_STATUS","已入网"); resData.put("NETWORK_STATUS", "已入网");
}else{ } else {
resData.put("NETWORK_STATUS","超时入网"); resData.put("NETWORK_STATUS", "超时入网");
} }
} }
operatingVehiclesService.edit(resData); operatingVehiclesService.edit(resData);
@ -155,13 +155,13 @@ public class BeidouController extends BaseController {
operationData.put("OPERATING_ID", pd.get("VEHICLE")); operationData.put("OPERATING_ID", pd.get("VEHICLE"));
operationData.put("CORPINFO_ID", pd.get("CORPINFO_ID")); operationData.put("CORPINFO_ID", pd.get("CORPINFO_ID"));
PageData resData = operatingVehiclesService.findById(operationData); PageData resData = operatingVehiclesService.findById(operationData);
if(!ObjectUtils.isEmpty(resData)) { if (!ObjectUtils.isEmpty(resData)) {
String dueDate = pd.getString("DUE_DATE"); String dueDate = pd.getString("DUE_DATE");
String day = DateUtil.getDay(); String day = DateUtil.getDay();
if(DateUtil.compareDate(dueDate, day)) { if (DateUtil.compareDate(dueDate, day)) {
resData.put("NETWORK_STATUS","已入网"); resData.put("NETWORK_STATUS", "已入网");
}else{ } else {
resData.put("NETWORK_STATUS","超时入网"); resData.put("NETWORK_STATUS", "超时入网");
} }
operatingVehiclesService.edit(resData); operatingVehiclesService.edit(resData);
} }
@ -213,14 +213,23 @@ public class BeidouController extends BaseController {
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID
page.setPd(pd); page.setPd(pd);
List<PageData> varList = beidouService.list(page); //列出Question列表 List<PageData> varList = beidouService.list(page); //列出Question列表
for (PageData operation : varList) {
varList.stream().anyMatch(data -> {
if ("1".equals(data.getString("OPEAR_ISSCRAP")) || "1".equals(data.getString("FREIGHT_ISSCRAP"))) {
data.put("ARCHIVES_TYPE", "1");
} else if ("1".equals(data.getString("OPEAR_ISASSIGNED")) || "1".equals(data.getString("FREIGHT_ISASSIGNED"))) {
data.put("ARCHIVES_TYPE", "2");
}
return false;
});
/*for (PageData operation : varList) {
if("1".equals(operation.get("OPEAR_ISSCRAP")) || "1".equals(operation.get("FREIGHT_ISSCRAP"))) { if("1".equals(operation.get("OPEAR_ISSCRAP")) || "1".equals(operation.get("FREIGHT_ISSCRAP"))) {
operation.put("ARCHIVES_TYPE", "1"); operation.put("ARCHIVES_TYPE", "1");
} }
if("1".equals(operation.get("OPEAR_ISASSIGNED")) || "1".equals(operation.get("FREIGHT_ISASSIGNED"))) { if("1".equals(operation.get("OPEAR_ISASSIGNED")) || "1".equals(operation.get("FREIGHT_ISASSIGNED"))) {
operation.put("ARCHIVES_TYPE", "2"); operation.put("ARCHIVES_TYPE", "2");
} }
} }*/
map.put("varList", varList); map.put("varList", varList);
map.put("page", page); map.put("page", page);
map.put("result", errInfo); map.put("result", errInfo);
@ -245,7 +254,7 @@ public class BeidouController extends BaseController {
pd = beidouService.findById(pd); //根据ID读取 pd = beidouService.findById(pd); //根据ID读取
pd.put("FOREIGN_KEY", pd.getString("BEIDOU_ID")); pd.put("FOREIGN_KEY", pd.getString("BEIDOU_ID"));
pd.put("TYPE",128); pd.put("TYPE", 128);
List<PageData> beidouinfoImgs = imgfilesService.listAll(pd);//北斗资料图片 List<PageData> beidouinfoImgs = imgfilesService.listAll(pd);//北斗资料图片
map.put("pd", pd); map.put("pd", pd);
map.put("beidouinfoImgs", beidouinfoImgs); map.put("beidouinfoImgs", beidouinfoImgs);
@ -260,26 +269,26 @@ public class BeidouController extends BaseController {
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
pd.put("CORPINFO_ID",Jurisdiction.getCORPINFO_ID()); pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
if(!StringUtils.isEmpty(pd.getString("TRAFFIC_TYPE")) && pd.getString("TRAFFIC_TYPE").equals("1")) { if (!StringUtils.isEmpty(pd.getString("TRAFFIC_TYPE")) && pd.getString("TRAFFIC_TYPE").equals("1")) {
// 营运车辆 // 营运车辆
List<PageData> operatingList = operatingVehiclesService.operationVehicleList(pd.getString("CORPINFO_ID")); List<PageData> operatingList = operatingVehiclesService.operationVehicleList(pd.getString("CORPINFO_ID"));
page.setPd(pd); page.setPd(pd);
List<PageData> compassList = beidouService.list(page); List<PageData> compassList = beidouService.list(page);
List<PageData> varList = new ArrayList<>(); List<PageData> varList = new ArrayList<>();
if(!CollectionUtils.isEmpty(compassList)) { if (!CollectionUtils.isEmpty(compassList)) {
varList = operatingList.stream().parallel() varList = operatingList.stream().parallel()
.filter(operating -> compassList.stream() .filter(operating -> compassList.stream()
.noneMatch(compass -> StringUtils.equals(operating.getString("OPERATING_ID"), compass.getString("VEHICLE")))) .noneMatch(compass -> StringUtils.equals(operating.getString("OPERATING_ID"), compass.getString("VEHICLE"))))
.collect(Collectors.toList()); .collect(Collectors.toList());
}else{ } else {
varList = operatingList; varList = operatingList;
} }
if(pd.containsKey("ID")){ if (pd.containsKey("ID")) {
pd.put("OPERATING_ID", pd.getString("ID")); pd.put("OPERATING_ID", pd.getString("ID"));
pd.put("FOREIGN_KEY", pd.getString("OPERATING_ID")); pd.put("FOREIGN_KEY", pd.getString("OPERATING_ID"));
pd.put("TYPE",121); pd.put("TYPE", 121);
List<PageData> drivingLicenseImgs = imgfilesService.listAll(pd);//行驶证照片 List<PageData> drivingLicenseImgs = imgfilesService.listAll(pd);//行驶证照片
map.put("drivingLicenseImgs", drivingLicenseImgs); map.put("drivingLicenseImgs", drivingLicenseImgs);
} }
@ -290,37 +299,40 @@ public class BeidouController extends BaseController {
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
} }
if("2".equals(pd.getString("TRAFFIC_TYPE"))) { if ("2".equals(pd.getString("TRAFFIC_TYPE"))) {
// 货运挂车 // 货运挂车
List<PageData> freightList = freightTrailerService.trailerList(pd.getString("CORPINFO_ID")); List<PageData> freightList = freightTrailerService.trailerList(pd.getString("CORPINFO_ID"));
page.setPd(pd); page.setPd(pd);
List<PageData> insAnnually = beidouService.list(page); List<PageData> insAnnually = beidouService.list(page);
for (int i = 0; i < insAnnually.size(); i++) {
for (int j = 0; j < freightList.size(); j++) { List<PageData> varList = new ArrayList<>();
if(freightList.get(j).get("FREIGHTTRAILER_ID").equals(insAnnually.get(i).get("VEHICLE"))) { if (!CollectionUtils.isEmpty(insAnnually)) {
freightList.remove(j); varList = freightList.stream().parallel()
} .filter(freight -> insAnnually.stream()
} .noneMatch(ins -> StringUtils.equals(freight.getString("FREIGHTTRAILER_ID"), ins.getString("VEHICLE"))))
.collect(Collectors.toList());
} else {
varList = freightList;
} }
if(pd.containsKey("ID")){ if (pd.containsKey("ID")) {
pd.put("FREIGHTTRAILER_ID", pd.getString("ID")); pd.put("FREIGHTTRAILER_ID", pd.getString("ID"));
pd.put("FOREIGN_KEY", pd.getString("FREIGHTTRAILER_ID")); pd.put("FOREIGN_KEY", pd.getString("FREIGHTTRAILER_ID"));
pd.put("TYPE",121); pd.put("TYPE", 121);
List<PageData> drivingLicenseImgs = imgfilesService.listAll(pd);//行驶证照片 List<PageData> drivingLicenseImgs = imgfilesService.listAll(pd);//行驶证照片
map.put("drivingLicenseImgs", drivingLicenseImgs); map.put("drivingLicenseImgs", drivingLicenseImgs);
} }
freightList.forEach(freight -> { varList.forEach(freight -> {
freight.put("ID", freight.getString("FREIGHTTRAILER_ID")); freight.put("ID", freight.getString("FREIGHTTRAILER_ID"));
}); });
map.put("list", freightList); map.put("list", varList);
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
} }
List<PageData> resData = freightTrailerService.vehicleList(pd); List<PageData> resData = freightTrailerService.vehicleList(pd);
if(pd.containsKey("ID")){ if (pd.containsKey("ID")) {
pd.put("FOREIGN_KEY", pd.getString("ID")); pd.put("FOREIGN_KEY", pd.getString("ID"));
pd.put("TYPE",121); pd.put("TYPE", 121);
List<PageData> drivingLicenseImgs = imgfilesService.listAll(pd);//行驶证照片 List<PageData> drivingLicenseImgs = imgfilesService.listAll(pd);//行驶证照片
map.put("drivingLicenseImgs", drivingLicenseImgs); map.put("drivingLicenseImgs", drivingLicenseImgs);
} }

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

@ -215,9 +215,9 @@ public class TrafficSafetyMeetingController extends BaseController {
String PRACTITIONER = pd.getString("PRACTITIONER"); // 关键词检索条件 String PRACTITIONER = pd.getString("PRACTITIONER"); // 关键词检索条件
if (Tools.notEmpty(PRACTITIONER)) if (Tools.notEmpty(PRACTITIONER))
pd.put("PRACTITIONER", PRACTITIONER.trim()); pd.put("PRACTITIONER", PRACTITIONER.trim());
String PRACTITIONERTYPE = pd.getString("PRACTITIONERTYPE"); // 关键词检索条件 String PRACTITIONERTYPE = pd.getString("PRACTITIONER_TYPE"); // 关键词检索条件
if (Tools.notEmpty(PRACTITIONERTYPE)) if (Tools.notEmpty(PRACTITIONERTYPE))
pd.put("PRACTITIONERTYPE", PRACTITIONERTYPE.trim()); pd.put("PRACTITIONER_TYPE", PRACTITIONERTYPE.trim());
String SIGNEDSTATUS = pd.getString("SIGNEDSTATUS"); // 关键词检索条件 String SIGNEDSTATUS = pd.getString("SIGNEDSTATUS"); // 关键词检索条件
if (Tools.notEmpty(SIGNEDSTATUS)) if (Tools.notEmpty(SIGNEDSTATUS))
pd.put("SIGNEDSTATUS", SIGNEDSTATUS.trim()); pd.put("SIGNEDSTATUS", SIGNEDSTATUS.trim());

1
src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityCustomerManagementController.java
View File

@ -26,6 +26,7 @@ import org.springframework.web.multipart.MultipartFile;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream;
@Controller @Controller
@RequestMapping("/securitycustomer") @RequestMapping("/securitycustomer")

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

@ -17,6 +17,7 @@ import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors;
@Controller @Controller
@RequestMapping("/managementagreement") @RequestMapping("/managementagreement")
@ -29,7 +30,7 @@ public class TrafficSecurityManagementAgreementController extends BaseController
//新增 //新增
@RequestMapping(value = "/add") @RequestMapping(value = "/add")
@ResponseBody @ResponseBody
public Object add(@RequestParam(value="FFILE",required=false) MultipartFile file) throws Exception { public Object add(@RequestParam(value = "FFILE", required = false) MultipartFile file) throws Exception {
Map<String, Object> map = new HashMap<String, Object>(); Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success"; String errInfo = "success";
PageData pd = this.getPageData(); PageData pd = this.getPageData();
@ -50,20 +51,20 @@ public class TrafficSecurityManagementAgreementController extends BaseController
} }
String ffile = DateUtil.getDays(); String ffile = DateUtil.getDays();
if (file != null && StringUtils.isNotBlank(pd.getString("CREATORNAME"))){ if (file != null && StringUtils.isNotBlank(pd.getString("CREATORNAME"))) {
pd.put("COMPLETIONSTATUS", "1"); pd.put("COMPLETIONSTATUS", "1");
String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".") + 1).toLowerCase();
if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName)) { if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName)) {
errInfo = "fail"; errInfo = "fail";
map.put("result", errInfo); map.put("result", errInfo);
map.put("msg", "文件格式不正确！"); map.put("msg", "文件格式不正确！");
return map; return map;
} }
String fileName =file.getOriginalFilename(); String fileName = file.getOriginalFilename();
smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
pd.put("ATTACHMENT_ROUTE", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd.put("ATTACHMENT_ROUTE", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
pd.put("ATTACHMENT_NAME",pd.getString("CREATORNAME")); pd.put("ATTACHMENT_NAME", pd.getString("CREATORNAME"));
pd.put("CONFIRM_MESSAGE_TIME",DateUtil.date2Str(new Date())); pd.put("CONFIRM_MESSAGE_TIME", DateUtil.date2Str(new Date()));
} }
managementAgreementService.save(pd); managementAgreementService.save(pd);
@ -76,7 +77,7 @@ public class TrafficSecurityManagementAgreementController extends BaseController
//修改 //修改
@RequestMapping(value = "/edit") @RequestMapping(value = "/edit")
@ResponseBody @ResponseBody
public Object edit(@RequestParam(value="FFILE",required=false) MultipartFile file) throws Exception { public Object edit(@RequestParam(value = "FFILE", required = false) MultipartFile file) throws Exception {
Map<String, Object> map = new HashMap<String, Object>(); Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success"; String errInfo = "success";
PageData pd = this.getPageData(); PageData pd = this.getPageData();
@ -88,9 +89,9 @@ public class TrafficSecurityManagementAgreementController extends BaseController
pd.put("ISDELETE", "0"); pd.put("ISDELETE", "0");
String ffile = DateUtil.getDays(); String ffile = DateUtil.getDays();
if (file != null && StringUtils.isNotBlank(pd.getString("OPERATORNAME"))){ if (file != null && StringUtils.isNotBlank(pd.getString("OPERATORNAME"))) {
pd.put("COMPLETIONSTATUS", "1"); pd.put("COMPLETIONSTATUS", "1");
String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".") + 1).toLowerCase();
if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName)) { if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName)) {
errInfo = "fail"; errInfo = "fail";
map.put("result", errInfo); map.put("result", errInfo);
@ -98,11 +99,11 @@ public class TrafficSecurityManagementAgreementController extends BaseController
return map; return map;
} }
//String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); //String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
String fileName =file.getOriginalFilename(); String fileName = file.getOriginalFilename();
smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
pd.put("ATTACHMENT_ROUTE", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd.put("ATTACHMENT_ROUTE", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
pd.put("ATTACHMENT_NAME",pd.getString("CREATORNAME")); pd.put("ATTACHMENT_NAME", pd.getString("CREATORNAME"));
pd.put("CONFIRM_MESSAGE_TIME",DateUtil.date2Str(new Date())); pd.put("CONFIRM_MESSAGE_TIME", DateUtil.date2Str(new Date()));
} }
managementAgreementService.edit(pd); managementAgreementService.edit(pd);
@ -114,6 +115,7 @@ public class TrafficSecurityManagementAgreementController extends BaseController
/** /**
* 列表 * 列表
*
* @param page * @param page
* @return * @return
* @throws Exception * @throws Exception
@ -129,15 +131,15 @@ public class TrafficSecurityManagementAgreementController extends BaseController
page.setPd(pd); page.setPd(pd);
List<PageData> varList = managementAgreementService.listForManagementAgreementlist(page); List<PageData> varList = managementAgreementService.listForManagementAgreementlist(page);
varList.forEach(data -> {
if(DateUtil.getDay().equals(data.getString("EXPIRYDATE"))) { /*varList.stream().anyMatch(data -> {
data.put("VALIDSTATUS","1"); if (DateUtil.getDay().equals(data.getString("EXPIRYDATE")) || DateUtil.compareDate(data.getString("EXPIRYDATE"), DateUtil.getDay())) {
} else if(DateUtil.compareDate( DateUtil.getDay(),data.getString("EXPIRYDATE")) ) { data.put("VALIDSTATUS", "1");
data.put("VALIDSTATUS","0"); } else {
} else if (DateUtil.compareDate( data.getString("EXPIRYDATE"),DateUtil.getDay()) || DateUtil.getDay().equals(data.getString("EXPIRYDATE"))) { data.put("VALIDSTATUS", "0");
data.put("VALIDSTATUS","1");
} }
}); return false;
});*/
map.put("varList", varList); map.put("varList", varList);
map.put("page", page); map.put("page", page);
map.put("result", errInfo); map.put("result", errInfo);
@ -145,14 +147,14 @@ public class TrafficSecurityManagementAgreementController extends BaseController
} }
//详情 //详情
@RequestMapping(value="/goEdit") @RequestMapping(value = "/goEdit")
@ResponseBody @ResponseBody
public Object goEdit() throws Exception{ public Object goEdit() throws Exception {
Map<String,Object> map = new HashMap<String,Object>(); Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
pd = managementAgreementService.findById(pd); //根据ID读取 pd = managementAgreementService.findById(pd); //根据ID读取
map.put("pd", pd); map.put("pd", pd);
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
@ -160,13 +162,14 @@ public class TrafficSecurityManagementAgreementController extends BaseController
/** /**
* 删除 * 删除
*
* @return * @return
* @throws Exception * @throws Exception
*/ */
@RequestMapping(value="/delete") @RequestMapping(value = "/delete")
@ResponseBody @ResponseBody
public Object delete() throws Exception{ public Object delete() throws Exception {
Map<String,String> map = new HashMap<String,String>(); Map<String, String> map = new HashMap<String, String>();
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();

39
src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityViolationRegistrationController.java
View File

@ -25,14 +25,12 @@ public class TrafficSecurityViolationRegistrationController extends BaseControll
@Autowired @Autowired
private TrafficSecurityViolationRegistrationService violationRegistrationService; private TrafficSecurityViolationRegistrationService violationRegistrationService;
@Autowired
private UsersService usersService;
@Autowired @Autowired
private Smb smb; private Smb smb;
@RequestMapping(value = "/add") @RequestMapping(value = "/add")
@ResponseBody @ResponseBody
public Object add(@RequestParam(value="FFILE",required=false) MultipartFile file) throws Exception { public Object add(@RequestParam(value = "FFILE", required = false) MultipartFile file) throws Exception {
Map<String, Object> map = new HashMap<String, Object>(); Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success"; String errInfo = "success";
PageData pd = this.getPageData(); PageData pd = this.getPageData();
@ -47,19 +45,19 @@ public class TrafficSecurityViolationRegistrationController extends BaseControll
pd.put("ISDELETE", "0"); pd.put("ISDELETE", "0");
String ffile = DateUtil.getDays(); String ffile = DateUtil.getDays();
if (file != null && StringUtils.isNotBlank(pd.getString("CREATORNAME"))){ if (file != null && StringUtils.isNotBlank(pd.getString("CREATORNAME"))) {
String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".") + 1).toLowerCase();
if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName)) { if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName)) {
errInfo = "fail"; errInfo = "fail";
map.put("result", errInfo); map.put("result", errInfo);
map.put("msg", "文件格式不正确！"); map.put("msg", "文件格式不正确！");
return map; return map;
} }
String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); String fileName = file.getOriginalFilename();
smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
pd.put("ATTACHMENT_ROUTE", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd.put("ATTACHMENT_ROUTE", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
pd.put("ATTACHMENT_NAME",pd.getString("CREATORNAME")); pd.put("ATTACHMENT_NAME", pd.getString("CREATORNAME"));
pd.put("CONFIRM_MESSAGE_TIME",DateUtil.date2Str(new Date())); pd.put("CONFIRM_MESSAGE_TIME", DateUtil.date2Str(new Date()));
} }
violationRegistrationService.save(pd); violationRegistrationService.save(pd);
@ -86,14 +84,16 @@ public class TrafficSecurityViolationRegistrationController extends BaseControll
return map; return map;
} }
/**删除 /**
* 删除
*
* @param * @param
* @throws Exception * @throws Exception
*/ */
@RequestMapping(value="/delete") @RequestMapping(value = "/delete")
@ResponseBody @ResponseBody
public Object delete() throws Exception{ public Object delete() throws Exception {
Map<String,String> map = new HashMap<String,String>(); Map<String, String> map = new HashMap<String, String>();
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
@ -107,10 +107,11 @@ public class TrafficSecurityViolationRegistrationController extends BaseControll
/** /**
* 查看详情 * 查看详情
*
* @return * @return
* @throws Exception * @throws Exception
*/ */
@RequestMapping(value="/goEdit") @RequestMapping(value = "/goEdit")
@ResponseBody @ResponseBody
public Object goEdit() throws Exception { public Object goEdit() throws Exception {
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
@ -125,7 +126,7 @@ public class TrafficSecurityViolationRegistrationController extends BaseControll
//修改 //修改
@RequestMapping(value = "/edit") @RequestMapping(value = "/edit")
@ResponseBody @ResponseBody
public Object edit(@RequestParam(value="FFILE",required=false) MultipartFile file) throws Exception { public Object edit(@RequestParam(value = "FFILE", required = false) MultipartFile file) throws Exception {
Map<String, Object> map = new HashMap<String, Object>(); Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success"; String errInfo = "success";
PageData pd = this.getPageData(); PageData pd = this.getPageData();
@ -135,20 +136,20 @@ public class TrafficSecurityViolationRegistrationController extends BaseControll
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间
String ffile = DateUtil.getDays(); String ffile = DateUtil.getDays();
if (file != null && StringUtils.isNotBlank(pd.getString("OPERATORNAME"))){ if (file != null && StringUtils.isNotBlank(pd.getString("OPERATORNAME"))) {
pd.put("COMPLETIONSTATUS", "1"); pd.put("COMPLETIONSTATUS", "1");
String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".") + 1).toLowerCase();
if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName)) { if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName)) {
errInfo = "fail"; errInfo = "fail";
map.put("result", errInfo); map.put("result", errInfo);
map.put("msg", "文件格式不正确！"); map.put("msg", "文件格式不正确！");
return map; return map;
} }
String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); String fileName = file.getOriginalFilename();
smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("OPERATINGCOMPANY") + "/" + ffile); smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("OPERATINGCOMPANY") + "/" + ffile);
pd.put("ATTACHMENT_ROUTE", Const.FILEPATHFILE + pd.getString("OPERATINGCOMPANY") + "/" + ffile + "/" + fileName); pd.put("ATTACHMENT_ROUTE", Const.FILEPATHFILE + pd.getString("OPERATINGCOMPANY") + "/" + ffile + "/" + fileName);
pd.put("ATTACHMENT_NAME",pd.getString("CREATORNAME")); pd.put("ATTACHMENT_NAME", pd.getString("CREATORNAME"));
pd.put("CONFIRM_MESSAGE_TIME",DateUtil.date2Str(new Date())); pd.put("CONFIRM_MESSAGE_TIME", DateUtil.date2Str(new Date()));
} }
violationRegistrationService.edit(pd); violationRegistrationService.edit(pd);

68
src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityWaybillRegistrationController.java
View File

@ -59,10 +59,11 @@ public class TrafficSecurityWaybillRegistrationController extends BaseController
/** /**
* 查看详情 * 查看详情
*
* @return * @return
* @throws Exception * @throws Exception
*/ */
@RequestMapping(value="/getDetail") @RequestMapping(value = "/getDetail")
@ResponseBody @ResponseBody
public Object goEdit() throws Exception { public Object goEdit() throws Exception {
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
@ -70,7 +71,7 @@ public class TrafficSecurityWaybillRegistrationController extends BaseController
PageData pd = this.getPageData(); PageData pd = this.getPageData();
List<PageData> commitmentList = trafficDrivingCommitmentService.getDrivingCommitment(pd); List<PageData> commitmentList = trafficDrivingCommitmentService.getDrivingCommitment(pd);
try { try {
pd = trafficDrivingTypeService.infoCategory(pd); //根据ID读取 pd = trafficDrivingTypeService.infoCategory(pd); //根据ID读取
// if(pd.getString("OPERATOR")) // if(pd.getString("OPERATOR"))
// pd.put("a", "119.60436762"); // pd.put("a", "119.60436762");
// pd.put("b", "39.94546157"); // pd.put("b", "39.94546157");
@ -122,47 +123,52 @@ public class TrafficSecurityWaybillRegistrationController extends BaseController
/** /**
* 删除 * 删除
*
* @return * @return
* @throws Exception * @throws Exception
*/ */
@RequestMapping(value="/delete") @RequestMapping(value = "/delete")
@ResponseBody @ResponseBody
public Object delete() throws Exception{ public Object delete() throws Exception {
Map<String,String> map = new HashMap<String,String>(); Map<String, String> map = new HashMap<String, String>();
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
pd.put("DELETOR", Jurisdiction.getUSER_ID());//删除人id pd.put("DELETOR", Jurisdiction.getUSER_ID());//删除人id
pd.put("DELETORNAME", Jurisdiction.getName());//删除人姓名 pd.put("DELETORNAME", Jurisdiction.getName());//删除人姓名
pd.put("DELETETIME", DateUtil.date2Str(new Date()));//删除时间 pd.put("DELETETIME", DateUtil.date2Str(new Date()));//删除时间
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
trafficSecurityWaybillRegistrationService.delete(pd); trafficSecurityWaybillRegistrationService.delete(pd);
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
} }
/**批量删除 /**
* 批量删除
*
* @param * @param
* @throws Exception * @throws Exception
*/ */
@RequestMapping(value="/deleteAll") @RequestMapping(value = "/deleteAll")
@ResponseBody @ResponseBody
public Object deleteAll() throws Exception{ public Object deleteAll() throws Exception {
Map<String,Object> map = new HashMap<String,Object>(); Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success"; String errInfo = "success";
String err=""; String err = "";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
String DATA_IDS = pd.getString("DATA_IDS"); String DATA_IDS = pd.getString("DATA_IDS");
if(Tools.notEmpty(DATA_IDS)){ if (Tools.notEmpty(DATA_IDS)) {
String ArrayDATA_IDS[] = DATA_IDS.split(","); String ArrayDATA_IDS[] = DATA_IDS.split(",");
for (String id : ArrayDATA_IDS) { for (String id : ArrayDATA_IDS) {
pd.put("WAYBILLREGISTRATION_ID", id); pd.put("WAYBILLREGISTRATION_ID", id);
pd.put("DELETORNAME", Jurisdiction.getName());//删除人 pd.put("DELETORNAME", Jurisdiction.getName());//删除人
pd.put("DELETETIME", DateUtil.date2Str(new Date()));//删除时间 pd.put("DELETETIME", DateUtil.date2Str(new Date()));//删除时间
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
trafficSecurityWaybillRegistrationService.delete(pd); trafficSecurityWaybillRegistrationService.delete(pd);
} }
errInfo = "success"; errInfo = "success";
}else{ } else {
errInfo = "error"; errInfo = "error";
} }
map.put("result", errInfo);//返回结果 map.put("result", errInfo);//返回结果
@ -171,45 +177,43 @@ public class TrafficSecurityWaybillRegistrationController extends BaseController
//详情 //详情
@RequestMapping(value="/goEdit") @RequestMapping(value = "/goEdit")
@ResponseBody @ResponseBody
public Object getSecurityWaybillRegistrationInfo() throws Exception{ public Object getSecurityWaybillRegistrationInfo() throws Exception {
Map<String,Object> map = new HashMap<String,Object>(); Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
pd = trafficSecurityWaybillRegistrationService.findById(pd);//根据ID读 pd = trafficSecurityWaybillRegistrationService.findById(pd);//根据ID读
if("".equals(pd.getString("TRUCKCART")) || "undefined".equals(pd.getString("TRUCKCART")) || StringUtils.isEmpty(pd.getString("TRUCKCART"))) {
pd.put("TRUCKCART","");
}
String[] dispatchers = pd.getString("DISPATCHER").split(","); String[] dispatchers = pd.getString("DISPATCHER").split(",");
List<PageData> names = new ArrayList<>(); List<PageData> names = new ArrayList<>();
for (String dispatcher : dispatchers) { for (String dispatcher : dispatchers) {
// 通过 用户id获取用户名
PageData user = new PageData(); PageData user = new PageData();
user.put("USER_ID",dispatcher.trim()); user.put("USER_ID", dispatcher.trim());
PageData pageData1 = usersService.findById(user); PageData pageData1 = usersService.findById(user);
names.add(pageData1); names.add(pageData1);
} }
List<PageData> deptList = usersService.listUserbyDep(pd); List<PageData> deptList = usersService.listUserbyDep(pd);
pd.put("deptList",deptList); pd.put("deptList", deptList);
pd.put("names",names); pd.put("names", names);
map.put("pd", pd); map.put("pd", pd);
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
} }
@RequestMapping(value="/getPrincipalContactList") @RequestMapping(value = "/getPrincipalContactList")
@ResponseBody @ResponseBody
public Object getPrincipalContactList() throws Exception{ public Object getPrincipalContactList() throws Exception {
Map<String,Object> map = new HashMap<String,Object>(); Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
List<PageData> principalContactList = trafficSecurityCustomerManagementService.getPrincipalContactList(pd); List<PageData> principalContactList = trafficSecurityCustomerManagementService.getPrincipalContactList(pd);
map.put("pd",principalContactList); map.put("pd", principalContactList);
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
} }
@ -230,12 +234,12 @@ public class TrafficSecurityWaybillRegistrationController extends BaseController
PageData pd2 = new PageData(); PageData pd2 = new PageData();
pd2.put("CONTACT", pd.getString("ENTRUST_PERSON")); pd2.put("CONTACT", pd.getString("ENTRUST_PERSON"));
PageData contactInfo = trafficSecurityCustomerManagementService.findByContactName(pd2); PageData contactInfo = trafficSecurityCustomerManagementService.findByContactName(pd2);
if(!ObjectUtil.isEmpty(contactInfo)) { if (!ObjectUtil.isEmpty(contactInfo)) {
pd.put("ENTRUST_PERSON", contactInfo.getString("CONTACT_ID")); pd.put("ENTRUST_PERSON", contactInfo.getString("CONTACT_ID"));
if(!contactInfo.getString("CONTACTPHONE").equals(pd.getString("CLIENTCONTACTPHONE"))) { if (!contactInfo.getString("CONTACTPHONE").equals(pd.getString("CLIENTCONTACTPHONE"))) {
PageData entrust = new PageData(); PageData entrust = new PageData();
entrust.put("CONTACTPHONE", pd.getString("CLIENTCONTACTPHONE")); entrust.put("CONTACTPHONE", pd.getString("CLIENTCONTACTPHONE"));
entrust.put("CUSTOMERCONTACT_ID",contactInfo.getString("CUSTOMERCONTACT_ID")); entrust.put("CUSTOMERCONTACT_ID", contactInfo.getString("CUSTOMERCONTACT_ID"));
entrust.put("OPERATOR", Jurisdiction.getUSER_ID()); // 修改人id entrust.put("OPERATOR", Jurisdiction.getUSER_ID()); // 修改人id
entrust.put("OPERATORNAME", Jurisdiction.getName()); // 修改人姓名 entrust.put("OPERATORNAME", Jurisdiction.getName()); // 修改人姓名
entrust.put("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间 entrust.put("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间
@ -245,12 +249,12 @@ public class TrafficSecurityWaybillRegistrationController extends BaseController
PageData pd3 = new PageData(); PageData pd3 = new PageData();
pd3.put("CONTACT", pd.getString("CONFIRM_PERSON")); pd3.put("CONTACT", pd.getString("CONFIRM_PERSON"));
PageData pageData = trafficSecurityCustomerManagementService.findByContactName(pd3); PageData pageData = trafficSecurityCustomerManagementService.findByContactName(pd3);
if(!ObjectUtil.isEmpty(pageData)) { if (!ObjectUtil.isEmpty(pageData)) {
pd.put("CONFIRM_PERSON", pageData.getString("CONTACT_ID")); pd.put("CONFIRM_PERSON", pageData.getString("CONTACT_ID"));
if(!pd.getString("CONFIRMINGPHONE").equals(pageData.getString("CONTACTPHONE"))) { if (!pd.getString("CONFIRMINGPHONE").equals(pageData.getString("CONTACTPHONE"))) {
PageData entrust = new PageData(); PageData entrust = new PageData();
entrust.put("CONTACTPHONE", pd.getString("CONFIRMINGPHONE")); entrust.put("CONTACTPHONE", pd.getString("CONFIRMINGPHONE"));
entrust.put("CUSTOMERCONTACT_ID",pageData.getString("CUSTOMERCONTACT_ID")); entrust.put("CUSTOMERCONTACT_ID", pageData.getString("CUSTOMERCONTACT_ID"));
entrust.put("OPERATOR", Jurisdiction.getUSER_ID()); // 修改人id entrust.put("OPERATOR", Jurisdiction.getUSER_ID()); // 修改人id
entrust.put("OPERATORNAME", Jurisdiction.getName()); // 修改人姓名 entrust.put("OPERATORNAME", Jurisdiction.getName()); // 修改人姓名
entrust.put("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间 entrust.put("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间

74
src/main/java/com/zcloud/controller/enterpriseSafetyProduction/EnterpriseSafetyProductionController.java
View File

@ -4,12 +4,8 @@ import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.Page; import com.zcloud.entity.Page;
import com.zcloud.entity.PageData; import com.zcloud.entity.PageData;
import com.zcloud.service.enterpriseSafetyProduction.EnterpriseSafetyProductionService; import com.zcloud.service.enterpriseSafetyProduction.EnterpriseSafetyProductionService;
import com.zcloud.service.freighttrailer.FreightTrailerService;
import com.zcloud.service.operatingvehicles.OperatingVehiclesService;
import com.zcloud.service.scrapManage.ScrapManageService;
import com.zcloud.util.DateUtil; import com.zcloud.util.DateUtil;
import com.zcloud.util.Jurisdiction; import com.zcloud.util.Jurisdiction;
import com.zcloud.util.Smb;
import com.zcloud.util.Tools; import com.zcloud.util.Tools;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
@ -28,40 +24,41 @@ public class EnterpriseSafetyProductionController extends BaseController {
@Autowired @Autowired
private EnterpriseSafetyProductionService enterpriseSafetyProductionService; private EnterpriseSafetyProductionService enterpriseSafetyProductionService;
@Autowired /**
private Smb smb; * 新增
*
/**新增
* @param * @param
* @throws Exception * @throws Exception
*/ */
@RequestMapping(value="/add") @RequestMapping(value = "/add")
@ResponseBody @ResponseBody
public Object add() throws Exception{ public Object add() throws Exception {
Map<String,Object> map = new HashMap<String,Object>(); Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
pd.put("SAFETYPRODUCTION_ID", this.get32UUID()); pd.put("SAFETYPRODUCTION_ID", this.get32UUID());
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
pd.put("ISDELETE", "0"); //是否删除(0:有效 1：删除) pd.put("ISDELETE", "0"); //是否删除(0:有效 1：删除)
pd.put("CREATOR", Jurisdiction.getUSER_ID()); //添加人id pd.put("CREATOR", Jurisdiction.getUSER_ID()); //添加人id
pd.put("CREATORNAME", Jurisdiction.getName()); //添加人名字 pd.put("CREATORNAME", Jurisdiction.getName()); //添加人名字
pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间 pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间
enterpriseSafetyProductionService.save(pd); enterpriseSafetyProductionService.save(pd);
map.put("pd", pd); map.put("pd", pd);
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
} }
/**删除 /**
* 删除
*
* @param * @param
* @throws Exception * @throws Exception
*/ */
@RequestMapping(value="/delete") @RequestMapping(value = "/delete")
@ResponseBody @ResponseBody
public Object delete() throws Exception{ public Object delete() throws Exception {
Map<String,String> map = new HashMap<String,String>(); Map<String, String> map = new HashMap<String, String>();
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
@ -70,23 +67,25 @@ public class EnterpriseSafetyProductionController extends BaseController {
pd.put("DELETTIME", DateUtil.date2Str(new Date())); pd.put("DELETTIME", DateUtil.date2Str(new Date()));
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
enterpriseSafetyProductionService.delete(pd); enterpriseSafetyProductionService.delete(pd);
map.put("result", errInfo); //返回结果 map.put("result", errInfo); //返回结果
return map; return map;
} }
/**修改 /**
* 修改
*
* @param * @param
* @throws Exception * @throws Exception
*/ */
@RequestMapping(value="/edit") @RequestMapping(value = "/edit")
@ResponseBody @ResponseBody
public Object edit() throws Exception{ public Object edit() throws Exception {
Map<String,Object> map = new HashMap<String,Object>(); Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
pd.put("ISDELETE", "0"); //是否删除(0:有效 1：删除) pd.put("ISDELETE", "0"); //是否删除(0:有效 1：删除)
pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id
pd.put("OPERATORNAME", Jurisdiction.getName()); // 修改人名字 pd.put("OPERATORNAME", Jurisdiction.getName()); // 修改人名字
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间
enterpriseSafetyProductionService.edit(pd); enterpriseSafetyProductionService.edit(pd);
@ -94,14 +93,17 @@ public class EnterpriseSafetyProductionController extends BaseController {
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
} }
/**去修改页面获取数据
/**
* 去修改页面获取数据
*
* @param * @param
* @throws Exception * @throws Exception
*/ */
@RequestMapping(value="/goEdit") @RequestMapping(value = "/goEdit")
@ResponseBody @ResponseBody
public Object goEdit() throws Exception{ public Object goEdit() throws Exception {
Map<String,Object> map = new HashMap<String,Object>(); Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
@ -112,18 +114,18 @@ public class EnterpriseSafetyProductionController extends BaseController {
return map; return map;
} }
@RequestMapping(value="/list") @RequestMapping(value = "/list")
@ResponseBody @ResponseBody
public Object list(Page page) throws Exception{ public Object list(Page page) throws Exception {
Map<String,Object> map = new HashMap<String,Object>(); Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件 String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件
if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim()); if (Tools.notEmpty(KEYWORDS)) pd.put("KEYWORDS", KEYWORDS.trim());
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
page.setPd(pd); page.setPd(pd);
List<PageData> varList = enterpriseSafetyProductionService.list(page); //列出MajorDangerSource列表 List<PageData> varList = enterpriseSafetyProductionService.list(page); //列出MajorDangerSource列表
map.put("varList", varList); map.put("varList", varList);
map.put("page", page); map.put("page", page);
map.put("result", errInfo); map.put("result", errInfo);

72
src/main/java/com/zcloud/controller/firefightingEquipmentFacility/FirefightingEquipmentFacilityController.java
View File

@ -27,43 +27,44 @@ public class FirefightingEquipmentFacilityController extends BaseController {
@Autowired @Autowired
private FirefightingEquipmentFacilityService firefightingEquipmentFacilityService; private FirefightingEquipmentFacilityService firefightingEquipmentFacilityService;
@Autowired
private Smb smb;
@Autowired @Autowired
private ImgFilesService imgfilesService; private ImgFilesService imgfilesService;
/**新增 /**
* 新增
*
* @param * @param
* @throws Exception * @throws Exception
*/ */
@RequestMapping(value="/add") @RequestMapping(value = "/add")
@ResponseBody @ResponseBody
public Object add() throws Exception{ public Object add() throws Exception {
Map<String,Object> map = new HashMap<String,Object>(); Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
pd.put("FIREFIGHTINGFACILITY_ID", this.get32UUID()); pd.put("FIREFIGHTINGFACILITY_ID", this.get32UUID());
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
pd.put("ISDELETE", "0"); //是否删除(0:有效 1：删除) pd.put("ISDELETE", "0"); //是否删除(0:有效 1：删除)
pd.put("CREATOR", Jurisdiction.getUSER_ID()); //添加人id pd.put("CREATOR", Jurisdiction.getUSER_ID()); //添加人id
pd.put("CREATORNAME", Jurisdiction.getName()); //添加人名字 pd.put("CREATORNAME", Jurisdiction.getName()); //添加人名字
pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间 pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间
firefightingEquipmentFacilityService.save(pd); firefightingEquipmentFacilityService.save(pd);
map.put("pd", pd); map.put("pd", pd);
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
} }
/**删除 /**
* 删除
*
* @param * @param
* @throws Exception * @throws Exception
*/ */
@RequestMapping(value="/delete") @RequestMapping(value = "/delete")
@ResponseBody @ResponseBody
public Object delete() throws Exception{ public Object delete() throws Exception {
Map<String,String> map = new HashMap<String,String>(); Map<String, String> map = new HashMap<String, String>();
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
@ -72,23 +73,25 @@ public class FirefightingEquipmentFacilityController extends BaseController {
pd.put("DELETTIME", DateUtil.date2Str(new Date())); pd.put("DELETTIME", DateUtil.date2Str(new Date()));
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
firefightingEquipmentFacilityService.delete(pd); firefightingEquipmentFacilityService.delete(pd);
map.put("result", errInfo); //返回结果 map.put("result", errInfo); //返回结果
return map; return map;
} }
/**修改 /**
* 修改
*
* @param * @param
* @throws Exception * @throws Exception
*/ */
@RequestMapping(value="/edit") @RequestMapping(value = "/edit")
@ResponseBody @ResponseBody
public Object edit() throws Exception{ public Object edit() throws Exception {
Map<String,Object> map = new HashMap<String,Object>(); Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
pd.put("ISDELETE", "0"); //是否删除(0:有效 1：删除) pd.put("ISDELETE", "0"); //是否删除(0:有效 1：删除)
pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id
pd.put("OPERATORNAME", Jurisdiction.getName()); // 修改人名字 pd.put("OPERATORNAME", Jurisdiction.getName()); // 修改人名字
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间
firefightingEquipmentFacilityService.edit(pd); firefightingEquipmentFacilityService.edit(pd);
@ -96,21 +99,24 @@ public class FirefightingEquipmentFacilityController extends BaseController {
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
} }
/**去修改页面获取数据
/**
* 去修改页面获取数据
*
* @param * @param
* @throws Exception * @throws Exception
*/ */
@RequestMapping(value="/goEdit") @RequestMapping(value = "/goEdit")
@ResponseBody @ResponseBody
public Object goEdit() throws Exception{ public Object goEdit() throws Exception {
Map<String,Object> map = new HashMap<String,Object>(); Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
pd = firefightingEquipmentFacilityService.findById(pd); pd = firefightingEquipmentFacilityService.findById(pd);
pd.put("FOREIGN_KEY", pd.getString("FIREFIGHTINGFACILITY_ID")); pd.put("FOREIGN_KEY", pd.getString("FIREFIGHTINGFACILITY_ID"));
pd.put("TYPE",120); pd.put("TYPE", 120);
List<PageData> firefightingequipmentImg = imgfilesService.listAll(pd); //设备设施 List<PageData> firefightingequipmentImg = imgfilesService.listAll(pd); //设备设施
map.put("firefightingequipmentImg", firefightingequipmentImg); map.put("firefightingequipmentImg", firefightingequipmentImg);
map.put("pd", pd); map.put("pd", pd);
@ -118,18 +124,18 @@ public class FirefightingEquipmentFacilityController extends BaseController {
return map; return map;
} }
@RequestMapping(value="/list") @RequestMapping(value = "/list")
@ResponseBody @ResponseBody
public Object list(Page page) throws Exception{ public Object list(Page page) throws Exception {
Map<String,Object> map = new HashMap<String,Object>(); Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件 String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件
if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim()); if (Tools.notEmpty(KEYWORDS)) pd.put("KEYWORDS", KEYWORDS.trim());
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
page.setPd(pd); page.setPd(pd);
List<PageData> varList = firefightingEquipmentFacilityService.list(page); //列出MajorDangerSource列表 List<PageData> varList = firefightingEquipmentFacilityService.list(page); //列出MajorDangerSource列表
map.put("varList", varList); map.put("varList", varList);
map.put("page", page); map.put("page", page);
map.put("result", errInfo); map.put("result", errInfo);

15
src/main/java/com/zcloud/controller/inspectAnnually/InspectAnnuallyController.java
View File

@ -160,15 +160,16 @@ public class InspectAnnuallyController extends BaseController {
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID
page.setPd(pd); page.setPd(pd);
List<PageData> varList = inspectAnnuallyService.list(page); //列出年检列表 List<PageData> varList = inspectAnnuallyService.list(page); //列出年检列表
varList.forEach(inspectAnnually -> {
boolean isScrapFlag = varList.stream().anyMatch(data -> "1".equals(inspectAnnually.get("OPEAR_ISSCRAP")) || "1".equals(inspectAnnually.get("FREIGHT_ISSCRAP"))); varList.stream().anyMatch(data -> {
boolean isAssignedFlag = varList.stream().anyMatch(data -> "1".equals(inspectAnnually.get("OPEAR_ISASSIGNED")) || "1".equals(inspectAnnually.get("FREIGHT_ISASSIGNED"))); if("1".equals(data.getString("OPEAR_ISSCRAP")) || "1".equals(data.getString("FREIGHT_ISSCRAP"))) {
if (isScrapFlag) { data.put("ARCHIVES_TYPE", "2");
inspectAnnually.put("ARCHIVES_TYPE", "2"); } else if ("1".equals(data.getString("OPEAR_ISASSIGNED")) || "1".equals(data.getString("FREIGHT_ISASSIGNED"))) {
} else if (isAssignedFlag) { data.put("ARCHIVES_TYPE", "1");
inspectAnnually.put("ARCHIVES_TYPE", "1");
} }
return false;
}); });
map.put("varList", varList); map.put("varList", varList);
map.put("page", page); map.put("page", page);
map.put("result", errInfo); map.put("result", errInfo);

10
src/main/java/com/zcloud/controller/maintain/MaintainController.java
View File

@ -50,9 +50,6 @@ public class MaintainController extends BaseController {
pd.put("CREATOR", Jurisdiction.getUSER_ID()); //添加人id pd.put("CREATOR", Jurisdiction.getUSER_ID()); //添加人id
pd.put("CREATORNAME", Jurisdiction.getUsername()); //添加人名字 pd.put("CREATORNAME", Jurisdiction.getUsername()); //添加人名字
pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间 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())); // 修改时间
maintainService.save(pd); maintainService.save(pd);
map.put("pd", pd); map.put("pd", pd);
map.put("result", errInfo); map.put("result", errInfo);
@ -71,7 +68,7 @@ public class MaintainController extends BaseController {
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
pd.put("DELETOR", Jurisdiction.getUSER_ID()); pd.put("DELETOR", Jurisdiction.getUSER_ID());
pd.put("DELETORNAME", Jurisdiction.getUsername()); pd.put("DELETORNAME", Jurisdiction.getName());
pd.put("DELETTIME", DateUtil.date2Str(new Date())); pd.put("DELETTIME", DateUtil.date2Str(new Date()));
maintainService.delete(pd); maintainService.delete(pd);
map.put("result", errInfo); //返回结果 map.put("result", errInfo); //返回结果
@ -90,11 +87,8 @@ public class MaintainController extends BaseController {
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
pd.put("ISDELETE", "0"); //是否删除(0:有效 1：删除) 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("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id
pd.put("OPERATORNAME", Jurisdiction.getUsername()); // 修改人名字 pd.put("OPERATORNAME", Jurisdiction.getName()); // 修改人名字
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间
maintainService.edit(pd); maintainService.edit(pd);
map.put("pd", pd); map.put("pd", pd);

49
src/main/java/com/zcloud/controller/maintenance/MaintenanceController.java
View File

@ -156,15 +156,18 @@ public class MaintenanceController extends BaseController {
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID
page.setPd(pd); page.setPd(pd);
List<PageData> varList = maintenanceService.list(page); //列出Question列表 List<PageData> varList = maintenanceService.list(page); //列出Question列表
for (PageData operation : varList) {
if ("1".equals(operation.get("OPEAR_ISSCRAP")) || "1".equals(operation.get("FREIGHT_ISSCRAP"))) { varList.stream().anyMatch(data -> {
operation.put("ARCHIVES_TYPE", "2"); if ("1".equals(data.getString("OPEAR_ISSCRAP")) || "1".equals(data.getString("FREIGHT_ISSCRAP"))) {
} else if ("1".equals(operation.get("OPEAR_ISASSIGNED")) || "1".equals(operation.get("FREIGHT_ISASSIGNED"))) { data.put("ARCHIVES_TYPE", "2");
operation.put("ARCHIVES_TYPE", "1"); } else if ("1".equals(data.getString("OPEAR_ISASSIGNED")) || "1".equals(data.getString("FREIGHT_ISASSIGNED"))) {
data.put("ARCHIVES_TYPE", "1");
} else { } else {
operation.put("ARCHIVES_TYPE", "0"); data.put("ARCHIVES_TYPE", "0");
} }
} return false;
});
map.put("varList", varList); map.put("varList", varList);
map.put("page", page); map.put("page", page);
map.put("result", errInfo); map.put("result", errInfo);
@ -234,37 +237,41 @@ public class MaintenanceController extends BaseController {
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
} }
if("2".equals(pd.getString("TRAFFIC_TYPE"))) { if ("2".equals(pd.getString("TRAFFIC_TYPE"))) {
// 货运挂车 // 货运挂车
List<PageData> freightList = freightTrailerService.trailerList(pd.getString("CORPINFO_ID")); List<PageData> freightList = freightTrailerService.trailerList(pd.getString("CORPINFO_ID"));
page.setPd(pd); page.setPd(pd);
List<PageData> insAnnually = maintenanceService.list(page); List<PageData> maintenanceList = maintenanceService.list(page);
for (int i = 0; i < insAnnually.size(); i++) {
for (int j = 0; j < freightList.size(); j++) { List<PageData> varList = new ArrayList<>();
if(freightList.get(j).get("FREIGHTTRAILER_ID").equals(insAnnually.get(i).get("VEHICLE"))) { if (!CollectionUtils.isEmpty(maintenanceList)) {
freightList.remove(j); varList = freightList.stream().parallel()
} .filter(freight -> freightList.stream()
} .noneMatch(maintenance -> StringUtils.equals(freight.getString("FREIGHTTRAILER_ID"), maintenance.getString("VEHICLE"))))
.collect(Collectors.toList());
} else {
varList = freightList;
} }
if(pd.containsKey("ID")){
if (pd.containsKey("ID")) {
pd.put("FREIGHTTRAILER_ID", pd.getString("ID")); pd.put("FREIGHTTRAILER_ID", pd.getString("ID"));
pd.put("FOREIGN_KEY", pd.getString("FREIGHTTRAILER_ID")); pd.put("FOREIGN_KEY", pd.getString("FREIGHTTRAILER_ID"));
pd.put("TYPE",121); pd.put("TYPE", 121);
List<PageData> drivingLicenseImgs = imgfilesService.listAll(pd);//行驶证照片 List<PageData> drivingLicenseImgs = imgfilesService.listAll(pd);//行驶证照片
map.put("drivingLicenseImgs", drivingLicenseImgs); map.put("drivingLicenseImgs", drivingLicenseImgs);
} }
freightList.forEach(freight -> { varList.forEach(freight -> {
freight.put("ID", freight.getString("FREIGHTTRAILER_ID")); freight.put("ID", freight.getString("FREIGHTTRAILER_ID"));
}); });
map.put("list", freightList); map.put("list", varList);
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
} }
List<PageData> resData = freightTrailerService.vehicleList(pd); List<PageData> resData = freightTrailerService.vehicleList(pd);
if(pd.containsKey("ID")){ if (pd.containsKey("ID")) {
pd.put("FOREIGN_KEY", pd.getString("ID")); pd.put("FOREIGN_KEY", pd.getString("ID"));
pd.put("TYPE",121); pd.put("TYPE", 121);
List<PageData> drivingLicenseImgs = imgfilesService.listAll(pd);//行驶证照片 List<PageData> drivingLicenseImgs = imgfilesService.listAll(pd);//行驶证照片
map.put("drivingLicenseImgs", drivingLicenseImgs); map.put("drivingLicenseImgs", drivingLicenseImgs);
} }

16
src/main/java/com/zcloud/controller/operations/OperationsController.java
View File

@ -156,14 +156,16 @@ public class OperationsController extends BaseController {
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID
page.setPd(pd); page.setPd(pd);
List<PageData> varList = operationsService.list(page); //列出Question列表 List<PageData> varList = operationsService.list(page); //列出Question列表
for (PageData operation : varList) {
if("1".equals(operation.get("OPEAR_ISSCRAP")) || "1".equals(operation.get("FREIGHT_ISSCRAP"))) { varList.stream().anyMatch(data -> {
operation.put("ARCHIVES_TYPE", "2"); if("1".equals(data.getString("OPEAR_ISSCRAP")) || "1".equals(data.getString("FREIGHT_ISSCRAP"))) {
data.put("ARCHIVES_TYPE", "2");
} else if ("1".equals(data.getString("OPEAR_ISASSIGNED")) || "1".equals(data.getString("FREIGHT_ISASSIGNED"))) {
data.put("ARCHIVES_TYPE", "1");
} }
if("1".equals(operation.get("OPEAR_ISASSIGNED")) || "1".equals(operation.get("FREIGHT_ISASSIGNED"))) { return false;
operation.put("ARCHIVES_TYPE", "1"); });
}
}
map.put("varList", varList); map.put("varList", varList);
map.put("page", page); map.put("page", page);
map.put("result", errInfo); map.put("result", errInfo);

11
src/main/java/com/zcloud/controller/reportedIncident/ReportedIncidentController.java
View File

@ -30,11 +30,6 @@ public class ReportedIncidentController extends BaseController {
@Autowired @Autowired
private ReportedIncidentService reportedIncidentService; private ReportedIncidentService reportedIncidentService;
@Autowired
private ImgFilesService imgfilesService;
@Autowired
private ScrapManageService scrapManageService;
/** /**
* 新增 * 新增
@ -139,10 +134,10 @@ public class ReportedIncidentController extends BaseController {
* @param * @param
* @throws Exception * @throws Exception
*/ */
@RequestMapping(value="/goEdit") @RequestMapping(value = "/goEdit")
@ResponseBody @ResponseBody
public Object goEdit() throws Exception{ public Object goEdit() throws Exception {
Map<String,Object> map = new HashMap<String,Object>(); Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();

8
src/main/java/com/zcloud/controller/scrapManage/ScrapManageController.java
View File

@ -53,7 +53,7 @@ public class ScrapManageController extends BaseController {
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
pd.put("ISDELETE", "0"); //是否删除(0:有效 1：删除) pd.put("ISDELETE", "0"); //是否删除(0:有效 1：删除)
pd.put("CREATOR", Jurisdiction.getUSER_ID()); //添加人id pd.put("CREATOR", Jurisdiction.getUSER_ID()); //添加人id
pd.put("CREATORNAME", Jurisdiction.getUsername()); //添加人名字 pd.put("CREATORNAME", Jurisdiction.getName()); //添加人名字
pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间 pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间
pd.put("ISSCRAP", "1"); pd.put("ISSCRAP", "1");
freightTrailerService.editScrapStatus(pd); freightTrailerService.editScrapStatus(pd);
@ -75,7 +75,7 @@ public class ScrapManageController extends BaseController {
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
pd.put("DELETOR", Jurisdiction.getUSER_ID()); pd.put("DELETOR", Jurisdiction.getUSER_ID());
pd.put("DELETORNAME", Jurisdiction.getUsername()); pd.put("DELETORNAME", Jurisdiction.getName());
pd.put("DELETTIME", DateUtil.date2Str(new Date())); pd.put("DELETTIME", DateUtil.date2Str(new Date()));
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
PageData pageData = scrapManageService.findById(pd); PageData pageData = scrapManageService.findById(pd);
@ -112,10 +112,10 @@ public class ScrapManageController extends BaseController {
pd = this.getPageData(); pd = this.getPageData();
pd.put("ISDELETE", "0"); //是否删除(0:有效 1：删除) pd.put("ISDELETE", "0"); //是否删除(0:有效 1：删除)
pd.put("CREATOR", Jurisdiction.getUSER_ID()); //添加人id pd.put("CREATOR", Jurisdiction.getUSER_ID()); //添加人id
pd.put("CREATORNAME", Jurisdiction.getUsername()); //添加人名字 pd.put("CREATORNAME", Jurisdiction.getName()); //添加人名字
pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间 pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间
pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id
pd.put("OPERATORNAME", Jurisdiction.getUsername()); // 修改人名字 pd.put("OPERATORNAME", Jurisdiction.getName()); // 修改人名字
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间
scrapManageService.edit(pd); scrapManageService.edit(pd);
map.put("pd", pd); map.put("pd", pd);

27
src/main/java/com/zcloud/controller/taxationManage/TaxationManageController.java
View File

@ -32,12 +32,6 @@ public class TaxationManageController extends BaseController {
@Autowired @Autowired
private TaxationManageService taxationManageService; private TaxationManageService taxationManageService;
@Autowired
private Smb smb;
@Autowired
private AssignedManageService assignedManageService;
@Autowired @Autowired
private FreightTrailerService freightTrailerService; private FreightTrailerService freightTrailerService;
@ -63,8 +57,7 @@ public class TaxationManageController extends BaseController {
if ("".equals(pd.getString("EXPIRE_STATUS"))) { if ("".equals(pd.getString("EXPIRE_STATUS"))) {
String expireDate = pd.getString("EXPIRE_DATE"); String expireDate = pd.getString("EXPIRE_DATE");
String day = DateUtil.getDay(); String day = DateUtil.getDay();
boolean flag = DateUtil.compareDate(expireDate, day); if (DateUtil.compareDate(expireDate, day)) {
if (flag) {
pd.put("EXPIRE_STATUS", "1"); pd.put("EXPIRE_STATUS", "1");
} else { } else {
pd.put("EXPIRE_STATUS", "0"); pd.put("EXPIRE_STATUS", "0");
@ -159,15 +152,17 @@ public class TaxationManageController extends BaseController {
if (Tools.notEmpty(KEYWORDS)) pd.put("KEYWORDS", KEYWORDS.trim()); if (Tools.notEmpty(KEYWORDS)) pd.put("KEYWORDS", KEYWORDS.trim());
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
page.setPd(pd); page.setPd(pd);
List<PageData> taxationList = taxationManageService.list(page); //列出MajorDangerSource列表 List<PageData> varList = taxationManageService.list(page); //列出MajorDangerSource列表
taxationList.forEach(taxation -> {
if ("1".equals(taxation.get("ISSCRAP"))) { varList.stream().anyMatch(data -> {
taxation.put("ARCHIVES_TYPE", "1"); if ("1".equals(data.getString("ISSCRAP"))) {
} else if ("1".equals(taxation.get("ISASSIGNED"))) { data.put("ARCHIVES_TYPE", "1");
taxation.put("ARCHIVES_TYPE", "2"); } else if ("1".equals(data.getString("ISASSIGNED"))) {
data.put("ARCHIVES_TYPE", "2");
} }
return false;
}); });
map.put("varList", taxationList); map.put("varList", varList);
map.put("page", page); map.put("page", page);
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
@ -203,7 +198,7 @@ public class TaxationManageController extends BaseController {
.filter(freight -> taxationList.stream() .filter(freight -> taxationList.stream()
.noneMatch(taxation -> StringUtils.equals(freight.getString("PLATE_NUMBER"), taxation.getString("PLATE_NUMBER")))) .noneMatch(taxation -> StringUtils.equals(freight.getString("PLATE_NUMBER"), taxation.getString("PLATE_NUMBER"))))
.collect(Collectors.toList()); .collect(Collectors.toList());
}else{ } else {
varList = freightTrailerList; varList = freightTrailerList;
} }

2
src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyMeetingRecipientMapper.xml
View File

@ -153,7 +153,7 @@
and u.NAME = #{pd.PRACTITIONER} and u.NAME = #{pd.PRACTITIONER}
</if> </if>
<if test="pd.PRACTITIONER_TYPE != null and pd.PRACTITIONER_TYPE != ''"><!-- 关键词检索-从业类型 --> <if test="pd.PRACTITIONER_TYPE != null and pd.PRACTITIONER_TYPE != ''"><!-- 关键词检索-从业类型 -->
and f.PRACTITIONER_TYPE = #{pd.PRACTITIONER_TYPE} and sd.BIANMA = #{pd.PRACTITIONER_TYPE}
</if> </if>
<if test="pd.ATTENDANCE_STATUS != null and pd.ATTENDANCE_STATUS != ''"><!-- 关键词检索-参会状态 --> <if test="pd.ATTENDANCE_STATUS != null and pd.ATTENDANCE_STATUS != ''"><!-- 关键词检索-参会状态 -->
and f.ATTENDANCE_STATUS = #{pd.ATTENDANCE_STATUS} and f.ATTENDANCE_STATUS = #{pd.ATTENDANCE_STATUS}

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

@ -153,6 +153,7 @@
<if test="pd.VALIDSTATUS != null and pd.VALIDSTATUS != ''"> <if test="pd.VALIDSTATUS != null and pd.VALIDSTATUS != ''">
and COALESCE(c.VALIDSTATUS, '0') = #{pd.VALIDSTATUS} and COALESCE(c.VALIDSTATUS, '0') = #{pd.VALIDSTATUS}
</if> </if>
GROUP BY u.NAME
ORDER BY c.OPERATTIME DESC ORDER BY c.OPERATTIME DESC
</select> </select>

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

@ -153,6 +153,7 @@
<if test="pd.VALIDSTATUS != null and pd.VALIDSTATUS != ''"><!-- 关键词检索-有效状态 --> <if test="pd.VALIDSTATUS != null and pd.VALIDSTATUS != ''"><!-- 关键词检索-有效状态 -->
and COALESCE(c.VALIDSTATUS, '0') = #{pd.VALIDSTATUS} and COALESCE(c.VALIDSTATUS, '0') = #{pd.VALIDSTATUS}
</if> </if>
GROUP BY u.NAME
ORDER BY c.OPERATTIME DESC ORDER BY c.OPERATTIME DESC
</select> </select>

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

@ -162,6 +162,8 @@
<if test="pd.VALIDSTATUS != null and pd.VALIDSTATUS != ''"> <if test="pd.VALIDSTATUS != null and pd.VALIDSTATUS != ''">
and COALESCE(c.VALIDSTATUS, '0') = #{pd.VALIDSTATUS} and COALESCE(c.VALIDSTATUS, '0') = #{pd.VALIDSTATUS}
</if> </if>
GROUP BY u.NAME
ORDER BY c.OPERATTIME DESC
</select> </select>
<select id="findById" resultType="com.zcloud.entity.PageData" parameterType="com.zcloud.entity.PageData"> <select id="findById" resultType="com.zcloud.entity.PageData" parameterType="com.zcloud.entity.PageData">

1
src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityManagementAgreementMapper.xml
View File

@ -134,6 +134,7 @@
<if test="pd.VALIDSTATUS != null and pd.VALIDSTATUS != ''"><!-- 关键词检索-有效状态 --> <if test="pd.VALIDSTATUS != null and pd.VALIDSTATUS != ''"><!-- 关键词检索-有效状态 -->
and f.VALIDSTATUS = #{pd.VALIDSTATUS} and f.VALIDSTATUS = #{pd.VALIDSTATUS}
</if> </if>
ORDER BY f.OPERATTIME DESC
</select> </select>
<select id="findById" resultType="com.zcloud.entity.PageData" parameterType="com.zcloud.entity.PageData"> <select id="findById" resultType="com.zcloud.entity.PageData" parameterType="com.zcloud.entity.PageData">

11
src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityViolationRegistrationMapper.xml
View File

@ -135,15 +135,16 @@
u.PHONE u.PHONE
from from
<include refid="tableName"></include> f <include refid="tableName"></include> f
left join bus_corp_info i on f.CORPINFO_ID = i.CORPINFO_ID LEFT JOIN bus_corp_info i ON f.CORPINFO_ID = i.CORPINFO_ID
left join sys_user u on f.USER_ID = u.USER_ID LEFT JOIN sys_user u ON f.USER_ID = u.USER_ID
where f.ISDELETE = '0' and f.CORPINFO_ID = #{pd.CORPINFO_ID} WHERE f.ISDELETE = '0' AND f.CORPINFO_ID = #{pd.CORPINFO_ID}
<if test="pd.USER_ID != null and pd.USER_ID != ''"> <if test="pd.USER_ID != null and pd.USER_ID != ''">
and u.NAME LIKE CONCAT(CONCAT('%', #{pd.USER_ID}),'%') AND u.NAME LIKE CONCAT(CONCAT('%', #{pd.USER_ID}),'%')
</if> </if>
<if test="pd.PENALTYTIME != null and pd.PENALTYTIME != ''"><!-- 检索-处罚时间 --> <if test="pd.PENALTYTIME != null and pd.PENALTYTIME != ''"><!-- 检索-处罚时间 -->
and f.PENALTYTIME = #{pd.PENALTYTIME} AND f.PENALTYTIME = #{pd.PENALTYTIME}
</if> </if>
ORDER BY f.OPERATTIME DESC
</select> </select>
<select id="findById" resultType="com.zcloud.entity.PageData" parameterType="com.zcloud.entity.PageData"> <select id="findById" resultType="com.zcloud.entity.PageData" parameterType="com.zcloud.entity.PageData">

6
src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityWaybillRegistrationMapper.xml
View File

@ -145,6 +145,8 @@
DELETETIME = #{DELETETIME} DELETETIME = #{DELETETIME}
where where
WAYBILLREGISTRATION_ID = #{WAYBILLREGISTRATION_ID} WAYBILLREGISTRATION_ID = #{WAYBILLREGISTRATION_ID}
AND
CORPINFO_ID = #{CORPINFO_ID}
</delete> </delete>
<update id="edit" parameterType="pd"> <update id="edit" parameterType="pd">
@ -220,7 +222,7 @@
and f.WAYBILLSTATUS = #{pd.WAYBILLSTATUS} and f.WAYBILLSTATUS = #{pd.WAYBILLSTATUS}
</if> </if>
<if test="pd.TRANSPORTVEHICLE != null and pd.TRANSPORTVEHICLE != ''"><!-- 关键词检索-车辆车牌 --> <if test="pd.TRANSPORTVEHICLE != null and pd.TRANSPORTVEHICLE != ''"><!-- 关键词检索-车辆车牌 -->
and f.TRANSPORTVEHICLE = #{pd.TRANSPORTVEHICLE} and f.TRANSPORTVEHICLE LIKE CONCAT(CONCAT('%', #{pd.TRANSPORTVEHICLE}),'%')
</if> </if>
<if test="pd.USER_ID != null and pd.USER_ID != ''"><!-- 关键词检索-从业人员 --> <if test="pd.USER_ID != null and pd.USER_ID != ''"><!-- 关键词检索-从业人员 -->
and f.PRACTITIONER = #{pd.USER_ID} and f.PRACTITIONER = #{pd.USER_ID}
@ -271,6 +273,8 @@
left join bus_traffic_customer_contact btcc2 on btcc2.CONTACT_ID = f.CONFIRMINGPERSON left join bus_traffic_customer_contact btcc2 on btcc2.CONTACT_ID = f.CONFIRMINGPERSON
where where
f.WAYBILLREGISTRATION_ID = #{WAYBILLREGISTRATION_ID} f.WAYBILLREGISTRATION_ID = #{WAYBILLREGISTRATION_ID}
AND
f.CORPINFO_ID = #{CORPINFO_ID}
</select> </select>

1
src/main/resources/mybatis/datasource/equipmentFacility/EquipmentFacilityMapper.xml
View File

@ -350,6 +350,7 @@
<if test="pd.FACILITY_LOCALTION != null and pd.FACILITY_LOCALTION != ''"><!-- 关键词检索 --> <if test="pd.FACILITY_LOCALTION != null and pd.FACILITY_LOCALTION != ''"><!-- 关键词检索 -->
and f.FACILITY_LOCALTION LIKE CONCAT(CONCAT('%', #{pd.FACILITY_LOCALTION}),'%') and f.FACILITY_LOCALTION LIKE CONCAT(CONCAT('%', #{pd.FACILITY_LOCALTION}),'%')
</if> </if>
ORDER BY f.OPERATTIME DESC
</select> </select>
<select id="listAll" parameterType="pd" resultType="pd"> <select id="listAll" parameterType="pd" resultType="pd">

2
src/main/resources/mybatis/datasource/firefightingEquipmentFacility/FirefightingEquipmentFacilityMapper.xml
View File

@ -350,7 +350,7 @@
<if test="pd.FACILITY_LOCALTION != null and pd.FACILITY_LOCALTION != ''"><!-- 关键词检索 --> <if test="pd.FACILITY_LOCALTION != null and pd.FACILITY_LOCALTION != ''"><!-- 关键词检索 -->
and f.FACILITY_LOCALTION LIKE CONCAT(CONCAT('%', #{pd.FACILITY_LOCALTION}),'%') and f.FACILITY_LOCALTION LIKE CONCAT(CONCAT('%', #{pd.FACILITY_LOCALTION}),'%')
</if> </if>
ORDER BY f.CREATTIME desc ORDER BY f.OPERATTIME desc
</select> </select>
<select id="listAll" parameterType="pd" resultType="pd"> <select id="listAll" parameterType="pd" resultType="pd">

2
src/main/resources/mybatis/datasource/labourEntrenchThing/LabourEntrenchThingMapper.xml
View File

@ -350,7 +350,7 @@
<if test="pd.PERSON_NAME != null and pd.PERSON_NAME != ''"><!-- 关键词检索 --> <if test="pd.PERSON_NAME != null and pd.PERSON_NAME != ''"><!-- 关键词检索 -->
and f.PERSON_NAME LIKE CONCAT(CONCAT('%', #{pd.PERSON_NAME}),'%') and f.PERSON_NAME LIKE CONCAT(CONCAT('%', #{pd.PERSON_NAME}),'%')
</if> </if>
ORDER BY f.CREATTIME desc ORDER BY f.OPERATTIME desc
</select> </select>
<select id="listAll" parameterType="pd" resultType="pd"> <select id="listAll" parameterType="pd" resultType="pd">

1
src/main/resources/mybatis/datasource/maintain/MaintainMapper.xml
View File

@ -345,6 +345,7 @@
f.ISDELETE = '0' f.ISDELETE = '0'
AND AND
f.PRODUCTIONFACILITY_ID = #{pd.PRODUCTIONFACILITY_ID} f.PRODUCTIONFACILITY_ID = #{pd.PRODUCTIONFACILITY_ID}
ORDER BY f.OPERATTIME DESC
</select> </select>

4
src/main/resources/mybatis/datasource/safetyInvestment/SafetyInvestmentPlanMapper.xml
View File

@ -145,7 +145,7 @@
<if test="pd.STATUS != null and pd.STATUS != ''"><!-- 关键词检索 --> <if test="pd.STATUS != null and pd.STATUS != ''"><!-- 关键词检索 -->
and f.STATUS = #{pd.STATUS} and f.STATUS = #{pd.STATUS}
</if> </if>
order by f.PLAN_YEAR DESC, f.PLAN_PERIOD, f.STATUS = 0 desc, f.CREATTIME desc order by f.PLAN_YEAR DESC, f.PLAN_PERIOD, f.STATUS = 0 desc, f.OPERATTIME desc
</select> </select>
<!-- 列表(全部) --> <!-- 列表(全部) -->
@ -164,7 +164,7 @@
ISDELETE = '1' ISDELETE = '1'
where where
SAFETYINVESTMENTPLAN_ID in SAFETYINVESTMENTPLAN_ID in
<foreach item="item" index="index" collection="ArrayDATA_IDS" open="(" separator="," close=")"> <foreach item="item" index="index" collection="array" open="(" separator="," close=")">
#{item} #{item}
</foreach> </foreach>
</delete> </delete>

2
src/main/resources/mybatis/datasource/safetyInvestment/SafetyInvestmentUseMapper.xml
View File

@ -151,7 +151,7 @@
ISDELETE = '1' ISDELETE = '1'
where where
SAFETYINVESTMENTUSE_ID in SAFETYINVESTMENTUSE_ID in
<foreach item="item" index="index" collection="ArrayDATA_IDS" open="(" separator="," close=")"> <foreach item="item" index="index" collection="array" open="(" separator="," close=")">
#{item} #{item}
</foreach> </foreach>
</delete> </delete>