diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/ms/entity/ProcessMarketStandardRelease.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/ms/entity/ProcessMarketStandardRelease.java index b164439b..72d73548 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/ms/entity/ProcessMarketStandardRelease.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/ms/entity/ProcessMarketStandardRelease.java @@ -83,7 +83,6 @@ public class ProcessMarketStandardRelease implements Serializable { @ApiModelProperty(value = "抄送人员") @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "id") private String copyUser; - /** * 标准详情列表 */ diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/ms/service/impl/ProcessMarketStandardReleaseServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/ms/service/impl/ProcessMarketStandardReleaseServiceImpl.java index f2a140d8..4a8c81ca 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/ms/service/impl/ProcessMarketStandardReleaseServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/ms/service/impl/ProcessMarketStandardReleaseServiceImpl.java @@ -249,6 +249,11 @@ public class ProcessMarketStandardReleaseServiceImpl extends ServiceImpl update = new LambdaUpdateWrapper<>(); + update.eq(ProcessMarketStandardRelease::getId,processMarketStandardRelease.getId()); + update.set(ProcessMarketStandardRelease::getEndTime,new Date()); + update(update); // 更新业务状态 lawsMarketStandardService.publish(processMarketStandardRelease.getManifestId()); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/controller/MarketStandardController.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/controller/MarketStandardController.java index fec146e0..eee0a298 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/controller/MarketStandardController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/controller/MarketStandardController.java @@ -70,7 +70,7 @@ public class MarketStandardController { public Result> queryPageListByOther(LawsMarketStandard marketStandard, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { - IPage pageList = marketStandardService.queryPage(marketStandard, pageNo, pageSize); + IPage pageList = marketStandardService.queryPageListByOther(marketStandard, pageNo, pageSize); return Result.OK(pageList); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandard.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandard.java index 03c3b4cb..8df2e6f2 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandard.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandard.java @@ -178,4 +178,11 @@ public class LawsMarketStandard implements Serializable { @TableField(exist = false) @ApiModelProperty(value = "市场法规清单") private List list; + + /** + * 流程查询标识 + */ + @ApiModelProperty(value = "流程查询标识") + @TableField(exist = false) + private String processFlag; } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/mapper/LawsMarketStandardMapper.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/mapper/LawsMarketStandardMapper.java index b9c54da0..b7aa8d52 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/mapper/LawsMarketStandardMapper.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/mapper/LawsMarketStandardMapper.java @@ -20,6 +20,9 @@ public interface LawsMarketStandardMapper extends BaseMapper IPage queryByPage(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); + + IPage queryByPageProcess(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); + List queryByPage(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); /** diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/mapper/xml/LawsMarketStandardMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/mapper/xml/LawsMarketStandardMapper.xml index 6d6c3541..f21779ef 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/mapper/xml/LawsMarketStandardMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/mapper/xml/LawsMarketStandardMapper.xml @@ -43,6 +43,20 @@ left join sys_user as u on u.id = ms.author ${ew.customSqlSegment} + + diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/ILawsMarketStandardService.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/ILawsMarketStandardService.java index 45a63b87..5957b606 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/ILawsMarketStandardService.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/ILawsMarketStandardService.java @@ -66,6 +66,16 @@ public interface ILawsMarketStandardService extends IService */ IPage queryPage(LawsMarketStandard marketStandard, Integer pageNo, Integer pageSize); + + /** + * 分页查询 其他业务使用 + * @param marketStandard + * @param pageNo + * @param pageSize + * @return + */ + IPage queryPageListByOther(LawsMarketStandard marketStandard, Integer pageNo, Integer pageSize); + /** * 新增 * @param marketStandardDetailVO diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java index b5a1604d..d3b41fc7 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java @@ -78,6 +78,20 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl queryPageListByOther(LawsMarketStandard marketStandard, Integer pageNo, Integer pageSize) { + Page page = new Page<>(pageNo, pageSize); + QueryWrapper queryWrapper = getLawsMarketStandardQueryWrapper(marketStandard); + if(StringUtils.isBlank(marketStandard.getProcessFlag())){ + return marketStandardMapper.queryByPage(page, queryWrapper); + }else{ + // 发起流程使用 + queryWrapper.and(i->i.isNull("pms.id").or().ne("pa.prc_status",1)); + queryWrapper.groupBy("ms.id"); + return marketStandardMapper.queryByPageProcess(page, queryWrapper); + } + } + @NotNull private QueryWrapper getLawsMarketStandardQueryWrapper(LawsMarketStandard marketStandard) { QueryWrapper queryWrapper = new QueryWrapper<>();