From 2f8353545b2e48417f8428632f76a9c470964e2d Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期三, 13 三月 2024 13:39:28 +0800 Subject: [PATCH] 考核积分 --- ycl-server/src/main/java/com/ycl/system/controller/SysDeptController.java | 7 ycl-server/src/main/java/com/ycl/platform/service/impl/TCheckPublishServiceImpl.java | 18 + ycl-server/src/main/java/com/ycl/platform/service/impl/TExamineScoreServiceImpl.java | 99 +++++++ ycl-server/src/main/java/com/ycl/system/service/impl/SysDeptServiceImpl.java | 14 + ycl-pojo/src/main/java/com/ycl/platform/domain/entity/YwUnit.java | 1 ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CheckTemplateVO.java | 3 ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckTemplate.java | 4 ycl-server/src/main/java/com/ycl/platform/controller/TCheckPublishController.java | 8 ycl-server/src/main/java/com/ycl/platform/service/ITCheckPublishService.java | 4 ycl-pojo/src/main/java/com/ycl/platform/domain/vo/TExamineScoreVO.java | 130 ++++++++++ ycl-server/src/main/java/com/ycl/platform/controller/TExamineScoreController.java | 99 +++++++ ycl-server/src/main/java/com/ycl/system/service/ISysDeptService.java | 6 ycl-server/src/main/resources/mapper/zgyw/TExamineScoreMapper.xml | 87 ++++++ ycl-pojo/src/main/java/com/ycl/platform/domain/entity/TExamineScore.java | 111 ++++++++ ycl-server/src/main/java/com/ycl/platform/service/ITExamineScoreService.java | 63 ++++ ycl-server/src/main/java/com/ycl/platform/mapper/TExamineScoreMapper.java | 63 ++++ ycl-server/src/main/java/com/ycl/platform/service/impl/CheckTemplateServiceImpl.java | 6 17 files changed, 719 insertions(+), 4 deletions(-) diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckTemplate.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckTemplate.java index bc3dc30..70472a5 100644 --- a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckTemplate.java +++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckTemplate.java @@ -44,5 +44,7 @@ @TableField("status") private String status; - + @ApiModelProperty("鍗曚綅id") + @TableField("unit_id") + private Integer unitId; } diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/TExamineScore.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/TExamineScore.java new file mode 100644 index 0000000..9440673 --- /dev/null +++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/TExamineScore.java @@ -0,0 +1,111 @@ +package com.ycl.platform.domain.entity; + +import annotation.Excel; +import com.ycl.system.entity.BaseEntity; +import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang.builder.ToStringStyle; + +import java.math.BigDecimal; + +/** + * 鑰冩牳璁″垎瀵硅薄 t_examine_score + * + * @author ruoyi + * @date 2024-03-13 + */ +public class TExamineScore extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** $column.columnComment */ + private Long id; + + /** 鍒嗗�� */ + @Excel(name = "鍒嗗��") + private BigDecimal score; + + /** 鍗曚綅id */ + @Excel(name = "鍗曚綅id") + private Long unitId; + + /** 鑰冩牳id */ + @Excel(name = "鑰冩牳id") + private Long examineId; + + /** 鎿嶄綔绫诲瀷 1/2 绯荤粺鎵撳垎/浜哄伐鎵撳垎 */ + @Excel(name = "鎿嶄綔绫诲瀷 1/2 绯荤粺鎵撳垎/浜哄伐鎵撳垎") + private Long operateCategory; + + /** 绉垎绫诲瀷 */ + @Excel(name = "绉垎绫诲瀷") + private Long scoreCategory; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setScore(BigDecimal score) + { + this.score = score; + } + + public BigDecimal getScore() + { + return score; + } + public void setUnitId(Long unitId) + { + this.unitId = unitId; + } + + public Long getUnitId() + { + return unitId; + } + public void setExamineId(Long examineId) + { + this.examineId = examineId; + } + + public Long getExamineId() + { + return examineId; + } + public void setOperateCategory(Long operateCategory) + { + this.operateCategory = operateCategory; + } + + public Long getOperateCategory() + { + return operateCategory; + } + public void setScoreCategory(Long scoreCategory) + { + this.scoreCategory = scoreCategory; + } + + public Long getScoreCategory() + { + return scoreCategory; + } + + @Override + public String toString() { + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("score", getScore()) + .append("unitId", getUnitId()) + .append("examineId", getExamineId()) + .append("operateCategory", getOperateCategory()) + .append("scoreCategory", getScoreCategory()) + .append("createTime", getCreateTime()) + .append("createBy", getCreateBy()) + .toString(); + } +} diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/YwUnit.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/YwUnit.java index fe7b5a1..265fbdc 100644 --- a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/YwUnit.java +++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/YwUnit.java @@ -46,5 +46,4 @@ @TableField("remark") private String remark; - } diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CheckTemplateVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CheckTemplateVO.java index 1e2f7a2..a6b65d2 100644 --- a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CheckTemplateVO.java +++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CheckTemplateVO.java @@ -39,7 +39,8 @@ /** 瑙勫垯鍒楄〃 */ private List<RuleItemVO> ruleFormList; - + /** 鍗曚綅鍚� */ + private String unitName; public static CheckTemplateVO getVoByEntity(@NonNull CheckTemplate entity, CheckTemplateVO vo) { if(vo == null) { vo = new CheckTemplateVO(); diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/TExamineScoreVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/TExamineScoreVO.java new file mode 100644 index 0000000..14073d9 --- /dev/null +++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/TExamineScoreVO.java @@ -0,0 +1,130 @@ +package com.ycl.platform.domain.vo; + +import annotation.Excel; +import com.ycl.system.entity.BaseEntity; +import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang.builder.ToStringStyle; + +import java.math.BigDecimal; + +/** + * 鑰冩牳璁″垎瀵硅薄 t_examine_score + * + * @author ruoyi + * @date 2024-03-13 + */ +public class TExamineScoreVO extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** $column.columnComment */ + private Long id; + + /** 鍒嗗�� */ + @Excel(name = "鍒嗗��") + private BigDecimal score; + + /** 鍗曚綅id */ + @Excel(name = "鍗曚綅id") + private Long unitId; + + /** 鑰冩牳id */ + @Excel(name = "鑰冩牳id") + private Long examineId; + + /** 鎿嶄綔绫诲瀷 1/2 绯荤粺鎵撳垎/浜哄伐鎵撳垎 */ + @Excel(name = "鎿嶄綔绫诲瀷 1/2 绯荤粺鎵撳垎/浜哄伐鎵撳垎") + private Long operateCategory; + + /** 绉垎绫诲瀷 */ + @Excel(name = "绉垎绫诲瀷") + private Long scoreCategory; + + private String unitName; + private String examineName; + + public String getUnitName() { + return unitName; + } + + public void setUnitName(String unitName) { + this.unitName = unitName; + } + + public String getExamineName() { + return examineName; + } + + public void setExamineName(String examineName) { + this.examineName = examineName; + } + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setScore(BigDecimal score) + { + this.score = score; + } + + public BigDecimal getScore() + { + return score; + } + public void setUnitId(Long unitId) + { + this.unitId = unitId; + } + + public Long getUnitId() + { + return unitId; + } + public void setExamineId(Long examineId) + { + this.examineId = examineId; + } + + public Long getExamineId() + { + return examineId; + } + public void setOperateCategory(Long operateCategory) + { + this.operateCategory = operateCategory; + } + + public Long getOperateCategory() + { + return operateCategory; + } + public void setScoreCategory(Long scoreCategory) + { + this.scoreCategory = scoreCategory; + } + + public Long getScoreCategory() + { + return scoreCategory; + } + + @Override + public String toString() { + return "TExamineScoreVO{" + + "id=" + id + + ", score=" + score + + ", unitId=" + unitId + + ", examineId=" + examineId + + ", operateCategory=" + operateCategory + + ", scoreCategory=" + scoreCategory + + ", unitName='" + unitName + '\'' + + ", examineName='" + examineName + '\'' + + '}'; + } +} diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/TCheckPublishController.java b/ycl-server/src/main/java/com/ycl/platform/controller/TCheckPublishController.java index 87b291f..e101f3f 100644 --- a/ycl-server/src/main/java/com/ycl/platform/controller/TCheckPublishController.java +++ b/ycl-server/src/main/java/com/ycl/platform/controller/TCheckPublishController.java @@ -4,10 +4,12 @@ import com.ycl.platform.domain.entity.TCheckPublish; import com.ycl.platform.service.ITCheckPublishService; import com.ycl.system.AjaxResult; +import com.ycl.system.Result; import com.ycl.system.controller.BaseController; import com.ycl.system.page.TableDataInfo; import com.ycl.utils.poi.ExcelUtil; import enumeration.BusinessType; +import io.swagger.annotations.ApiOperation; import jakarta.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; @@ -95,4 +97,10 @@ { return toAjax(tCheckPublishService.deleteTCheckPublishByIds(ids)); } + + @GetMapping("/all") + @ApiOperation(value = "涓嬫媺鍒楄〃", notes = "涓嬫媺鍒楄〃") + public Result all() { + return tCheckPublishService.all(); + } } diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/TExamineScoreController.java b/ycl-server/src/main/java/com/ycl/platform/controller/TExamineScoreController.java new file mode 100644 index 0000000..d2509bd --- /dev/null +++ b/ycl-server/src/main/java/com/ycl/platform/controller/TExamineScoreController.java @@ -0,0 +1,99 @@ +package com.ycl.platform.controller; + +import annotation.Log; +import com.ycl.platform.domain.entity.TExamineScore; +import com.ycl.platform.domain.vo.TExamineScoreVO; +import com.ycl.platform.service.ITExamineScoreService; +import com.ycl.system.AjaxResult; +import com.ycl.system.controller.BaseController; +import com.ycl.system.page.TableDataInfo; +import com.ycl.utils.poi.ExcelUtil; +import enumeration.BusinessType; +import jakarta.servlet.http.HttpServletResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 鑰冩牳璁″垎Controller + * + * @author ruoyi + * @date 2024-03-13 + */ +@RestController +@RequestMapping("/platform/score") +public class TExamineScoreController extends BaseController +{ + @Autowired + private ITExamineScoreService tExamineScoreService; + + /** + * 鏌ヨ鑰冩牳璁″垎鍒楄〃 + */ + @PreAuthorize("@ss.hasPermi('platform:score:list')") + @GetMapping("/list") + public TableDataInfo list(TExamineScore tExamineScore) + { + startPage(); + List<TExamineScoreVO> list = tExamineScoreService.selectTExamineScoreList(tExamineScore); + return getDataTable(list); + } + + /** + * 瀵煎嚭鑰冩牳璁″垎鍒楄〃 + */ + @PreAuthorize("@ss.hasPermi('platform:score:export')") + @Log(title = "鑰冩牳璁″垎", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, TExamineScore tExamineScore) + { + List<TExamineScoreVO> list = tExamineScoreService.selectTExamineScoreList(tExamineScore); + ExcelUtil<TExamineScoreVO> util = new ExcelUtil<TExamineScoreVO>(TExamineScoreVO.class); + util.exportExcel(response, list, "鑰冩牳璁″垎鏁版嵁"); + } + + /** + * 鑾峰彇鑰冩牳璁″垎璇︾粏淇℃伅 + */ + @PreAuthorize("@ss.hasPermi('platform:score:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return success(tExamineScoreService.selectTExamineScoreById(id)); + } + + /** + * 鏂板鑰冩牳璁″垎 + */ + @PreAuthorize("@ss.hasPermi('platform:score:add')") + @Log(title = "鑰冩牳璁″垎", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody TExamineScore tExamineScore) + { + return toAjax(tExamineScoreService.insertTExamineScore(tExamineScore)); + } + + /** + * 淇敼鑰冩牳璁″垎 + */ + @PreAuthorize("@ss.hasPermi('platform:score:edit')") + @Log(title = "鑰冩牳璁″垎", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody TExamineScore tExamineScore) + { + return toAjax(tExamineScoreService.updateTExamineScore(tExamineScore)); + } + + /** + * 鍒犻櫎鑰冩牳璁″垎 + */ + @PreAuthorize("@ss.hasPermi('platform:score:remove')") + @Log(title = "鑰冩牳璁″垎", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(tExamineScoreService.deleteTExamineScoreByIds(ids)); + } +} diff --git a/ycl-server/src/main/java/com/ycl/platform/mapper/TExamineScoreMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/TExamineScoreMapper.java new file mode 100644 index 0000000..007f23c --- /dev/null +++ b/ycl-server/src/main/java/com/ycl/platform/mapper/TExamineScoreMapper.java @@ -0,0 +1,63 @@ +package com.ycl.platform.mapper; + +import com.ycl.platform.domain.entity.TExamineScore; +import com.ycl.platform.domain.vo.TExamineScoreVO; + +import java.util.List; + +/** + * 鑰冩牳璁″垎Mapper鎺ュ彛 + * + * @author ruoyi + * @date 2024-03-13 + */ +public interface TExamineScoreMapper +{ + /** + * 鏌ヨ鑰冩牳璁″垎 + * + * @param id 鑰冩牳璁″垎涓婚敭 + * @return 鑰冩牳璁″垎 + */ + public TExamineScore selectTExamineScoreById(Long id); + + /** + * 鏌ヨ鑰冩牳璁″垎鍒楄〃 + * + * @param tExamineScore 鑰冩牳璁″垎 + * @return 鑰冩牳璁″垎闆嗗悎 + */ + public List<TExamineScoreVO> selectTExamineScoreList(TExamineScore tExamineScore); + + /** + * 鏂板鑰冩牳璁″垎 + * + * @param tExamineScore 鑰冩牳璁″垎 + * @return 缁撴灉 + */ + public int insertTExamineScore(TExamineScore tExamineScore); + + /** + * 淇敼鑰冩牳璁″垎 + * + * @param tExamineScore 鑰冩牳璁″垎 + * @return 缁撴灉 + */ + public int updateTExamineScore(TExamineScore tExamineScore); + + /** + * 鍒犻櫎鑰冩牳璁″垎 + * + * @param id 鑰冩牳璁″垎涓婚敭 + * @return 缁撴灉 + */ + public int deleteTExamineScoreById(Long id); + + /** + * 鎵归噺鍒犻櫎鑰冩牳璁″垎 + * + * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎 + * @return 缁撴灉 + */ + public int deleteTExamineScoreByIds(Long[] ids); +} diff --git a/ycl-server/src/main/java/com/ycl/platform/service/ITCheckPublishService.java b/ycl-server/src/main/java/com/ycl/platform/service/ITCheckPublishService.java index f4b370f..fd416e4 100644 --- a/ycl-server/src/main/java/com/ycl/platform/service/ITCheckPublishService.java +++ b/ycl-server/src/main/java/com/ycl/platform/service/ITCheckPublishService.java @@ -1,6 +1,7 @@ package com.ycl.platform.service; import com.ycl.platform.domain.entity.TCheckPublish; +import com.ycl.system.Result; import java.util.List; @@ -59,4 +60,7 @@ * @return 缁撴灉 */ public int deleteTCheckPublishById(Long id); + + Result all(); + } diff --git a/ycl-server/src/main/java/com/ycl/platform/service/ITExamineScoreService.java b/ycl-server/src/main/java/com/ycl/platform/service/ITExamineScoreService.java new file mode 100644 index 0000000..6f31bc5 --- /dev/null +++ b/ycl-server/src/main/java/com/ycl/platform/service/ITExamineScoreService.java @@ -0,0 +1,63 @@ +package com.ycl.platform.service; + +import com.ycl.platform.domain.entity.TExamineScore; +import com.ycl.platform.domain.vo.TExamineScoreVO; + +import java.util.List; + +/** + * 鑰冩牳璁″垎Service鎺ュ彛 + * + * @author ruoyi + * @date 2024-03-13 + */ +public interface ITExamineScoreService +{ + /** + * 鏌ヨ鑰冩牳璁″垎 + * + * @param id 鑰冩牳璁″垎涓婚敭 + * @return 鑰冩牳璁″垎 + */ + public TExamineScore selectTExamineScoreById(Long id); + + /** + * 鏌ヨ鑰冩牳璁″垎鍒楄〃 + * + * @param tExamineScore 鑰冩牳璁″垎 + * @return 鑰冩牳璁″垎闆嗗悎 + */ + public List<TExamineScoreVO> selectTExamineScoreList(TExamineScore tExamineScore); + + /** + * 鏂板鑰冩牳璁″垎 + * + * @param tExamineScore 鑰冩牳璁″垎 + * @return 缁撴灉 + */ + public int insertTExamineScore(TExamineScore tExamineScore); + + /** + * 淇敼鑰冩牳璁″垎 + * + * @param tExamineScore 鑰冩牳璁″垎 + * @return 缁撴灉 + */ + public int updateTExamineScore(TExamineScore tExamineScore); + + /** + * 鎵归噺鍒犻櫎鑰冩牳璁″垎 + * + * @param ids 闇�瑕佸垹闄ょ殑鑰冩牳璁″垎涓婚敭闆嗗悎 + * @return 缁撴灉 + */ + public int deleteTExamineScoreByIds(Long[] ids); + + /** + * 鍒犻櫎鑰冩牳璁″垎淇℃伅 + * + * @param id 鑰冩牳璁″垎涓婚敭 + * @return 缁撴灉 + */ + public int deleteTExamineScoreById(Long id); +} diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckTemplateServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckTemplateServiceImpl.java index 03b5866..bdb28d7 100644 --- a/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckTemplateServiceImpl.java +++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckTemplateServiceImpl.java @@ -9,6 +9,7 @@ import com.ycl.platform.mapper.CheckTemplateMapper; import com.ycl.platform.mapper.CheckTemplateRuleMapper; import com.ycl.platform.service.CheckTemplateService; +import com.ycl.platform.service.YwUnitService; import com.ycl.system.Result; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ycl.platform.domain.form.CheckTemplateForm; @@ -19,6 +20,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.ycl.system.page.PageUtil; import com.ycl.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.beans.BeanUtils; @@ -44,7 +46,8 @@ private final CheckTemplateMapper checkTemplateMapper; private final CheckTemplateRuleMapper checkTemplateRuleMapper; - + @Autowired + private YwUnitService unitService; /** * 娣诲姞 * @param form @@ -145,6 +148,7 @@ List<CheckTemplateVO> vos = page.getRecords().stream() .map( entity -> CheckTemplateVO.getVoByEntity(entity, null) + .setUnitName(unitService.getById(entity.getUnitId()).getUnitName()) ) .collect(Collectors.toList()); return Result.ok().data(vos).total(page.getTotal()); diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/TCheckPublishServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/TCheckPublishServiceImpl.java index edea606..2585ccf 100644 --- a/ycl-server/src/main/java/com/ycl/platform/service/impl/TCheckPublishServiceImpl.java +++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/TCheckPublishServiceImpl.java @@ -1,8 +1,11 @@ package com.ycl.platform.service.impl; +import com.ycl.platform.base.BaseSelect; import com.ycl.platform.domain.entity.TCheckPublish; import com.ycl.platform.mapper.TCheckPublishMapper; import com.ycl.platform.service.ITCheckPublishService; +import com.ycl.system.Result; +import com.ycl.system.entity.SysDept; import com.ycl.system.entity.SysUser; import com.ycl.system.mapper.SysUserMapper; import com.ycl.system.model.LoginUser; @@ -13,6 +16,7 @@ import java.util.Date; import java.util.List; +import java.util.stream.Collectors; /** * 鑰冩牳鍙戝竷Service涓氬姟灞傚鐞� @@ -110,4 +114,18 @@ { return tCheckPublishMapper.deleteTCheckPublishById(id); } + /** + * 涓嬫媺鍒楄〃 + * */ + @Override + public Result all() { + List<BaseSelect> vos = tCheckPublishMapper.selectTCheckPublishList(new TCheckPublish()).stream().map(checkPublish -> { + BaseSelect baseSelect = new BaseSelect(); + baseSelect.setId(Integer.parseInt(checkPublish.getId() + "")); + baseSelect.setValue(checkPublish.getExamineName()); + return baseSelect; + } + ).collect(Collectors.toList()); + return Result.ok().data(vos); + } } diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/TExamineScoreServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/TExamineScoreServiceImpl.java new file mode 100644 index 0000000..49e197b --- /dev/null +++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/TExamineScoreServiceImpl.java @@ -0,0 +1,99 @@ +package com.ycl.platform.service.impl; + +import com.ycl.platform.domain.entity.TExamineScore; +import com.ycl.platform.domain.vo.TExamineScoreVO; +import com.ycl.platform.mapper.TExamineScoreMapper; +import com.ycl.platform.service.ITExamineScoreService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import utils.DateUtils; + +import java.util.List; + +/** + * 鑰冩牳璁″垎Service涓氬姟灞傚鐞� + * + * @author ruoyi + * @date 2024-03-13 + */ +@Service +public class TExamineScoreServiceImpl implements ITExamineScoreService +{ + @Autowired + private TExamineScoreMapper tExamineScoreMapper; + + /** + * 鏌ヨ鑰冩牳璁″垎 + * + * @param id 鑰冩牳璁″垎涓婚敭 + * @return 鑰冩牳璁″垎 + */ + @Override + public TExamineScore selectTExamineScoreById(Long id) + { + return tExamineScoreMapper.selectTExamineScoreById(id); + } + + /** + * 鏌ヨ鑰冩牳璁″垎鍒楄〃 + * + * @param tExamineScore 鑰冩牳璁″垎 + * @return 鑰冩牳璁″垎 + */ + @Override + public List<TExamineScoreVO> selectTExamineScoreList(TExamineScore tExamineScore) + { + + + return tExamineScoreMapper.selectTExamineScoreList(tExamineScore); + } + + /** + * 鏂板鑰冩牳璁″垎 + * + * @param tExamineScore 鑰冩牳璁″垎 + * @return 缁撴灉 + */ + @Override + public int insertTExamineScore(TExamineScore tExamineScore) + { + tExamineScore.setCreateTime(DateUtils.getNowDate()); + return tExamineScoreMapper.insertTExamineScore(tExamineScore); + } + + /** + * 淇敼鑰冩牳璁″垎 + * + * @param tExamineScore 鑰冩牳璁″垎 + * @return 缁撴灉 + */ + @Override + public int updateTExamineScore(TExamineScore tExamineScore) + { + return tExamineScoreMapper.updateTExamineScore(tExamineScore); + } + + /** + * 鎵归噺鍒犻櫎鑰冩牳璁″垎 + * + * @param ids 闇�瑕佸垹闄ょ殑鑰冩牳璁″垎涓婚敭 + * @return 缁撴灉 + */ + @Override + public int deleteTExamineScoreByIds(Long[] ids) + { + return tExamineScoreMapper.deleteTExamineScoreByIds(ids); + } + + /** + * 鍒犻櫎鑰冩牳璁″垎淇℃伅 + * + * @param id 鑰冩牳璁″垎涓婚敭 + * @return 缁撴灉 + */ + @Override + public int deleteTExamineScoreById(Long id) + { + return tExamineScoreMapper.deleteTExamineScoreById(id); + } +} diff --git a/ycl-server/src/main/java/com/ycl/system/controller/SysDeptController.java b/ycl-server/src/main/java/com/ycl/system/controller/SysDeptController.java index f374409..cf4ef4b 100644 --- a/ycl-server/src/main/java/com/ycl/system/controller/SysDeptController.java +++ b/ycl-server/src/main/java/com/ycl/system/controller/SysDeptController.java @@ -2,10 +2,12 @@ import annotation.Log; import com.ycl.system.AjaxResult; +import com.ycl.system.Result; import com.ycl.system.entity.SysDept; import com.ycl.system.service.ISysDeptService; import constant.UserConstants; import enumeration.BusinessType; +import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.ArrayUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; @@ -121,4 +123,9 @@ deptService.checkDeptDataScope(deptId); return toAjax(deptService.deleteDeptById(deptId)); } + @GetMapping("/all") + @ApiOperation(value = "涓嬫媺鍒楄〃", notes = "涓嬫媺鍒楄〃") + public Result all() { + return deptService.all(); + } } diff --git a/ycl-server/src/main/java/com/ycl/system/service/ISysDeptService.java b/ycl-server/src/main/java/com/ycl/system/service/ISysDeptService.java index e3eee79..93faea3 100644 --- a/ycl-server/src/main/java/com/ycl/system/service/ISysDeptService.java +++ b/ycl-server/src/main/java/com/ycl/system/service/ISysDeptService.java @@ -1,5 +1,6 @@ package com.ycl.system.service; +import com.ycl.system.Result; import com.ycl.system.domain.TreeSelect; import com.ycl.system.entity.SysDept; @@ -122,4 +123,9 @@ * @return 缁撴灉 */ public int deleteDeptById(Long deptId); + /** + * 鍒楄〃 + * @return + */ + Result all(); } diff --git a/ycl-server/src/main/java/com/ycl/system/service/impl/SysDeptServiceImpl.java b/ycl-server/src/main/java/com/ycl/system/service/impl/SysDeptServiceImpl.java index fddbc01..f7a6506 100644 --- a/ycl-server/src/main/java/com/ycl/system/service/impl/SysDeptServiceImpl.java +++ b/ycl-server/src/main/java/com/ycl/system/service/impl/SysDeptServiceImpl.java @@ -2,6 +2,8 @@ import annotation.DataScope; import com.ycl.exception.ServiceException; +import com.ycl.platform.base.BaseSelect; +import com.ycl.system.Result; import com.ycl.system.domain.TreeSelect; import com.ycl.system.entity.SysDept; import com.ycl.system.entity.SysRole; @@ -294,6 +296,18 @@ return deptMapper.deleteDeptById(deptId); } + @Override + public Result all() { + List<BaseSelect> vos = deptMapper.selectDeptList(new SysDept()).stream().map(sysDept -> { + BaseSelect baseSelect = new BaseSelect(); + baseSelect.setId(Integer.parseInt(sysDept.getDeptId() + "")); + baseSelect.setValue(sysDept.getDeptName()); + return baseSelect; + } + ).collect(Collectors.toList()); + return Result.ok().data(vos); + } + /** * 閫掑綊鍒楄〃 */ diff --git a/ycl-server/src/main/resources/mapper/zgyw/TExamineScoreMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/TExamineScoreMapper.xml new file mode 100644 index 0000000..a1b78bb --- /dev/null +++ b/ycl-server/src/main/resources/mapper/zgyw/TExamineScoreMapper.xml @@ -0,0 +1,87 @@ +<?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.ycl.platform.mapper.TExamineScoreMapper"> + + <resultMap type="com.ycl.platform.domain.entity.TExamineScore" id="TExamineScoreResult"> + <result property="id" column="id" /> + <result property="score" column="score" /> + <result property="unitId" column="unit_id" /> + <result property="examineId" column="examine_id" /> + <result property="operateCategory" column="operate_category" /> + <result property="scoreCategory" column="score_category" /> + <result property="createTime" column="create_time" /> + <result property="createBy" column="create_by" /> + </resultMap> + + <sql id="selectTExamineScoreVo"> + select id, score, unit_id, examine_id, operate_category, score_category, create_time, create_by from t_examine_score + </sql> + + <select id="selectTExamineScoreList" resultType="com.ycl.platform.domain.vo.TExamineScoreVO"> + select tes.id, tes.score, tyu.unit_name, tcp.examine_name, tes.operate_category, tes.score_category,tes.create_time, tes.create_by + from t_examine_score tes + left join t_check_publish tcp on tes.examine_id = tcp.id + left join t_yw_unit tyu on tes.unit_id = tyu.id + <where> + <if test="score != null "> and score = #{score}</if> + <if test="unitId != null "> and unit_id = #{unitId}</if> + <if test="examineId != null "> and examine_id = #{examineId}</if> + <if test="operateCategory != null "> and operate_category = #{operateCategory}</if> + <if test="scoreCategory != null "> and score_category = #{scoreCategory}</if> + </where> + </select> + + <select id="selectTExamineScoreById" parameterType="Long" resultMap="TExamineScoreResult"> + <include refid="selectTExamineScoreVo"/> + where id = #{id} + </select> + + <insert id="insertTExamineScore" useGeneratedKeys="true" keyProperty="id"> + insert into t_examine_score + <trim prefix="(" suffix=")" suffixOverrides=","> + <if test="score != null">score,</if> + <if test="unitId != null">unit_id,</if> + <if test="examineId != null">examine_id,</if> + <if test="operateCategory != null">operate_category,</if> + <if test="scoreCategory != null">score_category,</if> + <if test="createTime != null">create_time,</if> + <if test="createBy != null">create_by,</if> + </trim> + <trim prefix="values (" suffix=")" suffixOverrides=","> + <if test="score != null">#{score},</if> + <if test="unitId != null">#{unitId},</if> + <if test="examineId != null">#{examineId},</if> + <if test="operateCategory != null">#{operateCategory},</if> + <if test="scoreCategory != null">#{scoreCategory},</if> + <if test="createTime != null">#{createTime},</if> + <if test="createBy != null">#{createBy},</if> + </trim> + </insert> + + <update id="updateTExamineScore"> + update t_examine_score + <trim prefix="SET" suffixOverrides=","> + <if test="score != null">score = #{score},</if> + <if test="unitId != null">unit_id = #{unitId},</if> + <if test="examineId != null">examine_id = #{examineId},</if> + <if test="operateCategory != null">operate_category = #{operateCategory},</if> + <if test="scoreCategory != null">score_category = #{scoreCategory},</if> + <if test="createTime != null">create_time = #{createTime},</if> + <if test="createBy != null">create_by = #{createBy},</if> + </trim> + where id = #{id} + </update> + + <delete id="deleteTExamineScoreById" parameterType="Long"> + delete from t_examine_score where id = #{id} + </delete> + + <delete id="deleteTExamineScoreByIds" parameterType="String"> + delete from t_examine_score where id in + <foreach item="id" collection="array" open="(" separator="," close=")"> + #{id} + </foreach> + </delete> +</mapper> \ No newline at end of file -- Gitblit v1.8.0