diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualScore/controller/DepartCompTotalScoreController.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualScore/controller/DepartCompTotalScoreController.java new file mode 100644 index 000000000..620bded2f --- /dev/null +++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualScore/controller/DepartCompTotalScoreController.java @@ -0,0 +1,168 @@ +package org.jeecg.modules.demo.annualScore.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.base.controller.JeecgController; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.modules.demo.annualScore.entity.DepartCompTotalScore; +import org.jeecg.modules.demo.annualScore.service.IDepartCompTotalScoreService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.Arrays; + +/** + * @Description: 院系总积分 + * @Author: jeecg-boot + * @Date: 2023-11-02 + * @Version: V1.0 + */ +@Api(tags = "院系总积分") +@RestController +@RequestMapping("/annualScore/departCompTotalScore") +@Slf4j +public class DepartCompTotalScoreController extends JeecgController { + @Autowired + private IDepartCompTotalScoreService departCompTotalScoreService; + + @ApiOperation(value = "院系总积分-重新汇算", notes = "院系总积分-重新汇算") + @PostMapping(value = "/reCollectScore") + public Result reCollectScore(@RequestBody DepartCompTotalScore departCompTotalScore) { + log.info("院系总积分-重新汇算 params:{}--", departCompTotalScore); + departCompTotalScoreService.collectScore(departCompTotalScore); + return Result.OK("操作成功！"); + } + + /** + * 添加 + * + * @param departCompTotalScore + * @return + */ +// @AutoLog(value = "院系总积分-添加") + @ApiOperation(value = "院系总积分-汇总", notes = "院系总积分-汇总") + @PostMapping(value = "/add") + public Result add(@RequestBody DepartCompTotalScore departCompTotalScore) { + departCompTotalScoreService.collectScore(departCompTotalScore); + return Result.OK("添加成功！"); + } + + /** + * 分页列表查询 + * + * @param departCompTotalScore + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "院系总积分-分页列表查询") + @ApiOperation(value = "院系总积分-分页列表查询", notes = "院系总积分-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(DepartCompTotalScore departCompTotalScore, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(departCompTotalScore, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = departCompTotalScoreService.page(page, queryWrapper); + return Result.OK(pageList); + } + + + /** + * 编辑 + * + * @param departCompTotalScore + * @return + */ +// @AutoLog(value = "院系总积分-编辑") + @ApiOperation(value = "院系总积分-编辑", notes = "院系总积分-编辑") +// @RequiresPermissions("annualScore:depart_comp_total_score:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST}) + public Result edit(@RequestBody DepartCompTotalScore departCompTotalScore) { + departCompTotalScoreService.updateById(departCompTotalScore); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ +// @AutoLog(value = "院系总积分-通过id删除") + @ApiOperation(value = "院系总积分-通过id删除", notes = "院系总积分-通过id删除") +// @RequiresPermissions("annualScore:depart_comp_total_score:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name = "id", required = true) String id) { + departCompTotalScoreService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ +// @AutoLog(value = "院系总积分-批量删除") + @ApiOperation(value = "院系总积分-批量删除", notes = "院系总积分-批量删除") +// @RequiresPermissions("annualScore:depart_comp_total_score:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name = "ids", required = true) String ids) { + this.departCompTotalScoreService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "院系总积分-通过id查询") + @ApiOperation(value = "院系总积分-通过id查询", notes = "院系总积分-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name = "id", required = true) String id) { + DepartCompTotalScore departCompTotalScore = departCompTotalScoreService.getById(id); + if (departCompTotalScore == null) { + return Result.error("未找到对应数据"); + } + return Result.OK(departCompTotalScore); + } + + /** + * 导出excel + * + * @param request + * @param departCompTotalScore + */ +// @RequiresPermissions("annualScore:depart_comp_total_score:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, DepartCompTotalScore departCompTotalScore) { + return super.exportXls(request, departCompTotalScore, DepartCompTotalScore.class, "院系总积分"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ +// @RequiresPermissions("annualScore:depart_comp_total_score:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, DepartCompTotalScore.class); + } + +} diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualScore/entity/DepartCompTotalScore.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualScore/entity/DepartCompTotalScore.java new file mode 100644 index 000000000..34ed18d89 --- /dev/null +++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualScore/entity/DepartCompTotalScore.java @@ -0,0 +1,73 @@ +package org.jeecg.modules.demo.annualScore.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.TableLogic; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 院系总积分 + * @Author: jeecg-boot + * @Date: 2023-11-02 + * @Version: V1.0 + */ +@Data +@TableName("depart_comp_total_score") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="depart_comp_total_score对象", description="院系总积分") +public class DepartCompTotalScore implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private Date updateTime; + /**所属部门*/ + @Excel(name = "所属部门", width = 15, dictTable = "sys_depart", dicText = "depart_name", dicCode = "id") + @Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "id") + @ApiModelProperty(value = "所属部门") + private String depet; + /**年度*/ + @Excel(name = "年度", width = 15, dictTable = "annual", dicText = "annual_name", dicCode = "id") + @Dict(dictTable = "annual", dicText = "annual_name", dicCode = "id") + @ApiModelProperty(value = "年度") + private String annualId; + /**积分*/ + @Excel(name = "积分", width = 15) + @ApiModelProperty(value = "积分") + private Double score; + /**备注*/ + @Excel(name = "备注", width = 15) + @ApiModelProperty(value = "备注") + private String remark; +} diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualScore/mapper/DepartCompTotalScoreMapper.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualScore/mapper/DepartCompTotalScoreMapper.java new file mode 100644 index 000000000..1fedf1db1 --- /dev/null +++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualScore/mapper/DepartCompTotalScoreMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.demo.annualScore.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.demo.annualScore.entity.DepartCompTotalScore; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 院系总积分 + * @Author: jeecg-boot + * @Date: 2023-11-02 + * @Version: V1.0 + */ +public interface DepartCompTotalScoreMapper extends BaseMapper { + +} diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualScore/mapper/xml/DepartCompTotalScoreMapper.xml b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualScore/mapper/xml/DepartCompTotalScoreMapper.xml new file mode 100644 index 000000000..a91cd5b4e --- /dev/null +++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualScore/mapper/xml/DepartCompTotalScoreMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualScore/service/IDepartCompTotalScoreService.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualScore/service/IDepartCompTotalScoreService.java new file mode 100644 index 000000000..ab1f1273e --- /dev/null +++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualScore/service/IDepartCompTotalScoreService.java @@ -0,0 +1,16 @@ +package org.jeecg.modules.demo.annualScore.service; + +import org.jeecg.modules.demo.annualScore.entity.DepartCompTotalScore; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 院系总积分 + * @Author: jeecg-boot + * @Date: 2023-11-02 + * @Version: V1.0 + */ +public interface IDepartCompTotalScoreService extends IService { + + void collectScore(DepartCompTotalScore departCompTotalScore); + +} diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualScore/service/impl/DepartCompTotalScoreServiceImpl.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualScore/service/impl/DepartCompTotalScoreServiceImpl.java new file mode 100644 index 000000000..b60e7a7b0 --- /dev/null +++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualScore/service/impl/DepartCompTotalScoreServiceImpl.java @@ -0,0 +1,64 @@ +package org.jeecg.modules.demo.annualScore.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import org.apache.commons.lang3.StringUtils; +import org.jeecg.modules.demo.annualScore.entity.DepartCompTotalScore; +import org.jeecg.modules.demo.annualScore.entity.PersonalCompScore; +import org.jeecg.modules.demo.annualScore.mapper.DepartCompTotalScoreMapper; +import org.jeecg.modules.demo.annualScore.service.IDepartCompTotalScoreService; +import org.jeecg.modules.demo.annualScore.service.IPersonalCompScoreService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.util.ObjectUtils; + +import java.util.Date; +import java.util.List; + +/** + * @Description: 院系总积分 + * @Author: jeecg-boot + * @Date: 2023-11-02 + * @Version: V1.0 + */ +@Service +public class DepartCompTotalScoreServiceImpl extends ServiceImpl implements IDepartCompTotalScoreService { + + @Autowired + private IPersonalCompScoreService iPersonalCompScoreService; + + /** + * @description: 根据院系和年度，统计个人比赛积分表数据 + * @param: [departCompTotalScore] + * @return: void + * @author: z.h.c + * @date: 23/11/2 15:45 + */ + @Override + public void collectScore(DepartCompTotalScore departCompTotalScore) { + + List personalCompScoreList = iPersonalCompScoreService.list(new LambdaQueryWrapper() + .eq(PersonalCompScore::getAnnualId, departCompTotalScore.getAnnualId()) + .eq(PersonalCompScore::getDepet, departCompTotalScore.getDepet())); + + double totalScore = 0; + if (ObjectUtils.isEmpty(personalCompScoreList)) { + totalScore = 0; + } else { + totalScore = personalCompScoreList.stream().mapToDouble(PersonalCompScore::getScore).sum(); + } + departCompTotalScore.setScore(totalScore); + + //id不为空，院系的某一年度已汇总过，重新汇算 + if (StringUtils.isNotEmpty(departCompTotalScore.getId())) { + departCompTotalScore.setUpdateTime(new Date()); + this.updateById(departCompTotalScore); + } else { + //首次汇总 + departCompTotalScore.setCreateTime(new Date()); + this.save(departCompTotalScore); + } + + } +} diff --git a/jeecgboot-vue3-master/src/views/annualScore/departCompTotalScore/DepartCompTotalScore.api.ts b/jeecgboot-vue3-master/src/views/annualScore/departCompTotalScore/DepartCompTotalScore.api.ts new file mode 100644 index 000000000..8af1e96d5 --- /dev/null +++ b/jeecgboot-vue3-master/src/views/annualScore/departCompTotalScore/DepartCompTotalScore.api.ts @@ -0,0 +1,81 @@ +import {defHttp} from '/@/utils/http/axios'; +import { useMessage } from "/@/hooks/web/useMessage"; + +const { createConfirm } = useMessage(); + +enum Api { + list = '/annualScore/departCompTotalScore/list', + save='/annualScore/departCompTotalScore/add', + edit='/annualScore/departCompTotalScore/edit', + deleteOne = '/annualScore/departCompTotalScore/delete', + deleteBatch = '/annualScore/departCompTotalScore/deleteBatch', + importExcel = '/annualScore/departCompTotalScore/importExcel', + exportXls = '/annualScore/departCompTotalScore/exportXls', + reCollectScore = '/annualScore/departCompTotalScore/reCollectScore', +} +/** + * 导出api + * @param params + */ +export const getExportUrl = Api.exportXls; +/** + * 导入api + */ +export const getImportUrl = Api.importExcel; +/** + * 列表接口 + * @param params + */ +export const list = (params) => + defHttp.get({url: Api.list, params}); + +/** + * 删除单个 + */ +export const deleteOne = (params,handleSuccess) => { + return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); +} +/** + * 批量删除 + * @param params + */ +export const batchDelete = (params, handleSuccess) => { + createConfirm({ + iconType: 'warning', + title: '确认删除', + content: '是否删除选中数据', + okText: '确认', + cancelText: '取消', + onOk: () => { + return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); + } + }); +} +/** + * 保存或者更新 + * @param params + */ +export const saveOrUpdate = (params, isUpdate) => { + let url = isUpdate ? Api.edit : Api.save; + return defHttp.post({url: url, params}); +} + +// 院系总积分 重新汇总 +export const reCollectScore = (params,handleSuccess) => { + createConfirm({ + iconType: 'warning', + title: '确认操作', + content: '确认发送请求吗', + okText: '确认', + cancelText: '取消', + onOk: () => { + return defHttp.post({url: Api.reCollectScore,params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); + } + }); +} diff --git a/jeecgboot-vue3-master/src/views/annualScore/departCompTotalScore/DepartCompTotalScore.data.ts b/jeecgboot-vue3-master/src/views/annualScore/departCompTotalScore/DepartCompTotalScore.data.ts new file mode 100644 index 000000000..48b3b3f4d --- /dev/null +++ b/jeecgboot-vue3-master/src/views/annualScore/departCompTotalScore/DepartCompTotalScore.data.ts @@ -0,0 +1,115 @@ +import {BasicColumn} from '/@/components/Table'; +import {FormSchema} from '/@/components/Table'; +import { rules} from '/@/utils/helper/validator'; +import { render } from '/@/utils/common/renderUtils'; +//列表数据 +export const columns: BasicColumn[] = [ + { + title: '所属部门', + align:"center", + dataIndex: 'depet_dictText' + }, + { + title: '年度', + align:"center", + dataIndex: 'annualId_dictText' + }, + { + title: '积分', + align:"center", + dataIndex: 'score' + }, + { + title: '汇总时间', + align:"center", + dataIndex: 'createTime' + }, + { + title: '更新时间', + align:"center", + dataIndex: 'updateTime' + }, + { + title: '备注', + align:"center", + dataIndex: 'remark' + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ + { + label: "所属部门", + field: 'depet', + component: 'JDictSelectTag', + componentProps:{ + dictCode:"sys_depart,depart_name,id" + }, + colProps: {span: 6}, + }, + { + label: "年度", + field: 'annualId', + component: 'JDictSelectTag', + componentProps:{ + dictCode:"annual,annual_name,id" + }, + colProps: {span: 6}, + }, +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '所属部门', + field: 'depet', + component: 'JDictSelectTag', + componentProps:{ + dictCode:"sys_depart,depart_name,id" + }, + dynamicRules: ({model,schema}) => { + return [ + { required: true, message: '请输入所属部门!'}, + ]; + }, + }, + { + label: '年度', + field: 'annualId', + component: 'JDictSelectTag', + componentProps:{ + dictCode:"annual,annual_name,id" + }, + dynamicRules: ({model,schema}) => { + return [ + { required: true, message: '请输入年度!'}, + ]; + }, + }, + // { + // label: '积分', + // field: 'score', + // component: 'InputNumber', + // }, + { + label: '备注', + field: 'remark', + component: 'Input', + }, + // TODO 主键隐藏字段，目前写死为ID + { + label: '', + field: 'id', + component: 'Input', + show: false + }, +]; + + + +/** + * 流程表单调用这个方法获取formSchema + * @param param + */ +export function getBpmFormSchema(_formData): FormSchema[]{ + // 默认和原始表单保持一致 如果流程中配置了权限数据，这里需要单独处理formSchema + return formSchema; +} diff --git a/jeecgboot-vue3-master/src/views/annualScore/departCompTotalScore/DepartCompTotalScoreList.vue b/jeecgboot-vue3-master/src/views/annualScore/departCompTotalScore/DepartCompTotalScoreList.vue new file mode 100644 index 000000000..6b0078d75 --- /dev/null +++ b/jeecgboot-vue3-master/src/views/annualScore/departCompTotalScore/DepartCompTotalScoreList.vue @@ -0,0 +1,186 @@ + + + + + diff --git a/jeecgboot-vue3-master/src/views/annualScore/departCompTotalScore/components/DepartCompTotalScoreForm.vue b/jeecgboot-vue3-master/src/views/annualScore/departCompTotalScore/components/DepartCompTotalScoreForm.vue new file mode 100644 index 000000000..37feadd36 --- /dev/null +++ b/jeecgboot-vue3-master/src/views/annualScore/departCompTotalScore/components/DepartCompTotalScoreForm.vue @@ -0,0 +1,70 @@ + + + \ No newline at end of file diff --git a/jeecgboot-vue3-master/src/views/annualScore/departCompTotalScore/components/DepartCompTotalScoreModal.vue b/jeecgboot-vue3-master/src/views/annualScore/departCompTotalScore/components/DepartCompTotalScoreModal.vue new file mode 100644 index 000000000..714084849 --- /dev/null +++ b/jeecgboot-vue3-master/src/views/annualScore/departCompTotalScore/components/DepartCompTotalScoreModal.vue @@ -0,0 +1,66 @@ + + + + + \ No newline at end of file