diff --git a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/SysExeBakMapper.java b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/SysExeBakMapper.java index 5f8791b..a9a5ba2 100644 --- a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/SysExeBakMapper.java +++ b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/SysExeBakMapper.java @@ -4,9 +4,12 @@ import com.czlis.common.core.domain.entity.lis.SysExeBak; import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; public interface SysExeBakMapper { List queryfilelist(String filepath); SysExeBak getfile(@Param("filepath") String filepath, @Param("filena") String filena); SysExeBak getdwfile(@Param("reportid") Integer reportid, @Param("reportkind") String reportkind); + String getLabIntersendList(String guid); + List> getBarprintList(@Param("strIds") List strIds); } diff --git a/lis-interfaceCommon/src/main/resources/mapper/SysExeBakMapper.xml b/lis-interfaceCommon/src/main/resources/mapper/SysExeBakMapper.xml index 10c146e..9c0f977 100644 --- a/lis-interfaceCommon/src/main/resources/mapper/SysExeBakMapper.xml +++ b/lis-interfaceCommon/src/main/resources/mapper/SysExeBakMapper.xml @@ -22,4 +22,15 @@ and reportkind = #{reportkind} + + diff --git a/liswork/src/main/java/com/czlis/liswork/controller/plugin/LisPluginController.java b/liswork/src/main/java/com/czlis/liswork/controller/plugin/LisPluginController.java index 83c50b9..e99c96c 100644 --- a/liswork/src/main/java/com/czlis/liswork/controller/plugin/LisPluginController.java +++ b/liswork/src/main/java/com/czlis/liswork/controller/plugin/LisPluginController.java @@ -38,5 +38,11 @@ public class LisPluginController extends BaseController { public Result getdwfile(String filename) { return lisPluginService.getdwfile(filename); } + @Anonymous + @ApiOperation("获取打印内容") + @GetMapping("/getprintlist") + public Result getprintlist(String guid) { + return lisPluginService.getprintlist(guid); + } } diff --git a/liswork/src/main/java/com/czlis/liswork/service/LisPluginService.java b/liswork/src/main/java/com/czlis/liswork/service/LisPluginService.java index 921cd6e..115d927 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/LisPluginService.java +++ b/liswork/src/main/java/com/czlis/liswork/service/LisPluginService.java @@ -6,4 +6,5 @@ public interface LisPluginService { Result queryfilelist(); Result getfile(String filename); Result getdwfile(String filename); + Result getprintlist(String printid); } diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/LisPluginServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/LisPluginServiceImpl.java index 461996f..cce3e5b 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/impl/LisPluginServiceImpl.java +++ b/liswork/src/main/java/com/czlis/liswork/service/impl/LisPluginServiceImpl.java @@ -4,13 +4,14 @@ import cn.hutool.core.codec.Base64; import com.czlis.common.core.domain.Result; import com.czlis.common.core.domain.entity.lis.SysExeBak; import com.czlis.common.utils.LisupdateUtils; +import com.czlis.interfaceCommon.mapper.ComOptMapper; import com.czlis.interfaceCommon.mapper.SysExeBakMapper; -import com.czlis.interfaceCommon.utils.CommonUtil; import com.czlis.liswork.service.LisPluginService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -21,7 +22,7 @@ public class LisPluginServiceImpl implements LisPluginService { @Autowired SysExeBakMapper sysExeBakMapper; @Autowired - CommonUtil commonUtil; + ComOptMapper comOptMapper; @Override public Result queryfilelist(){ //List filelist=sysExeBakMapper.queryfilelist("plugin"); @@ -50,7 +51,7 @@ public class LisPluginServiceImpl implements LisPluginService { */ @Override public Result getdwfile(String filetype){ - String reportids=commonUtil.getComOptValue("_MZCX_",filetype); + String reportids=comOptMapper.getComOptValue("_MZCX_",filetype); if(reportids==null||"".equals(reportids))return new Result("-1","未找到模板"); Integer reportid = Integer.parseInt(reportids); String reportkind="C"; @@ -84,4 +85,12 @@ public class LisPluginServiceImpl implements LisPluginService { } return new Result("-1","未找到"); } + @Override + public Result getprintlist(String guid){ + String senddata=sysExeBakMapper.getLabIntersendList(guid); + if(senddata==null||"".equals(senddata))return new Result("-1","未找到"); + List strIds = Arrays.asList(senddata.split(",")); + List> result = sysExeBakMapper.getBarprintList(strIds); + return new Result("0","成功",result); + } }