From 1d50bf8157577f40558f37006b27a6113bd169a8 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Sat, 7 Sep 2024 16:15:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/jeecg/modules/demo/sync/SyncZyxx.java | 12 +- .../controller/ZyInfoController.java | 65 ++ .../modules/demo/zyHuizong/entity/ZyInfo.java | 218 +++++++ .../demo/zyHuizong/mapper/ZyInfoMapper.java | 15 + .../zyHuizong/mapper/xml/ZyInfoMapper.xml | 5 + .../demo/zyHuizong/service/ZyInfoService.java | 15 + .../service/impl/ZyInfoServiceImpl.java | 23 + .../bl/xxhbjwxtxsmd/XxhbjwxtxsmdList2.vue | 11 +- .../zyHuizong/components/ZyInfoDetailForm.vue | 602 +++++++++++------- .../zyHuizongXiangxi/ZyHuizongXiangxi.data.ts | 4 + .../ZyHuizongXiangxiList2.vue | 16 + 11 files changed, 741 insertions(+), 245 deletions(-) create mode 100644 jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zyHuizong/controller/ZyInfoController.java create mode 100644 jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zyHuizong/entity/ZyInfo.java create mode 100644 jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zyHuizong/mapper/ZyInfoMapper.java create mode 100644 jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zyHuizong/mapper/xml/ZyInfoMapper.xml create mode 100644 jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zyHuizong/service/ZyInfoService.java create mode 100644 jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zyHuizong/service/impl/ZyInfoServiceImpl.java diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/sync/SyncZyxx.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/sync/SyncZyxx.java index 721f459..cf75bfe 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/sync/SyncZyxx.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/sync/SyncZyxx.java @@ -106,16 +106,16 @@ public class SyncZyxx extends BaseSync { //保存到胃 try { - QueryWrapper dqw = new QueryWrapper(); - zyHuizongService.remove(dqw); +// QueryWrapper dqw = new QueryWrapper(); +// zyHuizongService.remove(dqw); zyHuizongService.syncList(outDataList); - QueryWrapper dqw1 = new QueryWrapper(); - zyHuizongXiangxiService.remove(dqw1); +// QueryWrapper dqw1 = new QueryWrapper(); +// zyHuizongXiangxiService.remove(dqw1); zyHuizongXiangxiService.syncList(out1DataList); - QueryWrapper dqw2 = new QueryWrapper(); - zyInfoScjlService.remove(dqw2); +// QueryWrapper dqw2 = new QueryWrapper(); +// zyInfoScjlService.remove(dqw2); zyInfoScjlService.syncList(out2DataList); }catch (Exception e){ e.printStackTrace(); diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zyHuizong/controller/ZyInfoController.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zyHuizong/controller/ZyInfoController.java new file mode 100644 index 0000000..8c59217 --- /dev/null +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zyHuizong/controller/ZyInfoController.java @@ -0,0 +1,65 @@ +package org.jeecg.modules.demo.zyHuizong.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.apache.commons.lang.StringUtils; +import org.apache.shiro.SecurityUtils; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.aspect.annotation.AutoLog; +import org.jeecg.common.system.base.controller.JeecgController; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.system.vo.LoginUser; +import org.jeecg.modules.demo.zjSqxx.entity.ZjSqxx; +import org.jeecg.modules.demo.zjSqxx.service.IZjSqxxService; +import org.jeecg.modules.demo.zyHuizong.entity.ZyHuizong; +import org.jeecg.modules.demo.zyHuizong.entity.ZyInfo; +import org.jeecg.modules.demo.zyHuizong.service.IZyHuizongService; +import org.jeecg.modules.demo.zyHuizong.service.ZyInfoService; +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; +import java.util.Date; + +/** +* @Description: 作业汇总 +* @Author: jeecg-boot +* @Date: 2024-09-03 +* @Version: V1.0 +*/ +@Api(tags="作业汇总") +@RestController +@RequestMapping("/zyInfo/zyInfo") +@Slf4j +public class ZyInfoController extends JeecgController { + @Autowired + private ZyInfoService zyInfoService; + + /** + /** + * 通过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) { + ZyInfo zyHuizong = zyInfoService.getById(id); + if(zyHuizong==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(zyHuizong); + } + + +} diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zyHuizong/entity/ZyInfo.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zyHuizong/entity/ZyInfo.java new file mode 100644 index 0000000..836f025 --- /dev/null +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zyHuizong/entity/ZyInfo.java @@ -0,0 +1,218 @@ +package org.jeecg.modules.demo.zyHuizong.entity; + +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 lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.jeecg.common.aspect.annotation.Dict; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.util.Date; + +/** + * @Description: 作业发布 + * @Author: jeecg-boot + * @Date: 2024-05-06 + * @Version: V1.0 + */ +@Data +@TableName("zy_info") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="zy_info对象", description="作业发布") +public class ZyInfo implements Serializable { + private static final long serialVersionUID = 1L; + + /**id*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "id") + private String id; + /**createBy*/ + @ApiModelProperty(value = "createBy") + private String createBy; + /**createTime*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "createTime") + private Date createTime; + /**updateBy*/ + @ApiModelProperty(value = "updateBy") + private String updateBy; + /**updateTime*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "updateTime") + private Date updateTime; + /**作业名称*/ + @Excel(name = "作业名称", width = 15) + @ApiModelProperty(value = "作业名称") + private String title; + /**类型*/ + @Excel(name = "类型", width = 15, dicCode = "zy_type") + @Dict(dicCode = "zy_type") + @ApiModelProperty(value = "类型") + private String zyType; + /**描述*/ + @Excel(name = "描述", width = 15) + @ApiModelProperty(value = "描述") + private String content; + /**开始时间*/ + @Excel(name = "开始时间", width = 15, format = "yyyy-MM-dd HH:mm") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm") + @ApiModelProperty(value = "开始时间") + private Date startTime; + /**结束时间*/ + @Excel(name = "结束时间", width = 15, format = "yyyy-MM-dd HH:mm") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm") + @ApiModelProperty(value = "结束时间") + private Date endTime; + /**状态*/ + @Excel(name = "状态", width = 15) + @ApiModelProperty(value = "状态") + @Dict(dicCode = "zy_status") + private String zyStatus; + /**学年学期*/ + @Excel(name = "学年学期", width = 15) + @ApiModelProperty(value = "学年学期") + private String xnxq; + /**外网是否查重*/ + @Excel(name = "外网是否查重", width = 15, dicCode = "yn") + @Dict(dicCode = "yn") + @ApiModelProperty(value = "外网是否查重") + private String wwcc; + /**外网通过率*/ + @Excel(name = "外网通过率", width = 15) + @ApiModelProperty(value = "外网通过率") + private Double wwtgl; + /**内网查重*/ + @Excel(name = "内网查重", width = 15, dicCode = "yn") + @Dict(dicCode = "yn") + @ApiModelProperty(value = "内网查重") + private String nwcc; + /**内网通过率*/ + @Excel(name = "内网通过率", width = 15) + @ApiModelProperty(value = "内网通过率") + private Double nwtgl; + /**aigc查重*/ + @Excel(name = "aigc查重", width = 15, dicCode = "yn") + @Dict(dicCode = "yn") + @ApiModelProperty(value = "aigc查重") + private String aigccc; + /**aigc通过率*/ + @Excel(name = "aigc通过率", width = 15) + @ApiModelProperty(value = "aigc通过率") + private Double aigctgl; + /**校内查重*/ + @Excel(name = "校内查重", width = 15, dicCode = "yn") + @Dict(dicCode = "yn") + @ApiModelProperty(value = "校内查重") + private String xncc; + /**校内通过率*/ + @Excel(name = "校内通过率", width = 15) + @ApiModelProperty(value = "校内通过率") + private Double xntgl; + //作业分值 + private String score; + + private String rwbh; + private String filePath; + private String xkxs;//选课学生 + + private String kcnr;//考察内容（多选） + private String pfbz;//评分标准 + private String sturead;//评分标准是否允许学生查看 + private Integer sort;//序号 + private String xshpkg;//学生互评开关 + private String xshprsq;//学生互评人数 + private String zyLeixing;//作业类型 0课程作业 1期末作业 + + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm") + private Date xshpkssj;//学生互评开始时间 + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm") + private Date xshpjssj;//学生互评结束时间 + private String sfzzcj;//是否最终成绩（1是 0否） + private String xssfck;//学生是否查看（1是 0否） + private String hpsfwcone;//第1次互评是否完成（1是 0否） + private String hpsfwctwo;//第2次互评是否完成（1是 0否） + private String sfcc;//是否查重（0不查重 1查重） + private String sfsckhcl;//是否上传考核材料（0否 1是） + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm") + private Date sfsckhclTime;//上传考核材料时间 + + + @TableField(exist = false) + private String sflssj;//是否历史数据 + + @TableField(exist = false) + private String stuId; + @TableField(exist = false) + private String stuFilePath; + @TableField(exist = false) + private String stuPdfPath; + @TableField(exist = false) + private String wtjnum; + @TableField(exist = false) + private String ytjnum; + @TableField(exist = false) + private String wpynum; + @TableField(exist = false) + private String ypynum; + @TableField(exist = false) + private String wwxsl; + @TableField(exist = false) + private String nwxsl; + @TableField(exist = false) + private String aigcxsl; + @TableField(exist = false) + private String xnxsl; + @TableField(exist = false) + private String teano; + + @TableField(exist = false) + private String kcmc; + @TableField(exist = false) + private String skjs; + @TableField(exist = false) + private String stuscore; + + @TableField(exist = false) + private String wwsftg; + @TableField(exist = false) + private String nwsftg; + @TableField(exist = false) + private String aigcsftg; + @TableField(exist = false) + private String xnsftg; + @TableField(exist = false) + private String zzdf; + @TableField(exist = false) + private String xshpfs; + @TableField(exist = false) + private String jxfs; + @TableField(exist = false) + private String dpynum; + @TableField(exist = false) + private String zgccl; + @TableField(exist = false) + private String zyzb; + @TableField(exist = false) + private String scoreFabu; + @TableField(exist = false) + private String pyContent; + @TableField(exist = false) + private String pyFilePath; + +} diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zyHuizong/mapper/ZyInfoMapper.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zyHuizong/mapper/ZyInfoMapper.java new file mode 100644 index 0000000..386cd2d --- /dev/null +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zyHuizong/mapper/ZyInfoMapper.java @@ -0,0 +1,15 @@ +package org.jeecg.modules.demo.zyHuizong.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.jeecg.modules.demo.zyHuizong.entity.Vkczxzy0001; +import org.jeecg.modules.demo.zyHuizong.entity.ZyInfo; + +/** + * @Description: 作业汇总 + * @Author: jeecg-boot + * @Date: 2024-09-03 + * @Version: V1.0 + */ +public interface ZyInfoMapper extends BaseMapper { + +} diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zyHuizong/mapper/xml/ZyInfoMapper.xml b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zyHuizong/mapper/xml/ZyInfoMapper.xml new file mode 100644 index 0000000..683dd15 --- /dev/null +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zyHuizong/mapper/xml/ZyInfoMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zyHuizong/service/ZyInfoService.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zyHuizong/service/ZyInfoService.java new file mode 100644 index 0000000..bc3abdc --- /dev/null +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zyHuizong/service/ZyInfoService.java @@ -0,0 +1,15 @@ +package org.jeecg.modules.demo.zyHuizong.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.modules.demo.zyHuizong.entity.Vkczxzy0001; +import org.jeecg.modules.demo.zyHuizong.entity.ZyInfo; + +/** + * @Description: 作业汇总 + * @Author: jeecg-boot + * @Date: 2024-09-03 + * @Version: V1.0 + */ +public interface ZyInfoService extends IService { + +} diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zyHuizong/service/impl/ZyInfoServiceImpl.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zyHuizong/service/impl/ZyInfoServiceImpl.java new file mode 100644 index 0000000..36bd18f --- /dev/null +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zyHuizong/service/impl/ZyInfoServiceImpl.java @@ -0,0 +1,23 @@ +package org.jeecg.modules.demo.zyHuizong.service.impl; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.jeecg.modules.demo.zyHuizong.entity.Vkczxzy0001; +import org.jeecg.modules.demo.zyHuizong.entity.ZyInfo; +import org.jeecg.modules.demo.zyHuizong.mapper.Vkczxzy0001Mapper; +import org.jeecg.modules.demo.zyHuizong.mapper.ZyInfoMapper; +import org.jeecg.modules.demo.zyHuizong.service.Vkczxzy0001Service; +import org.jeecg.modules.demo.zyHuizong.service.ZyInfoService; +import org.springframework.stereotype.Service; + +/** + * @Description: 作业汇总 + * @Author: jeecg-boot + * @Date: 2024-09-03 + * @Version: V1.0 + */ +@Service +@DS("multi-datasource1") +public class ZyInfoServiceImpl extends ServiceImpl implements ZyInfoService { + +} diff --git a/jeecgboot-vue3/src/views/bl/xxhbjwxtxsmd/XxhbjwxtxsmdList2.vue b/jeecgboot-vue3/src/views/bl/xxhbjwxtxsmd/XxhbjwxtxsmdList2.vue index 69c2c95..edda503 100644 --- a/jeecgboot-vue3/src/views/bl/xxhbjwxtxsmd/XxhbjwxtxsmdList2.vue +++ b/jeecgboot-vue3/src/views/bl/xxhbjwxtxsmd/XxhbjwxtxsmdList2.vue @@ -5,19 +5,12 @@
-
- 模板下载： - 课程考核合理性评价单 - 成绩单 - 课程目标达成评价报告 - 专家用评价表 -
{{jxrwInfo?.value.xn}}{{jxrwInfo?.value.xqmc}}学期《{{jxrwInfo?.value.kcmc}}》课程考核材料
-
概要信息
- +
概要信息
+ 开课单位 ：{{jxrwInfo?.value.kkyxmc}} diff --git a/jeecgboot-vue3/src/views/bl/zyHuizong/components/ZyInfoDetailForm.vue b/jeecgboot-vue3/src/views/bl/zyHuizong/components/ZyInfoDetailForm.vue index 6f93ac8..ba9c207 100644 --- a/jeecgboot-vue3/src/views/bl/zyHuizong/components/ZyInfoDetailForm.vue +++ b/jeecgboot-vue3/src/views/bl/zyHuizong/components/ZyInfoDetailForm.vue @@ -1,106 +1,112 @@