From 10286f7f9f0e49c14ae35cc5c49ed649a92ca7cd Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Wed, 13 Mar 2024 19:05:42 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8F=AD=E7=BB=84=E8=B4=A8=E9=87=8F=E8=AF=84?= =?UTF-8?q?=E4=BB=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/system/base/dto/GxPlanDto.java | 24 +++++ .../entity/system/base/dto/ProDto.java | 3 + .../entity/system/base/dto/TeamQuEvalDto.java | 23 +++++ .../entity/system/base/vo/GxPlanVo.java | 53 +++++++++++ .../entity/system/base/vo/ProGxPlanVo.java | 10 -- .../entity/system/base/vo/TeamQuEvalVo.java | 46 +++++++++ .../entity/system/vo/SelectVo.java | 4 +- .../system/base/controller/ProController.java | 55 +++++++++-- .../base/controller/SelectController.java | 7 ++ .../base/controller/TeamQuEvalController.java | 65 +++++++++++++ .../system/base/mapper/IProMapper.java | 65 +++++++++++++ .../system/base/mapper/ISelectMapper.java | 12 +++ .../system/base/mapper/ITeamQuEvalMapper.java | 56 +++++++++++ .../system/base/service/IProService.java | 57 +++++++++++ .../system/base/service/ISelectService.java | 12 +++ .../base/service/ITeamQuEvalService.java | 57 +++++++++++ .../base/service/impl/ProServiceImpl.java | 79 ++++++++++++++++ .../base/service/impl/SelectServiceImpl.java | 8 ++ .../service/impl/TeamQuEvalServiceImpl.java | 83 ++++++++++++++++ .../mapper/base/ITeamQuEvalMapper.xml | 88 +++++++++++++++++ .../main/resources/mapper/base/ProMapper.xml | 94 ++++++++++++++++++- .../resources/mapper/base/SelectMapper.xml | 9 ++ 22 files changed, 888 insertions(+), 22 deletions(-) create mode 100644 securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/base/dto/GxPlanDto.java create mode 100644 securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/base/dto/TeamQuEvalDto.java create mode 100644 securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/base/vo/GxPlanVo.java delete mode 100644 securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/base/vo/ProGxPlanVo.java create mode 100644 securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/base/vo/TeamQuEvalVo.java create mode 100644 securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/controller/TeamQuEvalController.java create mode 100644 securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/mapper/ITeamQuEvalMapper.java create mode 100644 securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/ITeamQuEvalService.java create mode 100644 securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/TeamQuEvalServiceImpl.java create mode 100644 securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/ITeamQuEvalMapper.xml diff --git a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/base/dto/GxPlanDto.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/base/dto/GxPlanDto.java new file mode 100644 index 0000000..2e036ea --- /dev/null +++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/base/dto/GxPlanDto.java @@ -0,0 +1,24 @@ +package com.securitycontrol.entity.system.base.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author：cwchen + * @date：2024-03-13-15:45 + * @version：1.0 + * @description：工序计划-dto + */ +@Data +public class GxPlanDto { + + @ApiModelProperty(value = "工程ID") + private String planId; + + @ApiModelProperty(value = "标段编码") + private String bidCode; + + @ApiModelProperty(value = "关键字") + private String keyWord; + +} diff --git a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/base/dto/ProDto.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/base/dto/ProDto.java index c0305e7..bdb4267 100644 --- a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/base/dto/ProDto.java +++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/base/dto/ProDto.java @@ -20,4 +20,7 @@ public class ProDto { @ApiModelProperty(value = "关键字") private String keyWord; + + @ApiModelProperty(value = "标段编码") + private String bidCode; } diff --git a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/base/dto/TeamQuEvalDto.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/base/dto/TeamQuEvalDto.java new file mode 100644 index 0000000..5d7ad2e --- /dev/null +++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/base/dto/TeamQuEvalDto.java @@ -0,0 +1,23 @@ +package com.securitycontrol.entity.system.base.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author：cwchen + * @date：2024-03-13-17:59 + * @version：1.0 + * @description：班组质量评价-dto + */ +@Data +public class TeamQuEvalDto { + + @ApiModelProperty(value = "评价ID") + private String evalId; + @ApiModelProperty(value = "班组名称") + private String teamName; + @ApiModelProperty(value = "班组长") + private String teamLeader; + @ApiModelProperty(value = "评价日期") + private String evalTime; +} diff --git a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/base/vo/GxPlanVo.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/base/vo/GxPlanVo.java new file mode 100644 index 0000000..7e871c6 --- /dev/null +++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/base/vo/GxPlanVo.java @@ -0,0 +1,53 @@ +package com.securitycontrol.entity.system.base.vo; + +import com.fasterxml.jackson.annotation.JsonInclude; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author：cwchen + * @date：2024-03-13-15:45 + * @version：1.0 + * @description：工序计划表-vo + */ +@Data +public class GxPlanVo { + + @ApiModelProperty(value = "计划ID") + private String planId; + + @ApiModelProperty(value = "标段工程编码") + private String bidCode; + + @ApiModelProperty(value = "工序id") + private String gxId; + + @ApiModelProperty(value = "工序名称") + private String gxName; + + @ApiModelProperty(value = "工序作业权重") + private String gxWeight; + + @ApiModelProperty(value = "计划开始时间") + private String planStartTime; + + @ApiModelProperty(value = "计划结束时间") + private String planEndTime; + + @ApiModelProperty(value = "实际开始时间") + private String startTime; + + @ApiModelProperty(value = "实际结束时间") + private String endTime; + + @ApiModelProperty(value = "延期原因") + private String delaReason; + + @ApiModelProperty(value = "删除状态") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private Integer delFlag; + + @ApiModelProperty(value = "1. 新增 2.修改") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private Integer type; +} diff --git a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/base/vo/ProGxPlanVo.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/base/vo/ProGxPlanVo.java deleted file mode 100644 index d29e065..0000000 --- a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/base/vo/ProGxPlanVo.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.securitycontrol.entity.system.base.vo; - -/** - * @author：cwchen - * @date：2024-03-11-14:46 - * @version：1.0 - * @description：工程工序计划-vo - */ -public class ProGxPlanVo { -} diff --git a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/base/vo/TeamQuEvalVo.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/base/vo/TeamQuEvalVo.java new file mode 100644 index 0000000..868b245 --- /dev/null +++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/base/vo/TeamQuEvalVo.java @@ -0,0 +1,46 @@ +package com.securitycontrol.entity.system.base.vo; + +import com.fasterxml.jackson.annotation.JsonInclude; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author：cwchen + * @date：2024-03-13-17:58 + * @version：1.0 + * @description：班组质量评价-vo + */ +@Data +public class TeamQuEvalVo { + + @ApiModelProperty(value = "评价ID") + private String evalId; + + @ApiModelProperty(value = "班组ID") + private String teamId; + + @ApiModelProperty(value = "班组名称") + private String teamName; + + @ApiModelProperty(value = "班组长") + private String teamLeader; + + @ApiModelProperty(value = "班组长手机号") + private String teamLeaderPhone; + + @ApiModelProperty(value = "评价日期") + private String evalTime; + + @ApiModelProperty(value = "评价人") + private String evaluator; + + @ApiModelProperty(value = "星级分") + private String score; + + @ApiModelProperty(value = "评价内容") + private String content; + + @ApiModelProperty(value = "1.新增 2.修改") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private Integer type; +} diff --git a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/vo/SelectVo.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/vo/SelectVo.java index 18d1578..88caf4b 100644 --- a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/vo/SelectVo.java +++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/vo/SelectVo.java @@ -15,13 +15,13 @@ public class SelectVo { @ApiModelProperty(value = "id") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private Integer id; + private String id; @ApiModelProperty(value = "名称") @JsonInclude(JsonInclude.Include.NON_EMPTY) private String name; - @ApiModelProperty(value = "建管单位orgID") + @ApiModelProperty(value = "建管单位orgId") @JsonInclude(JsonInclude.Include.NON_EMPTY) private String orgId; } diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/controller/ProController.java b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/controller/ProController.java index 012d5f8..a8e31de 100644 --- a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/controller/ProController.java +++ b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/controller/ProController.java @@ -1,13 +1,13 @@ package com.securitycontrol.system.base.controller; -import com.alibaba.fastjson2.JSONObject; import com.securitycontrol.common.core.web.controller.BaseController; import com.securitycontrol.common.core.web.domain.AjaxResult; import com.securitycontrol.common.core.web.page.TableDataInfo; import com.securitycontrol.common.log.annotation.Log; import com.securitycontrol.common.log.enums.OperationType; +import com.securitycontrol.entity.system.base.dto.GxPlanDto; import com.securitycontrol.entity.system.base.dto.ProDto; -import com.securitycontrol.entity.system.base.dto.ProGxPlanDto; +import com.securitycontrol.entity.system.base.vo.GxPlanVo; import com.securitycontrol.entity.system.base.vo.ProVo; import com.securitycontrol.system.base.service.IProService; import io.swagger.annotations.ApiOperation; @@ -64,16 +64,10 @@ public class ProController extends BaseController { @ApiOperation(value = "删除工程") @PostMapping("delPro") @Log(title = "基础管理", menu = "基础管理->工程管理", grade = OperationType.DELETE_BUSINESS, details = "删除工程", type = "业务日志") - public AjaxResult delPro(ProDto dto) { + public AjaxResult delPro(@RequestBody ProDto dto) { return service.delPro(dto); } - @ApiOperation(value = "删除工程工序计划") - @PostMapping("delProGxPlan") - @Log(title = "基础管理", menu = "基础管理->工程管理", grade = OperationType.DELETE_BUSINESS, details = "删除工程工序计划", type = "业务日志") - public AjaxResult delProGxPlan(ProGxPlanDto dto) { - return service.delProGxPlan(dto); - } @ApiOperation(value = "工程图片/平面图预览") @GetMapping("viewProFile") @@ -87,4 +81,47 @@ public class ProController extends BaseController { public AjaxResult importProData(MultipartFile file, HttpServletRequest request, HttpServletResponse response) { return service.importProData(file,request,response); } + + @ApiOperation(value = "工程完工") + @PostMapping("editProStatus") + @Log(title = "基础管理", menu = "基础管理->工程管理", grade = OperationType.IMPORT_BUSINESS, details = "工程完工") + public AjaxResult editProStatus(@RequestBody ProVo vo) { + return service.editProStatus(vo); + } + + @ApiOperation(value = "获取工序列表") + @GetMapping("getGxPlanLists") + @Log(title = "基础管理", menu = "基础管理->工程管理", grade = OperationType.QUERY_BUSINESS, details = "查询工序计划", type = "业务日志") + public TableDataInfo getGxPlanLists(GxPlanDto dto) { + startPage(); + List list = service.getGxPlanLists(dto); + return getDataTable(list); + } + + @ApiOperation(value = "新增工序计划") + @PostMapping("addGxPlan") + @Log(title = "基础管理", menu = "基础管理->工程管理", grade = OperationType.ADD_BUSINESS, details = "新增工序计划", type = "业务日志") + public AjaxResult addGxPlan(@RequestBody GxPlanVo vo) { + return service.addOrUpdateGxPlan(vo); + } + + @ApiOperation(value = "修改工序计划") + @PostMapping("editGxPlan") + @Log(title = "基础管理", menu = "基础管理->工程管理", grade = OperationType.UPDATE_BUSINESS, details = "修改工序计划", type = "业务日志") + public AjaxResult editGxPlan(@RequestBody GxPlanVo vo) { + return service.addOrUpdateGxPlan(vo); + } + + @ApiOperation(value = "工序计划详情") + @GetMapping("getGxPlanById") + public AjaxResult getGxPlanById(GxPlanDto dto) { + return service.getGxPlanById(dto); + } + + @ApiOperation(value = "删除工序计划") + @PostMapping("delGxPlanById") + @Log(title = "基础管理", menu = "基础管理->工程管理", grade = OperationType.DELETE_BUSINESS, details = "删除工序计划", type = "业务日志") + public AjaxResult delGxPlanById(@RequestBody GxPlanDto dto) { + return service.delGxPlanById(dto); + } } diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/controller/SelectController.java b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/controller/SelectController.java index e06d30e..a4efc23 100644 --- a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/controller/SelectController.java +++ b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/controller/SelectController.java @@ -3,6 +3,7 @@ package com.securitycontrol.system.base.controller; import com.securitycontrol.common.core.web.controller.BaseController; import com.securitycontrol.common.core.web.domain.AjaxResult; import com.securitycontrol.entity.system.dto.MenuDto; +import com.securitycontrol.entity.system.dto.SelectDto; import com.securitycontrol.system.base.service.ISelectService; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.GetMapping; @@ -53,4 +54,10 @@ public class SelectController extends BaseController { public AjaxResult getBuildLists(){ return service.getBuildLists(); } + + @ApiOperation(value = "字典表下拉选") + @GetMapping("getDictLists") + public AjaxResult getDictLists(SelectDto dto){ + return service.getDictLists(dto); + } } diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/controller/TeamQuEvalController.java b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/controller/TeamQuEvalController.java new file mode 100644 index 0000000..b8fd825 --- /dev/null +++ b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/controller/TeamQuEvalController.java @@ -0,0 +1,65 @@ +package com.securitycontrol.system.base.controller; + +import com.securitycontrol.common.core.web.controller.BaseController; +import com.securitycontrol.common.core.web.domain.AjaxResult; +import com.securitycontrol.common.core.web.page.TableDataInfo; +import com.securitycontrol.common.log.annotation.Log; +import com.securitycontrol.common.log.enums.OperationType; +import com.securitycontrol.entity.system.base.dto.TeamQuEvalDto; +import com.securitycontrol.entity.system.base.vo.TeamQuEvalVo; +import com.securitycontrol.system.base.service.ITeamQuEvalService; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; + +/** + * @author：cwchen + * @date：2024-03-13-17:50 + * @version：1.0 + * @description：班组质量评价-web + */ +@RestController +@RequestMapping("/base/teamQuEval/") +public class TeamQuEvalController extends BaseController { + + @Resource(name = "ITeamQuEvalService") + private ITeamQuEvalService service; + + @ApiOperation(value = "获取班组质量评价列表") + @GetMapping("getTeamQuEvalLists") + @Log(title = "基础管理", menu = "基础管理->班组质量评价", grade = OperationType.QUERY_BUSINESS, details = "查询班组质量评价", type = "业务日志") + public TableDataInfo getTeamQuEvalLists(TeamQuEvalDto dto) { + startPage(); + List list = service.getTeamQuEvalLists(dto); + return getDataTable(list); + } + + @ApiOperation(value = "新增班组质量评价") + @PostMapping("addTeamEval") + @Log(title = "基础管理", menu = "基础管理->班组质量评价", grade = OperationType.ADD_BUSINESS, details = "新增班组质量评价", type = "业务日志") + public AjaxResult addTeamEval(@RequestBody TeamQuEvalVo vo) { + return service.addOrUpdateTeamEval(vo); + } + + @ApiOperation(value = "修改班组质量评价") + @PostMapping("editTeamEval") + @Log(title = "基础管理", menu = "基础管理->班组质量评价", grade = OperationType.UPDATE_BUSINESS, details = "修改班组质量评价", type = "业务日志") + public AjaxResult editTeamEval(@RequestBody TeamQuEvalVo vo) { + return service.addOrUpdateTeamEval(vo); + } + + @ApiOperation(value = "班组质量评价详情") + @GetMapping("getTeamEvalById") + public AjaxResult getTeamEvalById(TeamQuEvalDto dto) { + return service.getTeamEvalById(dto); + } + + @ApiOperation(value = "删除质量评价详情") + @PostMapping("delTeamEvalById") + @Log(title = "基础管理", menu = "基础管理->班组质量评价", grade = OperationType.DELETE_BUSINESS, details = "删除班组质量评价", type = "业务日志") + public AjaxResult delTeamEvalById(@RequestBody TeamQuEvalDto dto) { + return service.delTeamEvalById(dto); + } +} diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/mapper/IProMapper.java b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/mapper/IProMapper.java index eca5c1c..457390b 100644 --- a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/mapper/IProMapper.java +++ b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/mapper/IProMapper.java @@ -1,7 +1,9 @@ package com.securitycontrol.system.base.mapper; +import com.securitycontrol.entity.system.base.dto.GxPlanDto; import com.securitycontrol.entity.system.base.dto.ProDto; import com.securitycontrol.entity.system.base.dto.ProGxPlanDto; +import com.securitycontrol.entity.system.base.vo.GxPlanVo; import com.securitycontrol.entity.system.base.vo.ProVo; import com.securitycontrol.entity.system.vo.ResourceFileVo; import org.springframework.stereotype.Repository; @@ -101,6 +103,7 @@ public interface IProMapper { /** * 获取工程图片/平面图 + * * @param proId * @return List * @description @@ -108,4 +111,66 @@ public interface IProMapper { * @date 2024/3/12 10:55 */ List getFiles(String proId); + + /** + * 工程完工 + * + * @param vo + * @description + * @author cwchen + * @date 2024/3/13 15:25 + */ + void editProStatus(ProVo vo); + + /** + * 获取工序列表 + * + * @param dto + * @return List + * @description + * @author cwchen + * @date 2024/3/13 15:55 + */ + List getGxPlanLists(GxPlanDto dto); + + /** + * 新增/修改 工序计划 + * + * @param vo + * @description + * @author cwchen + * @date 2024/3/13 16:16 + */ + void addOrUpdateGxPlan(GxPlanVo vo); + + /** + * 工序计划详情 + * + * @param dto + * @return GxPlanVo + * @description + * @author cwchen + * @date 2024/3/13 16:27 + */ + GxPlanVo getGxPlanById(GxPlanDto dto); + + /** + * 删除工序计划 + * + * @param dto + * @description + * @author cwchen + * @date 2024/3/13 16:32 + */ + void delGxPlanById(GxPlanDto dto); + + /** + * 工程是否包含工序计划 + * @param dto + * @return int + * @description + * @author cwchen + * @date 2024/3/13 16:34 + */ + int isHasGxPlan(ProDto dto); } diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/mapper/ISelectMapper.java b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/mapper/ISelectMapper.java index 2359e35..2aa2eba 100644 --- a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/mapper/ISelectMapper.java +++ b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/mapper/ISelectMapper.java @@ -1,5 +1,6 @@ package com.securitycontrol.system.base.mapper; +import com.securitycontrol.entity.system.dto.SelectDto; import com.securitycontrol.entity.system.vo.SelectVo; import com.securitycontrol.entity.system.vo.TreeNode; import org.apache.ibatis.annotations.Param; @@ -57,10 +58,21 @@ public interface ISelectMapper { /** * 建管单位下拉选 + * * @return List * @description * @author cwchen * @date 2024/3/12 11:24 */ List getBuildLists(); + + /** + * 字典表下拉选 + * @param dto + * @return List + * @description + * @author cwchen + * @date 2024/3/13 17:09 + */ + List getDictLists(SelectDto dto); } diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/mapper/ITeamQuEvalMapper.java b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/mapper/ITeamQuEvalMapper.java new file mode 100644 index 0000000..ffaaee2 --- /dev/null +++ b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/mapper/ITeamQuEvalMapper.java @@ -0,0 +1,56 @@ +package com.securitycontrol.system.base.mapper; + +import com.securitycontrol.entity.system.base.dto.TeamQuEvalDto; +import com.securitycontrol.entity.system.base.vo.TeamQuEvalVo; +import org.springframework.stereotype.Repository; + +import java.util.List; + +/** + * @author：cwchen + * @date：2024-03-13-17:52 + * @version：1.0 + * @description：班组质量评价-数据库访问层 + */ +@Repository(value = "ITeamQuEvalMapper") +public interface ITeamQuEvalMapper { + + /** + * 获取班组质量评价列表 + * + * @param dto + * @return List + * @description + * @author cwchen + * @date 2024/3/13 18:01 + */ + List getTeamQuEvalLists(TeamQuEvalDto dto); + + /** + * 班组质量评价详情 + * @param dto + * @return TeamQuEvalVo + * @description + * @author cwchen + * @date 2024/3/13 18:26 + */ + TeamQuEvalVo getTeamEvalById(TeamQuEvalDto dto); + + /** + * 新增/修改班组质量评价 + * @param vo + * @description + * @author cwchen + * @date 2024/3/13 18:26 + */ + void addOrUpdateTeamEval(TeamQuEvalVo vo); + + /** + * 删除质量评价详情 + * @param dto + * @description + * @author cwchen + * @date 2024/3/13 18:26 + */ + void delTeamEvalById(TeamQuEvalDto dto); +} diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/IProService.java b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/IProService.java index 1913553..5abc6f6 100644 --- a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/IProService.java +++ b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/IProService.java @@ -1,8 +1,10 @@ package com.securitycontrol.system.base.service; import com.securitycontrol.common.core.web.domain.AjaxResult; +import com.securitycontrol.entity.system.base.dto.GxPlanDto; import com.securitycontrol.entity.system.base.dto.ProDto; import com.securitycontrol.entity.system.base.dto.ProGxPlanDto; +import com.securitycontrol.entity.system.base.vo.GxPlanVo; import com.securitycontrol.entity.system.base.vo.ProVo; import org.springframework.web.multipart.MultipartFile; @@ -88,6 +90,7 @@ public interface IProService { /** * 工程信息导入 + * * @param file * @param request * @param response @@ -97,4 +100,58 @@ public interface IProService { * @date 2024/3/13 9:10 */ AjaxResult importProData(MultipartFile file, HttpServletRequest request, HttpServletResponse response); + + /** + * 工程完工 + * + * @param vo + * @return AjaxResult + * @description + * @author cwchen + * @date 2024/3/13 15:23 + */ + AjaxResult editProStatus(ProVo vo); + + /** + * 获取工序列表 + * + * @param dto + * @return List + * @description + * @author cwchen + * @date 2024/3/13 15:53 + */ + List getGxPlanLists(GxPlanDto dto); + + /** + * 新增/修改 工序计划 + * + * @param vo + * @return AjaxResult + * @description + * @author cwchen + * @date 2024/3/13 16:07 + */ + AjaxResult addOrUpdateGxPlan(GxPlanVo vo); + + /** + * 工序计划详情 + * + * @param dto + * @return AjaxResult + * @description + * @author cwchen + * @date 2024/3/13 16:25 + */ + AjaxResult getGxPlanById(GxPlanDto dto); + + /** + * 删除工序计划 + * @param dto + * @return AjaxResult + * @description + * @author cwchen + * @date 2024/3/13 16:31 + */ + AjaxResult delGxPlanById(GxPlanDto dto); } diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/ISelectService.java b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/ISelectService.java index c466774..6c3aa68 100644 --- a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/ISelectService.java +++ b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/ISelectService.java @@ -2,6 +2,7 @@ package com.securitycontrol.system.base.service; import com.securitycontrol.common.core.web.domain.AjaxResult; import com.securitycontrol.entity.system.dto.MenuDto; +import com.securitycontrol.entity.system.dto.SelectDto; /** * @author：cwchen @@ -53,10 +54,21 @@ public interface ISelectService { /** * 建管单位下拉选 + * * @return AjaxResult * @description * @author cwchen * @date 2024/3/12 11:23 */ AjaxResult getBuildLists(); + + /** + * 字典表下拉选 + * @param dto + * @return AjaxResult + * @description + * @author cwchen + * @date 2024/3/13 17:08 + */ + AjaxResult getDictLists(SelectDto dto); } diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/ITeamQuEvalService.java b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/ITeamQuEvalService.java new file mode 100644 index 0000000..7446ba8 --- /dev/null +++ b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/ITeamQuEvalService.java @@ -0,0 +1,57 @@ +package com.securitycontrol.system.base.service; + +import com.securitycontrol.common.core.web.domain.AjaxResult; +import com.securitycontrol.entity.system.base.dto.TeamQuEvalDto; +import com.securitycontrol.entity.system.base.vo.TeamQuEvalVo; + +import java.util.List; + +/** + * @author：cwchen + * @date：2024-03-13-17:51 + * @version：1.0 + * @description：班组质量评价-业务层 + */ +public interface ITeamQuEvalService { + + /** + * 获取班组质量评价列表 + * + * @param dto + * @return List + * @description + * @author cwchen + * @date 2024/3/13 18:00 + */ + List getTeamQuEvalLists(TeamQuEvalDto dto); + + /** + * 新增/修改班组质量评价 + * @param vo + * @return AjaxResult + * @description + * @author cwchen + * @date 2024/3/13 18:21 + */ + AjaxResult addOrUpdateTeamEval(TeamQuEvalVo vo); + + /** + * 班组质量评价详情 + * @param dto + * @return AjaxResult + * @description + * @author cwchen + * @date 2024/3/13 18:21 + */ + AjaxResult getTeamEvalById(TeamQuEvalDto dto); + + /** + * 删除质量评价详情 + * @param dto + * @return AjaxResult + * @description + * @author cwchen + * @date 2024/3/13 18:21 + */ + AjaxResult delTeamEvalById(TeamQuEvalDto dto); +} diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/ProServiceImpl.java b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/ProServiceImpl.java index a26b41e..fac59e1 100644 --- a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/ProServiceImpl.java +++ b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/ProServiceImpl.java @@ -8,8 +8,10 @@ import com.securitycontrol.common.core.utils.StringUtils; import com.securitycontrol.common.core.utils.aes.DateTimeHelper; import com.securitycontrol.common.core.web.domain.AjaxResult; import com.securitycontrol.common.security.utils.ValidatorsUtils; +import com.securitycontrol.entity.system.base.dto.GxPlanDto; import com.securitycontrol.entity.system.base.dto.ProDto; import com.securitycontrol.entity.system.base.dto.ProGxPlanDto; +import com.securitycontrol.entity.system.base.vo.GxPlanVo; import com.securitycontrol.entity.system.base.vo.ProImportVo; import com.securitycontrol.entity.system.base.vo.ProVo; import com.securitycontrol.entity.system.vo.ResourceFileVo; @@ -160,11 +162,28 @@ public class ProServiceImpl implements IProService { @Transactional(rollbackFor = Exception.class) public AjaxResult delPro(ProDto dto) { try { + if(StringUtils.isEmpty(dto.getProId()) || StringUtils.isEmpty(dto.getBidCode())){ + return AjaxResult.error("参数不完整"); + } + int num = mapper.isHasGxPlan(dto); + if(num > 0){ + return AjaxResult.error("工程下包含工序计划"); + } mapper.delPro(dto); + // 查询工程文件 + List files = mapper.getFiles(dto.getProId()); + if(CollectionUtils.isNotEmpty(files)){ + files.forEach(item->{ + mapper.delFile(item.getFileId()); + mongoService.removeFile(item.getFileId()); + }); + } + } catch (Exception e) { log.error("删除工程", e); //手动回滚异常 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); + return AjaxResult.error(); } return AjaxResult.success(); } @@ -315,4 +334,64 @@ public class ProServiceImpl implements IProService { return fileVo; } + @Override + @Transactional(rollbackFor = Exception.class) + public AjaxResult editProStatus(ProVo vo) { + try { + mapper.editProStatus(vo); + } catch (Exception e) { + log.error("工程完工",e); + //手动回滚异常 + TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); + return AjaxResult.error(); + } + return AjaxResult.success(); + } + + @Override + public List getGxPlanLists(GxPlanDto dto) { + List list = new ArrayList<>(); + list = mapper.getGxPlanLists(dto); + return list; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public AjaxResult addOrUpdateGxPlan(GxPlanVo vo) { + try { + if(StringUtils.isEmpty(vo.getPlanId())){ + String gxPlanId = UUID.randomUUID().toString().replace("-", ""); + vo.setPlanId(gxPlanId); + vo.setType(1); + }else{ + vo.setType(2); + } + mapper.addOrUpdateGxPlan(vo); + } catch (Exception e) { + log.error("工序计划",e); + TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); + return AjaxResult.error(); + } + return AjaxResult.success(); + } + + @Override + public AjaxResult getGxPlanById(GxPlanDto dto) { + GxPlanVo vo = new GxPlanVo(); + vo = mapper.getGxPlanById(dto); + return AjaxResult.success(vo); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public AjaxResult delGxPlanById(GxPlanDto dto) { + try { + mapper.delGxPlanById(dto); + } catch (Exception e) { + log.error("工序计划",e); + TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); + return AjaxResult.error(); + } + return AjaxResult.success(); + } } diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/SelectServiceImpl.java b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/SelectServiceImpl.java index 8f9a7df..314c6bf 100644 --- a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/SelectServiceImpl.java +++ b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/SelectServiceImpl.java @@ -3,6 +3,7 @@ package com.securitycontrol.system.base.service.impl; import com.securitycontrol.common.core.web.domain.AjaxResult; import com.securitycontrol.entity.system.TreeBuild; import com.securitycontrol.entity.system.dto.MenuDto; +import com.securitycontrol.entity.system.dto.SelectDto; import com.securitycontrol.entity.system.vo.SelectVo; import com.securitycontrol.entity.system.vo.TreeNode; import com.securitycontrol.system.base.mapper.ISelectMapper; @@ -102,4 +103,11 @@ public class SelectServiceImpl implements ISelectService { list = mapper.getBuildLists(); return AjaxResult.success(list); } + + @Override + public AjaxResult getDictLists(SelectDto dto) { + List list = new ArrayList<>(); + list = mapper.getDictLists(dto); + return AjaxResult.success(list); + } } diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/TeamQuEvalServiceImpl.java b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/TeamQuEvalServiceImpl.java new file mode 100644 index 0000000..2ae2278 --- /dev/null +++ b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/TeamQuEvalServiceImpl.java @@ -0,0 +1,83 @@ +package com.securitycontrol.system.base.service.impl; + +import com.securitycontrol.common.core.utils.StringUtils; +import com.securitycontrol.common.core.utils.aes.DateTimeHelper; +import com.securitycontrol.common.core.web.domain.AjaxResult; +import com.securitycontrol.common.security.utils.SecurityUtils; +import com.securitycontrol.entity.system.base.dto.TeamQuEvalDto; +import com.securitycontrol.entity.system.base.vo.TeamQuEvalVo; +import com.securitycontrol.system.base.mapper.ITeamQuEvalMapper; +import com.securitycontrol.system.base.service.ITeamQuEvalService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.transaction.interceptor.TransactionAspectSupport; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + +/** + * @author：cwchen + * @date：2024-03-13-17:51 + * @version：1.0 + * @description：班组质量评价-业务逻辑层 + */ +@Service(value = "ITeamQuEvalService") +@Slf4j +public class TeamQuEvalServiceImpl implements ITeamQuEvalService { + + @Resource(name = "ITeamQuEvalMapper") + private ITeamQuEvalMapper mapper; + + @Override + public List getTeamQuEvalLists(TeamQuEvalDto dto) { + List list = new ArrayList<>(); + list = mapper.getTeamQuEvalLists(dto); + return list; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public AjaxResult addOrUpdateTeamEval(TeamQuEvalVo vo) { + try { + if (SecurityUtils.getLoginUser() != null && SecurityUtils.getLoginUser().getSysUser() != null) { + vo.setEvaluator(SecurityUtils.getLoginUser().getSysUser().getUserName()); + } + if (StringUtils.isEmpty(vo.getEvalId())) { + String evalId = UUID.randomUUID().toString().replace("-", ""); + vo.setEvalId(evalId); + vo.setType(1); + vo.setEvalTime(DateTimeHelper.getNowDate()); + } else { + vo.setType(2); + } + mapper.addOrUpdateTeamEval(vo); + } catch (Exception e) { + log.error("新增/修改班组质量评价", e); + return AjaxResult.error(); + } + return AjaxResult.success(); + } + + @Override + public AjaxResult getTeamEvalById(TeamQuEvalDto dto) { + TeamQuEvalVo vo = new TeamQuEvalVo(); + vo = mapper.getTeamEvalById(dto); + return AjaxResult.success(vo); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public AjaxResult delTeamEvalById(TeamQuEvalDto dto) { + try { + mapper.delTeamEvalById(dto); + } catch (Exception e) { + log.error("删除班组质量评价", e); + TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); + return AjaxResult.error(); + } + return AjaxResult.success(); + } +} diff --git a/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/ITeamQuEvalMapper.xml b/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/ITeamQuEvalMapper.xml new file mode 100644 index 0000000..af35cb5 --- /dev/null +++ b/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/ITeamQuEvalMapper.xml @@ -0,0 +1,88 @@ + + + + + + + INSERT INTO tb_team_eval + + id, + team_id, + team_name, + content, + leader, + score, + eval_time, + evaluator, + del_falge, + + + #{evalId}, + #{teamId}, + #{teamName}, + #{content}, + #{teamLeader}, + #{score}, + #{evalTime}, + #{evaluator}, + 0, + + + + UPDATE tb_team_eval + + team_id = #{teamId}, + team_name = #{teamName}, + content = #{content}, + leader = #{teamLeader}, + score = #{score}, + eval_time = #{evalTime}, + evaluator = #{evaluator}, + + WHERE id = #{evalId} + + + + + DELETE FROM tb_team_eval WHERE id = #{evalId} + + + + + + + \ No newline at end of file diff --git a/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/ProMapper.xml b/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/ProMapper.xml index 473b0d3..c68293b 100644 --- a/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/ProMapper.xml +++ b/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/ProMapper.xml @@ -101,9 +101,62 @@ #{updateTime}, + + + + INSERT INTO tb_gx_plan + + plan_id, + bid_code, + gx_id, + gx_weight, + plan_start_time, + plan_end_time, + start_time, + end_time, + dela_reason, + del_flag, + + + #{planId}, + #{bidCode}, + #{gxId}, + #{gxWeight}, + #{planStartTime}, + #{planEndTime}, + #{startTime}, + #{endTime}, + #{delaReason}, + 0, + + + + UPDATE tb_gx_plan + + gx_id = #{gxId}, + gx_weight = #{gxWeight}, + plan_start_time = #{planStartTime}, + plan_end_time = #{planEndTime}, + start_time = #{startTime}, + end_time = #{endTime}, + dela_reason = #{delaReason}, + + WHERE plan_id = #{planId} + + + + + UPDATE tb_project + + start_time = #{startTime}, + end_time = #{endTime}, + status = '完工', + + WHERE pro_id = #{proId} + - + DELETE FROM tb_project WHERE pro_id = #{proId} @@ -113,6 +166,10 @@ DELETE FROM tb_resource_file WHERE file_id = #{fileId} + + + DELETE FROM tb_gx_plan WHERE plan_id = #{planId} + + + + + + + \ No newline at end of file diff --git a/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/SelectMapper.xml b/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/SelectMapper.xml index 2f7e878..28f7426 100644 --- a/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/SelectMapper.xml +++ b/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/SelectMapper.xml @@ -43,4 +43,13 @@ org_id AS orgId FROM sys_build + + \ No newline at end of file