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

@@ -3,6 +3,7 @@ package cn.estsh.i3plus.core.api.iservice.busi;
 import cn.estsh.i3plus.pojo.base.bean.ListPager;
 import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.model.platform.LabelTemplateModel;
+import cn.estsh.i3plus.pojo.platform.bean.SessionUser;
 import cn.estsh.i3plus.pojo.platform.bean.SysLabelTemplate;
 import cn.estsh.i3plus.pojo.platform.bean.SysLabelTemplateParam;
 import io.swagger.annotations.ApiOperation;
@@ -72,4 +73,13 @@ public interface ISysLabelTemplateService {
      */
     @ApiOperation(value = "根据模板编号查询模板信息")
     LabelTemplateModel getLabelTemplateInfoById(String labelTemplateId);
+
+    /**
+     * 修改打印模板状态
+     * @param id        任务ID
+     * @param status    模板状态
+     * @param user      当前会话用户
+     */
+    @ApiOperation(value = "修改打印模板状态",notes = "修改打印模板状态")
+    void updateSysLabelTemplateStatus(Long id, int status, SessionUser user);
 }

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

@@ -197,4 +197,22 @@ public class SysLabelTemplateController extends CoreBaseController {
             return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
         }
     }
+
+    @PutMapping(value = "/status")
+    @ApiOperation(value = "根据编号修改打印模板状态",notes = "根据编号修改打印模板状态")
+    public ResultBean updateSysLabelTemplateByStatus(String id, int status){
+        try {
+            // 登录用户
+            SessionUser user = AuthUtil.getSessionUser();
+
+            ValidatorBean.checkNotNull(id, "打印模板编号不能为空");
+
+            sysLabelTemplateService.updateSysLabelTemplateStatus(Long.parseLong(id), status, getSessionUser());
+            return  ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+        }catch(ImppBusiException busExcep){
+            return ResultBean.fail(busExcep);
+        }catch(Exception e){
+            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
+        }
+    }
 }

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

@@ -8,6 +8,7 @@ import cn.estsh.i3plus.pojo.base.common.PagerHelper;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.HqlPack;
 import cn.estsh.i3plus.pojo.model.platform.LabelTemplateModel;
+import cn.estsh.i3plus.pojo.platform.bean.SessionUser;
 import cn.estsh.i3plus.pojo.platform.bean.SysLabelTemplate;
 import cn.estsh.i3plus.pojo.platform.bean.SysLabelTemplateParam;
 import cn.estsh.i3plus.pojo.platform.repository.SysLabelTemplateParamRepository;
@@ -175,4 +176,16 @@ public class SysLabelTemplateService implements ISysLabelTemplateService {
         templateModel.setTemplateParamList(listSysLabelTemplateParam(labelTemplateId));
         return templateModel;
     }
+
+    @Override
+    @ApiOperation(value = "修改打印模板状态",notes = "修改打印模板状态")
+    public void updateSysLabelTemplateStatus(Long id, int status, SessionUser user) {
+        SysLabelTemplate sysLabelTemplate = sysLabelTemplateRDao.getById(id);
+        sysLabelTemplate.setIsValid(status);
+        sysLabelTemplate.setModifyUser(user.getUserName());
+
+        //添加初始化
+        ConvertBean.modelUpdate(sysLabelTemplate, user);
+        sysLabelTemplateRDao.update(sysLabelTemplate);
+    }
 }