From 35b2f5bffffc56f5329490b3beb911728b6b4487 Mon Sep 17 00:00:00 2001 From: jinlin <jinlin> Date: 星期一, 27 十一月 2023 10:21:55 +0800 Subject: [PATCH] Changes --- modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/controller/WarehouseConfigItemController.java | 96 +++++ modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/model/ConfigItemWarehouse.java | 73 +++ modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseCmAuditDao.xml | 20 + modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/dto/ConfigItemWarehouseDto.java | 38 ++ modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/controller/ConfigItemWarehouseController.java | 102 +++++ modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/controller/WarehouseQaAuditController.java | 96 +++++ modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseQaAuditDao.xml | 20 + modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/dao/ConfigItemWarehouseDao.java | 23 + modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/dao/WarehouseQaAuditDao.java | 23 + modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/service/WarehouseQaAuditService.java | 47 ++ modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/service/ConfigItemWarehouseService.java | 151 +++++++ modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/service/WarehouseConfigItemService.java | 43 ++ modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/model/WarehouseConfigItem.java | 45 ++ modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/controller/WarehouseCmAuditController.java | 96 +++++ modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/model/WarehouseCmAudit.java | 51 ++ modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/dao/WarehouseConfigItemDao.java | 23 + modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/service/WarehouseCmAuditService.java | 47 ++ modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/dao/WarehouseCmAuditDao.java | 23 + modules/mainPart/src/main/resources/mapper/configItemWarehouse/ConfigItemWarehouseDao.xml | 20 + modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/model/WarehouseQaAudit.java | 51 ++ modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseConfigItemDao.xml | 20 + 21 files changed, 1,108 insertions(+), 0 deletions(-) diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/controller/ConfigItemWarehouseController.java b/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/controller/ConfigItemWarehouseController.java new file mode 100644 index 0000000..4ceee48 --- /dev/null +++ b/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/controller/ConfigItemWarehouseController.java @@ -0,0 +1,102 @@ +package com.zt.life.modules.configItemWarehouse.controller; + + +import com.zt.common.annotation.LogOperation; +import com.zt.common.constant.Constant; +import com.zt.common.annotation.QueryParam; +import com.zt.common.db.query.QueryFilter; +import com.zt.common.servlet.Result; +import com.zt.common.servlet.PageResult; +import com.zt.common.validator.AssertUtils; +import com.zt.common.validator.ValidatorUtils; +import com.zt.common.validator.group.AddGroup; +import com.zt.common.validator.group.DefaultGroup; +import com.zt.common.validator.group.UpdateGroup; +import com.zt.life.modules.configItemWarehouse.dto.ConfigItemWarehouseDto; +import com.zt.life.modules.configItemWarehouse.model.ConfigItemWarehouse; +import com.zt.life.modules.configItemWarehouse.service.ConfigItemWarehouseService; +import com.zt.life.modules.itemCirculatOrder.dto.ItemCirculatOrderDto; +import com.zt.life.modules.itemCirculatOrder.model.ItemCirculatOrderTechnical; +import com.zt.life.sys.dto.OssDto; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import springfox.documentation.annotations.ApiIgnore; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + + +/** + * config_item_warehouse + * + * @author zt generator + * @since 1.0.0 2023-11-27 + */ +@RestController +@RequestMapping("/configItemWarehouse/ConfigItemWarehouse/") +@Api(tags="config_item_warehouse") +public class ConfigItemWarehouseController { + @Autowired + private ConfigItemWarehouseService configItemWarehouseService; + + @GetMapping("page") + @ApiOperation("鍒嗛〉") + @ApiImplicitParams({ + @ApiImplicitParam(name = Constant.Q.PAGE, value = Constant.QV.PAGE, required = true, dataType = Constant.QT.INT), + @ApiImplicitParam(name = Constant.Q.LIMIT, value = Constant.QV.LIMIT, required = true, dataType = Constant.QT.INT), + @ApiImplicitParam(name = Constant.Q.ORDER_FIELD, value = Constant.QV.ORDER_FIELD, dataType = Constant.QT.STRING), + @ApiImplicitParam(name = Constant.Q.ORDER, value = Constant.QV.ORDER, dataType = Constant.QT.STRING), + @ApiImplicitParam(name = "code", value = "閰嶇疆椤瑰叆搴撶紪鍙�", dataType = Constant.QT.STRING, format = "code^LK"), + @ApiImplicitParam(name = "projectCode", value = "椤圭洰缂栧彿", dataType = Constant.QT.STRING, format = "project_code^LK"), + @ApiImplicitParam(name = "projectName", value = "椤圭洰鍚嶇О", dataType = Constant.QT.STRING, format = "project_name^LK"), + @ApiImplicitParam(name = "libraryType", value = "搴撶被鍨�", dataType = Constant.QT.STRING, format = "library_type^EQ") }) + public PageResult<ConfigItemWarehouse> page(@ApiIgnore @QueryParam QueryFilter queryFilter){ + + return PageResult.ok(configItemWarehouseService.page(queryFilter)); + } + + @GetMapping("getDto") + @ApiOperation("淇℃伅") + public Result<ConfigItemWarehouseDto> getDto(Long projectId, Long warehouseId) { + ConfigItemWarehouseDto data =configItemWarehouseService.getDto(projectId, warehouseId); + return Result.ok(data); + } + + @PostMapping + @ApiOperation("鏂板") + @LogOperation("鏂板") + public Result insert(@RequestBody ConfigItemWarehouse configItemWarehouse){ + //鏁堥獙鏁版嵁 + ValidatorUtils.validateEntity(configItemWarehouse, AddGroup.class, DefaultGroup.class); + configItemWarehouseService.insert(configItemWarehouse); + + return Result.ok(); + } + + @PutMapping + @ApiOperation("淇敼") + @LogOperation("淇敼") + public Result update(@RequestBody ConfigItemWarehouse configItemWarehouse){ + //鏁堥獙鏁版嵁 + ValidatorUtils.validateEntity(configItemWarehouse, UpdateGroup.class, DefaultGroup.class); + configItemWarehouseService.update(configItemWarehouse); + + return Result.ok(); + } + + @DeleteMapping + @ApiOperation("鍒犻櫎") + @LogOperation("鍒犻櫎") + public Result delete(@RequestBody Long[] ids){ + //鏁堥獙鏁版嵁 + AssertUtils.isArrayEmpty(ids, "id"); + configItemWarehouseService.delete(ids); + + return Result.ok(); + } + +} diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/controller/WarehouseCmAuditController.java b/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/controller/WarehouseCmAuditController.java new file mode 100644 index 0000000..8fba9dc --- /dev/null +++ b/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/controller/WarehouseCmAuditController.java @@ -0,0 +1,96 @@ +package com.zt.life.modules.configItemWarehouse.controller; + + +import com.zt.common.annotation.LogOperation; +import com.zt.common.constant.Constant; +import com.zt.common.annotation.QueryParam; +import com.zt.common.db.query.QueryFilter; +import com.zt.common.servlet.Result; +import com.zt.common.servlet.PageResult; +import com.zt.common.validator.AssertUtils; +import com.zt.common.validator.ValidatorUtils; +import com.zt.common.validator.group.AddGroup; +import com.zt.common.validator.group.DefaultGroup; +import com.zt.common.validator.group.UpdateGroup; +import com.zt.life.modules.configItemWarehouse.model.WarehouseCmAudit; +import com.zt.life.modules.configItemWarehouse.service.WarehouseCmAuditService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import springfox.documentation.annotations.ApiIgnore; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + + +/** + * warehouse_cm_audit + * + * @author zt generator + * @since 1.0.0 2023-11-27 + */ +@RestController +@RequestMapping("/configItemWarehouse/WarehouseCmAudit/") +@Api(tags="warehouse_cm_audit") +public class WarehouseCmAuditController { + @Autowired + private WarehouseCmAuditService warehouseCmAuditService; + + @GetMapping("page") + @ApiOperation("鍒嗛〉") + @ApiImplicitParams({ + @ApiImplicitParam(name = Constant.Q.PAGE, value = Constant.QV.PAGE, required = true, dataType = Constant.QT.INT), + @ApiImplicitParam(name = Constant.Q.LIMIT, value = Constant.QV.LIMIT, required = true, dataType = Constant.QT.INT), + @ApiImplicitParam(name = Constant.Q.ORDER_FIELD, value = Constant.QV.ORDER_FIELD, dataType = Constant.QT.STRING), + @ApiImplicitParam(name = Constant.Q.ORDER, value = Constant.QV.ORDER, dataType = Constant.QT.STRING), + }) + public PageResult<WarehouseCmAudit> page(@ApiIgnore @QueryParam QueryFilter queryFilter){ + + return PageResult.ok(warehouseCmAuditService.page(queryFilter)); + } + + @GetMapping("{id}") + @ApiOperation("淇℃伅") + public Result<WarehouseCmAudit> get(@PathVariable("id") Long id){ + WarehouseCmAudit data = warehouseCmAuditService.get(id); + + return Result.ok(data); + } + + @PostMapping + @ApiOperation("鏂板") + @LogOperation("鏂板") + public Result insert(@RequestBody WarehouseCmAudit warehouseCmAudit){ + //鏁堥獙鏁版嵁 + ValidatorUtils.validateEntity(warehouseCmAudit, AddGroup.class, DefaultGroup.class); + warehouseCmAuditService.insert(warehouseCmAudit); + + return Result.ok(); + } + + @PutMapping + @ApiOperation("淇敼") + @LogOperation("淇敼") + public Result update(@RequestBody WarehouseCmAudit warehouseCmAudit){ + //鏁堥獙鏁版嵁 + ValidatorUtils.validateEntity(warehouseCmAudit, UpdateGroup.class, DefaultGroup.class); + warehouseCmAuditService.update(warehouseCmAudit); + + return Result.ok(); + } + + @DeleteMapping + @ApiOperation("鍒犻櫎") + @LogOperation("鍒犻櫎") + public Result delete(@RequestBody Long[] ids){ + //鏁堥獙鏁版嵁 + AssertUtils.isArrayEmpty(ids, "id"); + warehouseCmAuditService.delete(ids); + + return Result.ok(); + } + +} diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/controller/WarehouseConfigItemController.java b/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/controller/WarehouseConfigItemController.java new file mode 100644 index 0000000..df899b7 --- /dev/null +++ b/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/controller/WarehouseConfigItemController.java @@ -0,0 +1,96 @@ +package com.zt.life.modules.configItemWarehouse.controller; + + +import com.zt.common.annotation.LogOperation; +import com.zt.common.constant.Constant; +import com.zt.common.annotation.QueryParam; +import com.zt.common.db.query.QueryFilter; +import com.zt.common.servlet.Result; +import com.zt.common.servlet.PageResult; +import com.zt.common.validator.AssertUtils; +import com.zt.common.validator.ValidatorUtils; +import com.zt.common.validator.group.AddGroup; +import com.zt.common.validator.group.DefaultGroup; +import com.zt.common.validator.group.UpdateGroup; +import com.zt.life.modules.configItemWarehouse.model.WarehouseConfigItem; +import com.zt.life.modules.configItemWarehouse.service.WarehouseConfigItemService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import springfox.documentation.annotations.ApiIgnore; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + + +/** + * warehouse_config_item + * + * @author zt generator + * @since 1.0.0 2023-11-27 + */ +@RestController +@RequestMapping("/configItemWarehouse/WarehouseConfigItem/") +@Api(tags="warehouse_config_item") +public class WarehouseConfigItemController { + @Autowired + private WarehouseConfigItemService warehouseConfigItemService; + + @GetMapping("page") + @ApiOperation("鍒嗛〉") + @ApiImplicitParams({ + @ApiImplicitParam(name = Constant.Q.PAGE, value = Constant.QV.PAGE, required = true, dataType = Constant.QT.INT), + @ApiImplicitParam(name = Constant.Q.LIMIT, value = Constant.QV.LIMIT, required = true, dataType = Constant.QT.INT), + @ApiImplicitParam(name = Constant.Q.ORDER_FIELD, value = Constant.QV.ORDER_FIELD, dataType = Constant.QT.STRING), + @ApiImplicitParam(name = Constant.Q.ORDER, value = Constant.QV.ORDER, dataType = Constant.QT.STRING), + }) + public PageResult<WarehouseConfigItem> page(@ApiIgnore @QueryParam QueryFilter queryFilter){ + + return PageResult.ok(warehouseConfigItemService.page(queryFilter)); + } + + @GetMapping("{id}") + @ApiOperation("淇℃伅") + public Result<WarehouseConfigItem> get(@PathVariable("id") Long id){ + WarehouseConfigItem data = warehouseConfigItemService.get(id); + + return Result.ok(data); + } + + @PostMapping + @ApiOperation("鏂板") + @LogOperation("鏂板") + public Result insert(@RequestBody WarehouseConfigItem warehouseConfigItem){ + //鏁堥獙鏁版嵁 + ValidatorUtils.validateEntity(warehouseConfigItem, AddGroup.class, DefaultGroup.class); + warehouseConfigItemService.insert(warehouseConfigItem); + + return Result.ok(); + } + + @PutMapping + @ApiOperation("淇敼") + @LogOperation("淇敼") + public Result update(@RequestBody WarehouseConfigItem warehouseConfigItem){ + //鏁堥獙鏁版嵁 + ValidatorUtils.validateEntity(warehouseConfigItem, UpdateGroup.class, DefaultGroup.class); + warehouseConfigItemService.update(warehouseConfigItem); + + return Result.ok(); + } + + @DeleteMapping + @ApiOperation("鍒犻櫎") + @LogOperation("鍒犻櫎") + public Result delete(@RequestBody Long[] ids){ + //鏁堥獙鏁版嵁 + AssertUtils.isArrayEmpty(ids, "id"); + warehouseConfigItemService.delete(ids); + + return Result.ok(); + } + +} diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/controller/WarehouseQaAuditController.java b/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/controller/WarehouseQaAuditController.java new file mode 100644 index 0000000..4ba8e05 --- /dev/null +++ b/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/controller/WarehouseQaAuditController.java @@ -0,0 +1,96 @@ +package com.zt.life.modules.configItemWarehouse.controller; + + +import com.zt.common.annotation.LogOperation; +import com.zt.common.constant.Constant; +import com.zt.common.annotation.QueryParam; +import com.zt.common.db.query.QueryFilter; +import com.zt.common.servlet.Result; +import com.zt.common.servlet.PageResult; +import com.zt.common.validator.AssertUtils; +import com.zt.common.validator.ValidatorUtils; +import com.zt.common.validator.group.AddGroup; +import com.zt.common.validator.group.DefaultGroup; +import com.zt.common.validator.group.UpdateGroup; +import com.zt.life.modules.configItemWarehouse.model.WarehouseQaAudit; +import com.zt.life.modules.configItemWarehouse.service.WarehouseQaAuditService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import springfox.documentation.annotations.ApiIgnore; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + + +/** + * warehouse_qa_audit + * + * @author zt generator + * @since 1.0.0 2023-11-27 + */ +@RestController +@RequestMapping("/configItemWarehouse/WarehouseQaAudit/") +@Api(tags="warehouse_qa_audit") +public class WarehouseQaAuditController { + @Autowired + private WarehouseQaAuditService warehouseQaAuditService; + + @GetMapping("page") + @ApiOperation("鍒嗛〉") + @ApiImplicitParams({ + @ApiImplicitParam(name = Constant.Q.PAGE, value = Constant.QV.PAGE, required = true, dataType = Constant.QT.INT), + @ApiImplicitParam(name = Constant.Q.LIMIT, value = Constant.QV.LIMIT, required = true, dataType = Constant.QT.INT), + @ApiImplicitParam(name = Constant.Q.ORDER_FIELD, value = Constant.QV.ORDER_FIELD, dataType = Constant.QT.STRING), + @ApiImplicitParam(name = Constant.Q.ORDER, value = Constant.QV.ORDER, dataType = Constant.QT.STRING), + }) + public PageResult<WarehouseQaAudit> page(@ApiIgnore @QueryParam QueryFilter queryFilter){ + + return PageResult.ok(warehouseQaAuditService.page(queryFilter)); + } + + @GetMapping("{id}") + @ApiOperation("淇℃伅") + public Result<WarehouseQaAudit> get(@PathVariable("id") Long id){ + WarehouseQaAudit data = warehouseQaAuditService.get(id); + + return Result.ok(data); + } + + @PostMapping + @ApiOperation("鏂板") + @LogOperation("鏂板") + public Result insert(@RequestBody WarehouseQaAudit warehouseQaAudit){ + //鏁堥獙鏁版嵁 + ValidatorUtils.validateEntity(warehouseQaAudit, AddGroup.class, DefaultGroup.class); + warehouseQaAuditService.insert(warehouseQaAudit); + + return Result.ok(); + } + + @PutMapping + @ApiOperation("淇敼") + @LogOperation("淇敼") + public Result update(@RequestBody WarehouseQaAudit warehouseQaAudit){ + //鏁堥獙鏁版嵁 + ValidatorUtils.validateEntity(warehouseQaAudit, UpdateGroup.class, DefaultGroup.class); + warehouseQaAuditService.update(warehouseQaAudit); + + return Result.ok(); + } + + @DeleteMapping + @ApiOperation("鍒犻櫎") + @LogOperation("鍒犻櫎") + public Result delete(@RequestBody Long[] ids){ + //鏁堥獙鏁版嵁 + AssertUtils.isArrayEmpty(ids, "id"); + warehouseQaAuditService.delete(ids); + + return Result.ok(); + } + +} diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/dao/ConfigItemWarehouseDao.java b/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/dao/ConfigItemWarehouseDao.java new file mode 100644 index 0000000..5969d3e --- /dev/null +++ b/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/dao/ConfigItemWarehouseDao.java @@ -0,0 +1,23 @@ +package com.zt.life.modules.configItemWarehouse.dao; + +import com.zt.common.dao.BaseDao; +import com.zt.life.modules.configItemWarehouse.model.ConfigItemWarehouse; +import org.apache.ibatis.annotations.Mapper; + + +import java.util.List; +import java.util.Map; + + +/** + * config_item_warehouse + * + * @author zt generator + * @since 1.0.0 2023-11-27 + */ +@Mapper +public interface ConfigItemWarehouseDao extends BaseDao<ConfigItemWarehouse> { + + List<ConfigItemWarehouse> getList(Map<String, Object> params); + +} diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/dao/WarehouseCmAuditDao.java b/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/dao/WarehouseCmAuditDao.java new file mode 100644 index 0000000..ac188b2 --- /dev/null +++ b/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/dao/WarehouseCmAuditDao.java @@ -0,0 +1,23 @@ +package com.zt.life.modules.configItemWarehouse.dao; + +import com.zt.common.dao.BaseDao; +import com.zt.life.modules.configItemWarehouse.model.WarehouseCmAudit; +import org.apache.ibatis.annotations.Mapper; + + +import java.util.List; +import java.util.Map; + + +/** + * warehouse_cm_audit + * + * @author zt generator + * @since 1.0.0 2023-11-27 + */ +@Mapper +public interface WarehouseCmAuditDao extends BaseDao<WarehouseCmAudit> { + + List<WarehouseCmAudit> getList(Map<String, Object> params); + +} diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/dao/WarehouseConfigItemDao.java b/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/dao/WarehouseConfigItemDao.java new file mode 100644 index 0000000..6aba8a6 --- /dev/null +++ b/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/dao/WarehouseConfigItemDao.java @@ -0,0 +1,23 @@ +package com.zt.life.modules.configItemWarehouse.dao; + +import com.zt.common.dao.BaseDao; +import com.zt.life.modules.configItemWarehouse.model.WarehouseConfigItem; +import org.apache.ibatis.annotations.Mapper; + + +import java.util.List; +import java.util.Map; + + +/** + * warehouse_config_item + * + * @author zt generator + * @since 1.0.0 2023-11-27 + */ +@Mapper +public interface WarehouseConfigItemDao extends BaseDao<WarehouseConfigItem> { + + List<WarehouseConfigItem> getList(Map<String, Object> params); + +} diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/dao/WarehouseQaAuditDao.java b/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/dao/WarehouseQaAuditDao.java new file mode 100644 index 0000000..9354333 --- /dev/null +++ b/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/dao/WarehouseQaAuditDao.java @@ -0,0 +1,23 @@ +package com.zt.life.modules.configItemWarehouse.dao; + +import com.zt.common.dao.BaseDao; +import com.zt.life.modules.configItemWarehouse.model.WarehouseQaAudit; +import org.apache.ibatis.annotations.Mapper; + + +import java.util.List; +import java.util.Map; + + +/** + * warehouse_qa_audit + * + * @author zt generator + * @since 1.0.0 2023-11-27 + */ +@Mapper +public interface WarehouseQaAuditDao extends BaseDao<WarehouseQaAudit> { + + List<WarehouseQaAudit> getList(Map<String, Object> params); + +} diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/dto/ConfigItemWarehouseDto.java b/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/dto/ConfigItemWarehouseDto.java new file mode 100644 index 0000000..25ebad0 --- /dev/null +++ b/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/dto/ConfigItemWarehouseDto.java @@ -0,0 +1,38 @@ +package com.zt.life.modules.configItemWarehouse.dto; + +import com.zt.life.modules.configItemWarehouse.model.ConfigItemWarehouse; +import com.zt.life.modules.configItemWarehouse.model.WarehouseCmAudit; +import com.zt.life.modules.configItemWarehouse.model.WarehouseConfigItem; +import com.zt.life.modules.configItemWarehouse.model.WarehouseQaAudit; +import com.zt.life.modules.itemCirculatOrder.model.ItemCirculatOrder; +import com.zt.life.modules.itemCirculatOrder.model.ItemCirculatOrderTechnical; +import com.zt.life.modules.project.model.Project; +import com.zt.life.modules.sysBaseInfo.model.TestAgencyInfo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +@Data +public class ConfigItemWarehouseDto { + private Long id; + private Long projectId; + private Long warehouseId; + + @ApiModelProperty(value = "娴嬭瘯椤圭洰鍩烘湰淇℃伅") + private Project project; + @ApiModelProperty(value = "閰嶇疆椤瑰叆搴�") + private ConfigItemWarehouse configItemWarehouse; + @ApiModelProperty(value = "娴嬭瘯鏈烘瀯淇℃伅") + private TestAgencyInfo TestAgencyInfo; + + + @ApiModelProperty(value = "鍏ュ簱閰嶇疆椤�") + private List<WarehouseConfigItem> configItemList = new ArrayList<>(); + @ApiModelProperty(value = "CM瀹℃牳") + private List<WarehouseCmAudit> cmAuditList = new ArrayList<>(); + @ApiModelProperty(value = "QA瀹℃牳") + private List<WarehouseQaAudit> qaAuditList = new ArrayList<>(); +} + diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/model/ConfigItemWarehouse.java b/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/model/ConfigItemWarehouse.java new file mode 100644 index 0000000..9a6fd48 --- /dev/null +++ b/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/model/ConfigItemWarehouse.java @@ -0,0 +1,73 @@ +package com.zt.life.modules.configItemWarehouse.model; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.zt.common.entity.BusiEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * config_item_warehouse + * + * @author zt generator + * @since 1.0.0 2023-11-27 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("config_item_warehouse") +public class ConfigItemWarehouse extends BusiEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "椤圭洰ID") + private Long projectId; + + @ApiModelProperty(value = "閰嶇疆椤瑰叆搴撶紪鍙�") + private String code; + + @ApiModelProperty(value = "椤圭洰缂栧彿") + private String projectCode; + + @ApiModelProperty(value = "椤圭洰鍚嶇О") + private String projectName; + + @ApiModelProperty(value = "鐢宠浜�") + private String applicant; + + @ApiModelProperty(value = "鐢宠鏃ユ湡") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date applyDate; + + @ApiModelProperty(value = "搴撶被鍨�") + private String libraryType; + + @ApiModelProperty(value = "鎵瑰噯鎰忚") + private String approvalOpinions; + + @ApiModelProperty(value = "鎵瑰噯绛惧瓧") + private String approvalSign; + + @ApiModelProperty(value = "鎵瑰噯鏃ユ湡") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date approvalDate; + + @ApiModelProperty(value = "椤圭洰CM鎿嶄綔") + private String projectCmOperations; + + @ApiModelProperty(value = "鎿嶄綔浜�") + private String operator; + + @ApiModelProperty(value = "鎿嶄綔鏃ユ湡") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date operateDate; + + @ApiModelProperty(value = "澶囨敞") + private String remark; + + @ApiModelProperty(value = "骞翠唤") + private String year; + +} diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/model/WarehouseCmAudit.java b/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/model/WarehouseCmAudit.java new file mode 100644 index 0000000..dd7c5c0 --- /dev/null +++ b/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/model/WarehouseCmAudit.java @@ -0,0 +1,51 @@ +package com.zt.life.modules.configItemWarehouse.model; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.zt.common.entity.BusiEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * warehouse_cm_audit + * + * @author zt generator + * @since 1.0.0 2023-11-27 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("warehouse_cm_audit") +public class WarehouseCmAudit extends BusiEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "鍏ュ簱ID") + private Long warehouseId; + + @ApiModelProperty(value = "搴忓彿") + private Integer no; + + @ApiModelProperty(value = "妫�鏌ラ」") + private String examineItem; + + @ApiModelProperty(value = "妫�鏌ョ粨鏋�") + private String examineResult; + + @ApiModelProperty(value = "涓嶉�傜敤璇存槑") + private String +notApplyExplan; + + @ApiModelProperty(value = "瀹℃牳缁撴灉") + private String auditResults; + + @ApiModelProperty(value = "瀹℃牳浜�") + private String auditors; + + @ApiModelProperty(value = "瀹℃牳鏃ユ湡") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date auditDate; + +} diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/model/WarehouseConfigItem.java b/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/model/WarehouseConfigItem.java new file mode 100644 index 0000000..87a07a1 --- /dev/null +++ b/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/model/WarehouseConfigItem.java @@ -0,0 +1,45 @@ +package com.zt.life.modules.configItemWarehouse.model; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.zt.common.entity.BusiEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * warehouse_config_item + * + * @author zt generator + * @since 1.0.0 2023-11-27 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("warehouse_config_item") +public class WarehouseConfigItem extends BusiEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "鍏ュ簱ID") + private Long warehouseId; + + @ApiModelProperty(value = "搴忓彿") + private Integer no; + + @ApiModelProperty(value = "閰嶇疆椤瑰悕绉�") + private String itemName; + + @ApiModelProperty(value = "閰嶇疆椤规爣璇�") + private String itemDentify; + + @ApiModelProperty(value = "鐗堟湰") + private String version; + + @ApiModelProperty(value = "涓婃函鐗�") + private Integer retrospectVersion; + + @ApiModelProperty(value = "瀵嗙骇") + private String secretClass; + +} diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/model/WarehouseQaAudit.java b/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/model/WarehouseQaAudit.java new file mode 100644 index 0000000..7159b92 --- /dev/null +++ b/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/model/WarehouseQaAudit.java @@ -0,0 +1,51 @@ +package com.zt.life.modules.configItemWarehouse.model; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.zt.common.entity.BusiEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * warehouse_qa_audit + * + * @author zt generator + * @since 1.0.0 2023-11-27 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("warehouse_qa_audit") +public class WarehouseQaAudit extends BusiEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "鍏ュ簱ID") + private Long warehouseId; + + @ApiModelProperty(value = "搴忓彿") + private Integer no; + + @ApiModelProperty(value = "妫�鏌ラ」") + private String examineItem; + + @ApiModelProperty(value = "妫�鏌ョ粨鏋�") + private String examineResult; + + @ApiModelProperty(value = "涓嶉�傜敤璇存槑") + private String +notApplyExplan; + + @ApiModelProperty(value = "瀹℃牳缁撴灉") + private String auditResults; + + @ApiModelProperty(value = "瀹℃牳浜�") + private String auditors; + + @ApiModelProperty(value = "瀹℃牳鏃ユ湡") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date auditDate; + +} diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/service/ConfigItemWarehouseService.java b/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/service/ConfigItemWarehouseService.java new file mode 100644 index 0000000..fd355ae --- /dev/null +++ b/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/service/ConfigItemWarehouseService.java @@ -0,0 +1,151 @@ +package com.zt.life.modules.configItemWarehouse.service; + +import com.zt.common.service.BaseService; +import com.zt.life.modules.configItemWarehouse.dao.ConfigItemWarehouseDao; +import com.zt.life.modules.configItemWarehouse.dto.ConfigItemWarehouseDto; +import com.zt.life.modules.configItemWarehouse.model.ConfigItemWarehouse; +import com.zt.life.modules.configItemWarehouse.model.WarehouseCmAudit; +import com.zt.life.modules.configItemWarehouse.model.WarehouseConfigItem; +import com.zt.life.modules.configItemWarehouse.model.WarehouseQaAudit; +import com.zt.life.modules.itemCirculatOrder.dto.ItemCirculatOrderDto; +import com.zt.life.modules.itemCirculatOrder.model.ItemCirculatOrder; +import com.zt.life.modules.itemCirculatOrder.model.ItemCirculatOrderTechnical; +import com.zt.life.modules.itemCirculatOrder.service.ItemCirculatOrderTechnicalService; +import com.zt.life.modules.project.service.ProjectService; +import com.zt.life.modules.sysBaseInfo.service.TestAgencyInfoService; +import com.zt.life.sys.service.SysOssConfigService; +import com.zt.modules.coderule.service.SysCodeRuleService; +import com.zt.modules.oss.service.SysOssService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.zt.common.db.query.QueryFilter; +import javax.annotation.Resource; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + + +/** + * config_item_warehouse + * + * @author zt generator + * @since 1.0.0 2023-11-27 + */ +@Service +public class ConfigItemWarehouseService extends BaseService<ConfigItemWarehouseDao, ConfigItemWarehouse> { + @Autowired + private SysOssConfigService sysOssConfigService; + + @Autowired + private SysOssService sysOssService; + + @Autowired + private TestAgencyInfoService testAgencyInfoService; + + @Autowired + private SysCodeRuleService sysCodeRuleService; + + @Autowired + private ProjectService projectService; + + @Autowired + private WarehouseCmAuditService cmAuditService; + + @Autowired + private WarehouseQaAuditService qaAuditService; + + @Autowired + private WarehouseConfigItemService configItemService; + + /** + * 鍒嗛〉鏌ヨ + * + * @param queryFilter + * @return + */ + public List<ConfigItemWarehouse> page(QueryFilter queryFilter) { + return baseDao.getList(queryFilter.getQueryParams()); + } + + /** + * 鍒犻櫎 + * + * @param ids + */ + public void delete(Long[] ids) { + super.deleteLogic(ids); + } + + /* public Boolean save(ItemCirculatOrderDto itemCirculatOrderDto) { + Long circulatOrderid = itemCirculatOrderDto.getCirculatOrder().getId(); + if (circulatOrderid != null) + baseDao.updateById(itemCirculatOrderDto.getCirculatOrder()); + else { + Map<String, String> map = new HashMap<>(); + map.put("funCode", "item_circulat_order"); + map.put("projectId",itemCirculatOrderDto.getProjectId().toString()); + itemCirculatOrderDto.getCirculatOrder().setProjectId(itemCirculatOrderDto.getProjectId()); + itemCirculatOrderDto.getCirculatOrder().setCode(sysCodeRuleService.getNewCode(map)); + baseDao.insert(itemCirculatOrderDto.getCirculatOrder()); + circulatOrderid = itemCirculatOrderDto.getCirculatOrder().getId(); + } + + for (ItemCirculatOrderTechnical circulatOrderTechnical : itemCirculatOrderDto.getTechnicalList()) { + circulatOrderTechnical.setCirculatOrderId(circulatOrderid); + if (circulatOrderTechnical.getId() != null) { + technicalService.update(circulatOrderTechnical); + } else { + circulatOrderTechnical.setCirculatOrderId(circulatOrderid); + technicalService.insert(circulatOrderTechnical); + } + sysOssConfigService.updateOss(circulatOrderTechnical.getId(), circulatOrderTechnical.getFiles());// 淇濆瓨闄勪欢 + } + + if (itemCirculatOrderDto.getTestAgencyInfo().getId() == 10000) { + itemCirculatOrderDto.getTestAgencyInfo().setId(circulatOrderid); + testAgencyInfoService.insert(itemCirculatOrderDto.getTestAgencyInfo()); + } else { + testAgencyInfoService.update(itemCirculatOrderDto.getTestAgencyInfo()); + } + return true; + }*/ + + public ConfigItemWarehouseDto getDto(Long projectId, Long warehouseId) { + ConfigItemWarehouseDto data = new ConfigItemWarehouseDto(); + if (warehouseId != null) { + data.setId(warehouseId); + ConfigItemWarehouse configItemWarehouse = this.get(warehouseId); + data.setConfigItemWarehouse(configItemWarehouse); + + projectId = configItemWarehouse.getProjectId(); + + data.setTestAgencyInfo(testAgencyInfoService.get(warehouseId)); + + List<WarehouseCmAudit> CmAuditList = cmAuditService.getList(warehouseId); + data.setCmAuditList(CmAuditList); + List<WarehouseQaAudit> QaAuditList = qaAuditService.getList(warehouseId); + data.setQaAuditList(QaAuditList); + List<WarehouseConfigItem> ConfigItemList = configItemService.getList(warehouseId); + data.setConfigItemList(ConfigItemList); + + } else { + ConfigItemWarehouse configItemWarehouse =new ConfigItemWarehouse(); + data.setConfigItemWarehouse(configItemWarehouse); + List<?> cmList = cmAuditService.itemList(projectId); + List<?> CmAuditList = cmList; + data.setCmAuditList((List<WarehouseCmAudit>) CmAuditList); + List<?> resultList = qaAuditService.itemList(projectId); + } + + if (projectId != null) { + data.setProjectId(projectId); + data.setProject(projectService.get(projectId)); + } + + if (data.getTestAgencyInfo() == null) + data.setTestAgencyInfo(testAgencyInfoService.get(10000L)); + + return data; + } + +} diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/service/WarehouseCmAuditService.java b/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/service/WarehouseCmAuditService.java new file mode 100644 index 0000000..a1048f6 --- /dev/null +++ b/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/service/WarehouseCmAuditService.java @@ -0,0 +1,47 @@ +package com.zt.life.modules.configItemWarehouse.service; + +import com.zt.common.service.BaseService; +import com.zt.life.modules.configItemWarehouse.dao.WarehouseCmAuditDao; +import com.zt.life.modules.configItemWarehouse.model.WarehouseCmAudit; +import org.springframework.stereotype.Service; +import com.zt.common.db.query.QueryFilter; +import javax.annotation.Resource; +import java.util.List; + + +/** + * warehouse_cm_audit + * + * @author zt generator + * @since 1.0.0 2023-11-27 + */ +@Service +public class WarehouseCmAuditService extends BaseService<WarehouseCmAuditDao, WarehouseCmAudit> { + + /** + * 鍒嗛〉鏌ヨ + * + * @param queryFilter + * @return + */ + public List<WarehouseCmAudit> page(QueryFilter queryFilter) { + return baseDao.getList(queryFilter.getQueryParams()); + } + + /** + * 鍒犻櫎 + * + * @param ids + */ + public void delete(Long[] ids) { + super.deleteLogic(ids); + } + + public List<WarehouseCmAudit> getList(Long warehouseId) { + return null; + } + + public List<?> itemList(Long projectId) { + return null; + } +} diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/service/WarehouseConfigItemService.java b/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/service/WarehouseConfigItemService.java new file mode 100644 index 0000000..4e15007 --- /dev/null +++ b/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/service/WarehouseConfigItemService.java @@ -0,0 +1,43 @@ +package com.zt.life.modules.configItemWarehouse.service; + +import com.zt.common.service.BaseService; +import com.zt.life.modules.configItemWarehouse.dao.WarehouseConfigItemDao; +import com.zt.life.modules.configItemWarehouse.model.WarehouseConfigItem; +import org.springframework.stereotype.Service; +import com.zt.common.db.query.QueryFilter; +import javax.annotation.Resource; +import java.util.List; + + +/** + * warehouse_config_item + * + * @author zt generator + * @since 1.0.0 2023-11-27 + */ +@Service +public class WarehouseConfigItemService extends BaseService<WarehouseConfigItemDao, WarehouseConfigItem> { + + /** + * 鍒嗛〉鏌ヨ + * + * @param queryFilter + * @return + */ + public List<WarehouseConfigItem> page(QueryFilter queryFilter) { + return baseDao.getList(queryFilter.getQueryParams()); + } + + /** + * 鍒犻櫎 + * + * @param ids + */ + public void delete(Long[] ids) { + super.deleteLogic(ids); + } + + public List<WarehouseConfigItem> getList(Long warehouseId) { + return null; + } +} diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/service/WarehouseQaAuditService.java b/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/service/WarehouseQaAuditService.java new file mode 100644 index 0000000..c7b1ac4 --- /dev/null +++ b/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/service/WarehouseQaAuditService.java @@ -0,0 +1,47 @@ +package com.zt.life.modules.configItemWarehouse.service; + +import com.zt.common.service.BaseService; +import com.zt.life.modules.configItemWarehouse.dao.WarehouseQaAuditDao; +import com.zt.life.modules.configItemWarehouse.model.WarehouseQaAudit; +import org.springframework.stereotype.Service; +import com.zt.common.db.query.QueryFilter; +import javax.annotation.Resource; +import java.util.List; + + +/** + * warehouse_qa_audit + * + * @author zt generator + * @since 1.0.0 2023-11-27 + */ +@Service +public class WarehouseQaAuditService extends BaseService<WarehouseQaAuditDao, WarehouseQaAudit> { + + /** + * 鍒嗛〉鏌ヨ + * + * @param queryFilter + * @return + */ + public List<WarehouseQaAudit> page(QueryFilter queryFilter) { + return baseDao.getList(queryFilter.getQueryParams()); + } + + /** + * 鍒犻櫎 + * + * @param ids + */ + public void delete(Long[] ids) { + super.deleteLogic(ids); + } + + public List<WarehouseQaAudit> getList(Long warehouseId) { + return null; + } + + public List<?> itemList(Long projectId) { + return null; + } +} diff --git a/modules/mainPart/src/main/resources/mapper/configItemWarehouse/ConfigItemWarehouseDao.xml b/modules/mainPart/src/main/resources/mapper/configItemWarehouse/ConfigItemWarehouseDao.xml new file mode 100644 index 0000000..97a7255 --- /dev/null +++ b/modules/mainPart/src/main/resources/mapper/configItemWarehouse/ConfigItemWarehouseDao.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + +<mapper namespace="com.zt.life.modules.configItemWarehouse.dao.ConfigItemWarehouseDao"> + + <select id="getList" resultType="com.zt.life.modules.configItemWarehouse.model.ConfigItemWarehouse"> + select a.* + from config_item_warehouse a + <where> + a.is_delete = 0 + <if test="whereSql!=null"> + and ${whereSql} + </if> + </where> + <if test="orderBySql!=null"> + ORDER BY ${orderBySql} + </if> + </select> + +</mapper> diff --git a/modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseCmAuditDao.xml b/modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseCmAuditDao.xml new file mode 100644 index 0000000..0b0852a --- /dev/null +++ b/modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseCmAuditDao.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + +<mapper namespace="com.zt.life.modules.configItemWarehouse.dao.WarehouseCmAuditDao"> + + <select id="getList" resultType="com.zt.life.modules.configItemWarehouse.model.WarehouseCmAudit"> + select a.* + from warehouse_cm_audit a + <where> + a.is_delete = 0 + <if test="whereSql!=null"> + and ${whereSql} + </if> + </where> + <if test="orderBySql!=null"> + ORDER BY ${orderBySql} + </if> + </select> + +</mapper> diff --git a/modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseConfigItemDao.xml b/modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseConfigItemDao.xml new file mode 100644 index 0000000..142b7f5 --- /dev/null +++ b/modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseConfigItemDao.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + +<mapper namespace="com.zt.life.modules.configItemWarehouse.dao.WarehouseConfigItemDao"> + + <select id="getList" resultType="com.zt.life.modules.configItemWarehouse.model.WarehouseConfigItem"> + select a.* + from warehouse_config_item a + <where> + a.is_delete = 0 + <if test="whereSql!=null"> + and ${whereSql} + </if> + </where> + <if test="orderBySql!=null"> + ORDER BY ${orderBySql} + </if> + </select> + +</mapper> diff --git a/modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseQaAuditDao.xml b/modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseQaAuditDao.xml new file mode 100644 index 0000000..f24fdfe --- /dev/null +++ b/modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseQaAuditDao.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + +<mapper namespace="com.zt.life.modules.configItemWarehouse.dao.WarehouseQaAuditDao"> + + <select id="getList" resultType="com.zt.life.modules.configItemWarehouse.model.WarehouseQaAudit"> + select a.* + from warehouse_qa_audit a + <where> + a.is_delete = 0 + <if test="whereSql!=null"> + and ${whereSql} + </if> + </where> + <if test="orderBySql!=null"> + ORDER BY ${orderBySql} + </if> + </select> + +</mapper> -- Gitblit v1.9.1