diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java index d125615d..610be0bf 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java @@ -782,6 +782,8 @@ public class BackApplyInfoServiceImpl implements IBackApplyInfoService { } } } + } else { + return AjaxResult.error("退料物资为空，无法进行提交"); } // 设置更新信息 backApplyInfo.setUpdateBy(SecurityUtils.getUsername()); diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseTaskServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseTaskServiceImpl.java index 9dfd2ef3..b9d876f5 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseTaskServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseTaskServiceImpl.java @@ -695,7 +695,7 @@ public class LeaseTaskServiceImpl implements ILeaseTaskService { @Override public LeaseApplyRequestVo getDetailsById(LeaseApplyInfo leaseApplyInfo) { try { - Long userId = SecurityUtils.getUserId(); + Long userId = SecurityUtils.getLoginUser().getUserid(); leaseApplyInfo.setUserId(userId); Optional optionalInfo = Optional.ofNullable(mapper.selectLeaseApplyInfoById(leaseApplyInfo)); LeaseApplyRequestVo leaseApplyRequestVo = new LeaseApplyRequestVo(); @@ -802,6 +802,8 @@ public class LeaseTaskServiceImpl implements ILeaseTaskService { */ @Override public List getPublishDetails(LeaseApplyInfo leaseApplyInfo) { + Long userId = SecurityUtils.getLoginUser().getUserid(); + leaseApplyInfo.setUserId(userId); List list = new ArrayList<>(); // 获取领料单详情 List details = mapper.selectPublishDetails(leaseApplyInfo); diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/DirectRotationController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/DirectRotationController.java index 544f7123..c1100412 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/DirectRotationController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/DirectRotationController.java @@ -1,25 +1,22 @@ package com.bonus.material.ma.controller; +import com.bonus.common.core.utils.poi.ExcelUtil; import com.bonus.common.core.web.controller.BaseController; import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.common.core.web.page.TableDataInfo; import com.bonus.common.log.annotation.SysLog; import com.bonus.common.log.enums.OperaType; import com.bonus.material.common.annotation.PreventRepeatSubmit; -import com.bonus.material.ma.domain.DirectApplyDetails; -import com.bonus.material.ma.domain.DirectApplyInfo; -import com.bonus.material.ma.domain.DirectApplyInfoDetails; -import com.bonus.material.ma.domain.StandardConfigBean; +import com.bonus.material.ma.domain.*; import com.bonus.material.ma.service.DirectRotationService; -import com.bonus.material.ma.service.WorkSiteDirectManageService; import com.bonus.material.settlement.domain.SltAgreementInfo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; -import java.util.Date; import java.util.List; @@ -96,13 +93,25 @@ public class DirectRotationController extends BaseController { public TableDataInfo list(DirectApplyInfo directApplyInfo) { startPage(); try { - List directApplyInfos = service.getList(directApplyInfo); + List directApplyInfos = service.getList(directApplyInfo); return getDataTable(directApplyInfos); } catch (Exception e) { return getDataTable(new ArrayList<>()); } } + /** + * 导出直转记录查询列表 + * @param response + * @param directApplyInfo + */ + @PostMapping("/export") + public void export(HttpServletResponse response, DirectApplyInfo directApplyInfo) { + List list = service.getList(directApplyInfo); + ExcelUtil util = new ExcelUtil<>(DirectApplyExportInfo.class); + util.exportExcel(response, list, "直转记录数据"); + } + /** * 直转记录查询列表--app */ @@ -110,7 +119,7 @@ public class DirectRotationController extends BaseController { @GetMapping("/appList") public AjaxResult appList(DirectApplyInfo directApplyInfo) { try { - List directApplyInfos = service.getList(directApplyInfo); + List directApplyInfos = service.getList(directApplyInfo); return AjaxResult.success(directApplyInfos); } catch (Exception e) { return AjaxResult.success(new ArrayList<>()); diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/DirectApplyExportInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/DirectApplyExportInfo.java new file mode 100644 index 00000000..eae98ff3 --- /dev/null +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/DirectApplyExportInfo.java @@ -0,0 +1,218 @@ +package com.bonus.material.ma.domain; + +import com.bonus.common.core.annotation.Excel; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; +import java.util.List; + +/** + * @Author ma_sh + * @create 2025/6/17 10:00 + */ +@EqualsAndHashCode(callSuper = false) +@Data +public class DirectApplyExportInfo { + + /** + * id + */ + private Integer id; + /** + * 直转单号(ZZ20240226-1) + */ + private String code; + /** + * 退料单位协议 + */ + private Integer backAgreementId; + + /** + * 退料工程id + */ + private String backProId; + /** + * 关键字 + */ + private String keyWord; + + private String createBy; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "申请时间", sort = 1, width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date createTime; + + private String updateBy; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date updateTime; + + private String remark; + /** + * 退料工程名称 + */ + @Excel(name = "转出工程", sort = 4) + private String backProName; + + /** + * 退料单位id + */ + private String backUnitId; + + /** + * 退料单位名称 + */ + @Excel(name = "转出单位", sort = 3) + private String backUnitName; + + /** + * 领料工程id + */ + private String leaseProId; + /** + * 领料工程名称 + */ + @Excel(name = "转入工程", sort = 6) + private String leaseProName; + /** + * 领料单位id + */ + private String leaseUnitId; + /** + * 领料单位名称 + */ + @Excel(name = "转入单位", sort = 5) + private String leaseUnitName; + /** + * 退料人 + */ + private String backMan; + /** + * 手机号 + */ + private String backPhone; + + @Excel(name = "转让方联系人及电话", sort = 5, width = 30) + private String backManAndPhone; + /** + * 退料备注 + */ + private String backRemark; + /** + * 领料单位协议 + */ + private int leaseAgreementId; + /** + * 领料人 + */ + private String leaseMan; + /** + * 领料联系电话 + */ + private String leasePhone; + + @Excel(name = "接收方联系人及电话", sort = 6, width = 30) + private String leaseManAndPhone; + /** + * 领料备注 + */ + private String leaseRemark; + + @JsonFormat( + pattern = "yyyy-MM-dd HH:mm:ss" + ) + @Excel( + name = "办理时间", sort = 7,width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss" + ) + private Date createTimeTwo; + /** + * 直转附件 + */ + private String dirUrl; + + /** + * 直转附件数组 + */ + private List dirUrls; + + /** + * 0待审批1审批同意2驳回 + */ + @Excel(name = "状态", sort = 8, readConverterExp = "0=待审核, 1=审核中, 2=已完成, 3=已驳回") + private String status; + /** + * 审核人 + */ + private String auditor; + /** + * 审核时间 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date auditTime; + /** + * 审核备注 + */ + private String auditRemark; + /** + * 退料单位协议 + */ + private String backAgreementCode; + /** + * 领料单位协议 + */ + private String leaseAgreementCode; + + /** + * 退料工程id + */ + private String lotId; + /** + * 退料单位id + */ + private String unitId; + + @Excel(name = "物资类型", sort = 7) + private String typeName; + + @Excel(name = "申请人", sort = 2) + private String createName; + + /** + * 退料明细 + */ + private List directApplyDetails; + + private Integer isApp; + + private Integer taskStatus; + + private String flowStatus; + + private String flowId; + + @ApiModelProperty(value = "本流程节点id") + private Integer nodeId; + + @ApiModelProperty(value = "下个流程节点id") + private Integer nextNodeId; + + @ApiModelProperty(value = "流程配置值") + private String configValue; + + @ApiModelProperty(value = "所属记录") + private Integer recordId; + + @ApiModelProperty(value = "流程节点签名方式 0:或签 1:会签") + private Integer nodeSignType; + + @ApiModelProperty(value = "开始时间") + private String startTime; + + @ApiModelProperty(value = "结束时间") + private String endTime; +} diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/mapper/DirectRotationMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/mapper/DirectRotationMapper.java index 729c825a..b3f632e2 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/mapper/DirectRotationMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/mapper/DirectRotationMapper.java @@ -1,6 +1,7 @@ package com.bonus.material.ma.mapper; import com.bonus.material.ma.domain.DirectApplyDetails; +import com.bonus.material.ma.domain.DirectApplyExportInfo; import com.bonus.material.ma.domain.DirectApplyInfo; import com.bonus.material.settlement.domain.SltAgreementInfo; import org.apache.ibatis.annotations.Mapper; @@ -27,7 +28,7 @@ public interface DirectRotationMapper { * @param directApplyInfo * @return */ - List getList(DirectApplyInfo directApplyInfo); + List getList(DirectApplyInfo directApplyInfo); /** * 查看 diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/DirectRotationService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/DirectRotationService.java index 01bb9dbe..23ad6a82 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/DirectRotationService.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/DirectRotationService.java @@ -2,6 +2,7 @@ package com.bonus.material.ma.service; import com.bonus.common.core.web.domain.AjaxResult; +import com.bonus.material.ma.domain.DirectApplyExportInfo; import com.bonus.material.ma.domain.DirectApplyInfo; import com.bonus.material.ma.domain.DirectApplyInfoDetails; import com.bonus.material.settlement.domain.SltAgreementInfo; @@ -27,7 +28,7 @@ public interface DirectRotationService { * @param directApplyInfo * @return */ - List getList(DirectApplyInfo directApplyInfo); + List getList(DirectApplyInfo directApplyInfo); /** * 新增直转申请 diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/DirectRotationImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/DirectRotationImpl.java index bccbe0f6..404bbbc0 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/DirectRotationImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/DirectRotationImpl.java @@ -2,10 +2,7 @@ package com.bonus.material.ma.service.impl; import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.common.security.utils.SecurityUtils; -import com.bonus.material.ma.domain.DirectApplyDetails; -import com.bonus.material.ma.domain.DirectApplyInfo; -import com.bonus.material.ma.domain.DirectApplyInfoDetails; -import com.bonus.material.ma.domain.DirectApplyUrl; +import com.bonus.material.ma.domain.*; import com.bonus.material.ma.mapper.DirectRotationMapper; import com.bonus.material.ma.service.DirectRotationService; import com.bonus.material.ma.service.WorkSiteDirectManageService; @@ -54,7 +51,7 @@ public class DirectRotationImpl implements DirectRotationService { } @Override - public List getList(DirectApplyInfo directApplyInfo) { + public List getList(DirectApplyInfo directApplyInfo) { return mapper.getList(directApplyInfo); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/record/controller/DerateRecordQueryController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/record/controller/DerateRecordQueryController.java index 5bd36e10..fda613db 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/record/controller/DerateRecordQueryController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/record/controller/DerateRecordQueryController.java @@ -1,5 +1,6 @@ package com.bonus.material.record.controller; +import com.bonus.common.core.utils.poi.ExcelUtil; import com.bonus.common.core.web.controller.BaseController; import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.common.core.web.page.TableDataInfo; @@ -7,15 +8,16 @@ import com.bonus.common.log.annotation.SysLog; import com.bonus.common.log.enums.OperaType; import com.bonus.material.common.annotation.PreventRepeatSubmit; import com.bonus.material.record.service.IDerateReocrdQueryService; -import com.bonus.material.record.service.ISltReocrdQueryService; import com.bonus.material.settlement.domain.SltAgreementInfo; import com.bonus.material.settlement.domain.SltAgreementReduce; +import com.bonus.material.settlement.domain.SltAgreementReduceRecord; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import javax.validation.constraints.NotNull; import java.util.ArrayList; import java.util.List; @@ -42,13 +44,25 @@ public class DerateRecordQueryController extends BaseController { public TableDataInfo getList(SltAgreementInfo bean) { startPage(); try { - List list = service.getList(bean); + List list = service.getList(bean); return getDataTable(list); } catch (Exception e) { return getDataTable(new ArrayList<>()); } } + /** + * 减免记录查询列表导出 + * @param response + * @param bean + */ + @PostMapping("/export") + public void export(HttpServletResponse response, SltAgreementInfo bean) { + List list = service.getList(bean); + ExcelUtil util = new ExcelUtil<>(SltAgreementReduceRecord.class); + util.exportExcel(response, list, "减免记录数据"); + } + /** * 减免记录查询列表 */ @@ -71,7 +85,7 @@ public class DerateRecordQueryController extends BaseController { @GetMapping("/getAppList") public AjaxResult getAppList(SltAgreementInfo bean) { try { - List list = service.getList(bean); + List list = service.getList(bean); return AjaxResult.success(list); } catch (Exception e) { return AjaxResult.success(new ArrayList<>()); diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/record/mapper/DerateRecordQueryMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/record/mapper/DerateRecordQueryMapper.java index b35d8ddd..5c3747d0 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/record/mapper/DerateRecordQueryMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/record/mapper/DerateRecordQueryMapper.java @@ -4,6 +4,7 @@ package com.bonus.material.record.mapper; import com.bonus.common.biz.domain.BmFileInfo; import com.bonus.material.settlement.domain.SltAgreementInfo; import com.bonus.material.settlement.domain.SltAgreementReduce; +import com.bonus.material.settlement.domain.SltAgreementReduceRecord; import java.util.List; @@ -19,7 +20,7 @@ public interface DerateRecordQueryMapper { * @param bean * @return */ - List getList(SltAgreementInfo bean); + List getList(SltAgreementInfo bean); /** diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/record/service/IDerateReocrdQueryService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/record/service/IDerateReocrdQueryService.java index 1a657d2b..706707a7 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/record/service/IDerateReocrdQueryService.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/record/service/IDerateReocrdQueryService.java @@ -3,6 +3,7 @@ package com.bonus.material.record.service; import com.bonus.material.settlement.domain.SltAgreementInfo; import com.bonus.material.settlement.domain.SltAgreementReduce; +import com.bonus.material.settlement.domain.SltAgreementReduceRecord; import java.util.List; @@ -18,7 +19,7 @@ public interface IDerateReocrdQueryService { * @param bean * @return */ - List getList(SltAgreementInfo bean); + List getList(SltAgreementInfo bean); /** * 根据条件获取减免记录 diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/record/service/impl/DerateRecordQueryServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/record/service/impl/DerateRecordQueryServiceImpl.java index e7bf95db..00aeac97 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/record/service/impl/DerateRecordQueryServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/record/service/impl/DerateRecordQueryServiceImpl.java @@ -10,6 +10,7 @@ import com.bonus.material.record.service.IDerateReocrdQueryService; import com.bonus.material.record.service.ISltReocrdQueryService; import com.bonus.material.settlement.domain.SltAgreementInfo; import com.bonus.material.settlement.domain.SltAgreementReduce; +import com.bonus.material.settlement.domain.SltAgreementReduceRecord; import com.bonus.material.work.domain.SysWorkflowNode; import com.bonus.material.work.domain.SysWorkflowRecordHistory; import com.bonus.material.work.mapper.SysWorkflowConfigMapper; @@ -46,7 +47,7 @@ public class DerateRecordQueryServiceImpl implements IDerateReocrdQueryService { @Override - public List getList(SltAgreementInfo bean) { + public List getList(SltAgreementInfo bean) { return mapper.getList(bean); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/domain/SltAgreementReduceRecord.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/domain/SltAgreementReduceRecord.java new file mode 100644 index 00000000..76d6b4ad --- /dev/null +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/domain/SltAgreementReduceRecord.java @@ -0,0 +1,160 @@ +package com.bonus.material.settlement.domain; + +import com.bonus.common.biz.domain.BmFileInfo; +import com.bonus.common.core.annotation.Excel; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.ToString; + +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; + +/** 减免记录查询 + * @Author ma_sh + * @create 2025/6/17 11:04 + */ +@Data +@ToString +public class SltAgreementReduceRecord { + /** $column.columnComment */ + private Long id; + + /** 协议id */ + @ApiModelProperty(value = "协议id") + private Long agreementId; + + /** 结算单号（例如：JM202402-1） */ + private String code; + + /** 创建人 */ + @ApiModelProperty(value = "创建人") + private String creator; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建时间") + @Excel(name = "申请时间", sort = 1, dateFormat = "yyyy-MM-dd HH:mm:ss", width = 30) + private Date createTime; + + @Excel(name = "申请人", sort = 2) + private String createBy; + + private String updateBy; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date updateTime; + + @Excel(name = "租赁单位", sort = 3) + private String unitName; + + private Integer proId; + + @Excel(name = "租赁工程", sort = 4) + private String projectName; + + @ApiModelProperty(value = "租赁单价") + @Excel(name = "租赁费用（元）", sort = 5) + private BigDecimal leasePrice; + + @ApiModelProperty(value = "租赁金额") + @Excel(name = "本次减免费用（元）", sort = 6) + private BigDecimal leaseMoney; + + @ApiModelProperty(value = "累计减免费用") + @Excel(name = "累计减免费用（元）", sort = 7) + private BigDecimal leaseMoneyAll; + + /** 状态0未结算1待审核2审核通过3审核驳回 */ + @Excel(name = "状态", sort = 8, readConverterExp = "0=待审核, 1=审核中, 2=已审核, 3=已驳回") + @ApiModelProperty(value = "状态0未结算1待审核2审核通过3审核驳回") + private String status; + + /** 数据所属 */ + @ApiModelProperty(value = "数据所属") + private Long companyId; + + /** 结算总费用 */ + @ApiModelProperty(value = "结算总费用") + private BigDecimal cost; + + @ApiModelProperty(value = "原因") + private String remark; + + @ApiModelProperty(value = "机具规格id") + private String typeId; + + @ApiModelProperty(value = "机具名称") + private String maName; + + @ApiModelProperty(value = "机具规格") + private String maModel; + + @ApiModelProperty(value = "机具单位") + private String maUnit; + + @ApiModelProperty(value = "租赁数量") + private BigDecimal num; + + + + @ApiModelProperty(value = "租赁开始时间") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date startTime; + + @ApiModelProperty(value = "租赁结束时间") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date endTime; + + @ApiModelProperty(value = "租赁天数") + private Long days; + + + @ApiModelProperty(value = "减免数量") + private BigDecimal reduceNum; + + @ApiModelProperty(value = "减免租赁单价") + private BigDecimal reduceLeasePrice; + + @ApiModelProperty(value = "减免开始时间") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date reduceStartTime; + + @ApiModelProperty(value = "减免结束时间") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date reduceEndTime; + + @ApiModelProperty(value = "减免租赁费用") + private BigDecimal reduceLeaseMoney; + + private Integer taskId; + + @ApiModelProperty(value = "减免天数") + private Long reduceDays; + + @ApiModelProperty(value = "附件列表") + private List bmFileInfos; + + private List detailList; + + private String typeName; + + private String modeName; + private String modelName; + + private Integer unitId; + + @ApiModelProperty(value = "本流程节点id") + private Integer nodeId; + + @ApiModelProperty(value = "下个流程节点id") + private Integer nextNodeId; + + @ApiModelProperty(value = "流程配置值") + private String configValue; + + @ApiModelProperty(value = "所属记录") + private Integer recordId; + + @ApiModelProperty(value = "流程节点签名方式 0:或签 1:会签") + private Integer nodeSignType; +} diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/controller/DirectAuditController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/controller/DirectAuditController.java index bdb48c79..a3c1964e 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/controller/DirectAuditController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/controller/DirectAuditController.java @@ -37,7 +37,7 @@ public class DirectAuditController extends BaseController { public TableDataInfo list(DirectApplyInfo directApplyInfo) { startPage(); try { - directApplyInfo.setAuditor(SecurityUtils.getUserId()+""); + directApplyInfo.setAuditor(SecurityUtils.getLoginUser().getUserid()+""); List directApplyInfos = service.getList(directApplyInfo); return getDataTable(directApplyInfos); } catch (Exception e) { diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/service/impl/SysWorkflowNodeServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/service/impl/SysWorkflowNodeServiceImpl.java index 95efe6f3..ef204697 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/service/impl/SysWorkflowNodeServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/service/impl/SysWorkflowNodeServiceImpl.java @@ -43,7 +43,7 @@ public class SysWorkflowNodeServiceImpl implements SysWorkflowNodeService { * 新增工作流详情 */ @Override - @Transactional + @Transactional(rollbackFor = Exception.class) public int addSysWorkflowNode(SysWorkflowNode sysWorkflowNode) { //保存创建人信息 sysWorkflowNode.setCreateBy(SecurityUtils.getLoginUser().getUserid().toString()); diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/DirectRotationMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/DirectRotationMapper.xml index a7ed501d..06863d80 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/DirectRotationMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/DirectRotationMapper.xml @@ -91,7 +91,7 @@ sai.ma_id,sai.type_id - SELECT * FROM ( SELECT DISTINCT dai.id AS id, diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/record/DerateRecordQueryMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/record/DerateRecordQueryMapper.xml index 5b645a7a..e9103be1 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/record/DerateRecordQueryMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/record/DerateRecordQueryMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - SELECT sra.id as id, sra.create_time as createTime, diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairMapper.xml index 3be0ed89..4cc96779 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairMapper.xml @@ -725,7 +725,7 @@ WHERE rd.`status` = '1' - + and mt2.type_name like CONCAT('%', #{typeName}, '%')