获取模板详情列表功能接口开发完成

modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysLabelTemplateService.java

@@ -44,7 +44,10 @@ public interface ISysLabelTemplateService {
      * 查询全部打印模板
      */
     @ApiOperation(value = "查询全部打印模板")
-    List<SysLabelTemplate> ListSysLabelTemplate(SysLabelTemplate template);
+    List<SysLabelTemplate> listSysLabelTemplate(SysLabelTemplate template);
+
+    @ApiOperation(value = "查询全部打印模板详情")
+    List<SysLabelTemplate> listSysLabelTemplateDetail(SysLabelTemplate template);
 
     /**
      * 根据id查询打印模板

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLabelTemplateController.java

@@ -142,7 +142,7 @@ public class SysLabelTemplateController extends CoreBaseController {
     @ApiOperation(value = "查询全部打印模板",notes = "查询全部打印模板")
     public ResultBean findSysConfigAll(@RequestBody SysLabelTemplate template){
         try {
-            List<SysLabelTemplate> sysLabelTemplateList = sysLabelTemplateService.ListSysLabelTemplate(template);
+            List<SysLabelTemplate> sysLabelTemplateList = sysLabelTemplateService.listSysLabelTemplate(template);
             return  ResultBean.success("操作成功")
                                 .setResultList(sysLabelTemplateList)
                                 .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
@@ -154,6 +154,25 @@ public class SysLabelTemplateController extends CoreBaseController {
     }
 
     /**
+     * 查询全部打印模板
+     * @return 处理结果
+     */
+    @GetMapping(value = "/list-detail")
+    @ApiOperation(value = "查询全部打印模板",notes = "查询全部打印模板")
+    public ResultBean findListDetail(@RequestBody SysLabelTemplate template){
+        try {
+            List<SysLabelTemplate> sysLabelTemplateList = sysLabelTemplateService.listSysLabelTemplateDetail(template);
+            return  ResultBean.success("操作成功")
+                    .setResultList(sysLabelTemplateList)
+                    .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+        }catch(ImppBusiException busExcep){
+            return ResultBean.fail(busExcep);
+        }catch(Exception e){
+            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
+        }
+    }
+
+    /**
      * 根据id查询打印模板
      * @param id 打印模板id
      * @return 处理结果

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLabelTemplateService.java

@@ -27,6 +27,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -141,11 +142,40 @@ public class SysLabelTemplateService implements ISysLabelTemplateService {
 
     @Override
     @ApiOperation(value = "查询打印模板", notes = "查询打印模板")
-    public List<SysLabelTemplate> ListSysLabelTemplate(SysLabelTemplate template) {
+    public List<SysLabelTemplate> listSysLabelTemplate(SysLabelTemplate template) {
         return sysLabelTemplateRDao.findByHqlWhere(CoreHqlPack.packBeanSysLabelTemplate(template));
     }
 
     @Override
+    public List<SysLabelTemplate> listSysLabelTemplateDetail(SysLabelTemplate template) {
+        List<SysLabelTemplate> list = sysLabelTemplateRDao.findByHqlWhere(CoreHqlPack.packBeanSysLabelTemplate(template));
+        if(list != null && list.size() > 0){
+            List<Long> ids = new ArrayList<>(list.size());
+            list.forEach(tmp -> ids.add(tmp.getId()));
+
+            DdlPackBean packBean = DdlPackBean.getDdlPackBean();
+            DdlPreparedPack.getInPackList(ids,"templateId",packBean);
+            List<SysLabelTemplateParam> paramList = sysLabelTemplateParamRDao.findByHqlWhere(packBean);
+
+            if(paramList != null && paramList.size() > 0){
+                for (SysLabelTemplateParam param : paramList) {
+                    for (SysLabelTemplate temp : list) {
+                        if(temp.getId().equals(param.getId())){
+                            List<SysLabelTemplateParam> params = temp.getLabelTemplateParamList();
+                            if(params == null){
+                                params = new ArrayList<>();
+                            }
+                            params.add(param);
+                            temp.setLabelTemplateParamList(params);
+                        }
+                    }
+                }
+            }
+        }
+        return list;
+    }
+
+    @Override
     @ApiOperation(value = "根据编号打印模板", notes = "根据编号打印模板")
     public SysLabelTemplate getSysLabelTemplateById(Long id) {
         return sysLabelTemplateRDao.getById(id);