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

src/main/java/com/xjrsoft/module/ledger/controller/LedgerConfigController.java

@@ -0,0 +1,96 @@
+package com.xjrsoft.module.ledger.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.xjrsoft.common.model.result.RT;
+import com.xjrsoft.common.page.ConventPage;
+import com.xjrsoft.common.page.PageOutput;
+import com.xjrsoft.common.utils.VoToColumnUtil;
+import com.xjrsoft.module.ledger.dto.AddLedgerConfigDto;
+import com.xjrsoft.module.ledger.dto.LedgerConfigPageDto;
+import com.xjrsoft.module.ledger.dto.UpdateLedgerConfigDto;
+import com.xjrsoft.module.ledger.entity.LedgerConfig;
+import com.xjrsoft.module.ledger.service.ILedgerConfigService;
+import com.xjrsoft.module.ledger.vo.LedgerConfigPageVo;
+import com.xjrsoft.module.ledger.vo.LedgerConfigVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+* @title: 台账配置表
+* @Author dzx
+* @Date: 2024-03-06
+* @Version 1.0
+*/
+@RestController
+@RequestMapping("/ledger" + "/ledgerConfig")
+@Api(value = "/ledger"  + "/ledgerConfig",tags = "台账配置表代码")
+@AllArgsConstructor
+public class LedgerConfigController {
+
+
+    private final ILedgerConfigService ledgerConfigService;
+
+    @GetMapping(value = "/page")
+    @ApiOperation(value="台账配置表列表(分页)")
+    @SaCheckPermission("ledgerconfig:detail")
+    public RT<PageOutput<LedgerConfigPageVo>> page(@Valid LedgerConfigPageDto dto){
+
+        LambdaQueryWrapper<LedgerConfig> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.orderByDesc(LedgerConfig::getId).select(LedgerConfig.class,x -> VoToColumnUtil.fieldsToColumns(LedgerConfigPageVo.class).contains(x.getProperty()));
+        IPage<LedgerConfig> page = ledgerConfigService.page(ConventPage.getPage(dto), queryWrapper);
+        PageOutput<LedgerConfigPageVo> pageOutput = ConventPage.getPageOutput(page, LedgerConfigPageVo.class);
+        return RT.ok(pageOutput);
+    }
+
+    @GetMapping(value = "/info")
+    @ApiOperation(value="根据id查询台账配置表信息")
+    @SaCheckPermission("ledgerconfig:detail")
+    public RT<LedgerConfigVo> info(@RequestParam Long id){
+        LedgerConfig ledgerConfig = ledgerConfigService.getById(id);
+        if (ledgerConfig == null) {
+           return RT.error("找不到此数据！");
+        }
+        return RT.ok(BeanUtil.toBean(ledgerConfig, LedgerConfigVo.class));
+    }
+
+
+    @PostMapping
+    @ApiOperation(value = "新增台账配置表")
+    @SaCheckPermission("ledgerconfig:add")
+    public RT<Boolean> add(@Valid @RequestBody AddLedgerConfigDto dto){
+        LedgerConfig ledgerConfig = BeanUtil.toBean(dto, LedgerConfig.class);
+        boolean isSuccess = ledgerConfigService.save(ledgerConfig);
+        return RT.ok(isSuccess);
+    }
+
+    @PutMapping
+    @ApiOperation(value = "修改台账配置表")
+    @SaCheckPermission("ledgerconfig:edit")
+    public RT<Boolean> update(@Valid @RequestBody UpdateLedgerConfigDto dto){
+        LedgerConfig ledgerConfig = BeanUtil.toBean(dto, LedgerConfig.class);
+        return RT.ok(ledgerConfigService.updateById(ledgerConfig));
+    }
+
+    @DeleteMapping
+    @ApiOperation(value = "删除台账配置表")
+    @SaCheckPermission("ledgerconfig:delete")
+    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
+        return RT.ok(ledgerConfigService.removeBatchByIds(ids));
+    }
+
+}

src/main/java/com/xjrsoft/module/ledger/dto/AddLedgerConfigDto.java

@@ -0,0 +1,37 @@
+package com.xjrsoft.module.ledger.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+
+/**
+* @title: 台账配置表
+* @Author dzx
+* @Date: 2024-03-06
+* @Version 1.0
+*/
+@Data
+public class AddLedgerConfigDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 台账名称
+    */
+    @ApiModelProperty("台账名称")
+    private String name;
+    /**
+    * magicapi接口地址
+    */
+    @ApiModelProperty("magicapi接口地址")
+    private String apiUrl;
+    /**
+    * 台账配置信息
+    */
+    @ApiModelProperty("台账配置信息")
+    private String configJson;
+
+}

src/main/java/com/xjrsoft/module/ledger/dto/LedgerConfigPageDto.java

@@ -0,0 +1,19 @@
+package com.xjrsoft.module.ledger.dto;
+
+import com.xjrsoft.common.page.PageInput;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+
+/**
+* @title: 台账配置表分页查询入参
+* @Author dzx
+* @Date: 2024-03-06
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class LedgerConfigPageDto extends PageInput {
+
+
+}

src/main/java/com/xjrsoft/module/ledger/dto/UpdateLedgerConfigDto.java

@@ -0,0 +1,24 @@
+package com.xjrsoft.module.ledger.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+
+/**
+* @title: 台账配置表
+* @Author dzx
+* @Date: 2024-03-06
+* @Version 1.0
+*/
+@Data
+public class UpdateLedgerConfigDto extends AddLedgerConfigDto {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private Long id;
+}

src/main/java/com/xjrsoft/module/ledger/entity/LedgerConfig.java

@@ -0,0 +1,89 @@
+package com.xjrsoft.module.ledger.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+* @title: 台账配置表
+* @Author dzx
+* @Date: 2024-03-06
+* @Version 1.0
+*/
+@Data
+@TableName("ledger_config")
+@ApiModel(value = "ledger_config", description = "台账配置表")
+public class LedgerConfig implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    @TableId
+    private Long id;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    @TableField(fill = FieldFill.INSERT)
+    private Long createUserId;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    @TableField(fill = FieldFill.INSERT)
+    private Date createDate;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    @TableField(fill = FieldFill.UPDATE)
+    private Long modifyUserId;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    @TableField(fill = FieldFill.UPDATE)
+    private Date modifyDate;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    @TableField(fill = FieldFill.INSERT)
+    @TableLogic
+    private Integer deleteMark;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    @TableField(fill = FieldFill.INSERT)
+    private Integer enabledMark;
+    /**
+    * 台账名称
+    */
+    @ApiModelProperty("台账名称")
+    private String name;
+    /**
+    * magicapi接口地址
+    */
+    @ApiModelProperty("magicapi接口地址")
+    private String apiUrl;
+    /**
+    * 台账配置信息
+    */
+    @ApiModelProperty("台账配置信息")
+    private String configJson;
+
+
+}

src/main/java/com/xjrsoft/module/ledger/mapper/LedgerConfigMapper.java

@@ -0,0 +1,16 @@
+package com.xjrsoft.module.ledger.mapper;
+
+import com.github.yulichang.base.MPJBaseMapper;
+import com.xjrsoft.module.ledger.entity.LedgerConfig;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @title: 台账配置表
+* @Author dzx
+* @Date: 2024-03-06
+* @Version 1.0
+*/
+@Mapper
+public interface LedgerConfigMapper extends MPJBaseMapper<LedgerConfig> {
+
+}

src/main/java/com/xjrsoft/module/ledger/mapper/WfSubscriptionMapper.java

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.base.MPJBaseMapper;
 import com.xjrsoft.module.ledger.dto.WfSubscriptionPageDto;
 import com.xjrsoft.module.ledger.entity.WfSubscription;
-import com.xjrsoft.module.ledger.vo.WfSubscriptionExcelVo;
 import com.xjrsoft.module.ledger.vo.WfSubscriptionListInfoVo;
 import com.xjrsoft.module.ledger.vo.WfSubscriptionPageVo;
 import org.apache.ibatis.annotations.Mapper;

src/main/java/com/xjrsoft/module/ledger/service/ILedgerConfigService.java

@@ -0,0 +1,14 @@
+package com.xjrsoft.module.ledger.service;
+
+import com.github.yulichang.base.MPJBaseService;
+import com.xjrsoft.module.ledger.entity.LedgerConfig;
+
+/**
+* @title: 台账配置表
+* @Author dzx
+* @Date: 2024-03-06
+* @Version 1.0
+*/
+
+public interface ILedgerConfigService extends MPJBaseService<LedgerConfig> {
+}

src/main/java/com/xjrsoft/module/ledger/service/IWfSubscriptionService.java

@@ -6,7 +6,6 @@ import com.xjrsoft.module.ledger.dto.WfSubscriptionPageDto;
 import com.xjrsoft.module.ledger.entity.WfSubscription;
 import com.xjrsoft.module.ledger.vo.WfSubscriptionExcelVo;
 import com.xjrsoft.module.ledger.vo.WfSubscriptionListInfoVo;
-import com.xjrsoft.module.ledger.vo.WfSubscriptionListVo;
 import com.xjrsoft.module.ledger.vo.WfSubscriptionPageVo;
 
 import java.util.List;

src/main/java/com/xjrsoft/module/ledger/service/impl/LedgerConfigServiceImpl.java

@@ -0,0 +1,19 @@
+package com.xjrsoft.module.ledger.service.impl;
+
+import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.xjrsoft.module.ledger.entity.LedgerConfig;
+import com.xjrsoft.module.ledger.mapper.LedgerConfigMapper;
+import com.xjrsoft.module.ledger.service.ILedgerConfigService;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+/**
+* @title: 台账配置表
+* @Author dzx
+* @Date: 2024-03-06
+* @Version 1.0
+*/
+@Service
+@AllArgsConstructor
+public class LedgerConfigServiceImpl extends MPJBaseServiceImpl<LedgerConfigMapper, LedgerConfig> implements ILedgerConfigService {
+}

src/main/java/com/xjrsoft/module/ledger/service/impl/WfSubscriptionServiceImpl.java

@@ -23,7 +23,6 @@ import com.xjrsoft.module.student.entity.BaseStudentAssessmentItem;
 import com.xjrsoft.module.student.vo.BaseStudentAssessmentItemPageVo;
 import com.xjrsoft.module.system.entity.File;
 import com.xjrsoft.module.system.service.IFileService;
-import com.xjrsoft.module.textbook.entity.WfTextbookRecede;
 import com.xjrsoft.module.workflow.entity.WorkflowExtra;
 import com.xjrsoft.module.workflow.entity.WorkflowFormRelation;
 import com.xjrsoft.module.workflow.entity.WorkflowRecord;
@@ -37,7 +36,12 @@ import org.springframework.transaction.annotation.Transactional;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
 import java.time.ZoneId;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**

src/main/java/com/xjrsoft/module/ledger/vo/LedgerConfigPageVo.java

@@ -0,0 +1,38 @@
+package com.xjrsoft.module.ledger.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+* @title: 台账配置表分页列表出参
+* @Author dzx
+* @Date: 2024-03-06
+* @Version 1.0
+*/
+@Data
+public class LedgerConfigPageVo {
+
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String id;
+    /**
+    * 台账名称
+    */
+    @ApiModelProperty("台账名称")
+    private String name;
+    /**
+    * magicapi接口地址
+    */
+    @ApiModelProperty("magicapi接口地址")
+    private String apiUrl;
+    /**
+    * 台账配置信息
+    */
+    @ApiModelProperty("台账配置信息")
+    private String configJson;
+
+}

src/main/java/com/xjrsoft/module/ledger/vo/LedgerConfigVo.java

@@ -0,0 +1,38 @@
+package com.xjrsoft.module.ledger.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+* @title: 台账配置表表单出参
+* @Author dzx
+* @Date: 2024-03-06
+* @Version 1.0
+*/
+@Data
+public class LedgerConfigVo {
+
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private Long id;
+    /**
+    * 台账名称
+    */
+    @ApiModelProperty("台账名称")
+    private String name;
+    /**
+    * magicapi接口地址
+    */
+    @ApiModelProperty("magicapi接口地址")
+    private String apiUrl;
+    /**
+    * 台账配置信息
+    */
+    @ApiModelProperty("台账配置信息")
+    private String configJson;
+
+
+
+}

src/main/java/com/xjrsoft/module/ledger/vo/WfSubscriptionExcelVo.java

@@ -2,13 +2,9 @@ package com.xjrsoft.module.ledger.vo;
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ContentStyle;
-import com.xjrsoft.module.system.entity.File;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.Date;
-import java.util.List;
-
 /**
  * @title: 物品申购分页列表出参
  * @Author dzx

src/main/resources/mapper/student/BaseStudentSchoolRollMapper.xml

@@ -128,6 +128,7 @@
         LEFT JOIN base_student_family_member t6 ON t6.user_id = t2.id AND t6.delete_mark = 0 AND t6.is_guardian = 1
         WHERE t2.delete_mark = 0
         AND t1.delete_mark = 0
+        and t3.archives_status = 'FB2901'
         <if test="dto.gradeId != null">
             and t4.grade_id = #{dto.gradeId}
         </if>