feat(production): 新增车间、班组、生产排产管理接口及Mapper
| ¶Ô±ÈÐÂÎļþ |
| | |
| | | package com.ruoyi.production.controller; |
| | | |
| | | import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
| | | import com.ruoyi.framework.web.domain.R; |
| | | import com.ruoyi.production.dto.ProductionSchedulingDto; |
| | | import com.ruoyi.production.pojo.ProductionScheduling; |
| | | import com.ruoyi.production.service.ProductionSchedulingService; |
| | | import io.swagger.annotations.Api; |
| | | import io.swagger.annotations.ApiOperation; |
| | | import org.springframework.beans.factory.annotation.Autowired; |
| | | import org.springframework.web.bind.annotation.*; |
| | | |
| | | import java.util.Arrays; |
| | | |
| | | @RestController |
| | | @RequestMapping("productionScheduling") |
| | | @Api(tags = "ç产æç") |
| | | public class ProductionSchedulingController { |
| | | |
| | | @Autowired |
| | | private ProductionSchedulingService productionSchedulingService; |
| | | |
| | | @GetMapping("page") |
| | | @ApiOperation("å页æ¥è¯¢") |
| | | public R page(Page<ProductionSchedulingDto> page, ProductionSchedulingDto dto) { |
| | | return R.ok(productionSchedulingService.pageProductionScheduling(page, dto)); |
| | | } |
| | | |
| | | @GetMapping("today") |
| | | @ApiOperation("æ¥è¯¢çç»ä»æ¥æç") |
| | | public R today(@RequestParam("teamId") Long teamId) { |
| | | return R.ok(productionSchedulingService.todayByTeam(teamId)); |
| | | } |
| | | |
| | | @ApiOperation("æ°å¢æç") |
| | | @PostMapping() |
| | | public R add(@RequestBody ProductionScheduling productionScheduling) { |
| | | return R.ok(productionSchedulingService.save(productionScheduling)); |
| | | } |
| | | |
| | | @ApiOperation("ä¿®æ¹æç") |
| | | @PutMapping() |
| | | public R update(@RequestBody ProductionScheduling productionScheduling) { |
| | | return R.ok(productionSchedulingService.updateById(productionScheduling)); |
| | | } |
| | | |
| | | @ApiOperation("å 餿ç") |
| | | @DeleteMapping("/{ids}") |
| | | public R delete(@PathVariable("ids") Long[] ids) { |
| | | return R.ok(productionSchedulingService.batchDelete(Arrays.asList(ids))); |
| | | } |
| | | } |
| ¶Ô±ÈÐÂÎļþ |
| | |
| | | package com.ruoyi.production.controller; |
| | | |
| | | import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
| | | import com.ruoyi.framework.web.domain.R; |
| | | import com.ruoyi.production.dto.ProductionTeamDto; |
| | | import com.ruoyi.production.pojo.ProductionTeam; |
| | | import com.ruoyi.production.service.ProductionTeamService; |
| | | import io.swagger.annotations.Api; |
| | | import io.swagger.annotations.ApiOperation; |
| | | import org.springframework.beans.factory.annotation.Autowired; |
| | | import org.springframework.web.bind.annotation.*; |
| | | |
| | | import java.util.Arrays; |
| | | |
| | | @RestController |
| | | @RequestMapping("productionTeam") |
| | | @Api(tags = "çç»ç®¡ç") |
| | | public class ProductionTeamController { |
| | | |
| | | @Autowired |
| | | private ProductionTeamService productionTeamService; |
| | | |
| | | @GetMapping("page") |
| | | @ApiOperation("å页æ¥è¯¢") |
| | | public R page(Page<ProductionTeamDto> page, ProductionTeamDto dto) { |
| | | return R.ok(productionTeamService.pageProductionTeam(page, dto)); |
| | | } |
| | | |
| | | @GetMapping("listAll") |
| | | @ApiOperation("æ¥è¯¢å
¨é¨çç»(å¯æè½¦é´è¿æ»¤)") |
| | | public R listAll(@RequestParam(value = "workshopId", required = false) Long workshopId) { |
| | | return R.ok(productionTeamService.listDto(workshopId)); |
| | | } |
| | | |
| | | @ApiOperation("æ°å¢çç»") |
| | | @PostMapping() |
| | | public R add(@RequestBody ProductionTeam productionTeam) { |
| | | return R.ok(productionTeamService.save(productionTeam)); |
| | | } |
| | | |
| | | @ApiOperation("ä¿®æ¹çç»") |
| | | @PutMapping() |
| | | public R update(@RequestBody ProductionTeam productionTeam) { |
| | | return R.ok(productionTeamService.updateById(productionTeam)); |
| | | } |
| | | |
| | | @ApiOperation("å é¤çç»") |
| | | @DeleteMapping("/{ids}") |
| | | public R delete(@PathVariable("ids") Long[] ids) { |
| | | return R.ok(productionTeamService.batchDelete(Arrays.asList(ids))); |
| | | } |
| | | } |
| ¶Ô±ÈÐÂÎļþ |
| | |
| | | package com.ruoyi.production.controller; |
| | | |
| | | import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
| | | import com.ruoyi.framework.web.domain.R; |
| | | import com.ruoyi.production.pojo.Workshop; |
| | | import com.ruoyi.production.service.WorkshopService; |
| | | import io.swagger.annotations.Api; |
| | | import io.swagger.annotations.ApiOperation; |
| | | import org.springframework.beans.factory.annotation.Autowired; |
| | | import org.springframework.web.bind.annotation.*; |
| | | |
| | | import java.util.Arrays; |
| | | |
| | | @RestController |
| | | @RequestMapping("workshop") |
| | | @Api(tags = "车é´ç®¡ç") |
| | | public class WorkshopController { |
| | | |
| | | @Autowired |
| | | private WorkshopService workshopService; |
| | | |
| | | @GetMapping("page") |
| | | @ApiOperation("å页æ¥è¯¢") |
| | | public R page(Page<Workshop> page, Workshop workshop) { |
| | | return R.ok(workshopService.pageWorkshop(page, workshop)); |
| | | } |
| | | |
| | | @GetMapping("listAll") |
| | | @ApiOperation("æ¥è¯¢å
¨é¨è½¦é´") |
| | | public R listAll() { |
| | | return R.ok(workshopService.listAll()); |
| | | } |
| | | |
| | | @ApiOperation("æ°å¢è½¦é´") |
| | | @PostMapping() |
| | | public R add(@RequestBody Workshop workshop) { |
| | | return R.ok(workshopService.save(workshop)); |
| | | } |
| | | |
| | | @ApiOperation("ä¿®æ¹è½¦é´") |
| | | @PutMapping() |
| | | public R update(@RequestBody Workshop workshop) { |
| | | return R.ok(workshopService.updateById(workshop)); |
| | | } |
| | | |
| | | @ApiOperation("å é¤è½¦é´") |
| | | @DeleteMapping("/{ids}") |
| | | public R delete(@PathVariable("ids") Long[] ids) { |
| | | return R.ok(workshopService.batchDelete(Arrays.asList(ids))); |
| | | } |
| | | } |
| ¶Ô±ÈÐÂÎļþ |
| | |
| | | package com.ruoyi.production.dto; |
| | | |
| | | import com.ruoyi.production.pojo.ProductionScheduling; |
| | | import io.swagger.annotations.ApiModelProperty; |
| | | import lombok.Data; |
| | | import org.springframework.format.annotation.DateTimeFormat; |
| | | |
| | | import java.time.LocalDate; |
| | | |
| | | @Data |
| | | public class ProductionSchedulingDto extends ProductionScheduling { |
| | | |
| | | @ApiModelProperty("æå±è½¦é´åç§°") |
| | | private String workshopName; |
| | | |
| | | @ApiModelProperty("çç»åç§°") |
| | | private String teamName; |
| | | |
| | | @ApiModelProperty("å¼å§æ¥æ(æ¥è¯¢ç¨)") |
| | | @DateTimeFormat(pattern = "yyyy-MM-dd") |
| | | private LocalDate startDate; |
| | | |
| | | @ApiModelProperty("ç»ææ¥æ(æ¥è¯¢ç¨)") |
| | | @DateTimeFormat(pattern = "yyyy-MM-dd") |
| | | private LocalDate endDate; |
| | | } |
| ¶Ô±ÈÐÂÎļþ |
| | |
| | | package com.ruoyi.production.dto; |
| | | |
| | | import com.ruoyi.production.pojo.ProductionTeam; |
| | | import io.swagger.annotations.ApiModelProperty; |
| | | import lombok.Data; |
| | | |
| | | @Data |
| | | public class ProductionTeamDto extends ProductionTeam { |
| | | |
| | | @ApiModelProperty("æå±è½¦é´åç§°") |
| | | private String workshopName; |
| | | } |
| ¶Ô±ÈÐÂÎļþ |
| | |
| | | package com.ruoyi.production.mapper; |
| | | |
| | | import com.baomidou.mybatisplus.core.mapper.BaseMapper; |
| | | import com.baomidou.mybatisplus.core.metadata.IPage; |
| | | import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
| | | import com.ruoyi.production.dto.ProductionSchedulingDto; |
| | | import com.ruoyi.production.pojo.ProductionScheduling; |
| | | import org.apache.ibatis.annotations.Mapper; |
| | | import org.apache.ibatis.annotations.Param; |
| | | |
| | | import java.time.LocalDate; |
| | | |
| | | @Mapper |
| | | public interface ProductionSchedulingMapper extends BaseMapper<ProductionScheduling> { |
| | | |
| | | IPage<ProductionSchedulingDto> pageProductionScheduling(Page<ProductionSchedulingDto> page, @Param("c") ProductionSchedulingDto dto); |
| | | |
| | | ProductionSchedulingDto todayByTeam(@Param("teamId") Long teamId, @Param("workDate") LocalDate workDate); |
| | | } |
| ¶Ô±ÈÐÂÎļþ |
| | |
| | | package com.ruoyi.production.mapper; |
| | | |
| | | import com.baomidou.mybatisplus.core.mapper.BaseMapper; |
| | | import com.baomidou.mybatisplus.core.metadata.IPage; |
| | | import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
| | | import com.ruoyi.production.dto.ProductionTeamDto; |
| | | import com.ruoyi.production.pojo.ProductionTeam; |
| | | import org.apache.ibatis.annotations.Mapper; |
| | | import org.apache.ibatis.annotations.Param; |
| | | |
| | | import java.util.List; |
| | | |
| | | @Mapper |
| | | public interface ProductionTeamMapper extends BaseMapper<ProductionTeam> { |
| | | |
| | | IPage<ProductionTeamDto> pageProductionTeam(Page<ProductionTeamDto> page, @Param("c") ProductionTeamDto dto); |
| | | |
| | | List<ProductionTeamDto> listProductionTeamDto(@Param("workshopId") Long workshopId); |
| | | } |
| ¶Ô±ÈÐÂÎļþ |
| | |
| | | package com.ruoyi.production.mapper; |
| | | |
| | | import com.baomidou.mybatisplus.core.mapper.BaseMapper; |
| | | import com.baomidou.mybatisplus.core.metadata.IPage; |
| | | import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
| | | import com.ruoyi.production.pojo.Workshop; |
| | | import org.apache.ibatis.annotations.Mapper; |
| | | import org.apache.ibatis.annotations.Param; |
| | | |
| | | @Mapper |
| | | public interface WorkshopMapper extends BaseMapper<Workshop> { |
| | | |
| | | IPage<Workshop> pageWorkshop(Page<Workshop> page, @Param("c") Workshop workshop); |
| | | } |
| ¶Ô±ÈÐÂÎļþ |
| | |
| | | package com.ruoyi.production.pojo; |
| | | |
| | | import com.baomidou.mybatisplus.annotation.FieldFill; |
| | | import com.baomidou.mybatisplus.annotation.IdType; |
| | | import com.baomidou.mybatisplus.annotation.TableField; |
| | | import com.baomidou.mybatisplus.annotation.TableId; |
| | | import com.baomidou.mybatisplus.annotation.TableName; |
| | | import com.fasterxml.jackson.annotation.JsonFormat; |
| | | import io.swagger.annotations.ApiModel; |
| | | import io.swagger.annotations.ApiModelProperty; |
| | | import lombok.Data; |
| | | import org.springframework.format.annotation.DateTimeFormat; |
| | | |
| | | import java.time.LocalDate; |
| | | import java.time.LocalDateTime; |
| | | |
| | | @TableName("production_scheduling") |
| | | @Data |
| | | @ApiModel(value = "productionScheduling", description = "ç产æç") |
| | | public class ProductionScheduling { |
| | | |
| | | @TableId(value = "id", type = IdType.AUTO) |
| | | @ApiModelProperty(value = "åºå·") |
| | | private Long id; |
| | | |
| | | @ApiModelProperty(value = "工使¥æ") |
| | | @JsonFormat(pattern = "yyyy-MM-dd") |
| | | @DateTimeFormat(pattern = "yyyy-MM-dd") |
| | | private LocalDate workDate; |
| | | |
| | | @ApiModelProperty(value = "çæ¬¡ åå
¸shift_type 1æ©ç 2ä¸ç 3æç 4å¤ç") |
| | | private Integer shiftType; |
| | | |
| | | @ApiModelProperty(value = "æå±è½¦é´ID") |
| | | private Long workshopId; |
| | | |
| | | @ApiModelProperty(value = "çç»ID") |
| | | private Long teamId; |
| | | |
| | | @ApiModelProperty(value = "ç¶æ åå
¸schedule_status 1已宿 2已确认 3已宿 4已忶") |
| | | private Integer status; |
| | | |
| | | @ApiModelProperty(value = "夿³¨") |
| | | private String remark; |
| | | |
| | | @ApiModelProperty(value = "ç§æ·ID") |
| | | @TableField(fill = FieldFill.INSERT) |
| | | private Long tenantId; |
| | | |
| | | @ApiModelProperty(value = "å建æ¶é´") |
| | | @TableField(fill = FieldFill.INSERT) |
| | | @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") |
| | | @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") |
| | | private LocalDateTime createTime; |
| | | |
| | | @ApiModelProperty(value = "æ´æ°æ¶é´") |
| | | @TableField(fill = FieldFill.INSERT_UPDATE) |
| | | @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") |
| | | @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") |
| | | private LocalDateTime updateTime; |
| | | } |
| ¶Ô±ÈÐÂÎļþ |
| | |
| | | package com.ruoyi.production.pojo; |
| | | |
| | | import com.baomidou.mybatisplus.annotation.FieldFill; |
| | | import com.baomidou.mybatisplus.annotation.IdType; |
| | | import com.baomidou.mybatisplus.annotation.TableField; |
| | | import com.baomidou.mybatisplus.annotation.TableId; |
| | | import com.baomidou.mybatisplus.annotation.TableName; |
| | | import com.fasterxml.jackson.annotation.JsonFormat; |
| | | import io.swagger.annotations.ApiModel; |
| | | import io.swagger.annotations.ApiModelProperty; |
| | | import lombok.Data; |
| | | import org.springframework.format.annotation.DateTimeFormat; |
| | | |
| | | import java.time.LocalDateTime; |
| | | |
| | | @TableName("production_team") |
| | | @Data |
| | | @ApiModel(value = "productionTeam", description = "çç»ç®¡ç") |
| | | public class ProductionTeam { |
| | | |
| | | @TableId(value = "id", type = IdType.AUTO) |
| | | @ApiModelProperty(value = "åºå·") |
| | | private Long id; |
| | | |
| | | @ApiModelProperty(value = "çç»åç§°") |
| | | private String teamName; |
| | | |
| | | @ApiModelProperty(value = "çç»ç¼ç ") |
| | | private String teamCode; |
| | | |
| | | @ApiModelProperty(value = "æå±è½¦é´ID") |
| | | private Long workshopId; |
| | | |
| | | @ApiModelProperty(value = "çç»é¿ç¨æ·ID") |
| | | private Long leaderUserId; |
| | | |
| | | @ApiModelProperty(value = "çç»é¿å§å") |
| | | private String leaderName; |
| | | |
| | | @ApiModelProperty(value = "èç³»çµè¯") |
| | | private String contactPhone; |
| | | |
| | | @ApiModelProperty(value = "ç¶æ 0å¯ç¨ 1åç¨") |
| | | private Integer status; |
| | | |
| | | @ApiModelProperty(value = "夿³¨") |
| | | private String remark; |
| | | |
| | | @ApiModelProperty(value = "ç§æ·ID") |
| | | @TableField(fill = FieldFill.INSERT) |
| | | private Long tenantId; |
| | | |
| | | @ApiModelProperty(value = "å建æ¶é´") |
| | | @TableField(fill = FieldFill.INSERT) |
| | | @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") |
| | | @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") |
| | | private LocalDateTime createTime; |
| | | |
| | | @ApiModelProperty(value = "æ´æ°æ¶é´") |
| | | @TableField(fill = FieldFill.INSERT_UPDATE) |
| | | @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") |
| | | @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") |
| | | private LocalDateTime updateTime; |
| | | } |
| ¶Ô±ÈÐÂÎļþ |
| | |
| | | package com.ruoyi.production.pojo; |
| | | |
| | | import com.baomidou.mybatisplus.annotation.FieldFill; |
| | | import com.baomidou.mybatisplus.annotation.IdType; |
| | | import com.baomidou.mybatisplus.annotation.TableField; |
| | | import com.baomidou.mybatisplus.annotation.TableId; |
| | | import com.baomidou.mybatisplus.annotation.TableName; |
| | | import com.fasterxml.jackson.annotation.JsonFormat; |
| | | import io.swagger.annotations.ApiModel; |
| | | import io.swagger.annotations.ApiModelProperty; |
| | | import lombok.Data; |
| | | import org.springframework.format.annotation.DateTimeFormat; |
| | | |
| | | import java.time.LocalDateTime; |
| | | |
| | | @TableName("workshop") |
| | | @Data |
| | | @ApiModel(value = "workshop", description = "车é´ç®¡ç") |
| | | public class Workshop { |
| | | |
| | | @TableId(value = "id", type = IdType.AUTO) |
| | | @ApiModelProperty(value = "åºå·") |
| | | private Long id; |
| | | |
| | | @ApiModelProperty(value = "车é´åç§°") |
| | | private String name; |
| | | |
| | | @ApiModelProperty(value = "车é´ç¼ç ") |
| | | private String code; |
| | | |
| | | @ApiModelProperty(value = "è´è´£äºº") |
| | | private String principal; |
| | | |
| | | @ApiModelProperty(value = "èç³»çµè¯") |
| | | private String contactPhone; |
| | | |
| | | @ApiModelProperty(value = "ç¶æ 0å¯ç¨ 1åç¨") |
| | | private Integer status; |
| | | |
| | | @ApiModelProperty(value = "夿³¨") |
| | | private String remark; |
| | | |
| | | @ApiModelProperty(value = "ç§æ·ID") |
| | | @TableField(fill = FieldFill.INSERT) |
| | | private Long tenantId; |
| | | |
| | | @ApiModelProperty(value = "å建æ¶é´") |
| | | @TableField(fill = FieldFill.INSERT) |
| | | @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") |
| | | @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") |
| | | private LocalDateTime createTime; |
| | | |
| | | @ApiModelProperty(value = "æ´æ°æ¶é´") |
| | | @TableField(fill = FieldFill.INSERT_UPDATE) |
| | | @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") |
| | | @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") |
| | | private LocalDateTime updateTime; |
| | | } |
| ¶Ô±ÈÐÂÎļþ |
| | |
| | | package com.ruoyi.production.service; |
| | | |
| | | import com.baomidou.mybatisplus.core.metadata.IPage; |
| | | import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
| | | import com.baomidou.mybatisplus.extension.service.IService; |
| | | import com.ruoyi.production.dto.ProductionSchedulingDto; |
| | | import com.ruoyi.production.pojo.ProductionScheduling; |
| | | |
| | | import java.util.List; |
| | | |
| | | public interface ProductionSchedulingService extends IService<ProductionScheduling> { |
| | | |
| | | IPage<ProductionSchedulingDto> pageProductionScheduling(Page<ProductionSchedulingDto> page, ProductionSchedulingDto dto); |
| | | |
| | | ProductionSchedulingDto todayByTeam(Long teamId); |
| | | |
| | | int batchDelete(List<Long> ids); |
| | | } |
| ¶Ô±ÈÐÂÎļþ |
| | |
| | | package com.ruoyi.production.service; |
| | | |
| | | import com.baomidou.mybatisplus.core.metadata.IPage; |
| | | import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
| | | import com.baomidou.mybatisplus.extension.service.IService; |
| | | import com.ruoyi.production.dto.ProductionTeamDto; |
| | | import com.ruoyi.production.pojo.ProductionTeam; |
| | | |
| | | import java.util.List; |
| | | |
| | | public interface ProductionTeamService extends IService<ProductionTeam> { |
| | | |
| | | IPage<ProductionTeamDto> pageProductionTeam(Page<ProductionTeamDto> page, ProductionTeamDto dto); |
| | | |
| | | List<ProductionTeamDto> listDto(Long workshopId); |
| | | |
| | | int batchDelete(List<Long> ids); |
| | | } |
| ¶Ô±ÈÐÂÎļþ |
| | |
| | | package com.ruoyi.production.service; |
| | | |
| | | import com.baomidou.mybatisplus.core.metadata.IPage; |
| | | import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
| | | import com.baomidou.mybatisplus.extension.service.IService; |
| | | import com.ruoyi.production.pojo.Workshop; |
| | | |
| | | import java.util.List; |
| | | |
| | | public interface WorkshopService extends IService<Workshop> { |
| | | |
| | | IPage<Workshop> pageWorkshop(Page<Workshop> page, Workshop workshop); |
| | | |
| | | List<Workshop> listAll(); |
| | | |
| | | int batchDelete(List<Long> ids); |
| | | } |
| ¶Ô±ÈÐÂÎļþ |
| | |
| | | package com.ruoyi.production.service.impl; |
| | | |
| | | import com.baomidou.mybatisplus.core.metadata.IPage; |
| | | import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
| | | import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; |
| | | import com.ruoyi.production.dto.ProductionSchedulingDto; |
| | | import com.ruoyi.production.mapper.ProductionSchedulingMapper; |
| | | import com.ruoyi.production.pojo.ProductionScheduling; |
| | | import com.ruoyi.production.service.ProductionSchedulingService; |
| | | import lombok.AllArgsConstructor; |
| | | import lombok.extern.slf4j.Slf4j; |
| | | import org.springframework.beans.factory.annotation.Autowired; |
| | | import org.springframework.stereotype.Service; |
| | | |
| | | import java.time.LocalDate; |
| | | import java.util.List; |
| | | |
| | | @Service |
| | | @AllArgsConstructor |
| | | @Slf4j |
| | | public class ProductionSchedulingServiceImpl extends ServiceImpl<ProductionSchedulingMapper, ProductionScheduling> implements ProductionSchedulingService { |
| | | |
| | | @Autowired |
| | | private ProductionSchedulingMapper productionSchedulingMapper; |
| | | |
| | | @Override |
| | | public IPage<ProductionSchedulingDto> pageProductionScheduling(Page<ProductionSchedulingDto> page, ProductionSchedulingDto dto) { |
| | | return productionSchedulingMapper.pageProductionScheduling(page, dto); |
| | | } |
| | | |
| | | @Override |
| | | public ProductionSchedulingDto todayByTeam(Long teamId) { |
| | | return productionSchedulingMapper.todayByTeam(teamId, LocalDate.now()); |
| | | } |
| | | |
| | | @Override |
| | | public int batchDelete(List<Long> ids) { |
| | | return productionSchedulingMapper.deleteBatchIds(ids); |
| | | } |
| | | } |
| ¶Ô±ÈÐÂÎļþ |
| | |
| | | package com.ruoyi.production.service.impl; |
| | | |
| | | import com.baomidou.mybatisplus.core.metadata.IPage; |
| | | import com.baomidou.mybatisplus.core.toolkit.Wrappers; |
| | | import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
| | | import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; |
| | | import com.ruoyi.production.dto.ProductionTeamDto; |
| | | import com.ruoyi.production.mapper.ProductionSchedulingMapper; |
| | | import com.ruoyi.production.mapper.ProductionTeamMapper; |
| | | import com.ruoyi.production.pojo.ProductionScheduling; |
| | | import com.ruoyi.production.pojo.ProductionTeam; |
| | | import com.ruoyi.production.service.ProductionTeamService; |
| | | import lombok.AllArgsConstructor; |
| | | import lombok.extern.slf4j.Slf4j; |
| | | import org.springframework.beans.factory.annotation.Autowired; |
| | | import org.springframework.stereotype.Service; |
| | | |
| | | import java.util.List; |
| | | |
| | | @Service |
| | | @AllArgsConstructor |
| | | @Slf4j |
| | | public class ProductionTeamServiceImpl extends ServiceImpl<ProductionTeamMapper, ProductionTeam> implements ProductionTeamService { |
| | | |
| | | @Autowired |
| | | private ProductionTeamMapper productionTeamMapper; |
| | | |
| | | @Autowired |
| | | private ProductionSchedulingMapper productionSchedulingMapper; |
| | | |
| | | @Override |
| | | public IPage<ProductionTeamDto> pageProductionTeam(Page<ProductionTeamDto> page, ProductionTeamDto dto) { |
| | | return productionTeamMapper.pageProductionTeam(page, dto); |
| | | } |
| | | |
| | | @Override |
| | | public List<ProductionTeamDto> listDto(Long workshopId) { |
| | | return productionTeamMapper.listProductionTeamDto(workshopId); |
| | | } |
| | | |
| | | @Override |
| | | public int batchDelete(List<Long> ids) { |
| | | List<ProductionScheduling> schedulings = productionSchedulingMapper.selectList(Wrappers.<ProductionScheduling>lambdaQuery().in(ProductionScheduling::getTeamId, ids)); |
| | | if (schedulings.size() > 0) { |
| | | throw new RuntimeException("该çç»å·²è¢«æçå¼ç¨ï¼ä¸è½å é¤"); |
| | | } |
| | | return productionTeamMapper.deleteBatchIds(ids); |
| | | } |
| | | } |
| ¶Ô±ÈÐÂÎļþ |
| | |
| | | package com.ruoyi.production.service.impl; |
| | | |
| | | import com.baomidou.mybatisplus.core.metadata.IPage; |
| | | import com.baomidou.mybatisplus.core.toolkit.Wrappers; |
| | | import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
| | | import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; |
| | | import com.ruoyi.production.mapper.ProductionSchedulingMapper; |
| | | import com.ruoyi.production.mapper.ProductionTeamMapper; |
| | | import com.ruoyi.production.mapper.WorkshopMapper; |
| | | import com.ruoyi.production.pojo.ProductionScheduling; |
| | | import com.ruoyi.production.pojo.ProductionTeam; |
| | | import com.ruoyi.production.pojo.Workshop; |
| | | import com.ruoyi.production.service.WorkshopService; |
| | | import lombok.AllArgsConstructor; |
| | | import lombok.extern.slf4j.Slf4j; |
| | | import org.springframework.beans.factory.annotation.Autowired; |
| | | import org.springframework.stereotype.Service; |
| | | |
| | | import java.util.List; |
| | | |
| | | @Service |
| | | @AllArgsConstructor |
| | | @Slf4j |
| | | public class WorkshopServiceImpl extends ServiceImpl<WorkshopMapper, Workshop> implements WorkshopService { |
| | | |
| | | @Autowired |
| | | private WorkshopMapper workshopMapper; |
| | | |
| | | @Autowired |
| | | private ProductionTeamMapper productionTeamMapper; |
| | | |
| | | @Autowired |
| | | private ProductionSchedulingMapper productionSchedulingMapper; |
| | | |
| | | @Override |
| | | public IPage<Workshop> pageWorkshop(Page<Workshop> page, Workshop workshop) { |
| | | return workshopMapper.pageWorkshop(page, workshop); |
| | | } |
| | | |
| | | @Override |
| | | public List<Workshop> listAll() { |
| | | return this.list(Wrappers.<Workshop>lambdaQuery().orderByAsc(Workshop::getId)); |
| | | } |
| | | |
| | | @Override |
| | | public int batchDelete(List<Long> ids) { |
| | | List<ProductionTeam> teams = productionTeamMapper.selectList(Wrappers.<ProductionTeam>lambdaQuery().in(ProductionTeam::getWorkshopId, ids)); |
| | | if (teams.size() > 0) { |
| | | throw new RuntimeException("该车é´å·²è¢«çç»å¼ç¨ï¼ä¸è½å é¤"); |
| | | } |
| | | List<ProductionScheduling> schedulings = productionSchedulingMapper.selectList(Wrappers.<ProductionScheduling>lambdaQuery().in(ProductionScheduling::getWorkshopId, ids)); |
| | | if (schedulings.size() > 0) { |
| | | throw new RuntimeException("该车é´å·²è¢«æçå¼ç¨ï¼ä¸è½å é¤"); |
| | | } |
| | | return workshopMapper.deleteBatchIds(ids); |
| | | } |
| | | } |
| ¶Ô±ÈÐÂÎļþ |
| | |
| | | <?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.ruoyi.production.mapper.ProductionSchedulingMapper"> |
| | | |
| | | <select id="pageProductionScheduling" resultType="com.ruoyi.production.dto.ProductionSchedulingDto"> |
| | | select t.*, w.name as workshop_name, pt.team_name |
| | | from production_scheduling t |
| | | left join workshop w on t.workshop_id = w.id |
| | | left join production_team pt on t.team_id = pt.id |
| | | <where> |
| | | <if test="c.startDate != null"> |
| | | and t.work_date >= #{c.startDate} |
| | | </if> |
| | | <if test="c.endDate != null"> |
| | | and t.work_date <= #{c.endDate} |
| | | </if> |
| | | <if test="c.workshopId != null"> |
| | | and t.workshop_id = #{c.workshopId} |
| | | </if> |
| | | <if test="c.teamId != null"> |
| | | and t.team_id = #{c.teamId} |
| | | </if> |
| | | <if test="c.status != null"> |
| | | and t.status = #{c.status} |
| | | </if> |
| | | </where> |
| | | order by t.work_date desc, t.id desc |
| | | </select> |
| | | |
| | | <select id="todayByTeam" resultType="com.ruoyi.production.dto.ProductionSchedulingDto"> |
| | | select t.*, w.name as workshop_name, pt.team_name |
| | | from production_scheduling t |
| | | left join workshop w on t.workshop_id = w.id |
| | | left join production_team pt on t.team_id = pt.id |
| | | where t.team_id = #{teamId} and t.work_date = #{workDate} |
| | | order by t.id desc |
| | | limit 1 |
| | | </select> |
| | | </mapper> |
| ¶Ô±ÈÐÂÎļþ |
| | |
| | | <?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.ruoyi.production.mapper.ProductionTeamMapper"> |
| | | |
| | | <select id="pageProductionTeam" resultType="com.ruoyi.production.dto.ProductionTeamDto"> |
| | | select t.*, w.name as workshop_name |
| | | from production_team t |
| | | left join workshop w on t.workshop_id = w.id |
| | | <where> |
| | | <if test="c.teamName != null and c.teamName != ''"> |
| | | and t.team_name like concat('%',#{c.teamName},'%') |
| | | </if> |
| | | <if test="c.workshopId != null"> |
| | | and t.workshop_id = #{c.workshopId} |
| | | </if> |
| | | <if test="c.status != null"> |
| | | and t.status = #{c.status} |
| | | </if> |
| | | </where> |
| | | order by t.id desc |
| | | </select> |
| | | |
| | | <select id="listProductionTeamDto" resultType="com.ruoyi.production.dto.ProductionTeamDto"> |
| | | select t.*, w.name as workshop_name |
| | | from production_team t |
| | | left join workshop w on t.workshop_id = w.id |
| | | <where> |
| | | <if test="workshopId != null"> |
| | | and t.workshop_id = #{workshopId} |
| | | </if> |
| | | </where> |
| | | order by t.id asc |
| | | </select> |
| | | </mapper> |
| ¶Ô±ÈÐÂÎļþ |
| | |
| | | <?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.ruoyi.production.mapper.WorkshopMapper"> |
| | | |
| | | <select id="pageWorkshop" resultType="com.ruoyi.production.pojo.Workshop"> |
| | | select * from workshop |
| | | <where> |
| | | <if test="c.name != null and c.name != ''"> |
| | | and name like concat('%',#{c.name},'%') |
| | | </if> |
| | | <if test="c.code != null and c.code != ''"> |
| | | and code like concat('%',#{c.code},'%') |
| | | </if> |
| | | <if test="c.status != null"> |
| | | and status = #{c.status} |
| | | </if> |
| | | </where> |
| | | order by id desc |
| | | </select> |
| | | </mapper> |