From 7476fb62b3b205e7b397d60354c566f60c29aa6e Mon Sep 17 00:00:00 2001 From: "277151821@qq.com" <277151821@qq.com> Date: Fri, 15 Mar 2024 11:21:18 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=8C=97=E6=96=97=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/beidou/BeidouController.java | 185 +++++++++++++++ .../datasource/beidou/BeidouMapper.java | 62 +++++ .../zcloud/service/beidou/BeidouService.java | 62 +++++ .../beidou/impl/BeidouServiceImpl.java | 84 +++++++ .../datasource/beidou/BeidouMapper.xml | 215 ++++++++++++++++++ 5 files changed, 608 insertions(+) create mode 100644 src/main/java/com/zcloud/controller/beidou/BeidouController.java create mode 100644 src/main/java/com/zcloud/mapper/datasource/beidou/BeidouMapper.java create mode 100644 src/main/java/com/zcloud/service/beidou/BeidouService.java create mode 100644 src/main/java/com/zcloud/service/beidou/impl/BeidouServiceImpl.java create mode 100644 src/main/resources/mybatis/datasource/beidou/BeidouMapper.xml diff --git a/src/main/java/com/zcloud/controller/beidou/BeidouController.java b/src/main/java/com/zcloud/controller/beidou/BeidouController.java new file mode 100644 index 0000000..4350e08 --- /dev/null +++ b/src/main/java/com/zcloud/controller/beidou/BeidouController.java @@ -0,0 +1,185 @@ +package com.zcloud.controller.beidou; + +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.beidou.BeidouService; +import com.zcloud.service.maintenance.MaintenanceService; +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("/beidou") +public class BeidouController extends BaseController { + + @Autowired + private BeidouService beidouService; + @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 map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("BEIDOU_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", "正常"); //档案状态 + + beidouService.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 map = new HashMap(); + 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())); //删除时间 + beidouService.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 map = new HashMap(); + 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())); //修改时间 + beidouService.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 map = new HashMap(); + 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())); //修改时间 + beidouService.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 map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID + page.setPd(pd); + List varList = beidouService.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 map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd = beidouService.findById(pd); //根据ID读取 + + pd.put("FOREIGN_KEY", pd.getString("BEIDOU_ID")); + pd.put("TYPE",128); + List beidouinfoImgs = imgfilesService.listAll(pd);//北斗资料图片 + map.put("pd", pd); + map.put("beidouinfoImgs", beidouinfoImgs); + map.put("result", errInfo); + return map; + } + + +} diff --git a/src/main/java/com/zcloud/mapper/datasource/beidou/BeidouMapper.java b/src/main/java/com/zcloud/mapper/datasource/beidou/BeidouMapper.java new file mode 100644 index 0000000..d56ddef --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/beidou/BeidouMapper.java @@ -0,0 +1,62 @@ +package com.zcloud.mapper.datasource.beidou; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + + +public interface BeidouMapper { + + /** + * 新增 + * + * @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 datalistPage(Page page); + + + /** + * 通过id获取数据 + * + * @param pd + * @throws Exception + */ + PageData findById(PageData pd); + + +} + diff --git a/src/main/java/com/zcloud/service/beidou/BeidouService.java b/src/main/java/com/zcloud/service/beidou/BeidouService.java new file mode 100644 index 0000000..0a3657c --- /dev/null +++ b/src/main/java/com/zcloud/service/beidou/BeidouService.java @@ -0,0 +1,62 @@ +package com.zcloud.service.beidou; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + + +public interface BeidouService { + + /** + * 新增 + * + * @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 list(Page page) throws Exception; + + + /** + * 通过id获取数据 + * + * @param pd + * @throws Exception + */ + public PageData findById(PageData pd) throws Exception; + + +} + diff --git a/src/main/java/com/zcloud/service/beidou/impl/BeidouServiceImpl.java b/src/main/java/com/zcloud/service/beidou/impl/BeidouServiceImpl.java new file mode 100644 index 0000000..6accd78 --- /dev/null +++ b/src/main/java/com/zcloud/service/beidou/impl/BeidouServiceImpl.java @@ -0,0 +1,84 @@ +package com.zcloud.service.beidou.impl; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.beidou.BeidouMapper; +import com.zcloud.service.beidou.BeidouService; +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 BeidouServiceImpl implements BeidouService { + + @Autowired + private BeidouMapper beidouMapper; + + /** + * 新增 + * + * @param pd + * @throws Exception + */ + public void save(PageData pd) throws Exception { + beidouMapper.save(pd); + } + + /** + * 删除 + * + * @param pd + * @throws Exception + */ + public void delete(PageData pd) throws Exception { + beidouMapper.delete(pd); + } + + /** + * 修改 + * + * @param pd + * @throws Exception + */ + public void edit(PageData pd) throws Exception { + beidouMapper.edit(pd); + } + + /** + * 修改 + * + * @param pd + * @throws Exception + */ + public void edit2(PageData pd) throws Exception { + beidouMapper.edit2(pd); + } + + /** + * 列表 + * + * @param page + * @throws Exception + */ + public List list(Page page) throws Exception { + return beidouMapper.datalistPage(page); + } + + + /** + * 通过id获取数据 + * + * @param pd + * @throws Exception + */ + public PageData findById(PageData pd) throws Exception { + return beidouMapper.findById(pd); + } + + +} + diff --git a/src/main/resources/mybatis/datasource/beidou/BeidouMapper.xml b/src/main/resources/mybatis/datasource/beidou/BeidouMapper.xml new file mode 100644 index 0000000..12edd10 --- /dev/null +++ b/src/main/resources/mybatis/datasource/beidou/BeidouMapper.xml @@ -0,0 +1,215 @@ + + + + + + + bus_traffic_mechanical_beidou + + + + + +BEIDOU_ID, +CORPINFO_ID, +NUM, +VEHICLE, +CAR_OWNERS, +TELEPHONE, +REGISTRANT, +NETWORK_ACCESS_COMPANY, +PROCESSING_DATE, +DUE_DATE, +ACTUAL_COLLECTION, +ALL_FEES, +REMINDER_DAYS, +REMINDER_DATE, +REMINDER_STATUS, +BEIDOUINFO, +NOTES, +ARCHIVES_TYPE, +ISDELETE, +CREATOR, +CREATORNAME, +CREATTIME + + + + +#{BEIDOU_ID}, +#{CORPINFO_ID}, +#{NUM}, +#{VEHICLE}, +#{CAR_OWNERS}, +#{TELEPHONE}, +#{REGISTRANT}, +#{NETWORK_ACCESS_COMPANY}, +#{PROCESSING_DATE}, +#{DUE_DATE}, +#{ACTUAL_COLLECTION}, +#{ALL_FEES}, +#{REMINDER_DAYS}, +#{REMINDER_DATE}, +#{REMINDER_STATUS}, +#{BEIDOUINFO}, +#{NOTES}, +#{ARCHIVES_TYPE}, +#{ISDELETE}, +#{CREATOR}, +#{CREATORNAME}, +#{CREATTIME} + + + + + insert into + + ( + + ) values ( + + ) + + + + + update + + set + ISDELETE = '1', + DELETEOR = #{DELETEOR}, + DELETEORNAME = #{DELETEORNAME}, + DELETTIME = #{DELETTIME} + where + BEIDOU_ID = #{BEIDOU_ID} + + + + + update + + set + NUM = #{NUM}, + VEHICLE = #{VEHICLE}, + CAR_OWNERS = #{CAR_OWNERS}, + TELEPHONE = #{TELEPHONE}, + REGISTRANT = #{REGISTRANT}, + NETWORK_ACCESS_COMPANY = #{NETWORK_ACCESS_COMPANY}, + PROCESSING_DATE = #{PROCESSING_DATE}, + DUE_DATE = #{DUE_DATE}, + ACTUAL_COLLECTION = #{ACTUAL_COLLECTION}, + ALL_FEES = #{ALL_FEES}, + REMINDER_DAYS = #{REMINDER_DAYS}, + REMINDER_DATE = #{REMINDER_DATE}, + REMINDER_STATUS = #{REMINDER_STATUS}, + BEIDOUINFO = #{BEIDOUINFO}, + NOTES = #{NOTES}, + OPERATOR = #{OPERATOR}, + OPERATORNAME = #{OPERATORNAME}, + OPERATTIME = #{OPERATTIME} + where + BEIDOU_ID = #{BEIDOU_ID} + + + + + + update + + set + + REMINDER_STATUS = #{REMINDER_STATUS}, + + OPERATOR = #{OPERATOR}, + OPERATORNAME = #{OPERATORNAME}, + OPERATTIME = #{OPERATTIME} + where + BEIDOU_ID = #{BEIDOU_ID} + + + + + + + + + + From 3e79f43c2f853d7b576fbe3946d0fb84237b6bd3 Mon Sep 17 00:00:00 2001 From: "277151821@qq.com" <277151821@qq.com> Date: Fri, 15 Mar 2024 11:23:46 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=B9=B4=E6=A3=80=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/zcloud/controller/system/ImgFilesController.java | 2 +- .../datasource/inspectAnnually/InspectAnnuallyMapper.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zcloud/controller/system/ImgFilesController.java b/src/main/java/com/zcloud/controller/system/ImgFilesController.java index a7360af..c886d1f 100644 --- a/src/main/java/com/zcloud/controller/system/ImgFilesController.java +++ b/src/main/java/com/zcloud/controller/system/ImgFilesController.java @@ -62,7 +62,7 @@ public class ImgFilesController extends BaseController { // 保存文件 File tempFile = new File(file.getOriginalFilename()); FileUtils.copyInputStreamToFile(file.getInputStream(), tempFile); - if(!FileUpload.isImage(tempFile) && !TYPE.equals("2") && !TYPE.equals("3")) {//四色图改为json文件,不用判断类型 + if(!FileUpload.isImage(tempFile) && !TYPE.equals("2") && !TYPE.equals("3") && !TYPE.equals("129")) {//四色图改为json文件,不用判断类型 map.put("result", "failed"); map.put("exception", "上传图片格式不正确，请重新上传"); return map; diff --git a/src/main/resources/mybatis/datasource/inspectAnnually/InspectAnnuallyMapper.xml b/src/main/resources/mybatis/datasource/inspectAnnually/InspectAnnuallyMapper.xml index 5a5d0d2..9fdc2a5 100644 --- a/src/main/resources/mybatis/datasource/inspectAnnually/InspectAnnuallyMapper.xml +++ b/src/main/resources/mybatis/datasource/inspectAnnually/InspectAnnuallyMapper.xml @@ -207,7 +207,7 @@ CREATTIME and f.REMINDER_STATUS = #{pd.REMINDER_STATUS} - and case when f.DUE_DATE < NOW() then 1 else 0 end = #{pd.DUE_DATE_TYPE} + and case when f.DUE_DATE < NOW() then 0 else 1 end = #{pd.DUE_DATE_TYPE} ORDER BY f.CREATTIME DESC From e3b792417a6b1e0a454ca21aca46f9f151ce33b8 Mon Sep 17 00:00:00 2001 From: "277151821@qq.com" <277151821@qq.com> Date: Fri, 15 Mar 2024 11:24:29 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=9D=E9=99=A9=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/insure/InsureController.java | 189 ++++++++++++++ .../datasource/insure/InsureMapper.java | 64 +++++ .../zcloud/service/insure/InsureService.java | 64 +++++ .../insure/impl/InsureServiceImpl.java | 88 +++++++ .../datasource/insure/InsureMapper.xml | 236 ++++++++++++++++++ 5 files changed, 641 insertions(+) create mode 100644 src/main/java/com/zcloud/controller/insure/InsureController.java create mode 100644 src/main/java/com/zcloud/mapper/datasource/insure/InsureMapper.java create mode 100644 src/main/java/com/zcloud/service/insure/InsureService.java create mode 100644 src/main/java/com/zcloud/service/insure/impl/InsureServiceImpl.java create mode 100644 src/main/resources/mybatis/datasource/insure/InsureMapper.xml diff --git a/src/main/java/com/zcloud/controller/insure/InsureController.java b/src/main/java/com/zcloud/controller/insure/InsureController.java new file mode 100644 index 0000000..b6bf351 --- /dev/null +++ b/src/main/java/com/zcloud/controller/insure/InsureController.java @@ -0,0 +1,189 @@ +package com.zcloud.controller.insure; + +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.insure.InsureService; +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("/insure") +public class InsureController extends BaseController { + + @Autowired + private InsureService insureService; + @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 map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("INSURE_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", "正常"); //档案状态 + + insureService.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 map = new HashMap(); + 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())); //删除时间 + insureService.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 map = new HashMap(); + 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())); //修改时间 + insureService.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 map = new HashMap(); + 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())); //修改时间 + insureService.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 map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID + page.setPd(pd); + List varList = insureService.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 map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd = insureService.findById(pd); //根据ID读取 + + pd.put("FOREIGN_KEY", pd.getString("INSURE_ID")); + pd.put("TYPE",125); + List insureinfoImgs = imgfilesService.listAll(pd);//保险资料图片 + pd.put("TYPE",129); + List attachmentUploadImgs = imgfilesService.listAll(pd);//保险附件上传 + + map.put("pd", pd); + map.put("insureinfoImgs", insureinfoImgs); + map.put("attachmentUploadImgs", attachmentUploadImgs); + map.put("result", errInfo); + return map; + } + + +} diff --git a/src/main/java/com/zcloud/mapper/datasource/insure/InsureMapper.java b/src/main/java/com/zcloud/mapper/datasource/insure/InsureMapper.java new file mode 100644 index 0000000..8607aed --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/insure/InsureMapper.java @@ -0,0 +1,64 @@ +package com.zcloud.mapper.datasource.insure; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 企业信息管理-货运挂车 + */ +public interface InsureMapper { + + /** + * 新增 + * + * @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 datalistPage(Page page); + + + /** + * 通过id获取数据 + * + * @param pd + * @throws Exception + */ + PageData findById(PageData pd); + + +} + diff --git a/src/main/java/com/zcloud/service/insure/InsureService.java b/src/main/java/com/zcloud/service/insure/InsureService.java new file mode 100644 index 0000000..f12df67 --- /dev/null +++ b/src/main/java/com/zcloud/service/insure/InsureService.java @@ -0,0 +1,64 @@ +package com.zcloud.service.insure; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 企业信息管理-货运挂车 + */ +public interface InsureService { + + /** + * 新增 + * + * @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 list(Page page) throws Exception; + + + /** + * 通过id获取数据 + * + * @param pd + * @throws Exception + */ + public PageData findById(PageData pd) throws Exception; + + +} + diff --git a/src/main/java/com/zcloud/service/insure/impl/InsureServiceImpl.java b/src/main/java/com/zcloud/service/insure/impl/InsureServiceImpl.java new file mode 100644 index 0000000..309ef20 --- /dev/null +++ b/src/main/java/com/zcloud/service/insure/impl/InsureServiceImpl.java @@ -0,0 +1,88 @@ +package com.zcloud.service.insure.impl; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.insure.InsureMapper; +import com.zcloud.service.insure.InsureService; +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 InsureServiceImpl implements InsureService { + + @Autowired + private InsureMapper insureMapper; + + /** + * 新增 + * + * @param pd + * @throws Exception + */ + public void save(PageData pd) throws Exception { + insureMapper.save(pd); + } + + /** + * 删除 + * + * @param pd + * @throws Exception + */ + public void delete(PageData pd) throws Exception { + insureMapper.delete(pd); + } + + /** + * 修改 + * + * @param pd + * @throws Exception + */ + public void edit(PageData pd) throws Exception { + insureMapper.edit(pd); + } + + /** + * 修改 + * + * @param pd + * @throws Exception + */ + public void edit2(PageData pd) throws Exception { + insureMapper.edit2(pd); + } + + /** + * 列表 + * + * @param page + * @throws Exception + */ + public List list(Page page) throws Exception { + return insureMapper.datalistPage(page); + } + + + + /** + * 通过id获取数据 + * + * @param pd + * @throws Exception + */ + public PageData findById(PageData pd) throws Exception { + return insureMapper.findById(pd); + } + + + +} + diff --git a/src/main/resources/mybatis/datasource/insure/InsureMapper.xml b/src/main/resources/mybatis/datasource/insure/InsureMapper.xml new file mode 100644 index 0000000..ded5c6c --- /dev/null +++ b/src/main/resources/mybatis/datasource/insure/InsureMapper.xml @@ -0,0 +1,236 @@ + + + + + + + bus_traffic_mechanical_insure + + + + + +INSURE_ID, +CORPINFO_ID, +NUM, +VEHICLE_MODEL, +VEHICLE, +CAR_OWNERS, +TELEPHONE, +REGISTRANT, +INSURANCE_COMPANY, +INSURANCE_COVERAGE, +PROCESSING_DATE, +EFFECTIVE_DATE, +DUE_DATE, +ALL_FEES, +ACTUAL_COLLECTION, +REMINDER_DAYS, +REMINDER_DATE, +REMINDER_STATUS, +ATTACHMENT_UPLOAD, +INSUREINFO, +NOTES, +ARCHIVES_TYPE, +ISDELETE, +CREATOR, +CREATORNAME, +CREATTIME + + + + +#{INSURE_ID}, +#{CORPINFO_ID}, +#{NUM}, +#{VEHICLE_MODEL}, +#{VEHICLE}, +#{CAR_OWNERS}, +#{TELEPHONE}, +#{REGISTRANT}, +#{INSURANCE_COMPANY}, +#{INSURANCE_COVERAGE}, +#{PROCESSING_DATE}, +#{EFFECTIVE_DATE}, +#{DUE_DATE}, +#{ALL_FEES}, +#{ACTUAL_COLLECTION}, +#{REMINDER_DAYS}, +#{REMINDER_DATE}, +#{REMINDER_STATUS}, +#{ATTACHMENT_UPLOAD}, +#{INSUREINFO}, +#{NOTES}, +#{ARCHIVES_TYPE}, +#{ISDELETE}, +#{CREATOR}, +#{CREATORNAME}, +#{CREATTIME} + + + + + insert into + + ( + + ) values ( + + ) + + + + + update + + set + ISDELETE = '1', + DELETEOR = #{DELETEOR}, + DELETEORNAME = #{DELETEORNAME}, + DELETTIME = #{DELETTIME} + where + INSURE_ID = #{INSURE_ID} + + + + + update + + set + NUM = #{NUM}, + VEHICLE_MODEL = #{VEHICLE_MODEL}, + VEHICLE = #{VEHICLE}, + CAR_OWNERS = #{CAR_OWNERS}, + TELEPHONE = #{TELEPHONE}, + REGISTRANT = #{REGISTRANT}, + INSURANCE_COMPANY = #{INSURANCE_COMPANY}, + INSURANCE_COVERAGE = #{INSURANCE_COVERAGE}, + PROCESSING_DATE = #{PROCESSING_DATE}, + EFFECTIVE_DATE = #{EFFECTIVE_DATE}, + DUE_DATE = #{DUE_DATE}, + ALL_FEES = #{ALL_FEES}, + ACTUAL_COLLECTION = #{ACTUAL_COLLECTION}, + REMINDER_DAYS = #{REMINDER_DAYS}, + REMINDER_DATE = #{REMINDER_DATE}, + REMINDER_STATUS = #{REMINDER_STATUS}, + ATTACHMENT_UPLOAD = #{ATTACHMENT_UPLOAD}, + INSUREINFO = #{INSUREINFO}, + NOTES = #{NOTES}, + ARCHIVES_TYPE = #{ARCHIVES_TYPE}, + OPERATOR = #{OPERATOR}, + OPERATORNAME = #{OPERATORNAME}, + OPERATTIME = #{OPERATTIME} + where + INSURE_ID = #{INSURE_ID} + + + + + + update + + set + + REMINDER_STATUS = #{REMINDER_STATUS}, + + OPERATOR = #{OPERATOR}, + OPERATORNAME = #{OPERATORNAME}, + OPERATTIME = #{OPERATTIME} + where + INSURE_ID = #{INSURE_ID} + + + + + + + + + + From e32470182bba7cebf7baa86aa05c300044047f02 Mon Sep 17 00:00:00 2001 From: "277151821@qq.com" <277151821@qq.com> Date: Fri, 15 Mar 2024 11:25:36 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E7=BB=B4=E4=BF=9D=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../maintenance/MaintenanceController.java | 184 +++++++++++++++ .../maintenance/MaintenanceMapper.java | 62 +++++ .../maintenance/MaintenanceService.java | 62 +++++ .../impl/MaintenanceServiceImpl.java | 84 +++++++ .../maintenance/MaintenanceMapper.xml | 223 ++++++++++++++++++ 5 files changed, 615 insertions(+) create mode 100644 src/main/java/com/zcloud/controller/maintenance/MaintenanceController.java create mode 100644 src/main/java/com/zcloud/mapper/datasource/maintenance/MaintenanceMapper.java create mode 100644 src/main/java/com/zcloud/service/maintenance/MaintenanceService.java create mode 100644 src/main/java/com/zcloud/service/maintenance/impl/MaintenanceServiceImpl.java create mode 100644 src/main/resources/mybatis/datasource/maintenance/MaintenanceMapper.xml diff --git a/src/main/java/com/zcloud/controller/maintenance/MaintenanceController.java b/src/main/java/com/zcloud/controller/maintenance/MaintenanceController.java new file mode 100644 index 0000000..8f757a1 --- /dev/null +++ b/src/main/java/com/zcloud/controller/maintenance/MaintenanceController.java @@ -0,0 +1,184 @@ +package com.zcloud.controller.maintenance; + +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.maintenance.MaintenanceService; +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("/maintenance") +public class MaintenanceController extends BaseController { + + @Autowired + private MaintenanceService maintenanceService; + @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 map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("MAINTENANCE_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", "正常"); //档案状态 + + maintenanceService.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 map = new HashMap(); + 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())); //删除时间 + maintenanceService.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 map = new HashMap(); + 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())); //修改时间 + maintenanceService.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 map = new HashMap(); + 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())); //修改时间 + maintenanceService.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 map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID + page.setPd(pd); + List varList = maintenanceService.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 map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd = maintenanceService.findById(pd); //根据ID读取 + + pd.put("FOREIGN_KEY", pd.getString("MAINTENANCE_ID")); + pd.put("TYPE",127); + List maintenanceinfoImgs = imgfilesService.listAll(pd);//维保资料图片 + map.put("pd", pd); + map.put("maintenanceinfoImgs", maintenanceinfoImgs); + map.put("result", errInfo); + return map; + } + + +} diff --git a/src/main/java/com/zcloud/mapper/datasource/maintenance/MaintenanceMapper.java b/src/main/java/com/zcloud/mapper/datasource/maintenance/MaintenanceMapper.java new file mode 100644 index 0000000..5f35a00 --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/maintenance/MaintenanceMapper.java @@ -0,0 +1,62 @@ +package com.zcloud.mapper.datasource.maintenance; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + + +public interface MaintenanceMapper { + + /** + * 新增 + * + * @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 datalistPage(Page page); + + + /** + * 通过id获取数据 + * + * @param pd + * @throws Exception + */ + PageData findById(PageData pd); + + +} + diff --git a/src/main/java/com/zcloud/service/maintenance/MaintenanceService.java b/src/main/java/com/zcloud/service/maintenance/MaintenanceService.java new file mode 100644 index 0000000..8561058 --- /dev/null +++ b/src/main/java/com/zcloud/service/maintenance/MaintenanceService.java @@ -0,0 +1,62 @@ +package com.zcloud.service.maintenance; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + + +public interface MaintenanceService { + + /** + * 新增 + * + * @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 list(Page page) throws Exception; + + + /** + * 通过id获取数据 + * + * @param pd + * @throws Exception + */ + public PageData findById(PageData pd) throws Exception; + + +} + diff --git a/src/main/java/com/zcloud/service/maintenance/impl/MaintenanceServiceImpl.java b/src/main/java/com/zcloud/service/maintenance/impl/MaintenanceServiceImpl.java new file mode 100644 index 0000000..3ef319a --- /dev/null +++ b/src/main/java/com/zcloud/service/maintenance/impl/MaintenanceServiceImpl.java @@ -0,0 +1,84 @@ +package com.zcloud.service.maintenance.impl; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.maintenance.MaintenanceMapper; +import com.zcloud.service.maintenance.MaintenanceService; +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 MaintenanceServiceImpl implements MaintenanceService { + + @Autowired + private MaintenanceMapper maintenanceMapper; + + /** + * 新增 + * + * @param pd + * @throws Exception + */ + public void save(PageData pd) throws Exception { + maintenanceMapper.save(pd); + } + + /** + * 删除 + * + * @param pd + * @throws Exception + */ + public void delete(PageData pd) throws Exception { + maintenanceMapper.delete(pd); + } + + /** + * 修改 + * + * @param pd + * @throws Exception + */ + public void edit(PageData pd) throws Exception { + maintenanceMapper.edit(pd); + } + + /** + * 修改 + * + * @param pd + * @throws Exception + */ + public void edit2(PageData pd) throws Exception { + maintenanceMapper.edit2(pd); + } + + /** + * 列表 + * + * @param page + * @throws Exception + */ + public List list(Page page) throws Exception { + return maintenanceMapper.datalistPage(page); + } + + + /** + * 通过id获取数据 + * + * @param pd + * @throws Exception + */ + public PageData findById(PageData pd) throws Exception { + return maintenanceMapper.findById(pd); + } + + +} + diff --git a/src/main/resources/mybatis/datasource/maintenance/MaintenanceMapper.xml b/src/main/resources/mybatis/datasource/maintenance/MaintenanceMapper.xml new file mode 100644 index 0000000..f7e833e --- /dev/null +++ b/src/main/resources/mybatis/datasource/maintenance/MaintenanceMapper.xml @@ -0,0 +1,223 @@ + + + + + + + bus_traffic_mechanical_maintenance + + + + + +MAINTENANCE_ID, +CORPINFO_ID, +NUM, +VEHICLE, +CAR_OWNERS, +TELEPHONE, +REGISTRANT, +MAINTENANCE_LEVEL, +MAINTENANCE_CYCLE, +KILOMETERS, +PROCESSING_DATE, +DUE_DATE, +AGREEMENT_NUM, +MAINTENANCE_COMPANY, +REMINDER_DAYS, +REMINDER_DATE, +REMINDER_STATUS, +MAINTENANCEINFO, +NOTES, +ARCHIVES_TYPE, +ISDELETE, +CREATOR, +CREATORNAME, +CREATTIME + + + + +#{MAINTENANCE_ID}, +#{CORPINFO_ID}, +#{NUM}, +#{VEHICLE}, +#{CAR_OWNERS}, +#{TELEPHONE}, +#{REGISTRANT}, +#{MAINTENANCE_LEVEL}, +#{MAINTENANCE_CYCLE}, +#{KILOMETERS}, +#{PROCESSING_DATE}, +#{DUE_DATE}, +#{AGREEMENT_NUM}, +#{MAINTENANCE_COMPANY}, +#{REMINDER_DAYS}, +#{REMINDER_DATE}, +#{REMINDER_STATUS}, +#{MAINTENANCEINFO}, +#{NOTES}, +#{ARCHIVES_TYPE}, +#{ISDELETE}, +#{CREATOR}, +#{CREATORNAME}, +#{CREATTIME} + + + + + insert into + + ( + + ) values ( + + ) + + + + + update + + set + ISDELETE = '1', + DELETEOR = #{DELETEOR}, + DELETEORNAME = #{DELETEORNAME}, + DELETTIME = #{DELETTIME} + where + MAINTENANCE_ID = #{MAINTENANCE_ID} + + + + + update + + set + NUM = #{NUM}, + VEHICLE = #{VEHICLE}, + CAR_OWNERS = #{CAR_OWNERS}, + TELEPHONE = #{TELEPHONE}, + REGISTRANT = #{REGISTRANT}, + MAINTENANCE_LEVEL = #{MAINTENANCE_LEVEL}, + MAINTENANCE_CYCLE = #{MAINTENANCE_CYCLE}, + KILOMETERS = #{KILOMETERS}, + PROCESSING_DATE = #{PROCESSING_DATE}, + DUE_DATE = #{DUE_DATE}, + AGREEMENT_NUM = #{AGREEMENT_NUM}, + MAINTENANCE_COMPANY = #{MAINTENANCE_COMPANY}, + REMINDER_DAYS = #{REMINDER_DAYS}, + REMINDER_DATE = #{REMINDER_DATE}, + REMINDER_STATUS = #{REMINDER_STATUS}, + MAINTENANCEINFO = #{MAINTENANCEINFO}, + NOTES = #{NOTES}, + OPERATOR = #{OPERATOR}, + OPERATORNAME = #{OPERATORNAME}, + OPERATTIME = #{OPERATTIME} + where + MAINTENANCE_ID = #{MAINTENANCE_ID} + + + + + + update + + set + + REMINDER_STATUS = #{REMINDER_STATUS}, + + OPERATOR = #{OPERATOR}, + OPERATORNAME = #{OPERATORNAME}, + OPERATTIME = #{OPERATTIME} + where + MAINTENANCE_ID = #{MAINTENANCE_ID} + + + + + + + + + + From 326a5024ef7bfbae5a98dca9c3844d4a47c1eb04 Mon Sep 17 00:00:00 2001 From: "277151821@qq.com" <277151821@qq.com> Date: Fri, 15 Mar 2024 11:26:18 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E8=90=A5=E8=BF=90=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operations/OperationsController.java | 184 +++++++++++++++ .../operations/OperationsMapper.java | 64 ++++++ .../service/operations/OperationsService.java | 64 ++++++ .../impl/OperationsServiceImpl.java | 86 +++++++ .../operations/OperationsMapper.xml | 211 ++++++++++++++++++ 5 files changed, 609 insertions(+) create mode 100644 src/main/java/com/zcloud/controller/operations/OperationsController.java create mode 100644 src/main/java/com/zcloud/mapper/datasource/operations/OperationsMapper.java create mode 100644 src/main/java/com/zcloud/service/operations/OperationsService.java create mode 100644 src/main/java/com/zcloud/service/operations/impl/OperationsServiceImpl.java create mode 100644 src/main/resources/mybatis/datasource/operations/OperationsMapper.xml diff --git a/src/main/java/com/zcloud/controller/operations/OperationsController.java b/src/main/java/com/zcloud/controller/operations/OperationsController.java new file mode 100644 index 0000000..f19aa0f --- /dev/null +++ b/src/main/java/com/zcloud/controller/operations/OperationsController.java @@ -0,0 +1,184 @@ +package com.zcloud.controller.operations; + +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.operations.OperationsService; +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("/operations") +public class OperationsController extends BaseController { + + @Autowired + private OperationsService operationsService; + @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 map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("OPERATIONS_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", "正常"); //档案状态 + + operationsService.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 map = new HashMap(); + 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())); //删除时间 + operationsService.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 map = new HashMap(); + 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())); //修改时间 + operationsService.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 map = new HashMap(); + 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())); //修改时间 + operationsService.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 map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID + page.setPd(pd); + List varList = operationsService.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 map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd = operationsService.findById(pd); //根据ID读取 + + pd.put("FOREIGN_KEY", pd.getString("OPERATIONS_ID")); + pd.put("TYPE",126); + List operationsinfoImgs = imgfilesService.listAll(pd);//营运证资料图片 + map.put("pd", pd); + map.put("operationsinfoImgs", operationsinfoImgs); + map.put("result", errInfo); + return map; + } + + +} diff --git a/src/main/java/com/zcloud/mapper/datasource/operations/OperationsMapper.java b/src/main/java/com/zcloud/mapper/datasource/operations/OperationsMapper.java new file mode 100644 index 0000000..3486271 --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/operations/OperationsMapper.java @@ -0,0 +1,64 @@ +package com.zcloud.mapper.datasource.operations; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 企业信息管理-货运挂车 + */ +public interface OperationsMapper { + + /** + * 新增 + * + * @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 datalistPage(Page page); + + + /** + * 通过id获取数据 + * + * @param pd + * @throws Exception + */ + PageData findById(PageData pd); + + +} + diff --git a/src/main/java/com/zcloud/service/operations/OperationsService.java b/src/main/java/com/zcloud/service/operations/OperationsService.java new file mode 100644 index 0000000..5f7615f --- /dev/null +++ b/src/main/java/com/zcloud/service/operations/OperationsService.java @@ -0,0 +1,64 @@ +package com.zcloud.service.operations; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 企业信息管理-货运挂车 + */ +public interface OperationsService { + + /** + * 新增 + * + * @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 list(Page page) throws Exception; + + + /** + * 通过id获取数据 + * + * @param pd + * @throws Exception + */ + public PageData findById(PageData pd) throws Exception; + + +} + diff --git a/src/main/java/com/zcloud/service/operations/impl/OperationsServiceImpl.java b/src/main/java/com/zcloud/service/operations/impl/OperationsServiceImpl.java new file mode 100644 index 0000000..d197098 --- /dev/null +++ b/src/main/java/com/zcloud/service/operations/impl/OperationsServiceImpl.java @@ -0,0 +1,86 @@ +package com.zcloud.service.operations.impl; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.operations.OperationsMapper; +import com.zcloud.service.operations.OperationsService; +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 OperationsServiceImpl implements OperationsService { + + @Autowired + private OperationsMapper operationsMapper; + + /** + * 新增 + * + * @param pd + * @throws Exception + */ + public void save(PageData pd) throws Exception { + operationsMapper.save(pd); + } + + /** + * 删除 + * + * @param pd + * @throws Exception + */ + public void delete(PageData pd) throws Exception { + operationsMapper.delete(pd); + } + + /** + * 修改 + * + * @param pd + * @throws Exception + */ + public void edit(PageData pd) throws Exception { + operationsMapper.edit(pd); + } + + /** + * 修改 + * + * @param pd + * @throws Exception + */ + public void edit2(PageData pd) throws Exception { + operationsMapper.edit2(pd); + } + + /** + * 列表 + * + * @param page + * @throws Exception + */ + public List list(Page page) throws Exception { + return operationsMapper.datalistPage(page); + } + + + /** + * 通过id获取数据 + * + * @param pd + * @throws Exception + */ + public PageData findById(PageData pd) throws Exception { + return operationsMapper.findById(pd); + } + + +} + diff --git a/src/main/resources/mybatis/datasource/operations/OperationsMapper.xml b/src/main/resources/mybatis/datasource/operations/OperationsMapper.xml new file mode 100644 index 0000000..b79a5f8 --- /dev/null +++ b/src/main/resources/mybatis/datasource/operations/OperationsMapper.xml @@ -0,0 +1,211 @@ + + + + + + + bus_traffic_mechanical_operations + + + + + +OPERATIONS_ID, +CORPINFO_ID, +NUM, +VEHICLE_MODEL, +VEHICLE, +CAR_OWNERS, +TELEPHONE, +REGISTRANT, +PROCESSING_DATE, +CYCLE, +DUE_DATE, +REMINDER_DAYS, +REMINDER_DATE, +REMINDER_STATUS, +OPERATIONSINFO, +NOTES, +ARCHIVES_TYPE, +ISDELETE, +CREATOR, +CREATORNAME, +CREATTIME + + + + +#{OPERATIONS_ID}, +#{CORPINFO_ID}, +#{NUM}, +#{VEHICLE_MODEL}, +#{VEHICLE}, +#{CAR_OWNERS}, +#{TELEPHONE}, +#{REGISTRANT}, +#{PROCESSING_DATE}, +#{CYCLE}, +#{DUE_DATE}, +#{REMINDER_DAYS}, +#{REMINDER_DATE}, +#{REMINDER_STATUS}, +#{OPERATIONSINFO}, +#{NOTES}, +#{ARCHIVES_TYPE}, +#{ISDELETE}, +#{CREATOR}, +#{CREATORNAME}, +#{CREATTIME} + + + + + insert into + + ( + + ) values ( + + ) + + + + + update + + set + ISDELETE = '1', + DELETEOR = #{DELETEOR}, + DELETEORNAME = #{DELETEORNAME}, + DELETTIME = #{DELETTIME} + where + OPERATIONS_ID = #{OPERATIONS_ID} + + + + + update + + set + NUM = #{NUM}, + VEHICLE_MODEL = #{VEHICLE_MODEL}, + VEHICLE = #{VEHICLE}, + CAR_OWNERS = #{CAR_OWNERS}, + TELEPHONE = #{TELEPHONE}, + REGISTRANT = #{REGISTRANT}, + PROCESSING_DATE = #{PROCESSING_DATE}, + CYCLE = #{CYCLE}, + DUE_DATE = #{DUE_DATE}, + REMINDER_DAYS = #{REMINDER_DAYS}, + REMINDER_DATE = #{REMINDER_DATE}, + REMINDER_STATUS = #{REMINDER_STATUS}, + OPERATIONSINFO = #{OPERATIONSINFO}, + NOTES = #{NOTES}, + OPERATOR = #{OPERATOR}, + OPERATORNAME = #{OPERATORNAME}, + OPERATTIME = #{OPERATTIME} + where + OPERATIONS_ID = #{OPERATIONS_ID} + + + + + update + + set + + REMINDER_STATUS = #{REMINDER_STATUS}, + + OPERATOR = #{OPERATOR}, + OPERATORNAME = #{OPERATORNAME}, + OPERATTIME = #{OPERATTIME} + where + OPERATIONS_ID = #{OPERATIONS_ID} + + + + + + + + + + From 2311b8333af15dc390f4a0ac2507e5f14a333903 Mon Sep 17 00:00:00 2001 From: WenShiJun Date: Fri, 15 Mar 2024 17:52:47 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=AE=89=E5=85=A8?= =?UTF-8?q?=E4=BA=8B=E6=95=85=E6=A1=A3=E6=A1=88=E6=A8=A1=E5=9D=97=E5=BC=80?= =?UTF-8?q?=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TrafficSafetyAssessmentController.java | 20 + .../TrafficSafetyProductionController.java | 20 + ...curityAccidentInvestigationController.java | 180 +++++++++ ...SecurityManagementAgreementController.java | 181 +++++++++ ...cSecurityManagementStaffingController.java | 20 + ...curityViolationRegistrationController.java | 163 ++++++++ .../TrafficSafetyAssessmentMapper.java | 2 + .../TrafficSafetyProductionMapper.java | 2 + ...icSecurityAccidentInvestigationMapper.java | 19 + ...fficSecurityManagementAgreementMapper.java | 20 + ...afficSecurityManagementStaffingMapper.java | 2 + ...icSecurityViolationRegistrationMapper.java | 20 + .../TrafficSafetyAssessmentService.java | 2 + .../TrafficSafetyProductionService.java | 2 + ...cSecurityAccidentInvestigationService.java | 18 + ...ficSecurityManagementAgreementService.java | 18 + ...fficSecurityManagementStaffingService.java | 2 + ...cSecurityViolationRegistrationService.java | 19 + .../TrafficSafetyAssessmentServiceImpl.java | 5 + .../TrafficSafetyProductionServiceImpl.java | 5 + ...urityAccidentInvestigationServiceImpl.java | 41 ++ .../TrafficSecurityCommitmentServiceImpl.java | 5 +- .../TrafficSecurityEmployeesDetailsImpl.java | 5 +- ...ecurityManagementAgreementServiceImpl.java | 40 ++ ...SecurityManagementStaffingServiceImpl.java | 5 + ...urityViolationRegistrationServiceImpl.java | 40 ++ .../TrafficSafetyAssessmentMapper.xml | 12 + .../TrafficSafetyProductionMapper.xml | 12 + ...ficSecurityAccidentInvestigationMapper.xml | 359 ++++++++++++++++++ ...afficSecurityManagementAgreementMapper.xml | 146 +++++++ ...rafficSecurityManagementStaffingMapper.xml | 12 + ...ficSecurityViolationRegistrationMapper.xml | 158 ++++++++ .../mybatis/datasource/system/UsersMapper.xml | 1 + 33 files changed, 1552 insertions(+), 4 deletions(-) create mode 100644 src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityAccidentInvestigationController.java create mode 100644 src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityManagementAgreementController.java create mode 100644 src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityViolationRegistrationController.java create mode 100644 src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityAccidentInvestigationMapper.java create mode 100644 src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityManagementAgreementMapper.java create mode 100644 src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityViolationRegistrationMapper.java create mode 100644 src/main/java/com/zcloud/service/comprehensive/TrafficSecurityAccidentInvestigationService.java create mode 100644 src/main/java/com/zcloud/service/comprehensive/TrafficSecurityManagementAgreementService.java create mode 100644 src/main/java/com/zcloud/service/comprehensive/TrafficSecurityViolationRegistrationService.java create mode 100644 src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityAccidentInvestigationServiceImpl.java rename src/main/java/com/zcloud/service/comprehensive/{ => impl}/TrafficSecurityCommitmentServiceImpl.java (88%) rename src/main/java/com/zcloud/service/comprehensive/{ => impl}/TrafficSecurityEmployeesDetailsImpl.java (80%) create mode 100644 src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityManagementAgreementServiceImpl.java create mode 100644 src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityViolationRegistrationServiceImpl.java create mode 100644 src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityAccidentInvestigationMapper.xml create mode 100644 src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityManagementAgreementMapper.xml create mode 100644 src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityViolationRegistrationMapper.xml diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyAssessmentController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyAssessmentController.java index 2171757..b735991 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyAssessmentController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyAssessmentController.java @@ -157,4 +157,24 @@ public class TrafficSafetyAssessmentController extends BaseController { map.put("result", errInfo); return map; } + + /** + * 删除 + * @return + * @throws Exception + */ + @RequestMapping(value="/delete") + @ResponseBody + public Object delete() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("DELETOR", Jurisdiction.getUSER_ID());//删除人id + pd.put("DELETORNAME", Jurisdiction.getUsername());//删除人姓名 + pd.put("DELETETIME", DateUtil.date2Str(new Date()));//删除时间 + safetyAssessmentService.delete(pd); + map.put("result", errInfo); + return map; + } } diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyProductionController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyProductionController.java index 90fefc9..19a1079 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyProductionController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyProductionController.java @@ -156,4 +156,24 @@ public class TrafficSafetyProductionController extends BaseController { map.put("result", errInfo); return map; } + + /** + * 删除 + * @return + * @throws Exception + */ + @RequestMapping(value="/delete") + @ResponseBody + public Object delete() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("DELETOR", Jurisdiction.getUSER_ID());//删除人id + pd.put("DELETORNAME", Jurisdiction.getUsername());//删除人姓名 + pd.put("DELETETIME", DateUtil.date2Str(new Date()));//删除时间 + safetyProductionService.delete(pd); + map.put("result", errInfo); + return map; + } } diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityAccidentInvestigationController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityAccidentInvestigationController.java new file mode 100644 index 0000000..eb1e575 --- /dev/null +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityAccidentInvestigationController.java @@ -0,0 +1,180 @@ +package com.zcloud.controller.comprehensive; + +import com.zcloud.controller.base.BaseController; +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.service.comprehensive.TrafficSecurityAccidentInvestigationService; +import com.zcloud.service.comprehensive.TrafficSecurityViolationRegistrationService; +import com.zcloud.util.*; +import org.apache.commons.lang.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.multipart.MultipartFile; + +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@Controller +@RequestMapping("/accidentinvestigation") +public class TrafficSecurityAccidentInvestigationController extends BaseController { + @Autowired + private TrafficSecurityAccidentInvestigationService accidentInvestigationService; + @Autowired + private Smb smb; + + @RequestMapping(value = "/add") + @ResponseBody + public Object add(@RequestParam(value="FFILEONE",required=false) MultipartFile fileOne, + @RequestParam(value="FFILETWO",required=false) MultipartFile fileTwo) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = this.getPageData(); + + String accidentinvestigation_id = this.get32UUID(); + pd.put("CREATOR", Jurisdiction.getUSER_ID()); // 创建人id + pd.put("CREATORNAME", Jurisdiction.getName()); // 创建人姓名 + pd.put("ACCIDENTINVESTIGATION_ID", accidentinvestigation_id); // 主键 + pd.put("INCIDENTNUMBER", this.get32UUID()); // 事故编号 + pd.put("CERTIFICATIONNUMBER", this.get32UUID()); // 认定书编号 + pd.put("CREATETIME", DateUtil.date2Str(new Date())); // 添加时间 + pd.put("DEPARTMENT", Jurisdiction.getCORPINFO_ID()); // 部门 + pd.put("ISDELETE", "0"); + + String ffile = DateUtil.getDays(); + if (fileOne != null && StringUtils.isNotBlank(pd.getString("CREATORNAME"))){ + String suffixName = fileOne.getOriginalFilename().substring(fileOne.getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); + if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName)) { + errInfo = "fail"; + map.put("result", errInfo); + map.put("msg", "文件格式不正确！"); + return map; + } + String fileName = this.get32UUID() + fileOne.getOriginalFilename().substring(fileOne.getOriginalFilename().lastIndexOf(".")); + smb.sshSftp(fileOne, fileName, Const.FILEPATHFILE + pd.getString("TRANSPORTATIONCOMPANY") + "/" + ffile); + pd.put("ACCIDENTREPORTRECORD", Const.FILEPATHFILE + pd.getString("TRANSPORTATIONCOMPANY") + "/" + ffile + "/" + fileName); + pd.put("ATTACHMENT_NAME",pd.getString("CREATORNAME")); + pd.put("CONFIRM_MESSAGE_TIME",DateUtil.date2Str(new Date())); + } + if (fileTwo != null && StringUtils.isNotBlank(pd.getString("CREATORNAME"))){ + String suffixName = fileTwo.getOriginalFilename().substring(fileTwo.getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); + if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName)) { + errInfo = "fail"; + map.put("result", errInfo); + map.put("msg", "文件格式不正确！"); + return map; + } + String fileName = this.get32UUID() + fileTwo.getOriginalFilename().substring(fileTwo.getOriginalFilename().lastIndexOf(".")); + smb.sshSftp(fileTwo, fileName, Const.FILEPATHFILE + pd.getString("TRANSPORTATIONCOMPANY") + "/" + ffile); + pd.put("ACCIDENTANALYSISRECORD", Const.FILEPATHFILE + pd.getString("TRANSPORTATIONCOMPANY") + "/" + ffile + "/" + fileName); + pd.put("ATTACHMENT_NAME",pd.getString("CREATORNAME")); + pd.put("CONFIRM_MESSAGE_TIME",DateUtil.date2Str(new Date())); + } + + accidentInvestigationService.save(pd); + map.put("result", errInfo); + map.put("pd", pd); + return map; + } + + //列表 + @RequestMapping(value = "/listForAccidentInvestigation") + @ResponseBody + public Object listForAccidentInvestigation(Page page) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + + String USER_ID = pd.getString("USER_ID"); + if (Tools.notEmpty(USER_ID)) + pd.put("USER_ID", USER_ID.trim()); + + String ACCIDENTDATE = pd.getString("ACCIDENTDATE"); // 运输车辆 + if (Tools.notEmpty(ACCIDENTDATE)) + pd.put("ACCIDENTDATE", ACCIDENTDATE.trim()); + + page.setPd(pd); + List varList = accidentInvestigationService.listForAccidentInvestigation(page); + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } + + /**删除 + * @param + * @throws Exception + */ + @RequestMapping(value="/delete") + @ResponseBody + public Object delete() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("DELETOR", Jurisdiction.getUSER_ID());//删除人id + pd.put("DELETORNAME", Jurisdiction.getUsername());//删除人姓名 + pd.put("DELETETIME", DateUtil.date2Str(new Date()));//删除时间 + accidentInvestigationService.delete(pd); + map.put("result", errInfo); + return map; + } + + /** + * 查看详情 + * @return + * @throws Exception + */ + @RequestMapping(value="/goEdit") + @ResponseBody + public Object goEdit() throws Exception { + Map map = new HashMap<>(); + String errInfo = "success"; + PageData pd = this.getPageData(); + pd = accidentInvestigationService.findById(pd); // 根据ID读取 + map.put("pd", pd); + map.put("result", errInfo); + return map; + } + + //修改 + @RequestMapping(value = "/edit") + @ResponseBody + public Object edit(@RequestParam(value="FFILE",required=false) MultipartFile file) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = this.getPageData(); + + pd.put("OPERATOR", Jurisdiction.getUSER_ID()); // 修改人id + pd.put("OPERATORNAME", Jurisdiction.getName()); // 修改人姓名 + pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间 + + String ffile = DateUtil.getDays(); + if (file != null && StringUtils.isNotBlank(pd.getString("OPERATORNAME"))){ + pd.put("COMPLETIONSTATUS", "1"); + String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); + if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName)) { + errInfo = "fail"; + map.put("result", errInfo); + map.put("msg", "文件格式不正确！"); + return map; + } + String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); + smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("OPERATINGCOMPANY") + "/" + ffile); + pd.put("ATTACHMENT_ROUTE", Const.FILEPATHFILE + pd.getString("OPERATINGCOMPANY") + "/" + ffile + "/" + fileName); + pd.put("ATTACHMENT_NAME",pd.getString("CREATORNAME")); + pd.put("CONFIRM_MESSAGE_TIME",DateUtil.date2Str(new Date())); + } + + accidentInvestigationService.edit(pd); + + map.put("result", errInfo); + map.put("pd", pd); + return map; + } +} diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityManagementAgreementController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityManagementAgreementController.java new file mode 100644 index 0000000..8791b34 --- /dev/null +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityManagementAgreementController.java @@ -0,0 +1,181 @@ +package com.zcloud.controller.comprehensive; + +import com.zcloud.controller.base.BaseController; +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.service.comprehensive.TrafficSecurityManagementAgreementService; +import com.zcloud.util.*; +import org.apache.commons.lang.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.multipart.MultipartFile; + +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@Controller +@RequestMapping("/managementagreement") +public class TrafficSecurityManagementAgreementController extends BaseController { + @Autowired + private TrafficSecurityManagementAgreementService managementAgreementService; + @Autowired + private Smb smb; + + //新增 + @RequestMapping(value = "/add") + @ResponseBody + public Object add(@RequestParam(value="FFILE",required=false) MultipartFile file) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = this.getPageData(); + String managementagreementId = this.get32UUID(); + + pd.put("CREATOR", Jurisdiction.getUSER_ID()); // 创建人id + pd.put("CREATORNAME", Jurisdiction.getName()); // 创建人姓名 + pd.put("OPERATINGCOMPANY", Jurisdiction.getCORPINFO_ID()); // 经营企业 + pd.put("MANAGEMENTAGREEMENT_ID", managementagreementId); // 主键 + pd.put("CREATETIME", DateUtil.date2Str(new Date())); // 添加时间 + pd.put("COMPLETIONSTATUS", "0"); + pd.put("ISDELETE", "0"); + + if (DateUtil.compareDate(DateUtil.getDay(), pd.getString("EXPIRYDATE"))) { + pd.put("VALIDSTATUS", "0"); + } else { + pd.put("VALIDSTATUS", "1"); + } + String ffile = DateUtil.getDays(); + + if (file != null && StringUtils.isNotBlank(pd.getString("CREATORNAME"))){ + pd.put("COMPLETIONSTATUS", "1"); + String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); + if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName)) { + errInfo = "fail"; + map.put("result", errInfo); + map.put("msg", "文件格式不正确！"); + return map; + } + String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); + smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("OPERATINGCOMPANY") + "/" + ffile); + pd.put("ATTACHMENT_ROUTE", Const.FILEPATHFILE + pd.getString("OPERATINGCOMPANY") + "/" + ffile + "/" + fileName); + pd.put("ATTACHMENT_NAME",pd.getString("CREATORNAME")); + pd.put("CONFIRM_MESSAGE_TIME",DateUtil.date2Str(new Date())); + } + + managementAgreementService.save(pd); + + map.put("result", errInfo); + map.put("pd", pd); + return map; + } + + //修改 + @RequestMapping(value = "/edit") + @ResponseBody + public Object edit(@RequestParam(value="FFILE",required=false) MultipartFile file) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = this.getPageData(); + + pd.put("OPERATOR", Jurisdiction.getUSER_ID()); // 修改人id + pd.put("OPERATORNAME", Jurisdiction.getName()); // 修改人姓名 + pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间 + pd.put("OPERATINGCOMPANY", Jurisdiction.getCORPINFO_ID()); // 经营企业 + pd.put("ISDELETE", "0"); + String ffile = DateUtil.getDays(); + + if (file != null && StringUtils.isNotBlank(pd.getString("OPERATORNAME"))){ + pd.put("COMPLETIONSTATUS", "1"); + String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); + if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName)) { + errInfo = "fail"; + map.put("result", errInfo); + map.put("msg", "文件格式不正确！"); + return map; + } + String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); + smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("OPERATINGCOMPANY") + "/" + ffile); + pd.put("ATTACHMENT_ROUTE", Const.FILEPATHFILE + pd.getString("OPERATINGCOMPANY") + "/" + ffile + "/" + fileName); + pd.put("ATTACHMENT_NAME",pd.getString("CREATORNAME")); + pd.put("CONFIRM_MESSAGE_TIME",DateUtil.date2Str(new Date())); + } + + managementAgreementService.edit(pd); + + map.put("result", errInfo); + map.put("pd", pd); + return map; + } + + /** + * 列表 + * @param page + * @return + * @throws Exception + */ + @RequestMapping(value = "/listForManagementAgreementlist") + @ResponseBody + public Object listForManagementAgreementlist(Page page) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + + String SYSTEMNAME = pd.getString("SYSTEMNAME"); // 关键词检索条件 + if (Tools.notEmpty(SYSTEMNAME)) + pd.put("SYSTEMNAME", SYSTEMNAME.trim()); + + String COMPLETIONSTATUS = pd.getString("COMPLETIONSTATUS"); // 关键词检索条件 + if (Tools.notEmpty(COMPLETIONSTATUS)) + pd.put("COMPLETIONSTATUS", COMPLETIONSTATUS.trim()); + + String VALIDSTATUS = pd.getString("VALIDSTATUS"); // 关键词检索条件 + if (Tools.notEmpty(VALIDSTATUS)) + pd.put("VALIDSTATUS", VALIDSTATUS.trim()); + + page.setPd(pd); + List varList = managementAgreementService.listForManagementAgreementlist(page); + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } + + //详情 + @RequestMapping(value="/goEdit") + @ResponseBody + public Object goEdit() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd = managementAgreementService.findById(pd); //根据ID读取 + map.put("pd", pd); + map.put("result", errInfo); + return map; + } + + /** + * 删除 + * @return + * @throws Exception + */ + @RequestMapping(value="/delete") + @ResponseBody + public Object delete() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("DELETOR", Jurisdiction.getUSER_ID());//删除人id + pd.put("DELETORNAME", Jurisdiction.getUsername());//删除人姓名 + pd.put("DELETETIME", DateUtil.date2Str(new Date()));//删除时间 + managementAgreementService.delete(pd); + map.put("result", errInfo); + return map; + } +} diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityManagementStaffingController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityManagementStaffingController.java index 14ebf7b..60a3a52 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityManagementStaffingController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityManagementStaffingController.java @@ -160,4 +160,24 @@ public class TrafficSecurityManagementStaffingController extends BaseController map.put("result", errInfo); return map; } + + /** + * 删除 + * @return + * @throws Exception + */ + @RequestMapping(value="/delete") + @ResponseBody + public Object delete() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("DELETOR", Jurisdiction.getUSER_ID());//删除人id + pd.put("DELETORNAME", Jurisdiction.getUsername());//删除人姓名 + pd.put("DELETETIME", DateUtil.date2Str(new Date()));//删除时间 + securityManagementStaffingService.delete(pd); + map.put("result", errInfo); + return map; + } } diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityViolationRegistrationController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityViolationRegistrationController.java new file mode 100644 index 0000000..6ed198a --- /dev/null +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityViolationRegistrationController.java @@ -0,0 +1,163 @@ +package com.zcloud.controller.comprehensive; + +import com.zcloud.controller.base.BaseController; +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.service.comprehensive.TrafficSecurityViolationRegistrationService; +import com.zcloud.util.*; +import org.apache.commons.lang.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.multipart.MultipartFile; + +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@Controller +@RequestMapping("/violationregistration") +public class TrafficSecurityViolationRegistrationController extends BaseController { + @Autowired + private TrafficSecurityViolationRegistrationService violationRegistrationService; + @Autowired + private Smb smb; + + @RequestMapping(value = "/add") + @ResponseBody + public Object add(@RequestParam(value="FFILE",required=false) MultipartFile file) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = this.getPageData(); + + String registration_id = this.get32UUID(); + + pd.put("CREATOR", Jurisdiction.getUSER_ID()); // 创建人id + pd.put("CREATORNAME", Jurisdiction.getName()); // 创建人姓名 + pd.put("REGISTRATION_ID", registration_id); // 主键 + pd.put("CREATETIME", DateUtil.date2Str(new Date())); // 添加时间 + pd.put("TRANSPORTATIONCOMPANY", Jurisdiction.getCORPINFO_ID()); // 运输企业 + pd.put("ISDELETE", "0"); + + String ffile = DateUtil.getDays(); + if (file != null && StringUtils.isNotBlank(pd.getString("CREATORNAME"))){ + String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); + if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName)) { + errInfo = "fail"; + map.put("result", errInfo); + map.put("msg", "文件格式不正确！"); + return map; + } + String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); + smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("TRANSPORTATIONCOMPANY") + "/" + ffile); + pd.put("ATTACHMENT_ROUTE", Const.FILEPATHFILE + pd.getString("TRANSPORTATIONCOMPANY") + "/" + ffile + "/" + fileName); + pd.put("ATTACHMENT_NAME",pd.getString("CREATORNAME")); + pd.put("CONFIRM_MESSAGE_TIME",DateUtil.date2Str(new Date())); + } + + violationRegistrationService.save(pd); + map.put("result", errInfo); + map.put("pd", pd); + return map; + } + + //列表 + @RequestMapping(value = "/listForViolationRegistration") + @ResponseBody + public Object listForViolationRegistration(Page page) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + + String USER_ID = pd.getString("USER_ID"); // 运输企业 + if (Tools.notEmpty(USER_ID)) + pd.put("USER_ID", USER_ID.trim()); + + String PENALTYTIME = pd.getString("PENALTYTIME"); // 运输车辆 + if (Tools.notEmpty(PENALTYTIME)) + pd.put("PENALTYTIME", PENALTYTIME.trim()); + + page.setPd(pd); + List varList = violationRegistrationService.listForViolationRegistration(page); + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } + + /**删除 + * @param + * @throws Exception + */ + @RequestMapping(value="/delete") + @ResponseBody + public Object delete() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("DELETOR", Jurisdiction.getUSER_ID());//删除人id + pd.put("DELETORNAME", Jurisdiction.getUsername());//删除人姓名 + pd.put("DELETETIME", DateUtil.date2Str(new Date()));//删除时间 + violationRegistrationService.delete(pd); + map.put("result", errInfo); + return map; + } + + /** + * 查看详情 + * @return + * @throws Exception + */ + @RequestMapping(value="/goEdit") + @ResponseBody + public Object goEdit() throws Exception { + Map map = new HashMap<>(); + String errInfo = "success"; + PageData pd = this.getPageData(); + pd = violationRegistrationService.findById(pd); // 根据ID读取 + map.put("pd", pd); + map.put("result", errInfo); + return map; + } + + //修改 + @RequestMapping(value = "/edit") + @ResponseBody + public Object edit(@RequestParam(value="FFILE",required=false) MultipartFile file) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = this.getPageData(); + + pd.put("OPERATOR", Jurisdiction.getUSER_ID()); // 修改人id + pd.put("OPERATORNAME", Jurisdiction.getName()); // 修改人姓名 + pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间 + + String ffile = DateUtil.getDays(); + if (file != null && StringUtils.isNotBlank(pd.getString("OPERATORNAME"))){ + pd.put("COMPLETIONSTATUS", "1"); + String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); + if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName)) { + errInfo = "fail"; + map.put("result", errInfo); + map.put("msg", "文件格式不正确！"); + return map; + } + String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); + smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("OPERATINGCOMPANY") + "/" + ffile); + pd.put("ATTACHMENT_ROUTE", Const.FILEPATHFILE + pd.getString("OPERATINGCOMPANY") + "/" + ffile + "/" + fileName); + pd.put("ATTACHMENT_NAME",pd.getString("CREATORNAME")); + pd.put("CONFIRM_MESSAGE_TIME",DateUtil.date2Str(new Date())); + } + + violationRegistrationService.edit(pd); + + map.put("result", errInfo); + map.put("pd", pd); + return map; + } +} diff --git a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSafetyAssessmentMapper.java b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSafetyAssessmentMapper.java index de71b99..c428b10 100644 --- a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSafetyAssessmentMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSafetyAssessmentMapper.java @@ -15,4 +15,6 @@ public interface TrafficSafetyAssessmentMapper { void edit(PageData pd); PageData findById(PageData pd); + + void delete(PageData pd); } diff --git a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSafetyProductionMapper.java b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSafetyProductionMapper.java index 6865a11..32919df 100644 --- a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSafetyProductionMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSafetyProductionMapper.java @@ -15,4 +15,6 @@ public interface TrafficSafetyProductionMapper { void edit(PageData pd); PageData findById(PageData pd); + + void delete(PageData pd); } diff --git a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityAccidentInvestigationMapper.java b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityAccidentInvestigationMapper.java new file mode 100644 index 0000000..cefd1a8 --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityAccidentInvestigationMapper.java @@ -0,0 +1,19 @@ +package com.zcloud.mapper.datasource.comprehensive; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +@Mapper +public interface TrafficSecurityAccidentInvestigationMapper { + void save(PageData pd); + + List datalistPage(Page page); + + void edit(PageData pd); + + PageData findById(PageData pd); + + void delete(PageData pd); +} diff --git a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityManagementAgreementMapper.java b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityManagementAgreementMapper.java new file mode 100644 index 0000000..4d51069 --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityManagementAgreementMapper.java @@ -0,0 +1,20 @@ +package com.zcloud.mapper.datasource.comprehensive; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface TrafficSecurityManagementAgreementMapper { + void save(PageData pd); + + List datalistPage(Page page); + + void edit(PageData pd); + + PageData findById(PageData pd); + + void delete(PageData pd); +} diff --git a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityManagementStaffingMapper.java b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityManagementStaffingMapper.java index ebe514e..1c978e9 100644 --- a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityManagementStaffingMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityManagementStaffingMapper.java @@ -15,4 +15,6 @@ public interface TrafficSecurityManagementStaffingMapper { void edit(PageData pd); PageData findById(PageData pd); + + void delete(PageData pd); } diff --git a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityViolationRegistrationMapper.java b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityViolationRegistrationMapper.java new file mode 100644 index 0000000..f9f1506 --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityViolationRegistrationMapper.java @@ -0,0 +1,20 @@ +package com.zcloud.mapper.datasource.comprehensive; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface TrafficSecurityViolationRegistrationMapper { + void save(PageData pd); + + List datalistPage(Page page); + + void edit(PageData pd); + + PageData findById(PageData pd); + + void delete(PageData pd); +} diff --git a/src/main/java/com/zcloud/service/comprehensive/TrafficSafetyAssessmentService.java b/src/main/java/com/zcloud/service/comprehensive/TrafficSafetyAssessmentService.java index 33fafee..627e91b 100644 --- a/src/main/java/com/zcloud/service/comprehensive/TrafficSafetyAssessmentService.java +++ b/src/main/java/com/zcloud/service/comprehensive/TrafficSafetyAssessmentService.java @@ -13,4 +13,6 @@ public interface TrafficSafetyAssessmentService { List listForSafetyAssessment(Page page); PageData findById(PageData pd); + + void delete(PageData pd); } diff --git a/src/main/java/com/zcloud/service/comprehensive/TrafficSafetyProductionService.java b/src/main/java/com/zcloud/service/comprehensive/TrafficSafetyProductionService.java index 3b0a8fa..3b7e990 100644 --- a/src/main/java/com/zcloud/service/comprehensive/TrafficSafetyProductionService.java +++ b/src/main/java/com/zcloud/service/comprehensive/TrafficSafetyProductionService.java @@ -13,4 +13,6 @@ public interface TrafficSafetyProductionService { List listForSafetyProductionlist(Page page); PageData findById(PageData pd); + + void delete(PageData pd); } diff --git a/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityAccidentInvestigationService.java b/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityAccidentInvestigationService.java new file mode 100644 index 0000000..c9a539b --- /dev/null +++ b/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityAccidentInvestigationService.java @@ -0,0 +1,18 @@ +package com.zcloud.service.comprehensive; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +public interface TrafficSecurityAccidentInvestigationService { + void save(PageData pd); + + List listForAccidentInvestigation(Page page); + + void delete(PageData pd); + + PageData findById(PageData pd); + + void edit(PageData pd); +} diff --git a/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityManagementAgreementService.java b/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityManagementAgreementService.java new file mode 100644 index 0000000..e6ae118 --- /dev/null +++ b/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityManagementAgreementService.java @@ -0,0 +1,18 @@ +package com.zcloud.service.comprehensive; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +public interface TrafficSecurityManagementAgreementService { + void save(PageData pd); + + void edit(PageData pd); + + List listForManagementAgreementlist(Page page); + + PageData findById(PageData pd); + + void delete(PageData pd); +} diff --git a/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityManagementStaffingService.java b/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityManagementStaffingService.java index 7bfd1c5..66eb67a 100644 --- a/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityManagementStaffingService.java +++ b/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityManagementStaffingService.java @@ -13,4 +13,6 @@ public interface TrafficSecurityManagementStaffingService { void edit(PageData pd); PageData findById(PageData pd); + + void delete(PageData pd); } diff --git a/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityViolationRegistrationService.java b/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityViolationRegistrationService.java new file mode 100644 index 0000000..ea802c2 --- /dev/null +++ b/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityViolationRegistrationService.java @@ -0,0 +1,19 @@ +package com.zcloud.service.comprehensive; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +public interface TrafficSecurityViolationRegistrationService { + void save(PageData pd); + + List listForViolationRegistration(Page page); + + void delete(PageData pd); + + PageData findById(PageData pd); + + void edit(PageData pd); + +} diff --git a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSafetyAssessmentServiceImpl.java b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSafetyAssessmentServiceImpl.java index 012201a..f64e91c 100644 --- a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSafetyAssessmentServiceImpl.java +++ b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSafetyAssessmentServiceImpl.java @@ -33,4 +33,9 @@ public class TrafficSafetyAssessmentServiceImpl implements TrafficSafetyAssessme public PageData findById(PageData pd) { return safetyAssessmentMapper.findById(pd); } + + @Override + public void delete(PageData pd) { + safetyAssessmentMapper.delete(pd); + } } diff --git a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSafetyProductionServiceImpl.java b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSafetyProductionServiceImpl.java index 80426ad..246a309 100644 --- a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSafetyProductionServiceImpl.java +++ b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSafetyProductionServiceImpl.java @@ -32,4 +32,9 @@ public class TrafficSafetyProductionServiceImpl implements TrafficSafetyProducti public PageData findById(PageData pd) { return speedProductionMapper.findById(pd); } + + @Override + public void delete(PageData pd) { + speedProductionMapper.delete(pd); + } } diff --git a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityAccidentInvestigationServiceImpl.java b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityAccidentInvestigationServiceImpl.java new file mode 100644 index 0000000..8c2c529 --- /dev/null +++ b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityAccidentInvestigationServiceImpl.java @@ -0,0 +1,41 @@ +package com.zcloud.service.comprehensive.impl; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.comprehensive.TrafficSecurityAccidentInvestigationMapper; +import com.zcloud.service.comprehensive.TrafficSecurityAccidentInvestigationService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class TrafficSecurityAccidentInvestigationServiceImpl implements TrafficSecurityAccidentInvestigationService { + + @Autowired + private TrafficSecurityAccidentInvestigationMapper accidentInvestigationMapper; + @Override + public void save(PageData pd) { + accidentInvestigationMapper.save(pd); + } + + @Override + public List listForAccidentInvestigation(Page page) { + return accidentInvestigationMapper.datalistPage(page); + } + + @Override + public void delete(PageData pd) { + accidentInvestigationMapper.delete(pd); + } + + @Override + public PageData findById(PageData pd) { + return accidentInvestigationMapper.findById(pd); + } + + @Override + public void edit(PageData pd) { + accidentInvestigationMapper.edit(pd); + } +} diff --git a/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityCommitmentServiceImpl.java b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityCommitmentServiceImpl.java similarity index 88% rename from src/main/java/com/zcloud/service/comprehensive/TrafficSecurityCommitmentServiceImpl.java rename to src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityCommitmentServiceImpl.java index d57d295..f21d038 100644 --- a/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityCommitmentServiceImpl.java +++ b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityCommitmentServiceImpl.java @@ -1,15 +1,16 @@ -package com.zcloud.service.comprehensive; +package com.zcloud.service.comprehensive.impl; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; import com.zcloud.mapper.datasource.comprehensive.TrafficSecurityCommitmentMapper; +import com.zcloud.service.comprehensive.TrafficSecurityCommitmentService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @Service -public class TrafficSecurityCommitmentServiceImpl implements TrafficSecurityCommitmentService{ +public class TrafficSecurityCommitmentServiceImpl implements TrafficSecurityCommitmentService { @Autowired private TrafficSecurityCommitmentMapper securityCommitmentMapper; diff --git a/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityEmployeesDetailsImpl.java b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityEmployeesDetailsImpl.java similarity index 80% rename from src/main/java/com/zcloud/service/comprehensive/TrafficSecurityEmployeesDetailsImpl.java rename to src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityEmployeesDetailsImpl.java index caa6462..a7829b4 100644 --- a/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityEmployeesDetailsImpl.java +++ b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityEmployeesDetailsImpl.java @@ -1,15 +1,16 @@ -package com.zcloud.service.comprehensive; +package com.zcloud.service.comprehensive.impl; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; import com.zcloud.mapper.datasource.comprehensive.TrafficSecurityEmployeesDetailsMapper; +import com.zcloud.service.comprehensive.TrafficSecurityEmployeesDetailsService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @Service -public class TrafficSecurityEmployeesDetailsImpl implements TrafficSecurityEmployeesDetailsService{ +public class TrafficSecurityEmployeesDetailsImpl implements TrafficSecurityEmployeesDetailsService { @Autowired private TrafficSecurityEmployeesDetailsMapper ecoDetailsMapper; diff --git a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityManagementAgreementServiceImpl.java b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityManagementAgreementServiceImpl.java new file mode 100644 index 0000000..680dcfa --- /dev/null +++ b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityManagementAgreementServiceImpl.java @@ -0,0 +1,40 @@ +package com.zcloud.service.comprehensive.impl; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.comprehensive.TrafficSecurityManagementAgreementMapper; +import com.zcloud.service.comprehensive.TrafficSecurityManagementAgreementService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class TrafficSecurityManagementAgreementServiceImpl implements TrafficSecurityManagementAgreementService { + @Autowired + private TrafficSecurityManagementAgreementMapper managementAgreementMapper; + @Override + public void save(PageData pd) { + managementAgreementMapper.save(pd); + } + + @Override + public void edit(PageData pd) { + managementAgreementMapper.edit(pd); + } + + @Override + public List listForManagementAgreementlist(Page page) { + return managementAgreementMapper.datalistPage(page); + } + + @Override + public PageData findById(PageData pd) { + return managementAgreementMapper.findById(pd); + } + + @Override + public void delete(PageData pd) { + managementAgreementMapper.delete(pd); + } +} diff --git a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityManagementStaffingServiceImpl.java b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityManagementStaffingServiceImpl.java index d81c2fe..05ee69b 100644 --- a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityManagementStaffingServiceImpl.java +++ b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityManagementStaffingServiceImpl.java @@ -33,4 +33,9 @@ public class TrafficSecurityManagementStaffingServiceImpl implements TrafficSecu public PageData findById(PageData pd) { return securityManagementStaffingMapper.findById(pd); } + + @Override + public void delete(PageData pd) { + securityManagementStaffingMapper.delete(pd); + } } diff --git a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityViolationRegistrationServiceImpl.java b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityViolationRegistrationServiceImpl.java new file mode 100644 index 0000000..e4a361c --- /dev/null +++ b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityViolationRegistrationServiceImpl.java @@ -0,0 +1,40 @@ +package com.zcloud.service.comprehensive.impl; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.comprehensive.TrafficSecurityViolationRegistrationMapper; +import com.zcloud.service.comprehensive.TrafficSecurityViolationRegistrationService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class TrafficSecurityViolationRegistrationServiceImpl implements TrafficSecurityViolationRegistrationService { + @Autowired + private TrafficSecurityViolationRegistrationMapper verificationRegistrationMapper; + @Override + public void save(PageData pd) { + verificationRegistrationMapper.save(pd); + } + + @Override + public List listForViolationRegistration(Page page) { + return verificationRegistrationMapper.datalistPage(page); + } + + @Override + public void delete(PageData pd) { + verificationRegistrationMapper.delete(pd); + } + + @Override + public PageData findById(PageData pd) { + return verificationRegistrationMapper.findById(pd); + } + + @Override + public void edit(PageData pd) { + verificationRegistrationMapper.edit(pd); + } +} diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyAssessmentMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyAssessmentMapper.xml index 1899471..1635d24 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyAssessmentMapper.xml +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyAssessmentMapper.xml @@ -101,6 +101,18 @@ SAFETYASSESSMENT_ID = #{SAFETYASSESSMENT_ID} + + + update + + set + ISDELETE = '1', + DELETOR = #{DELETOR}, + DELETETIME = #{DELETETIME} + where + SAFETYASSESSMENT_ID = #{SAFETYASSESSMENT_ID} + + select diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityAccidentInvestigationMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityAccidentInvestigationMapper.xml new file mode 100644 index 0000000..f931e1f --- /dev/null +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityAccidentInvestigationMapper.xml @@ -0,0 +1,359 @@ + + + + + + BUS_TRAFFIC_ACCIDENT_INVESTIGATION + + + + + SYS_DICTIONARIES + + + + + f.ACCIDENTINVESTIGATION_ID, + f.ACCIDENTDATE, + f.ACCIDENTLOCATION, + f.INJUREDPART, + f.CERTIFICATIONSTATUS, + f.EDUCATIONSITUATION, + f.ACCIDENTDESCRIPTION, + f.ACCIDENTNATURE, + f.USER_ID, + f.CONFIRMATIONTIME, + f.ACCIDENTANALYSIS, + f.PUNISHMENTOPINION, + f.RESPONSIBLEPERSON, + f.SECONDARYRESPONSIBLEPERSON, + f.PREVENTIVEMEASURES, + f.COMPLETIONSTATUS, + f.RECTIFICATIONRESPONSIBLEPERSON, + f.RECTIFICATIONTIME, + f.SUPERVISOROPINION, + f.SUPERVISORLEADER, + f.SUPERVISORCONFIRMATIONTIME, + f.SAFETYSUPERVISIONOPINION, + f.SAFETYSUPERVISIONDEPARTMENT, + f.SAFETYSUPERVISIONCONFIRMATIONTIME, + f.INSPECTOR, + f.INSPECTORCONFIRMATIONTIME, + f.CERTIFICATIONNUMBER, + f.WORKINJURYIDENTIFICATIONLEVEL, + f.ACCIDENTRECORDPERSON, + f.REGISTRATIONDATE, + f.ACCIDENTREPORTRECORD, + f.ACCIDENTANALYSISRECORD, + f.ACCIDENTNUMBER, + f.ISDELETE, + f.DELETOR, + f.DELETORNAME, + f.DELETETIME, + f.CREATOR, + f.CREATORNAME, + f.CREATETIME, + f.OPERATOR, + f.OPERATORNAME, + f.OPERATTIME, + f.AGE, + f.EDUCATIONALLEVEL, + f.DEPARTMENT, + f.JOBTYPE, + f.PARTY, + f.INCIDENTNUMBER, + f.ENTRYDATE + + + + + ACCIDENTINVESTIGATION_ID, + ACCIDENTDATE, + ACCIDENTLOCATION, + INJUREDPART, + CERTIFICATIONSTATUS, + EDUCATIONSITUATION, + ACCIDENTDESCRIPTION, + ACCIDENTNATURE, + USER_ID, + CONFIRMATIONTIME, + ACCIDENTANALYSIS, + PUNISHMENTOPINION, + RESPONSIBLEPERSON, + SECONDARYRESPONSIBLEPERSON, + PREVENTIVEMEASURES, + COMPLETIONSTATUS, + RECTIFICATIONRESPONSIBLEPERSON, + RECTIFICATIONTIME, + SUPERVISOROPINION, + SUPERVISORLEADER, + SUPERVISORCONFIRMATIONTIME, + SAFETYSUPERVISIONOPINION, + SAFETYSUPERVISIONDEPARTMENT, + SAFETYSUPERVISIONCONFIRMATIONTIME, + INSPECTOR, + INSPECTORCONFIRMATIONTIME, + CERTIFICATIONNUMBER, + WORKINJURYIDENTIFICATIONLEVEL, + ACCIDENTRECORDPERSON, + REGISTRATIONDATE, + ACCIDENTREPORTRECORD, + ACCIDENTANALYSISRECORD, + ACCIDENTNUMBER, + ISDELETE, + DELETOR, + DELETORNAME, + DELETETIME, + CREATOR, + CREATORNAME, + CREATETIME, + OPERATOR, + OPERATORNAME, + OPERATTIME, + AGE, + EDUCATIONALLEVEL, + DEPARTMENT, + JOBTYPE, + PARTY, + INCIDENTNUMBER, + ENTRYDATE + + + + + #{ACCIDENTINVESTIGATION_ID}, + #{ACCIDENTDATE}, + #{ACCIDENTLOCATION}, + #{INJUREDPART}, + #{CERTIFICATIONSTATUS}, + #{EDUCATIONSITUATION}, + #{ACCIDENTDESCRIPTION}, + #{ACCIDENTNATURE}, + #{USER_ID}, + #{CONFIRMATIONTIME}, + #{ACCIDENTANALYSIS}, + #{PUNISHMENTOPINION}, + #{RESPONSIBLEPERSON}, + #{SECONDARYRESPONSIBLEPERSON}, + #{PREVENTIVEMEASURES}, + #{COMPLETIONSTATUS}, + #{RECTIFICATIONRESPONSIBLEPERSON}, + #{RECTIFICATIONTIME}, + #{SUPERVISOROPINION}, + #{SUPERVISORLEADER}, + #{SUPERVISORCONFIRMATIONTIME}, + #{SAFETYSUPERVISIONOPINION}, + #{SAFETYSUPERVISIONDEPARTMENT}, + #{SAFETYSUPERVISIONCONFIRMATIONTIME}, + #{INSPECTOR}, + #{INSPECTORCONFIRMATIONTIME}, + #{CERTIFICATIONNUMBER}, + #{WORKINJURYIDENTIFICATIONLEVEL}, + #{ACCIDENTRECORDPERSON}, + #{REGISTRATIONDATE}, + #{ACCIDENTREPORTRECORD}, + #{ACCIDENTANALYSISRECORD}, + #{ACCIDENTNUMBER}, + #{ISDELETE}, + #{DELETOR}, + #{DELETORNAME}, + #{DELETETIME}, + #{CREATOR}, + #{CREATORNAME}, + #{CREATETIME}, + #{OPERATOR}, + #{OPERATORNAME}, + #{OPERATTIME}, + #{AGE}, + #{EDUCATIONALLEVEL}, + #{DEPARTMENT}, + #{JOBTYPE}, + #{PARTY}, + #{INCIDENTNUMBER}, + #{ENTRYDATE} + + + + + insert into + + ( + + ) values ( + + ) + + + + + update + + + + ACCIDENTDATE = #{ACCIDENTDATE}, + + + ACCIDENTLOCATION = #{ACCIDENTLOCATION}, + + + INJUREDPART = #{INJUREDPART}, + + + CERTIFICATIONSTATUS = #{CERTIFICATIONSTATUS}, + + + EDUCATIONSITUATION = #{EDUCATIONSITUATION}, + + + ACCIDENTDESCRIPTION = #{ACCIDENTDESCRIPTION}, + + + ACCIDENTNATURE = #{ACCIDENTNATURE}, + + + USER_ID = #{USER_ID}, + + + CONFIRMATIONTIME = #{CONFIRMATIONTIME}, + + + ACCIDENTANALYSIS = #{ACCIDENTANALYSIS}, + + + PUNISHMENTOPINION = #{PUNISHMENTOPINION}, + + + RESPONSIBLEPERSON = #{RESPONSIBLEPERSON}, + + + SECONDARYRESPONSIBLEPERSON = #{SECONDARYRESPONSIBLEPERSON}, + + + PREVENTIVEMEASURES = #{PREVENTIVEMEASURES}, + + + COMPLETIONSTATUS = #{COMPLETIONSTATUS}, + + + RECTIFICATIONRESPONSIBLEPERSON = #{RECTIFICATIONRESPONSIBLEPERSON}, + + + RECTIFICATIONTIME = #{RECTIFICATIONTIME}, + + + SUPERVISOROPINION = #{SUPERVISOROPINION}, + + + SUPERVISORLEADER = #{SUPERVISORLEADER}, + + + SUPERVISORCONFIRMATIONTIME = #{SUPERVISORCONFIRMATIONTIME}, + + + SAFETYSUPERVISIONOPINION = #{SAFETYSUPERVISIONOPINION}, + + + SAFETYSUPERVISIONDEPARTMENT = #{SAFETYSUPERVISIONDEPARTMENT}, + + + SAFETYSUPERVISIONCONFIRMATIONTIME = #{SAFETYSUPERVISIONCONFIRMATIONTIME}, + + + INSPECTOR = #{INSPECTOR}, + + + INSPECTORCONFIRMATIONTIME = #{INSPECTORCONFIRMATIONTIME}, + + + CERTIFICATIONNUMBER = #{CERTIFICATIONNUMBER}, + + + WORKINJURYIDENTIFICATIONLEVEL = #{WORKINJURYIDENTIFICATIONLEVEL}, + + + ACCIDENTRECORDPERSON = #{ACCIDENTRECORDPERSON}, + + + REGISTRATIONDATE = #{REGISTRATIONDATE}, + + + ACCIDENTREPORTRECORD = #{ACCIDENTREPORTRECORD}, + + + ACCIDENTANALYSISRECORD = #{ACCIDENTANALYSISRECORD}, + + + ACCIDENTNUMBER = #{ACCIDENTNUMBER}, + + + OPERATOR = #{OPERATOR}, + + + OPERATORNAME = #{OPERATORNAME}, + + + OPERATTIME = #{OPERATTIME}, + + + AGE = #{AGE}, + + + EDUCATIONALLEVEL = #{EDUCATIONALLEVEL}, + + + DEPARTMENT = #{DEPARTMENT}, + + + JOBTYPE = #{JOBTYPE}, + + + PARTY = #{PARTY}, + + + ENTRYDATE = #{ENTRYDATE} + + + where ACCIDENTINVESTIGATION_ID = #{ACCIDENTINVESTIGATION_ID} + + + + + update + + set + ISDELETE = '1', + DELETOR = #{DELETOR}, + DELETETIME = #{DELETETIME} + where + ACCIDENTINVESTIGATION_ID = #{ACCIDENTINVESTIGATION_ID} + + + + + + + diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityManagementAgreementMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityManagementAgreementMapper.xml new file mode 100644 index 0000000..09e7cae --- /dev/null +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityManagementAgreementMapper.xml @@ -0,0 +1,146 @@ + + + + + + BUS_TRAFFIC_MANAGEMENT_AGREEMENT + + + + + SYS_DICTIONARIES + + + + + f.MANAGEMENTAGREEMENT_ID, + f.MANAGEMENTAGREEMENTNAME, + f.COMPLETIONSTATUS, + f.VALIDSTATUS, + f.OPERATINGCOMPANY, + f.EXPIRYDATE, + f.OPERATINGTYPE, + f.ATTACHMENT_ROUTE, + f.ISDELETE, + f.DELETOR, + f.DELETORNAME, + f.DELETETIME, + f.CREATOR, + f.CREATORNAME, + f.CREATETIME, + f.OPERATOR, + f.OPERATORNAME, + f.OPERATTIME + + + + + MANAGEMENTAGREEMENT_ID, + MANAGEMENTAGREEMENTNAME, + COMPLETIONSTATUS, + VALIDSTATUS, + OPERATINGCOMPANY, + EXPIRYDATE, + OPERATINGTYPE, + ATTACHMENT_ROUTE, + ISDELETE, + DELETOR, + DELETORNAME, + DELETETIME, + CREATOR, + CREATORNAME, + CREATETIME, + OPERATOR, + OPERATORNAME, + OPERATTIME + + + + + #{MANAGEMENTAGREEMENT_ID}, + #{MANAGEMENTAGREEMENTNAME}, + #{COMPLETIONSTATUS}, + #{VALIDSTATUS}, + #{OPERATINGCOMPANY}, + #{EXPIRYDATE}, + #{OPERATINGTYPE}, + #{ATTACHMENT_ROUTE}, + #{ISDELETE}, + #{DELETOR}, + #{DELETORNAME}, + #{DELETETIME}, + #{CREATOR}, + #{CREATORNAME}, + #{CREATETIME}, + #{OPERATOR}, + #{OPERATORNAME}, + #{OPERATTIME} + + + + + + insert into + + ( + + ) values ( + + ) + + + + + update + + set + OPERATOR = #{OPERATOR}, + OPERATORNAME = #{OPERATORNAME}, + OPERATTIME = #{OPERATTIME}, + EXPIRYDATE = #{EXPIRYDATE}, + ATTACHMENT_ROUTE=#{ATTACHMENT_ROUTE} + where + MANAGEMENTAGREEMENT_ID = #{MANAGEMENTAGREEMENT_ID} + + + + + update + + set + ISDELETE = '1', + DELETOR = #{DELETOR}, + DELETETIME = #{DELETETIME} + where + MANAGEMENTAGREEMENT_ID = #{MANAGEMENTAGREEMENT_ID} + + + + + + + diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityManagementStaffingMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityManagementStaffingMapper.xml index 3af03ad..8dd6376 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityManagementStaffingMapper.xml +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityManagementStaffingMapper.xml @@ -103,6 +103,18 @@ STAFFING_ID = #{STAFFING_ID} + + + update + + set + ISDELETE = '1', + DELETOR = #{DELETOR}, + DELETETIME = #{DELETETIME} + where + STAFFING_ID = #{STAFFING_ID} + + + select + f.*, + i.CORP_NAME, + u.NAME, + u.PHONE + from + f + left join bus_corp_info i on f.TRANSPORTATIONCOMPANY = i.CORPINFO_ID + left join sys_user u on f.USER_ID = u.USER_ID + where f.ISDELETE = '0' + + and f.USER_ID = #{pd.USER_ID} + + + and f.PENALTYTIME = #{pd.PENALTYTIME} + + + + + + diff --git a/src/main/resources/mybatis/datasource/system/UsersMapper.xml b/src/main/resources/mybatis/datasource/system/UsersMapper.xml index 842e2ab..b29ecfb 100644 --- a/src/main/resources/mybatis/datasource/system/UsersMapper.xml +++ b/src/main/resources/mybatis/datasource/system/UsersMapper.xml @@ -459,6 +459,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" u.PASSWORD, u.LAST_LOGIN, u.NAME, + u.SEX, u.IP, u.EMAIL, u.NUMBER,