法规清单分页修改

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;
-
     /**
      * 标准详情列表
      */

laws-modules/src/main/java/com/jero/modules/activiti/process/ms/service/impl/ProcessMarketStandardReleaseServiceImpl.java

@@ -249,6 +249,11 @@ public class ProcessMarketStandardReleaseServiceImpl extends ServiceImpl<Process
         if(Objects.isNull(processMarketStandardRelease)){
             return;
         }
+        // 更新流程完成时间
+        LambdaUpdateWrapper<ProcessMarketStandardRelease> update = new LambdaUpdateWrapper<>();
+        update.eq(ProcessMarketStandardRelease::getId,processMarketStandardRelease.getId());
+        update.set(ProcessMarketStandardRelease::getEndTime,new Date());
+        update(update);
         // 更新业务状态
         lawsMarketStandardService.publish(processMarketStandardRelease.getManifestId());
     }

laws-modules/src/main/java/com/jero/modules/laws/marketStandard/controller/MarketStandardController.java

@@ -70,7 +70,7 @@ public class MarketStandardController {
     public Result<IPage<LawsMarketStandard>> queryPageListByOther(LawsMarketStandard marketStandard,
                                                            @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                            @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
-        IPage<LawsMarketStandard> pageList = marketStandardService.queryPage(marketStandard, pageNo, pageSize);
+        IPage<LawsMarketStandard> pageList = marketStandardService.queryPageListByOther(marketStandard, pageNo, pageSize);
         return Result.OK(pageList);
     }
 

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<LawsMarketStandardDetail> list;
+
+    /**
+     * 流程查询标识
+     */
+    @ApiModelProperty(value = "流程查询标识")
+    @TableField(exist = false)
+    private String processFlag;
 }

laws-modules/src/main/java/com/jero/modules/laws/marketStandard/mapper/LawsMarketStandardMapper.java

@@ -20,6 +20,9 @@ public interface LawsMarketStandardMapper extends BaseMapper<LawsMarketStandard>
 
     IPage<LawsMarketStandard> queryByPage(Page<LawsMarketStandard> page, @Param(Constants.WRAPPER) QueryWrapper<LawsMarketStandard> queryWrapper);
 
+
+    IPage<LawsMarketStandard> queryByPageProcess(Page<LawsMarketStandard> page, @Param(Constants.WRAPPER) QueryWrapper<LawsMarketStandard> queryWrapper);
+
     List<LawsMarketStandard> queryByPage(@Param(Constants.WRAPPER) QueryWrapper<LawsMarketStandard> queryWrapper);
 
     /**

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}
     </select>
+
+    <select id="queryByPageProcess" resultType="com.jero.modules.laws.marketStandard.entity.LawsMarketStandard">
+        select ms.*
+        from laws_market_standard ms
+        JOIN (
+            SELECT manifest_no as manifest_no_max,  min(id) AS min_id
+            FROM laws_market_standard where del_flag = 0
+            GROUP BY manifest_no
+        ) ms1 on ms1.min_id = ms.id and ms1.manifest_no_max = ms.manifest_no
+        left join sys_user as u on u.id = ms.author
+        left join process_market_standard_release pms on pms.manifest_id = ms.id
+        left join process_all pa on pms.process_instance_id = pa.process_instance_id
+            ${ew.customSqlSegment}
+    </select>
     <select id="getOneByManifestNo" resultType="java.lang.String">
         select max(manifest_no) as manifest_no from laws_market_standard where manifest_no like CONCAT(#{str},'%')
     </select>

laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/ILawsMarketStandardService.java

@@ -66,6 +66,16 @@ public interface ILawsMarketStandardService extends IService<LawsMarketStandard>
      */
     IPage<LawsMarketStandard> queryPage(LawsMarketStandard marketStandard, Integer pageNo, Integer pageSize);
 
+
+    /**
+     * 分页查询 其他业务使用
+     * @param marketStandard
+     * @param pageNo
+     * @param pageSize
+     * @return
+     */
+    IPage<LawsMarketStandard> queryPageListByOther(LawsMarketStandard marketStandard, Integer pageNo, Integer pageSize);
+
     /**
      * 新增
      * @param marketStandardDetailVO

laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java

@@ -78,6 +78,20 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl<LawsMarketStandar
         return marketStandardMapper.queryByPage(page, queryWrapper);
     }
 
+    @Override
+    public IPage<LawsMarketStandard> queryPageListByOther(LawsMarketStandard marketStandard, Integer pageNo, Integer pageSize) {
+        Page<LawsMarketStandard> page = new Page<>(pageNo, pageSize);
+        QueryWrapper<LawsMarketStandard> 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<LawsMarketStandard> getLawsMarketStandardQueryWrapper(LawsMarketStandard marketStandard) {
         QueryWrapper<LawsMarketStandard> queryWrapper = new QueryWrapper<>();