From ae4bd6bc38914c3e0d4041484bd69e07edf775b0 Mon Sep 17 00:00:00 2001 From: guo Date: Thu, 21 Dec 2023 13:52:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A6=95=E5=9B=BE=E9=83=A8=E5=88=86=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RtDesignChangeContactSheetController.java | 139 ++++++++++++++++++ .../controller/RtMaterialOrderController.java | 139 ++++++++++++++++++ ...ewTechnologiesAndNewProcessController.java | 139 ++++++++++++++++++ .../RtProgressPaymentContractController.java | 139 ++++++++++++++++++ .../rt/controller/RtToolController.java | 139 ++++++++++++++++++ .../rt/entity/RtDesignChangeContactSheet.java | 124 ++++++++++++++++ .../modules/rt/entity/RtMaterialOrder.java | 139 ++++++++++++++++++ .../RtNewTechnologiesAndNewProcess.java | 80 ++++++++++ .../rt/entity/RtProgressPaymentContract.java | 114 ++++++++++++++ .../zhgd/xmgl/modules/rt/entity/RtTool.java | 90 ++++++++++++ .../RtDesignChangeContactSheetMapper.java | 16 ++ .../rt/mapper/RtMaterialOrderMapper.java | 16 ++ .../RtNewTechnologiesAndNewProcessMapper.java | 16 ++ .../RtProgressPaymentContractMapper.java | 16 ++ .../xmgl/modules/rt/mapper/RtToolMapper.java | 16 ++ .../xml/RtDesignChangeContactSheetMapper.xml | 4 + .../rt/mapper/xml/RtMaterialOrderMapper.xml | 4 + .../RtNewTechnologiesAndNewProcessMapper.xml | 4 + .../xml/RtProgressPaymentContractMapper.xml | 4 + .../modules/rt/mapper/xml/RtToolMapper.xml | 4 + .../IRtDesignChangeContactSheetService.java | 25 ++++ .../rt/service/IRtMaterialOrderService.java | 25 ++++ ...RtNewTechnologiesAndNewProcessService.java | 25 ++++ .../IRtProgressPaymentContractService.java | 25 ++++ .../modules/rt/service/IRtToolService.java | 25 ++++ ...RtDesignChangeContactSheetServiceImpl.java | 69 +++++++++ .../impl/RtMaterialOrderServiceImpl.java | 72 +++++++++ ...wTechnologiesAndNewProcessServiceImpl.java | 69 +++++++++ .../RtProgressPaymentContractServiceImpl.java | 69 +++++++++ .../rt/service/impl/RtToolServiceImpl.java | 79 ++++++++++ 30 files changed, 1825 insertions(+) create mode 100644 src/main/java/com/zhgd/xmgl/modules/rt/controller/RtDesignChangeContactSheetController.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/rt/controller/RtMaterialOrderController.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/rt/controller/RtNewTechnologiesAndNewProcessController.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/rt/controller/RtProgressPaymentContractController.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/rt/controller/RtToolController.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/rt/entity/RtDesignChangeContactSheet.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/rt/entity/RtMaterialOrder.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/rt/entity/RtNewTechnologiesAndNewProcess.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/rt/entity/RtProgressPaymentContract.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/rt/entity/RtTool.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/rt/mapper/RtDesignChangeContactSheetMapper.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/rt/mapper/RtMaterialOrderMapper.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/rt/mapper/RtNewTechnologiesAndNewProcessMapper.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/rt/mapper/RtProgressPaymentContractMapper.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/rt/mapper/RtToolMapper.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/rt/mapper/xml/RtDesignChangeContactSheetMapper.xml create mode 100644 src/main/java/com/zhgd/xmgl/modules/rt/mapper/xml/RtMaterialOrderMapper.xml create mode 100644 src/main/java/com/zhgd/xmgl/modules/rt/mapper/xml/RtNewTechnologiesAndNewProcessMapper.xml create mode 100644 src/main/java/com/zhgd/xmgl/modules/rt/mapper/xml/RtProgressPaymentContractMapper.xml create mode 100644 src/main/java/com/zhgd/xmgl/modules/rt/mapper/xml/RtToolMapper.xml create mode 100644 src/main/java/com/zhgd/xmgl/modules/rt/service/IRtDesignChangeContactSheetService.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/rt/service/IRtMaterialOrderService.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/rt/service/IRtNewTechnologiesAndNewProcessService.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/rt/service/IRtProgressPaymentContractService.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/rt/service/IRtToolService.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/rt/service/impl/RtDesignChangeContactSheetServiceImpl.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/rt/service/impl/RtMaterialOrderServiceImpl.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/rt/service/impl/RtNewTechnologiesAndNewProcessServiceImpl.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/rt/service/impl/RtProgressPaymentContractServiceImpl.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/rt/service/impl/RtToolServiceImpl.java diff --git a/src/main/java/com/zhgd/xmgl/modules/rt/controller/RtDesignChangeContactSheetController.java b/src/main/java/com/zhgd/xmgl/modules/rt/controller/RtDesignChangeContactSheetController.java new file mode 100644 index 000000000..760b62812 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/rt/controller/RtDesignChangeContactSheetController.java @@ -0,0 +1,139 @@ +package com.zhgd.xmgl.modules.rt.controller; + +import com.zhgd.xmgl.modules.rt.entity.RtDesignChangeContactSheet; +import com.zhgd.xmgl.modules.rt.service.IRtDesignChangeContactSheetService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiImplicitParams; + +import java.util.HashMap; + +import springfox.documentation.annotations.ApiIgnore; + +import java.util.List; + +import com.zhgd.jeecg.common.api.vo.Result; +import org.apache.commons.collections.MapUtils; + +import org.simpleframework.xml.core.Validate; +import com.baomidou.mybatisplus.core.metadata.IPage; +import lombok.extern.slf4j.Slf4j; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + + +/** + * @Title: Controller + * @Description: 榕图-设计变更联系单 + * @author： pds + * @date： 2023-12-21 + * @version： V1.0 + */ +@RestController +@RequestMapping("/xmgl/rtDesignChangeContactSheet") +@Slf4j +@Api(tags = "榕图-设计变更联系单相关Api") +public class RtDesignChangeContactSheetController { + @Autowired + private IRtDesignChangeContactSheetService rtDesignChangeContactSheetService; + + /** + * 分页列表查询 + * + * @return + */ + @ApiOperation(value = "分页列表查询榕图-设计变更联系单信息", notes = "分页列表查询榕图-设计变更联系单信息", httpMethod = "GET") + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "query", required = true, dataType = "Integer"), + @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"), + }) + @GetMapping(value = "/page") + public Result> queryPageList(@ApiIgnore @RequestParam HashMap paramMap) { + return Result.success(rtDesignChangeContactSheetService.queryPageList(paramMap)); + } + + /** + * 列表查询 + * + * @return + */ + @ApiOperation(value = "列表查询榕图-设计变更联系单信息", notes = "列表查询榕图-设计变更联系单信息", httpMethod = "GET") + @GetMapping(value = "/list") + public Result> queryList(@ApiIgnore @RequestParam HashMap paramMap) { + return Result.success(rtDesignChangeContactSheetService.queryList(paramMap)); + } + + /** + * 添加 + * + * @param rtDesignChangeContactSheet + * @return + */ + @ApiOperation(value = "添加榕图-设计变更联系单信息", notes = "添加榕图-设计变更联系单信息", httpMethod = "POST") + @PostMapping(value = "/add") + public Result add(@RequestBody @Validate RtDesignChangeContactSheet rtDesignChangeContactSheet) { + rtDesignChangeContactSheetService.add(rtDesignChangeContactSheet); + return Result.ok(); + } + + /** + * 编辑 + * + * @param rtDesignChangeContactSheet + * @return + */ + @ApiOperation(value = "编辑榕图-设计变更联系单信息", notes = "编辑榕图-设计变更联系单信息", httpMethod = "POST") + @PostMapping(value = "/edit") + public Result edit(@RequestBody RtDesignChangeContactSheet rtDesignChangeContactSheet) { + rtDesignChangeContactSheetService.edit(rtDesignChangeContactSheet); + return Result.ok(); + } + + /** + * 通过id删除 + * + * @return + */ + @ApiOperation(value = "删除榕图-设计变更联系单信息", notes = "删除榕图-设计变更联系单信息", httpMethod = "POST") + @ApiImplicitParam(name = "id", value = "榕图-设计变更联系单ID", paramType = "body", required = true, dataType = "String", example = "{\"id\":\"1\"}") + @PostMapping(value = "/delete") + public Result delete(@ApiIgnore @RequestBody HashMap map) { + String id = MapUtils.getString(map, "id"); + Result result = new Result(); + RtDesignChangeContactSheet rtDesignChangeContactSheet = rtDesignChangeContactSheetService.getById(id); + if (rtDesignChangeContactSheet == null) { + result.error500("未找到对应实体"); + } else { + boolean ok = rtDesignChangeContactSheetService.removeById(id); + if (ok) { + result.success("删除成功!"); + } + } + + return result; + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @ApiOperation(value = "通过id查询榕图-设计变更联系单信息", notes = "通过id查询榕图-设计变更联系单信息", httpMethod = "GET") + @ApiImplicitParam(name = "id", value = "榕图-设计变更联系单ID", paramType = "query", required = true, dataType = "Integer") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name = "id", required = true) String id) { + Result result = new Result(); + RtDesignChangeContactSheet rtDesignChangeContactSheet = rtDesignChangeContactSheetService.getById(id); + if (rtDesignChangeContactSheet == null) { + result.error500("未找到对应实体"); + } else { + result.setResult(rtDesignChangeContactSheet); + result.setSuccess(true); + } + return result; + } + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/rt/controller/RtMaterialOrderController.java b/src/main/java/com/zhgd/xmgl/modules/rt/controller/RtMaterialOrderController.java new file mode 100644 index 000000000..24109fc5a --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/rt/controller/RtMaterialOrderController.java @@ -0,0 +1,139 @@ +package com.zhgd.xmgl.modules.rt.controller; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiImplicitParams; + +import java.util.HashMap; + +import springfox.documentation.annotations.ApiIgnore; + +import java.util.List; + +import com.zhgd.jeecg.common.api.vo.Result; +import org.apache.commons.collections.MapUtils; +import com.zhgd.xmgl.modules.rt.entity.RtMaterialOrder; +import com.zhgd.xmgl.modules.rt.service.IRtMaterialOrderService; + +import org.simpleframework.xml.core.Validate; +import com.baomidou.mybatisplus.core.metadata.IPage; +import lombok.extern.slf4j.Slf4j; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + + +/** + * @Title: Controller + * @Description: 榕图-物资订单 + * @author： pds + * @date： 2023-12-21 + * @version： V1.0 + */ +@RestController +@RequestMapping("/xmgl/rtMaterialOrder") +@Slf4j +@Api(tags = "榕图-物资订单相关Api") +public class RtMaterialOrderController { + @Autowired + private IRtMaterialOrderService rtMaterialOrderService; + + /** + * 分页列表查询 + * + * @return + */ + @ApiOperation(value = "分页列表查询榕图-物资订单信息", notes = "分页列表查询榕图-物资订单信息", httpMethod = "GET") + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "query", required = true, dataType = "Integer"), + @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"), + }) + @GetMapping(value = "/page") + public Result> queryPageList(@ApiIgnore @RequestParam HashMap paramMap) { + return Result.success(rtMaterialOrderService.queryPageList(paramMap)); + } + + /** + * 列表查询 + * + * @return + */ + @ApiOperation(value = "列表查询榕图-物资订单信息", notes = "列表查询榕图-物资订单信息", httpMethod = "GET") + @GetMapping(value = "/list") + public Result> queryList(@ApiIgnore @RequestParam HashMap paramMap) { + return Result.success(rtMaterialOrderService.queryList(paramMap)); + } + + /** + * 添加 + * + * @param rtMaterialOrder + * @return + */ + @ApiOperation(value = "添加榕图-物资订单信息", notes = "添加榕图-物资订单信息", httpMethod = "POST") + @PostMapping(value = "/add") + public Result add(@RequestBody @Validate RtMaterialOrder rtMaterialOrder) { + rtMaterialOrderService.add(rtMaterialOrder); + return Result.ok(); + } + + /** + * 编辑 + * + * @param rtMaterialOrder + * @return + */ + @ApiOperation(value = "编辑榕图-物资订单信息", notes = "编辑榕图-物资订单信息", httpMethod = "POST") + @PostMapping(value = "/edit") + public Result edit(@RequestBody RtMaterialOrder rtMaterialOrder) { + rtMaterialOrderService.edit(rtMaterialOrder); + return Result.ok(); + } + + /** + * 通过id删除 + * + * @return + */ + @ApiOperation(value = "删除榕图-物资订单信息", notes = "删除榕图-物资订单信息", httpMethod = "POST") + @ApiImplicitParam(name = "id", value = "榕图-物资订单ID", paramType = "body", required = true, dataType = "String", example = "{\"id\":\"1\"}") + @PostMapping(value = "/delete") + public Result delete(@ApiIgnore @RequestBody HashMap map) { + String id = MapUtils.getString(map, "id"); + Result result = new Result(); + RtMaterialOrder rtMaterialOrder = rtMaterialOrderService.getById(id); + if (rtMaterialOrder == null) { + result.error500("未找到对应实体"); + } else { + boolean ok = rtMaterialOrderService.removeById(id); + if (ok) { + result.success("删除成功!"); + } + } + + return result; + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @ApiOperation(value = "通过id查询榕图-物资订单信息", notes = "通过id查询榕图-物资订单信息", httpMethod = "GET") + @ApiImplicitParam(name = "id", value = "榕图-物资订单ID", paramType = "query", required = true, dataType = "Integer") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name = "id", required = true) String id) { + Result result = new Result(); + RtMaterialOrder rtMaterialOrder = rtMaterialOrderService.getById(id); + if (rtMaterialOrder == null) { + result.error500("未找到对应实体"); + } else { + result.setResult(rtMaterialOrder); + result.setSuccess(true); + } + return result; + } + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/rt/controller/RtNewTechnologiesAndNewProcessController.java b/src/main/java/com/zhgd/xmgl/modules/rt/controller/RtNewTechnologiesAndNewProcessController.java new file mode 100644 index 000000000..6a0a02df8 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/rt/controller/RtNewTechnologiesAndNewProcessController.java @@ -0,0 +1,139 @@ +package com.zhgd.xmgl.modules.rt.controller; + +import com.zhgd.xmgl.modules.rt.service.IRtNewTechnologiesAndNewProcessService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiImplicitParams; + +import java.util.HashMap; + +import springfox.documentation.annotations.ApiIgnore; + +import java.util.List; + +import com.zhgd.jeecg.common.api.vo.Result; +import org.apache.commons.collections.MapUtils; +import com.zhgd.xmgl.modules.rt.entity.RtNewTechnologiesAndNewProcess; + +import org.simpleframework.xml.core.Validate; +import com.baomidou.mybatisplus.core.metadata.IPage; +import lombok.extern.slf4j.Slf4j; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + + +/** + * @Title: Controller + * @Description: 榕图-新技术新工艺汇编 + * @author： pds + * @date： 2023-12-21 + * @version： V1.0 + */ +@RestController +@RequestMapping("/xmgl/rtNewTechnologiesAndNewProcess") +@Slf4j +@Api(tags = "榕图-新技术新工艺汇编相关Api") +public class RtNewTechnologiesAndNewProcessController { + @Autowired + private IRtNewTechnologiesAndNewProcessService rtNewTechnologiesAndNewProcessService; + + /** + * 分页列表查询 + * + * @return + */ + @ApiOperation(value = "分页列表查询榕图-新技术新工艺汇编信息", notes = "分页列表查询榕图-新技术新工艺汇编信息", httpMethod = "GET") + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "query", required = true, dataType = "Integer"), + @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"), + }) + @GetMapping(value = "/page") + public Result> queryPageList(@ApiIgnore @RequestParam HashMap paramMap) { + return Result.success(rtNewTechnologiesAndNewProcessService.queryPageList(paramMap)); + } + + /** + * 列表查询 + * + * @return + */ + @ApiOperation(value = "列表查询榕图-新技术新工艺汇编信息", notes = "列表查询榕图-新技术新工艺汇编信息", httpMethod = "GET") + @GetMapping(value = "/list") + public Result> queryList(@ApiIgnore @RequestParam HashMap paramMap) { + return Result.success(rtNewTechnologiesAndNewProcessService.queryList(paramMap)); + } + + /** + * 添加 + * + * @param rtNewTechnologiesAndNewProcess + * @return + */ + @ApiOperation(value = "添加榕图-新技术新工艺汇编信息", notes = "添加榕图-新技术新工艺汇编信息", httpMethod = "POST") + @PostMapping(value = "/add") + public Result add(@RequestBody @Validate RtNewTechnologiesAndNewProcess rtNewTechnologiesAndNewProcess) { + rtNewTechnologiesAndNewProcessService.add(rtNewTechnologiesAndNewProcess); + return Result.ok(); + } + + /** + * 编辑 + * + * @param rtNewTechnologiesAndNewProcess + * @return + */ + @ApiOperation(value = "编辑榕图-新技术新工艺汇编信息", notes = "编辑榕图-新技术新工艺汇编信息", httpMethod = "POST") + @PostMapping(value = "/edit") + public Result edit(@RequestBody RtNewTechnologiesAndNewProcess rtNewTechnologiesAndNewProcess) { + rtNewTechnologiesAndNewProcessService.edit(rtNewTechnologiesAndNewProcess); + return Result.ok(); + } + + /** + * 通过id删除 + * + * @return + */ + @ApiOperation(value = "删除榕图-新技术新工艺汇编信息", notes = "删除榕图-新技术新工艺汇编信息", httpMethod = "POST") + @ApiImplicitParam(name = "id", value = "榕图-新技术新工艺汇编ID", paramType = "body", required = true, dataType = "String", example = "{\"id\":\"1\"}") + @PostMapping(value = "/delete") + public Result delete(@ApiIgnore @RequestBody HashMap map) { + String id = MapUtils.getString(map, "id"); + Result result = new Result(); + RtNewTechnologiesAndNewProcess rtNewTechnologiesAndNewProcess = rtNewTechnologiesAndNewProcessService.getById(id); + if (rtNewTechnologiesAndNewProcess == null) { + result.error500("未找到对应实体"); + } else { + boolean ok = rtNewTechnologiesAndNewProcessService.removeById(id); + if (ok) { + result.success("删除成功!"); + } + } + + return result; + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @ApiOperation(value = "通过id查询榕图-新技术新工艺汇编信息", notes = "通过id查询榕图-新技术新工艺汇编信息", httpMethod = "GET") + @ApiImplicitParam(name = "id", value = "榕图-新技术新工艺汇编ID", paramType = "query", required = true, dataType = "Integer") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name = "id", required = true) String id) { + Result result = new Result(); + RtNewTechnologiesAndNewProcess rtNewTechnologiesAndNewProcess = rtNewTechnologiesAndNewProcessService.getById(id); + if (rtNewTechnologiesAndNewProcess == null) { + result.error500("未找到对应实体"); + } else { + result.setResult(rtNewTechnologiesAndNewProcess); + result.setSuccess(true); + } + return result; + } + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/rt/controller/RtProgressPaymentContractController.java b/src/main/java/com/zhgd/xmgl/modules/rt/controller/RtProgressPaymentContractController.java new file mode 100644 index 000000000..b1d41b696 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/rt/controller/RtProgressPaymentContractController.java @@ -0,0 +1,139 @@ +package com.zhgd.xmgl.modules.rt.controller; + +import com.zhgd.xmgl.modules.rt.entity.RtProgressPaymentContract; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiImplicitParams; + +import java.util.HashMap; + +import springfox.documentation.annotations.ApiIgnore; + +import java.util.List; + +import com.zhgd.jeecg.common.api.vo.Result; +import org.apache.commons.collections.MapUtils; +import com.zhgd.xmgl.modules.rt.service.IRtProgressPaymentContractService; + +import org.simpleframework.xml.core.Validate; +import com.baomidou.mybatisplus.core.metadata.IPage; +import lombok.extern.slf4j.Slf4j; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + + +/** + * @Title: Controller + * @Description: 榕图-进度款合同 + * @author： pds + * @date： 2023-12-21 + * @version： V1.0 + */ +@RestController +@RequestMapping("/xmgl/rtProgressPaymentContract") +@Slf4j +@Api(tags = "榕图-进度款合同相关Api") +public class RtProgressPaymentContractController { + @Autowired + private IRtProgressPaymentContractService rtProgressPaymentContractService; + + /** + * 分页列表查询 + * + * @return + */ + @ApiOperation(value = "分页列表查询榕图-进度款合同信息", notes = "分页列表查询榕图-进度款合同信息", httpMethod = "GET") + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "query", required = true, dataType = "Integer"), + @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"), + }) + @GetMapping(value = "/page") + public Result> queryPageList(@ApiIgnore @RequestParam HashMap paramMap) { + return Result.success(rtProgressPaymentContractService.queryPageList(paramMap)); + } + + /** + * 列表查询 + * + * @return + */ + @ApiOperation(value = "列表查询榕图-进度款合同信息", notes = "列表查询榕图-进度款合同信息", httpMethod = "GET") + @GetMapping(value = "/list") + public Result> queryList(@ApiIgnore @RequestParam HashMap paramMap) { + return Result.success(rtProgressPaymentContractService.queryList(paramMap)); + } + + /** + * 添加 + * + * @param rtProgressPaymentContract + * @return + */ + @ApiOperation(value = "添加榕图-进度款合同信息", notes = "添加榕图-进度款合同信息", httpMethod = "POST") + @PostMapping(value = "/add") + public Result add(@RequestBody @Validate RtProgressPaymentContract rtProgressPaymentContract) { + rtProgressPaymentContractService.add(rtProgressPaymentContract); + return Result.ok(); + } + + /** + * 编辑 + * + * @param rtProgressPaymentContract + * @return + */ + @ApiOperation(value = "编辑榕图-进度款合同信息", notes = "编辑榕图-进度款合同信息", httpMethod = "POST") + @PostMapping(value = "/edit") + public Result edit(@RequestBody RtProgressPaymentContract rtProgressPaymentContract) { + rtProgressPaymentContractService.edit(rtProgressPaymentContract); + return Result.ok(); + } + + /** + * 通过id删除 + * + * @return + */ + @ApiOperation(value = "删除榕图-进度款合同信息", notes = "删除榕图-进度款合同信息", httpMethod = "POST") + @ApiImplicitParam(name = "id", value = "榕图-进度款合同ID", paramType = "body", required = true, dataType = "String", example = "{\"id\":\"1\"}") + @PostMapping(value = "/delete") + public Result delete(@ApiIgnore @RequestBody HashMap map) { + String id = MapUtils.getString(map, "id"); + Result result = new Result(); + RtProgressPaymentContract rtProgressPaymentContract = rtProgressPaymentContractService.getById(id); + if (rtProgressPaymentContract == null) { + result.error500("未找到对应实体"); + } else { + boolean ok = rtProgressPaymentContractService.removeById(id); + if (ok) { + result.success("删除成功!"); + } + } + + return result; + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @ApiOperation(value = "通过id查询榕图-进度款合同信息", notes = "通过id查询榕图-进度款合同信息", httpMethod = "GET") + @ApiImplicitParam(name = "id", value = "榕图-进度款合同ID", paramType = "query", required = true, dataType = "Integer") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name = "id", required = true) String id) { + Result result = new Result(); + RtProgressPaymentContract rtProgressPaymentContract = rtProgressPaymentContractService.getById(id); + if (rtProgressPaymentContract == null) { + result.error500("未找到对应实体"); + } else { + result.setResult(rtProgressPaymentContract); + result.setSuccess(true); + } + return result; + } + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/rt/controller/RtToolController.java b/src/main/java/com/zhgd/xmgl/modules/rt/controller/RtToolController.java new file mode 100644 index 000000000..c8eb214ce --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/rt/controller/RtToolController.java @@ -0,0 +1,139 @@ +package com.zhgd.xmgl.modules.rt.controller; + +import com.zhgd.xmgl.modules.rt.entity.RtTool; +import com.zhgd.xmgl.modules.rt.service.IRtToolService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiImplicitParams; + +import java.util.HashMap; + +import springfox.documentation.annotations.ApiIgnore; + +import java.util.List; + +import com.zhgd.jeecg.common.api.vo.Result; +import org.apache.commons.collections.MapUtils; + +import org.simpleframework.xml.core.Validate; +import com.baomidou.mybatisplus.core.metadata.IPage; +import lombok.extern.slf4j.Slf4j; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + + +/** + * @Title: Controller + * @Description: 榕图-工器具 + * @author： pds + * @date： 2023-12-21 + * @version： V1.0 + */ +@RestController +@RequestMapping("/xmgl/rtTool") +@Slf4j +@Api(tags = "榕图-工器具相关Api") +public class RtToolController { + @Autowired + private IRtToolService rtToolService; + + /** + * 分页列表查询 + * + * @return + */ + @ApiOperation(value = "分页列表查询榕图-工器具信息", notes = "分页列表查询榕图-工器具信息", httpMethod = "GET") + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "query", required = true, dataType = "Integer"), + @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"), + }) + @GetMapping(value = "/page") + public Result> queryPageList(@ApiIgnore @RequestParam HashMap paramMap) { + return Result.success(rtToolService.queryPageList(paramMap)); + } + + /** + * 列表查询 + * + * @return + */ + @ApiOperation(value = "列表查询榕图-工器具信息", notes = "列表查询榕图-工器具信息", httpMethod = "GET") + @GetMapping(value = "/list") + public Result> queryList(@ApiIgnore @RequestParam HashMap paramMap) { + return Result.success(rtToolService.queryList(paramMap)); + } + + /** + * 添加 + * + * @param rtTool + * @return + */ + @ApiOperation(value = "添加榕图-工器具信息", notes = "添加榕图-工器具信息", httpMethod = "POST") + @PostMapping(value = "/add") + public Result add(@RequestBody @Validate RtTool rtTool) { + rtToolService.add(rtTool); + return Result.ok(); + } + + /** + * 编辑 + * + * @param rtTool + * @return + */ + @ApiOperation(value = "编辑榕图-工器具信息", notes = "编辑榕图-工器具信息", httpMethod = "POST") + @PostMapping(value = "/edit") + public Result edit(@RequestBody RtTool rtTool) { + rtToolService.edit(rtTool); + return Result.ok(); + } + + /** + * 通过id删除 + * + * @return + */ + @ApiOperation(value = "删除榕图-工器具信息", notes = "删除榕图-工器具信息", httpMethod = "POST") + @ApiImplicitParam(name = "id", value = "榕图-工器具ID", paramType = "body", required = true, dataType = "String", example = "{\"id\":\"1\"}") + @PostMapping(value = "/delete") + public Result delete(@ApiIgnore @RequestBody HashMap map) { + String id = MapUtils.getString(map, "id"); + Result result = new Result(); + RtTool rtTool = rtToolService.getById(id); + if (rtTool == null) { + result.error500("未找到对应实体"); + } else { + boolean ok = rtToolService.removeById(id); + if (ok) { + result.success("删除成功!"); + } + } + + return result; + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @ApiOperation(value = "通过id查询榕图-工器具信息", notes = "通过id查询榕图-工器具信息", httpMethod = "GET") + @ApiImplicitParam(name = "id", value = "榕图-工器具ID", paramType = "query", required = true, dataType = "Integer") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name = "id", required = true) String id) { + Result result = new Result(); + RtTool rtTool = rtToolService.getById(id); + if (rtTool == null) { + result.error500("未找到对应实体"); + } else { + result.setResult(rtTool); + result.setSuccess(true); + } + return result; + } + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/rt/entity/RtDesignChangeContactSheet.java b/src/main/java/com/zhgd/xmgl/modules/rt/entity/RtDesignChangeContactSheet.java new file mode 100644 index 000000000..540ab36ad --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/rt/entity/RtDesignChangeContactSheet.java @@ -0,0 +1,124 @@ +package com.zhgd.xmgl.modules.rt.entity; + +import java.io.Serializable; +import java.util.Date; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + * @Description: 榕图-设计变更联系单 + * @author： pds + * @date： 2023-12-21 + * @version： V1.0 + */ +@Data +@TableName("rt_design_change_contact_sheet") +@ApiModel(value = "RtDesignChangeContactSheet实体类", description = "RtDesignChangeContactSheet") +public class RtDesignChangeContactSheet implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * id + */ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "id") + private java.lang.Long id; + /** + * 工程名称 + */ + @Excel(name = "工程名称", width = 15) + @ApiModelProperty(value = "工程名称") + private java.lang.String projectName; + /** + * 设计单位 + */ + @Excel(name = "设计单位", width = 15) + @ApiModelProperty(value = "设计单位") + private java.lang.String designUnit; + /** + * 变更内容 + */ + @Excel(name = "变更内容", width = 15) + @ApiModelProperty(value = "变更内容") + private java.lang.String changeContent; + /** + * 负责人 + */ + @Excel(name = "负责人", width = 15) + @ApiModelProperty(value = "负责人") + private java.lang.String principal; + /** + * 提出单位 + */ + @Excel(name = "提出单位", width = 15) + @ApiModelProperty(value = "提出单位") + private java.lang.String proposingUnit; + /** + * 提出变更日期 + */ + @Excel(name = "提出变更日期", width = 15) + @ApiModelProperty(value = "提出变更日期") + private java.lang.String proposedChangeDate; + /** + * 业主项目部审核意见 + */ + @Excel(name = "业主项目部审核意见", width = 15) + @ApiModelProperty(value = "业主项目部审核意见") + private java.lang.String reviewOpinion; + /** + * 项目经理 + */ + @Excel(name = "项目经理", width = 15) + @ApiModelProperty(value = "项目经理") + private java.lang.String projectManager; + /** + * 业主部门 + */ + @Excel(name = "业主部门", width = 15) + @ApiModelProperty(value = "业主部门") + private java.lang.String ownerDepartment; + /** + * 审核回复日期 + */ + @Excel(name = "审核回复日期", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "审核回复日期") + private java.util.Date reviewReplyDate; + /** + * 附件 + */ + @Excel(name = "附件", width = 15) + @ApiModelProperty(value = "附件") + private java.lang.String appendix; + /** + * 创建时间 yyyy-MM-dd HH:mm:ss + */ + @Excel(name = "创建时间 yyyy-MM-dd HH:mm:ss", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建时间 yyyy-MM-dd HH:mm:ss") + private java.util.Date createTime; + /** + * 更新时间 yyyy-MM-dd HH:mm:ss + */ + @Excel(name = "更新时间 yyyy-MM-dd HH:mm:ss", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新时间 yyyy-MM-dd HH:mm:ss") + private java.util.Date updateTime; + /** + * 项目sn + */ + @Excel(name = "项目sn", width = 15) + @ApiModelProperty(value = "项目sn") + private java.lang.String projectSn; +} diff --git a/src/main/java/com/zhgd/xmgl/modules/rt/entity/RtMaterialOrder.java b/src/main/java/com/zhgd/xmgl/modules/rt/entity/RtMaterialOrder.java new file mode 100644 index 000000000..5f6f56c01 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/rt/entity/RtMaterialOrder.java @@ -0,0 +1,139 @@ +package com.zhgd.xmgl.modules.rt.entity; + +import java.io.Serializable; +import java.util.Date; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + * @Description: 榕图-物资订单 + * @author： pds + * @date： 2023-12-21 + * @version： V1.0 + */ +@Data +@TableName("rt_material_order") +@ApiModel(value = "RtMaterialOrder实体类", description = "RtMaterialOrder") +public class RtMaterialOrder implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * id + */ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "id") + private java.lang.Long id; + /** + * 采购订单号 + */ + @Excel(name = "采购订单号", width = 15) + @ApiModelProperty(value = "采购订单号") + private java.lang.String purchaseOrderNumber; + /** + * 项目名称 + */ + @Excel(name = "项目名称", width = 15) + @ApiModelProperty(value = "项目名称") + private java.lang.String projectName; + /** + * 供应商名称 + */ + @Excel(name = "供应商名称", width = 15) + @ApiModelProperty(value = "供应商名称") + private java.lang.String supplierName; + /** + * 采购组 + */ + @Excel(name = "采购组", width = 15) + @ApiModelProperty(value = "采购组") + private java.lang.String purchasingGroup; + /** + * 物料号 + */ + @Excel(name = "物料号", width = 15) + @ApiModelProperty(value = "物料号") + private java.lang.String itemNumber; + /** + * 物料短文本 + */ + @Excel(name = "物料短文本", width = 15) + @ApiModelProperty(value = "物料短文本") + private java.lang.String materialShortText; + /** + * 采购订单数量 + */ + @Excel(name = "采购订单数量", width = 15) + @ApiModelProperty(value = "采购订单数量") + private java.lang.String purchaseOrderQuantity; + /** + * 单价 (不含税) + */ + @Excel(name = "单价 (不含税)", width = 15) + @ApiModelProperty(value = "单价 (不含税)") + private java.lang.String unitPrice; + /** + * 基本计量单位 + */ + @Excel(name = "基本计量单位", width = 15) + @ApiModelProperty(value = "基本计量单位") + private java.lang.String basicUnitOfMeasurement; + /** + * 合同金额 (元) + */ + @Excel(name = "合同金额 (元)", width = 15) + @ApiModelProperty(value = "合同金额 (元)") + private java.math.BigDecimal contractAmount; + /** + * 联系人 + */ + @Excel(name = "联系人", width = 15) + @ApiModelProperty(value = "联系人") + private java.lang.String contactPerson; + /** + * 联系方式 + */ + @Excel(name = "联系方式", width = 15) + @ApiModelProperty(value = "联系方式") + private java.lang.String contactInformation; + /** + * 到货时间 + */ + @Excel(name = "到货时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "到货时间") + private java.util.Date arrivalTime; + /** + * 创建时间 yyyy-MM-dd HH:mm:ss + */ + @Excel(name = "创建时间 yyyy-MM-dd HH:mm:ss", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建时间 yyyy-MM-dd HH:mm:ss") + private java.util.Date createTime; + /** + * 更新时间 yyyy-MM-dd HH:mm:ss + */ + @Excel(name = "更新时间 yyyy-MM-dd HH:mm:ss", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新时间 yyyy-MM-dd HH:mm:ss") + private java.util.Date updateTime; + /** + * 项目sn + */ + @Excel(name = "项目sn", width = 15) + @ApiModelProperty(value = "项目sn") + private java.lang.String projectSn; + @ApiModelProperty(value = "是否到货") + private Boolean isArrival; + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/rt/entity/RtNewTechnologiesAndNewProcess.java b/src/main/java/com/zhgd/xmgl/modules/rt/entity/RtNewTechnologiesAndNewProcess.java new file mode 100644 index 000000000..37071d778 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/rt/entity/RtNewTechnologiesAndNewProcess.java @@ -0,0 +1,80 @@ +package com.zhgd.xmgl.modules.rt.entity; + +import java.io.Serializable; +import java.util.Date; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + * @Description: 榕图-新技术新工艺汇编 + * @author： pds + * @date： 2023-12-21 + * @version： V1.0 + */ +@Data +@TableName("rt_new_technologies_and_new_process") +@ApiModel(value = "RtNewTechnologiesAndNewProcess实体类", description = "RtNewTechnologiesAndNewProcess") +public class RtNewTechnologiesAndNewProcess implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * id + */ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "id") + private java.lang.Long id; + /** + * 分类 + */ + @Excel(name = "分类", width = 15) + @ApiModelProperty(value = "分类") + private java.lang.String classify; + /** + * 新技术/新工艺 + */ + @Excel(name = "新技术/新工艺", width = 15) + @ApiModelProperty(value = "新技术/新工艺") + private java.lang.String newTechnologiesAndNewProcessContent; + /** + * 新技术/新工艺 + */ + @Excel(name = "新技术/新工艺", width = 15) + @ApiModelProperty(value = "新技术/新工艺") + private java.lang.String newTechnologiesAndNewProcess; + /** + * 图片展示 + */ + @Excel(name = "图片展示", width = 15) + @ApiModelProperty(value = "图片展示") + private java.lang.String imageDisplay; + /** + * 创建时间 yyyy-MM-dd HH:mm:ss + */ + @Excel(name = "创建时间 yyyy-MM-dd HH:mm:ss", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建时间 yyyy-MM-dd HH:mm:ss") + private java.util.Date createTime; + /** + * 更新时间 yyyy-MM-dd HH:mm:ss + */ + @Excel(name = "更新时间 yyyy-MM-dd HH:mm:ss", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新时间 yyyy-MM-dd HH:mm:ss") + private java.util.Date updateTime; + /** + * 项目sn + */ + @Excel(name = "项目sn", width = 15) + @ApiModelProperty(value = "项目sn") + private java.lang.String projectSn; +} diff --git a/src/main/java/com/zhgd/xmgl/modules/rt/entity/RtProgressPaymentContract.java b/src/main/java/com/zhgd/xmgl/modules/rt/entity/RtProgressPaymentContract.java new file mode 100644 index 000000000..2c8e5067e --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/rt/entity/RtProgressPaymentContract.java @@ -0,0 +1,114 @@ +package com.zhgd.xmgl.modules.rt.entity; + +import java.io.Serializable; +import java.util.Date; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + * @Description: 榕图-进度款合同 + * @author： pds + * @date： 2023-12-21 + * @version： V1.0 + */ +@Data +@TableName("rt_progress_payment_contract") +@ApiModel(value = "RtProgressPaymentContract实体类", description = "RtProgressPaymentContract") +public class RtProgressPaymentContract implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * id + */ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "id") + private java.lang.Long id; + /** + * 工程名称 + */ + @Excel(name = "工程名称", width = 15) + @ApiModelProperty(value = "工程名称") + private java.lang.String projectName; + /** + * 合同总价 + */ + @Excel(name = "合同总价", width = 15) + @ApiModelProperty(value = "合同总价") + private java.lang.String totalContractPrice; + /** + * 申请进度款 + */ + @Excel(name = "申请进度款", width = 15) + @ApiModelProperty(value = "申请进度款") + private java.lang.Double applyForProgressPayment; + /** + * 本期申领预付款总额(元) + */ + @Excel(name = "本期申领预付款总额(元)", width = 15) + @ApiModelProperty(value = "本期申领预付款总额(元)") + private java.math.BigDecimal advancePaymentTotalAmount; + /** + * 申请时间 + */ + @Excel(name = "申请时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "申请时间") + private java.util.Date applicationTime; + /** + * 批复时间 + */ + @Excel(name = "批复时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "批复时间") + private java.util.Date approvalTime; + /** + * 审批状态：1待审核2审核中3已审核 + */ + @Excel(name = "审批状态：1待审核2审核中3已审核", width = 15) + @ApiModelProperty(value = "审批状态：1待审核2审核中3已审核") + private java.lang.Integer approvalStatus; + /** + * 备注 + */ + @Excel(name = "备注", width = 15) + @ApiModelProperty(value = "备注") + private java.lang.String remark; + /** + * 附件 + */ + @Excel(name = "附件", width = 15) + @ApiModelProperty(value = "附件") + private java.lang.String appendix; + /** + * 创建时间 yyyy-MM-dd HH:mm:ss + */ + @Excel(name = "创建时间 yyyy-MM-dd HH:mm:ss", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建时间 yyyy-MM-dd HH:mm:ss") + private java.util.Date createTime; + /** + * 更新时间 yyyy-MM-dd HH:mm:ss + */ + @Excel(name = "更新时间 yyyy-MM-dd HH:mm:ss", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新时间 yyyy-MM-dd HH:mm:ss") + private java.util.Date updateTime; + /** + * 项目sn + */ + @Excel(name = "项目sn", width = 15) + @ApiModelProperty(value = "项目sn") + private java.lang.String projectSn; +} diff --git a/src/main/java/com/zhgd/xmgl/modules/rt/entity/RtTool.java b/src/main/java/com/zhgd/xmgl/modules/rt/entity/RtTool.java new file mode 100644 index 000000000..ce3b46989 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/rt/entity/RtTool.java @@ -0,0 +1,90 @@ +package com.zhgd.xmgl.modules.rt.entity; + +import java.io.Serializable; +import java.util.Date; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + * @Description: 榕图-工器具 + * @author： pds + * @date： 2023-12-21 + * @version： V1.0 + */ +@Data +@TableName("rt_tool") +@ApiModel(value = "RtTool实体类", description = "RtTool") +public class RtTool implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * id + */ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "id") + private java.lang.Long id; + /** + * 设备编号 + */ + @Excel(name = "设备编号", width = 15) + @ApiModelProperty(value = "设备编号") + private java.lang.String devSn; + /** + * 工器具名称 + */ + @Excel(name = "工器具名称", width = 15) + @ApiModelProperty(value = "工器具名称") + private java.lang.String toolName; + /** + * 工器具状态：1在场2离场 + */ + @Excel(name = "工器具状态：1在场2离场", width = 15) + @ApiModelProperty(value = "工器具状态：1在场2离场") + private java.lang.Integer toolStatus; + /** + * 进场时间 + */ + @Excel(name = "进场时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "进场时间") + private java.util.Date entryTime; + /** + * 离场时间 + */ + @Excel(name = "离场时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "离场时间") + private java.util.Date exitTime; + /** + * 创建时间 yyyy-MM-dd HH:mm:ss + */ + @Excel(name = "创建时间 yyyy-MM-dd HH:mm:ss", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建时间 yyyy-MM-dd HH:mm:ss") + private java.util.Date createTime; + /** + * 更新时间 yyyy-MM-dd HH:mm:ss + */ + @Excel(name = "更新时间 yyyy-MM-dd HH:mm:ss", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新时间 yyyy-MM-dd HH:mm:ss") + private java.util.Date updateTime; + /** + * 项目sn + */ + @Excel(name = "项目sn", width = 15) + @ApiModelProperty(value = "项目sn") + private java.lang.String projectSn; +} diff --git a/src/main/java/com/zhgd/xmgl/modules/rt/mapper/RtDesignChangeContactSheetMapper.java b/src/main/java/com/zhgd/xmgl/modules/rt/mapper/RtDesignChangeContactSheetMapper.java new file mode 100644 index 000000000..735e76be7 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/rt/mapper/RtDesignChangeContactSheetMapper.java @@ -0,0 +1,16 @@ +package com.zhgd.xmgl.modules.rt.mapper; + +import org.apache.ibatis.annotations.Mapper; +import com.zhgd.xmgl.modules.rt.entity.RtDesignChangeContactSheet; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 榕图-设计变更联系单 + * @author： pds + * @date： 2023-12-21 + * @version： V1.0 + */ +@Mapper +public interface RtDesignChangeContactSheetMapper extends BaseMapper { + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/rt/mapper/RtMaterialOrderMapper.java b/src/main/java/com/zhgd/xmgl/modules/rt/mapper/RtMaterialOrderMapper.java new file mode 100644 index 000000000..a017d3dc1 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/rt/mapper/RtMaterialOrderMapper.java @@ -0,0 +1,16 @@ +package com.zhgd.xmgl.modules.rt.mapper; + +import org.apache.ibatis.annotations.Mapper; +import com.zhgd.xmgl.modules.rt.entity.RtMaterialOrder; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 榕图-物资订单 + * @author： pds + * @date： 2023-12-21 + * @version： V1.0 + */ +@Mapper +public interface RtMaterialOrderMapper extends BaseMapper { + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/rt/mapper/RtNewTechnologiesAndNewProcessMapper.java b/src/main/java/com/zhgd/xmgl/modules/rt/mapper/RtNewTechnologiesAndNewProcessMapper.java new file mode 100644 index 000000000..495139681 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/rt/mapper/RtNewTechnologiesAndNewProcessMapper.java @@ -0,0 +1,16 @@ +package com.zhgd.xmgl.modules.rt.mapper; + +import org.apache.ibatis.annotations.Mapper; +import com.zhgd.xmgl.modules.rt.entity.RtNewTechnologiesAndNewProcess; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 榕图-新技术新工艺汇编 + * @author： pds + * @date： 2023-12-21 + * @version： V1.0 + */ +@Mapper +public interface RtNewTechnologiesAndNewProcessMapper extends BaseMapper { + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/rt/mapper/RtProgressPaymentContractMapper.java b/src/main/java/com/zhgd/xmgl/modules/rt/mapper/RtProgressPaymentContractMapper.java new file mode 100644 index 000000000..d661d997c --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/rt/mapper/RtProgressPaymentContractMapper.java @@ -0,0 +1,16 @@ +package com.zhgd.xmgl.modules.rt.mapper; + +import com.zhgd.xmgl.modules.rt.entity.RtProgressPaymentContract; +import org.apache.ibatis.annotations.Mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 榕图-进度款合同 + * @author： pds + * @date： 2023-12-21 + * @version： V1.0 + */ +@Mapper +public interface RtProgressPaymentContractMapper extends BaseMapper { + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/rt/mapper/RtToolMapper.java b/src/main/java/com/zhgd/xmgl/modules/rt/mapper/RtToolMapper.java new file mode 100644 index 000000000..b17b23abe --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/rt/mapper/RtToolMapper.java @@ -0,0 +1,16 @@ +package com.zhgd.xmgl.modules.rt.mapper; + +import com.zhgd.xmgl.modules.rt.entity.RtTool; +import org.apache.ibatis.annotations.Mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 榕图-工器具 + * @author： pds + * @date： 2023-12-21 + * @version： V1.0 + */ +@Mapper +public interface RtToolMapper extends BaseMapper { + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/rt/mapper/xml/RtDesignChangeContactSheetMapper.xml b/src/main/java/com/zhgd/xmgl/modules/rt/mapper/xml/RtDesignChangeContactSheetMapper.xml new file mode 100644 index 000000000..c48b95386 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/rt/mapper/xml/RtDesignChangeContactSheetMapper.xml @@ -0,0 +1,4 @@ + + + + diff --git a/src/main/java/com/zhgd/xmgl/modules/rt/mapper/xml/RtMaterialOrderMapper.xml b/src/main/java/com/zhgd/xmgl/modules/rt/mapper/xml/RtMaterialOrderMapper.xml new file mode 100644 index 000000000..5759795a6 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/rt/mapper/xml/RtMaterialOrderMapper.xml @@ -0,0 +1,4 @@ + + + + diff --git a/src/main/java/com/zhgd/xmgl/modules/rt/mapper/xml/RtNewTechnologiesAndNewProcessMapper.xml b/src/main/java/com/zhgd/xmgl/modules/rt/mapper/xml/RtNewTechnologiesAndNewProcessMapper.xml new file mode 100644 index 000000000..cb8d830a7 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/rt/mapper/xml/RtNewTechnologiesAndNewProcessMapper.xml @@ -0,0 +1,4 @@ + + + + diff --git a/src/main/java/com/zhgd/xmgl/modules/rt/mapper/xml/RtProgressPaymentContractMapper.xml b/src/main/java/com/zhgd/xmgl/modules/rt/mapper/xml/RtProgressPaymentContractMapper.xml new file mode 100644 index 000000000..b7a15ea3b --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/rt/mapper/xml/RtProgressPaymentContractMapper.xml @@ -0,0 +1,4 @@ + + + + diff --git a/src/main/java/com/zhgd/xmgl/modules/rt/mapper/xml/RtToolMapper.xml b/src/main/java/com/zhgd/xmgl/modules/rt/mapper/xml/RtToolMapper.xml new file mode 100644 index 000000000..69bc88c15 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/rt/mapper/xml/RtToolMapper.xml @@ -0,0 +1,4 @@ + + + + diff --git a/src/main/java/com/zhgd/xmgl/modules/rt/service/IRtDesignChangeContactSheetService.java b/src/main/java/com/zhgd/xmgl/modules/rt/service/IRtDesignChangeContactSheetService.java new file mode 100644 index 000000000..6a344b23f --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/rt/service/IRtDesignChangeContactSheetService.java @@ -0,0 +1,25 @@ +package com.zhgd.xmgl.modules.rt.service; + +import com.zhgd.xmgl.modules.rt.entity.RtDesignChangeContactSheet; +import com.baomidou.mybatisplus.extension.service.IService; +import com.baomidou.mybatisplus.core.metadata.IPage; + +import java.util.HashMap; +import java.util.List; + +/** + * @Description: 榕图-设计变更联系单 + * @author： pds + * @date： 2023-12-21 + * @version： V1.0 + */ +public interface IRtDesignChangeContactSheetService extends IService { + + IPage queryPageList(HashMap paramMap); + + List queryList(HashMap paramMap); + + void add(RtDesignChangeContactSheet rtDesignChangeContactSheet); + + void edit(RtDesignChangeContactSheet rtDesignChangeContactSheet); +} diff --git a/src/main/java/com/zhgd/xmgl/modules/rt/service/IRtMaterialOrderService.java b/src/main/java/com/zhgd/xmgl/modules/rt/service/IRtMaterialOrderService.java new file mode 100644 index 000000000..961402183 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/rt/service/IRtMaterialOrderService.java @@ -0,0 +1,25 @@ +package com.zhgd.xmgl.modules.rt.service; + +import com.zhgd.xmgl.modules.rt.entity.RtMaterialOrder; +import com.baomidou.mybatisplus.extension.service.IService; +import com.baomidou.mybatisplus.core.metadata.IPage; + +import java.util.HashMap; +import java.util.List; + +/** + * @Description: 榕图-物资订单 + * @author： pds + * @date： 2023-12-21 + * @version： V1.0 + */ +public interface IRtMaterialOrderService extends IService { + + IPage queryPageList(HashMap paramMap); + + List queryList(HashMap paramMap); + + void add(RtMaterialOrder rtMaterialOrder); + + void edit(RtMaterialOrder rtMaterialOrder); +} diff --git a/src/main/java/com/zhgd/xmgl/modules/rt/service/IRtNewTechnologiesAndNewProcessService.java b/src/main/java/com/zhgd/xmgl/modules/rt/service/IRtNewTechnologiesAndNewProcessService.java new file mode 100644 index 000000000..48fa65989 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/rt/service/IRtNewTechnologiesAndNewProcessService.java @@ -0,0 +1,25 @@ +package com.zhgd.xmgl.modules.rt.service; + +import com.zhgd.xmgl.modules.rt.entity.RtNewTechnologiesAndNewProcess; +import com.baomidou.mybatisplus.extension.service.IService; +import com.baomidou.mybatisplus.core.metadata.IPage; + +import java.util.HashMap; +import java.util.List; + +/** + * @Description: 榕图-新技术新工艺汇编 + * @author： pds + * @date： 2023-12-21 + * @version： V1.0 + */ +public interface IRtNewTechnologiesAndNewProcessService extends IService { + + IPage queryPageList(HashMap paramMap); + + List queryList(HashMap paramMap); + + void add(RtNewTechnologiesAndNewProcess rtNewTechnologiesAndNewProcess); + + void edit(RtNewTechnologiesAndNewProcess rtNewTechnologiesAndNewProcess); +} diff --git a/src/main/java/com/zhgd/xmgl/modules/rt/service/IRtProgressPaymentContractService.java b/src/main/java/com/zhgd/xmgl/modules/rt/service/IRtProgressPaymentContractService.java new file mode 100644 index 000000000..db7301d15 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/rt/service/IRtProgressPaymentContractService.java @@ -0,0 +1,25 @@ +package com.zhgd.xmgl.modules.rt.service; + +import com.zhgd.xmgl.modules.rt.entity.RtProgressPaymentContract; +import com.baomidou.mybatisplus.extension.service.IService; +import com.baomidou.mybatisplus.core.metadata.IPage; + +import java.util.HashMap; +import java.util.List; + +/** + * @Description: 榕图-进度款合同 + * @author： pds + * @date： 2023-12-21 + * @version： V1.0 + */ +public interface IRtProgressPaymentContractService extends IService { + + IPage queryPageList(HashMap paramMap); + + List queryList(HashMap paramMap); + + void add(RtProgressPaymentContract rtProgressPaymentContract); + + void edit(RtProgressPaymentContract rtProgressPaymentContract); +} diff --git a/src/main/java/com/zhgd/xmgl/modules/rt/service/IRtToolService.java b/src/main/java/com/zhgd/xmgl/modules/rt/service/IRtToolService.java new file mode 100644 index 000000000..e600c9791 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/rt/service/IRtToolService.java @@ -0,0 +1,25 @@ +package com.zhgd.xmgl.modules.rt.service; + +import com.zhgd.xmgl.modules.rt.entity.RtTool; +import com.baomidou.mybatisplus.extension.service.IService; +import com.baomidou.mybatisplus.core.metadata.IPage; + +import java.util.HashMap; +import java.util.List; + +/** + * @Description: 榕图-工器具 + * @author： pds + * @date： 2023-12-21 + * @version： V1.0 + */ +public interface IRtToolService extends IService { + + IPage queryPageList(HashMap paramMap); + + List queryList(HashMap paramMap); + + void add(RtTool rtTool); + + void edit(RtTool rtTool); +} diff --git a/src/main/java/com/zhgd/xmgl/modules/rt/service/impl/RtDesignChangeContactSheetServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/rt/service/impl/RtDesignChangeContactSheetServiceImpl.java new file mode 100644 index 000000000..dd604cd0a --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/rt/service/impl/RtDesignChangeContactSheetServiceImpl.java @@ -0,0 +1,69 @@ +package com.zhgd.xmgl.modules.rt.service.impl; + +import com.zhgd.xmgl.modules.rt.entity.RtDesignChangeContactSheet; +import com.zhgd.xmgl.modules.rt.mapper.RtDesignChangeContactSheetMapper; +import com.zhgd.xmgl.modules.rt.service.IRtDesignChangeContactSheetService; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.zhgd.jeecg.common.system.query.QueryGenerator; +import com.zhgd.xmgl.util.PageUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +import java.util.HashMap; +import java.util.List; + +import com.zhgd.xmgl.util.RefUtil; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.beans.factory.annotation.Autowired; + +/** + * @Description: 榕图-设计变更联系单 + * @author： pds + * @date： 2023-12-21 + * @version： V1.0 + */ +@Service +@Transactional(rollbackFor = Exception.class) +public class RtDesignChangeContactSheetServiceImpl extends ServiceImpl implements IRtDesignChangeContactSheetService { + @Autowired + private RtDesignChangeContactSheetMapper rtDesignChangeContactSheetMapper; + + @Override + public IPage queryPageList(HashMap paramMap) { + QueryWrapper queryWrapper = getQueryWrapper(paramMap); + Page page = PageUtil.getPage(paramMap); + IPage pageList = this.page(page, queryWrapper); + pageList.setRecords(dealList(pageList.getRecords())); + return pageList; + } + + @Override + public List queryList(HashMap paramMap) { + QueryWrapper queryWrapper = getQueryWrapper(paramMap); + return dealList(this.list(queryWrapper)); + } + + private QueryWrapper getQueryWrapper(HashMap paramMap) { + String alias = ""; + QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(RtDesignChangeContactSheet.class, paramMap, alias); + queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(RtDesignChangeContactSheet::getId)); + return queryWrapper; + } + + private List dealList(List list) { + return list; + } + + @Override + public void add(RtDesignChangeContactSheet rtDesignChangeContactSheet) { + rtDesignChangeContactSheet.setId(null); + baseMapper.insert(rtDesignChangeContactSheet); + } + + @Override + public void edit(RtDesignChangeContactSheet rtDesignChangeContactSheet) { + baseMapper.updateById(rtDesignChangeContactSheet); + } +} diff --git a/src/main/java/com/zhgd/xmgl/modules/rt/service/impl/RtMaterialOrderServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/rt/service/impl/RtMaterialOrderServiceImpl.java new file mode 100644 index 000000000..1709959b5 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/rt/service/impl/RtMaterialOrderServiceImpl.java @@ -0,0 +1,72 @@ +package com.zhgd.xmgl.modules.rt.service.impl; + +import com.zhgd.xmgl.modules.rt.entity.RtMaterialOrder; +import com.zhgd.xmgl.modules.rt.mapper.RtMaterialOrderMapper; +import com.zhgd.xmgl.modules.rt.service.IRtMaterialOrderService; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.zhgd.jeecg.common.system.query.QueryGenerator; +import com.zhgd.xmgl.util.PageUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +import java.util.HashMap; +import java.util.List; + +import com.zhgd.xmgl.util.RefUtil; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.beans.factory.annotation.Autowired; + +/** + * @Description: 榕图-物资订单 + * @author： pds + * @date： 2023-12-21 + * @version： V1.0 + */ +@Service +@Transactional(rollbackFor = Exception.class) +public class RtMaterialOrderServiceImpl extends ServiceImpl implements IRtMaterialOrderService { + @Autowired + private RtMaterialOrderMapper rtMaterialOrderMapper; + + @Override + public IPage queryPageList(HashMap paramMap) { + QueryWrapper queryWrapper = getQueryWrapper(paramMap); + Page page = PageUtil.getPage(paramMap); + IPage pageList = this.page(page, queryWrapper); + pageList.setRecords(dealList(pageList.getRecords())); + return pageList; + } + + @Override + public List queryList(HashMap paramMap) { + QueryWrapper queryWrapper = getQueryWrapper(paramMap); + return dealList(this.list(queryWrapper)); + } + + private QueryWrapper getQueryWrapper(HashMap paramMap) { + String alias = ""; + QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(RtMaterialOrder.class, paramMap, alias); + queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(RtMaterialOrder::getId)); + return queryWrapper; + } + + private List dealList(List list) { + return list; + } + + @Override + public void add(RtMaterialOrder rtMaterialOrder) { + rtMaterialOrder.setId(null); + baseMapper.insert(rtMaterialOrder); + } + + @Override + public void edit(RtMaterialOrder rtMaterialOrder) { + if (rtMaterialOrder.getArrivalTime() != null) { + rtMaterialOrder.setIsArrival(true); + } + baseMapper.updateById(rtMaterialOrder); + } +} diff --git a/src/main/java/com/zhgd/xmgl/modules/rt/service/impl/RtNewTechnologiesAndNewProcessServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/rt/service/impl/RtNewTechnologiesAndNewProcessServiceImpl.java new file mode 100644 index 000000000..6e6b5c04a --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/rt/service/impl/RtNewTechnologiesAndNewProcessServiceImpl.java @@ -0,0 +1,69 @@ +package com.zhgd.xmgl.modules.rt.service.impl; + +import com.zhgd.xmgl.modules.rt.entity.RtNewTechnologiesAndNewProcess; +import com.zhgd.xmgl.modules.rt.mapper.RtNewTechnologiesAndNewProcessMapper; +import com.zhgd.xmgl.modules.rt.service.IRtNewTechnologiesAndNewProcessService; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.zhgd.jeecg.common.system.query.QueryGenerator; +import com.zhgd.xmgl.util.PageUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +import java.util.HashMap; +import java.util.List; + +import com.zhgd.xmgl.util.RefUtil; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.beans.factory.annotation.Autowired; + +/** + * @Description: 榕图-新技术新工艺汇编 + * @author： pds + * @date： 2023-12-21 + * @version： V1.0 + */ +@Service +@Transactional(rollbackFor = Exception.class) +public class RtNewTechnologiesAndNewProcessServiceImpl extends ServiceImpl implements IRtNewTechnologiesAndNewProcessService { + @Autowired + private RtNewTechnologiesAndNewProcessMapper rtNewTechnologiesAndNewProcessMapper; + + @Override + public IPage queryPageList(HashMap paramMap) { + QueryWrapper queryWrapper = getQueryWrapper(paramMap); + Page page = PageUtil.getPage(paramMap); + IPage pageList = this.page(page, queryWrapper); + pageList.setRecords(dealList(pageList.getRecords())); + return pageList; + } + + @Override + public List queryList(HashMap paramMap) { + QueryWrapper queryWrapper = getQueryWrapper(paramMap); + return dealList(this.list(queryWrapper)); + } + + private QueryWrapper getQueryWrapper(HashMap paramMap) { + String alias = ""; + QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(RtNewTechnologiesAndNewProcess.class, paramMap, alias); + queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(RtNewTechnologiesAndNewProcess::getId)); + return queryWrapper; + } + + private List dealList(List list) { + return list; + } + + @Override + public void add(RtNewTechnologiesAndNewProcess rtNewTechnologiesAndNewProcess) { + rtNewTechnologiesAndNewProcess.setId(null); + baseMapper.insert(rtNewTechnologiesAndNewProcess); + } + + @Override + public void edit(RtNewTechnologiesAndNewProcess rtNewTechnologiesAndNewProcess) { + baseMapper.updateById(rtNewTechnologiesAndNewProcess); + } +} diff --git a/src/main/java/com/zhgd/xmgl/modules/rt/service/impl/RtProgressPaymentContractServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/rt/service/impl/RtProgressPaymentContractServiceImpl.java new file mode 100644 index 000000000..62c084560 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/rt/service/impl/RtProgressPaymentContractServiceImpl.java @@ -0,0 +1,69 @@ +package com.zhgd.xmgl.modules.rt.service.impl; + +import com.zhgd.xmgl.modules.rt.entity.RtProgressPaymentContract; +import com.zhgd.xmgl.modules.rt.mapper.RtProgressPaymentContractMapper; +import com.zhgd.xmgl.modules.rt.service.IRtProgressPaymentContractService; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.zhgd.jeecg.common.system.query.QueryGenerator; +import com.zhgd.xmgl.util.PageUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +import java.util.HashMap; +import java.util.List; + +import com.zhgd.xmgl.util.RefUtil; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.beans.factory.annotation.Autowired; + +/** + * @Description: 榕图-进度款合同 + * @author： pds + * @date： 2023-12-21 + * @version： V1.0 + */ +@Service +@Transactional(rollbackFor = Exception.class) +public class RtProgressPaymentContractServiceImpl extends ServiceImpl implements IRtProgressPaymentContractService { + @Autowired + private RtProgressPaymentContractMapper rtProgressPaymentContractMapper; + + @Override + public IPage queryPageList(HashMap paramMap) { + QueryWrapper queryWrapper = getQueryWrapper(paramMap); + Page page = PageUtil.getPage(paramMap); + IPage pageList = this.page(page, queryWrapper); + pageList.setRecords(dealList(pageList.getRecords())); + return pageList; + } + + @Override + public List queryList(HashMap paramMap) { + QueryWrapper queryWrapper = getQueryWrapper(paramMap); + return dealList(this.list(queryWrapper)); + } + + private QueryWrapper getQueryWrapper(HashMap paramMap) { + String alias = ""; + QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(RtProgressPaymentContract.class, paramMap, alias); + queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(RtProgressPaymentContract::getId)); + return queryWrapper; + } + + private List dealList(List list) { + return list; + } + + @Override + public void add(RtProgressPaymentContract rtProgressPaymentContract) { + rtProgressPaymentContract.setId(null); + baseMapper.insert(rtProgressPaymentContract); + } + + @Override + public void edit(RtProgressPaymentContract rtProgressPaymentContract) { + baseMapper.updateById(rtProgressPaymentContract); + } +} diff --git a/src/main/java/com/zhgd/xmgl/modules/rt/service/impl/RtToolServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/rt/service/impl/RtToolServiceImpl.java new file mode 100644 index 000000000..5f8e7324d --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/rt/service/impl/RtToolServiceImpl.java @@ -0,0 +1,79 @@ +package com.zhgd.xmgl.modules.rt.service.impl; + +import com.zhgd.xmgl.modules.rt.entity.RtTool; +import com.zhgd.xmgl.modules.rt.mapper.RtToolMapper; +import com.zhgd.xmgl.modules.rt.service.IRtToolService; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.zhgd.jeecg.common.system.query.QueryGenerator; +import com.zhgd.xmgl.util.PageUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Objects; + +import com.zhgd.xmgl.util.RefUtil; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.beans.factory.annotation.Autowired; + +/** + * @Description: 榕图-工器具 + * @author： pds + * @date： 2023-12-21 + * @version： V1.0 + */ +@Service +@Transactional(rollbackFor = Exception.class) +public class RtToolServiceImpl extends ServiceImpl implements IRtToolService { + @Autowired + private RtToolMapper rtToolMapper; + + @Override + public IPage queryPageList(HashMap paramMap) { + QueryWrapper queryWrapper = getQueryWrapper(paramMap); + Page page = PageUtil.getPage(paramMap); + IPage pageList = this.page(page, queryWrapper); + pageList.setRecords(dealList(pageList.getRecords())); + return pageList; + } + + @Override + public List queryList(HashMap paramMap) { + QueryWrapper queryWrapper = getQueryWrapper(paramMap); + return dealList(this.list(queryWrapper)); + } + + private QueryWrapper getQueryWrapper(HashMap paramMap) { + String alias = ""; + QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(RtTool.class, paramMap, alias); + queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(RtTool::getId)); + return queryWrapper; + } + + private List dealList(List list) { + return list; + } + + @Override + public void add(RtTool rtTool) { + setExitTimeIf(rtTool); + rtTool.setId(null); + baseMapper.insert(rtTool); + } + + @Override + public void edit(RtTool rtTool) { + setExitTimeIf(rtTool); + baseMapper.updateById(rtTool); + } + + private void setExitTimeIf(RtTool rtTool) { + if (Objects.equals(rtTool.getToolStatus(), 2)) { + rtTool.setExitTime(new Date()); + } + } +}