Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev

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

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

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

@@ -140,9 +140,9 @@ public class SysLabelTemplateController extends CoreBaseController {
      */
     @GetMapping(value = "/list")
     @ApiOperation(value = "查询全部打印模板",notes = "查询全部打印模板")
-    public ResultBean findSysConfigAll(){
+    public ResultBean findSysConfigAll(@RequestBody SysLabelTemplate template){
         try {
-            List<SysLabelTemplate> sysLabelTemplateList = sysLabelTemplateService.ListSysLabelTemplate();
+            List<SysLabelTemplate> sysLabelTemplateList = sysLabelTemplateService.ListSysLabelTemplate(template);
             return  ResultBean.success("操作成功")
                                 .setResultList(sysLabelTemplateList)
                                 .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
@@ -238,29 +238,6 @@ public class SysLabelTemplateController extends CoreBaseController {
     }
 
     /**
-     * 根据打印模板编号查询模板
-     * @param organizeCode 工厂代码
-     * @return 处理结果
-     */
-    @GetMapping("/get-all")
-    @ApiOperation(value = "查询所有有效的模板数据同步到PCN微服务",notes = "查询所有有效的模板数据同步到PCN微服务")
-    public ResultBean getSysLabelTemplateInfoByCode(@RequestParam("organizeCode") String organizeCode,
-                                                    @RequestParam("modifyDateTime") String modifyDateTime) {
-        try {
-            ValidatorBean.checkNotNull(organizeCode, "工厂代码不能为空");
-            ValidatorBean.checkNotNull(modifyDateTime, "修改时间");
-
-            return  ResultBean.success("操作成功")
-                    .setResultObject(sysLabelTemplateService.getLabelTemplateInfoByCode(organizeCode, modifyDateTime))
-                    .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
-        }catch(ImppBusiException busExcep){
-            return ResultBean.fail(busExcep);
-        }catch(Exception e){
-            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
-        }
-    }
-
-    /**
      * 根据编号修改打印模板状态
      * @param id 模板id
      * @param status 模板状态

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

@@ -141,8 +141,8 @@ public class SysLabelTemplateService implements ISysLabelTemplateService {
 
     @Override
     @ApiOperation(value = "查询打印模板", notes = "查询打印模板")
-    public List<SysLabelTemplate> ListSysLabelTemplate() {
+    public List<SysLabelTemplate> ListSysLabelTemplate(SysLabelTemplate template) {
-        return sysLabelTemplateRDao.list();
+        return sysLabelTemplateRDao.findByHqlWhere(CoreHqlPack.packBeanSysLabelTemplate(template));
     }
 
     @Override