Merge remote-tracking branch 'origin/tsg' into tsg

src/main/java/com/gunshi/project/xyt/controller/PersonnelPlanController.java

@@ -1,6 +1,8 @@
 package com.gunshi.project.xyt.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gunshi.core.result.R;
@@ -114,7 +116,7 @@ public class PersonnelPlanController extends AbstractCommonFileController{
     @Operation(summary = "分页")
     @PostMapping("/page")
     public R<Page<PersonnelPlan>> page(@RequestBody @Validated PersonnelPlanPage page) {
-        LambdaQueryChainWrapper<PersonnelPlan> query = service.lambdaQuery();
+        LambdaQueryWrapper<PersonnelPlan> query = Wrappers.lambdaQuery();
 
         Date stm = page.getStm();
         if (Objects.nonNull(stm)){

src/main/java/com/gunshi/project/xyt/controller/PersonnelPlanLogController.java

@@ -1,7 +1,9 @@
 package com.gunshi.project.xyt.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.Maps;
@@ -10,6 +12,7 @@ import com.gunshi.project.xyt.entity.so.PersonnelPlanLogPage;
 import com.gunshi.project.xyt.entity.vo.PersonnelPlanLogStatisticsVo;
 import com.gunshi.project.xyt.model.PersonnelPlan;
 import com.gunshi.project.xyt.model.PersonnelPlanLog;
+import com.gunshi.project.xyt.service.FileAssociationsService;
 import com.gunshi.project.xyt.service.PersonnelPlanLogService;
 import com.gunshi.project.xyt.service.PersonnelPlanService;
 import com.gunshi.project.xyt.util.DateUtil;
@@ -37,7 +40,7 @@ import java.util.*;
 @Tag(name = "培训记录表")
 @RestController
 @RequestMapping(value = "/personnelPlanLog")
-public class PersonnelPlanLogController {
+public class PersonnelPlanLogController extends AbstractCommonFileController{
 
 
     @Autowired
@@ -47,6 +50,10 @@ public class PersonnelPlanLogController {
     @Autowired
     private PersonnelPlanService planService;
 
+
+    @Autowired
+    private FileAssociationsService fileService;
+
     @Operation(summary = "新增")
     @PostMapping("/insert")
     public R<PersonnelPlanLog> insert(@Validated(Insert.class) @RequestBody PersonnelPlanLog dto) {
@@ -67,6 +74,11 @@ public class PersonnelPlanLogController {
         }
         dto.setId(IdWorker.getId());
         boolean result = service.save(dto);
+
+        if (result){
+            fileService.saveFile(dto.getFiles1(), getGroupId(1), String.valueOf( dto.getId()));
+            fileService.saveFile(dto.getFiles2(), getGroupId(2), String.valueOf( dto.getId()));
+        }
         return R.ok(result ? dto : null);
     }
 
@@ -88,6 +100,10 @@ public class PersonnelPlanLogController {
             throw new IllegalArgumentException("培训计划不存在");
         }
         boolean result = service.updateById(dto);
+        if (result){
+            fileService.saveFile(dto.getFiles1(), getGroupId(1), String.valueOf( dto.getId()));
+            fileService.saveFile(dto.getFiles2(), getGroupId(2), String.valueOf( dto.getId()));
+        }
         return R.ok(result ? dto : null);
     }
 
@@ -97,6 +113,18 @@ public class PersonnelPlanLogController {
     public R<Boolean> del(@Schema(name = "id") @PathVariable("id") Serializable id) {
         return R.ok(service.removeById(id));
     }
+    @Operation(summary = "获取详情(包括文件信息)")
+    @GetMapping("/get/{id}")
+    public R<PersonnelPlanLog> get(@Schema(name = "id") @PathVariable("id") Serializable id) {
+        PersonnelPlanLog o = service.getById(id);
+        if (Objects.isNull(o)) {
+            throw new IllegalArgumentException("当前数据不存在");
+        }
+
+        o.setFiles1(fileService.getFiles(getGroupId(1),String.valueOf(o.getId())));
+        o.setFiles2(fileService.getFiles(getGroupId(2),String.valueOf(o.getId())));
+        return R.ok(o);
+    }
 
     @Operation(summary = "列表")
     @PostMapping("/list")
@@ -200,7 +228,7 @@ public class PersonnelPlanLogController {
     @Operation(summary = "分页")
     @PostMapping("/page")
     public R<Page<PersonnelPlanLog>> page(@RequestBody @Validated PersonnelPlanLogPage page) {
-        LambdaQueryChainWrapper<PersonnelPlanLog> query = service.lambdaQuery();
+        LambdaQueryWrapper<PersonnelPlanLog> query = Wrappers.lambdaQuery();
 
         Date stm = page.getStm();
         if (Objects.nonNull(stm)) {
@@ -230,4 +258,11 @@ public class PersonnelPlanLogController {
         return R.ok(service.page(page.getPageSo().toPage(), query));
     }
 
+    @Override
+    public String getGroupId() {
+        return "personnelPlanLog";
+    }
+    public String getGroupId(int num) {
+        return "personnelPlanLog" + num;
+    }
 }

src/main/java/com/gunshi/project/xyt/controller/ResPersonController.java

@@ -1,6 +1,8 @@
 package com.gunshi.project.xyt.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gunshi.core.result.R;
@@ -84,7 +86,7 @@ public class ResPersonController {
     @Operation(summary = "分页")
     @PostMapping("/page")
     public R<Page<ResPerson>> page(@RequestBody @Validated ResPersonPage page) {
-        LambdaQueryChainWrapper<ResPerson> query = service.lambdaQuery();
+        LambdaQueryWrapper<ResPerson> query = Wrappers.lambdaQuery();
         Integer type = page.getType();
         if (Objects.nonNull(type)){
             query.eq(ResPerson::getType, type);

src/main/java/com/gunshi/project/xyt/controller/SysDepartController.java

@@ -39,7 +39,7 @@
 //    @PostMapping("/insert")
 //    public R<SysDepart> insert(@Validated(Insert.class) @RequestBody SysDepart dto) {
 //
-//        LambdaQueryChainWrapper<SysDepart> query = service.lambdaQuery()
+//        LambdaQueryChainWrapper<SysDepart> query = Wrappers.lambdaQuery()
 //                .eq(SysDepart::getName, dto.getName());
 //        if (Objects.nonNull(dto.getPid())){
 //            query.eq(SysDepart::getPid, dto.getPid());
@@ -58,7 +58,7 @@
 //    @PostMapping("/update")
 //    public R<SysDepart> update(@Validated(Update.class) @RequestBody SysDepart dto) {
 //
-//        LambdaQueryChainWrapper<SysDepart> query = service.lambdaQuery()
+//        LambdaQueryChainWrapper<SysDepart> query = Wrappers.lambdaQuery()
 //                .ne(SysDepart::getId, dto.getId())
 //                .eq(SysDepart::getName, dto.getName());
 //        if (Objects.nonNull(dto.getPid())){

src/main/java/com/gunshi/project/xyt/controller/SzCaseController.java

@@ -1,6 +1,8 @@
 package com.gunshi.project.xyt.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.Maps;
@@ -113,7 +115,7 @@ public class SzCaseController extends AbstractCommonFileController{
     @Operation(summary = "分页")
     @PostMapping("/page")
     public R<Page<SzCase>> page(@RequestBody @Validated SzCasePage page) {
-        LambdaQueryChainWrapper<SzCase> query = service.lambdaQuery();
+        LambdaQueryWrapper<SzCase> query = Wrappers.lambdaQuery();
 
         if (Objects.nonNull(page.getCaseType())){
             query.eq(SzCase::getCaseType, page.getCaseType());

src/main/java/com/gunshi/project/xyt/controller/SzRegulatoryFrameworkController.java

@@ -1,7 +1,8 @@
 package com.gunshi.project.xyt.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
-import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gunshi.core.result.R;
 import com.gunshi.project.xyt.entity.so.SzRegulatoryFrameworkPage;
@@ -93,7 +94,7 @@ public class SzRegulatoryFrameworkController extends AbstractCommonFileControlle
     @Operation(summary = "分页")
     @PostMapping("/page")
     public R<Page<SzRegulatoryFramework>> page(@RequestBody @Validated SzRegulatoryFrameworkPage page) {
-        LambdaQueryChainWrapper<SzRegulatoryFramework> query = service.lambdaQuery();
+        LambdaQueryWrapper<SzRegulatoryFramework> query = Wrappers.lambdaQuery();
 
         if (Objects.nonNull(page.getType())) {
             query.eq(SzRegulatoryFramework::getType, page.getType());

src/main/java/com/gunshi/project/xyt/controller/SzRuleByLawController.java

@@ -1,7 +1,8 @@
 package com.gunshi.project.xyt.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
-import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gunshi.core.result.R;
 import com.gunshi.project.xyt.entity.so.SzRuleByLawPage;
@@ -96,7 +97,7 @@ public class SzRuleByLawController extends AbstractCommonFileController {
     @Operation(summary = "分页")
     @PostMapping("/page")
     public R<Page<SzRuleByLaw>> page(@RequestBody @Validated SzRuleByLawPage page) {
-        LambdaQueryChainWrapper<SzRuleByLaw> query = service.lambdaQuery();
+        LambdaQueryWrapper<SzRuleByLaw> query = Wrappers.lambdaQuery();
 
         if (Objects.nonNull(page.getType())) {
             query.eq(SzRuleByLaw::getType, page.getType());

src/main/java/com/gunshi/project/xyt/model/CommCreate.java

@@ -0,0 +1,50 @@
+package com.gunshi.project.xyt.model;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.gunshi.core.dateformat.DateFormatString;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.Size;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * Description:
+ * Created by XuSan on 2024/9/25.
+ *
+ * @author XuSan
+ * @version 1.0
+ */
+@Schema(description="新增公共模型")
+@Data
+public class CommCreate {
+
+
+    /**
+     * 创建人Id
+     */
+    @TableField(value="create_by")
+    @Schema(description="填报人Id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long createBy;
+
+    /**
+     * 创建人名字
+     */
+    @TableField(value="create_name")
+    @Schema(description="填报人名字")
+    @Size(max = 30,message = "填报人名字最大长度要小于 30")
+    private String createName;
+
+    /**
+     * 创建人时间
+     */
+    @Schema(description="填报时间 格式：" + DateFormatString.YYYY_MM_DD_HH_MM_SS)
+    @TableField(value="create_time")
+    @JsonFormat(pattern = DateFormatString.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8")
+    private Date createTime;
+
+}

src/main/java/com/gunshi/project/xyt/model/CommUpdate.java

@@ -0,0 +1,52 @@
+package com.gunshi.project.xyt.model;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.gunshi.core.dateformat.DateFormatString;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.Size;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * Description:
+ * Created by XuSan on 2024/9/25.
+ *
+ * @author XuSan
+ * @version 1.0
+ */
+@EqualsAndHashCode(callSuper = true)
+@Schema(description="修改公共模型")
+@Data
+public class CommUpdate extends CommCreate{
+
+
+    /**
+     * 更新人Id
+     */
+    @TableField(value="update_by")
+    @Schema(description="更新人Id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long updateBy;
+
+    /**
+     * 更新人名字
+     */
+    @TableField(value="update_name")
+    @Schema(description="更新人名字")
+    @Size(max = 30,message = "更新人名字最大长度要小于 30")
+    private String updateName;
+
+    /**
+     * 更新时间
+     */
+    @Schema(description="更新时间 格式：" + DateFormatString.YYYY_MM_DD_HH_MM_SS)
+    @TableField(value="update_time")
+    @JsonFormat(pattern = DateFormatString.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8")
+    private Date updateTime;
+
+}

src/main/java/com/gunshi/project/xyt/model/PersonnelPlanLog.java

@@ -162,8 +162,11 @@ public class PersonnelPlanLog implements Serializable {
     @TableField(value="reg_date")
     private Date regDate;
 
+    @TableField(exist = false)
+    @Schema(description = "签到培训表")
+    private List<FileAssociations> files1;
 
     @TableField(exist = false)
-    @Schema(description = "文件集合")
+    @Schema(description = "附件")
-    private List<FileAssociations> files;
+    private List<FileAssociations> files2;
 }

src/main/java/com/gunshi/project/xyt/model/ResPerson.java

@@ -11,6 +11,7 @@ import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Size;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
 
@@ -21,10 +22,11 @@ import java.io.Serializable;
  * @author XuSan
  * @version 1.0
  */
+@EqualsAndHashCode(callSuper = true)
 @Schema(description="责任人表")
 @Data
 @TableName("public.res_person")
-public class ResPerson implements Serializable {
+public class ResPerson extends CommUpdate implements Serializable {
 
 
     private static final long serialVersionUID = 1L;
@@ -85,4 +87,5 @@ public class ResPerson implements Serializable {
     @Schema(description="职责范围")
     @Size(max = 200,message = "职责范围最大长度要小于 200")
     private String dutyBound;
+
 }

src/main/java/com/gunshi/project/xyt/model/SzRuleByLaw.java

@@ -30,7 +30,7 @@ import java.util.List;
 @Schema(description="法律法规管理表")
 @Data
 @TableName("public.sz_rule_by_law")
-public class SzRuleByLaw implements Serializable {
+public class SzRuleByLaw extends CommUpdate implements Serializable {
 
 
     private static final long serialVersionUID = 1L;
@@ -98,54 +98,6 @@ public class SzRuleByLaw implements Serializable {
     private Date implementationDate;
 
 
-    /**
-     * 创建人Id
-     */
-    @TableField(value="create_by")
-    @Schema(description="填报人Id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long createBy;
-
-    /**
-     * 创建人名字
-     */
-    @TableField(value="create_name")
-    @Schema(description="填报人名字")
-    @Size(max = 30,message = "填报人名字最大长度要小于 30")
-    private String createName;
-
-    /**
-     * 创建人时间
-     */
-    @Schema(description="填报时间 格式：" + DateFormatString.YYYY_MM_DD_HH_MM_SS)
-    @TableField(value="create_time")
-    @JsonFormat(pattern = DateFormatString.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8")
-    private Date createTime;
-
-    /**
-     * 更新人Id
-     */
-    @TableField(value="update_by")
-    @Schema(description="更新人Id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long updateBy;
-
-    /**
-     * 更新人名字
-     */
-    @TableField(value="update_name")
-    @Schema(description="更新人名字")
-    @Size(max = 30,message = "更新人名字最大长度要小于 30")
-    private String updateName;
-
-    /**
-     * 更新时间
-     */
-    @Schema(description="更新时间 格式：" + DateFormatString.YYYY_MM_DD_HH_MM_SS)
-    @TableField(value="update_time")
-    @JsonFormat(pattern = DateFormatString.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8")
-    private Date updateTime;
-
     @TableField(exist = false)
     @Schema(description = "文件集合")
     private List<FileAssociations> files;