jiangs/lis8.0
2
0
Fork 0
Code Issues 29 Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: jiangs:f60612abbd88b3708089dc8fc8574626293f82a1
Branches Tags
jiangs:master
jiangs:wy
jiangs:lis8.0_test
..
compare: jiangs:be514715168c5e4b28b7ad71ad53b68e8bd65a5d
Branches Tags
jiangs:master
jiangs:wy
jiangs:lis8.0_test

No commits in common. "f60612abbd88b3708089dc8fc8574626293f82a1" and "be514715168c5e4b28b7ad71ad53b68e8bd65a5d" have entirely different histories.
f60612abbd ... be51471516

6 changed files with 9 additions and 40 deletions
Show Stats Expand all files Collapse all files

7
zycx/src/main/java/com/czlis/zycx/controller/ZycxController.java
View File

@ -7,7 +7,6 @@ import com.czlis.common.core.domain.entity.lis.LabReqmain;
import com.czlis.common.core.domain.entity.lis.LabReqpack;
import com.czlis.common.core.domain.entity.lis.LabResult;
import com.czlis.interfaceCommon.utils.PackBarcodeUtil;
import com.czlis.zycx.pojo.QuerySqdVO;
import com.czlis.zycx.pojo.Web_getBarcode;
import com.czlis.zycx.service.ZycxService;
import io.swagger.annotations.Api;
@ -35,9 +34,9 @@ public class ZycxController extends BaseController {
@ApiOperation("获取申请单")
@GetMapping("/query")
//@PreAuthorize("@ss.hasPermi('zycx:interface:query')")
public Result getSQDInfo(QuerySqdVO querySqdVO){
log.info("查询申请单，zyreq/query：{},",querySqdVO.toString());
List<Web_getBarcode> sqdInfoList = zycxService.getSQDInfo(querySqdVO);
public Result getSQDInfo(String dept,String userid,String st,String et,String yljg){
log.info("查询申请单，zyreq/query：{},{},{},{},{}",dept,userid,st,et,yljg);
List<Web_getBarcode> sqdInfoList = zycxService.getSQDInfo(dept,userid,st,et,yljg);
return new Result("0","查询成功！",sqdInfoList);
}

19
zycx/src/main/java/com/czlis/zycx/pojo/QuerySqdVO.java
View File

@ -1,19 +0,0 @@
package com.czlis.zycx.pojo;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@AllArgsConstructor
@NoArgsConstructor
public class QuerySqdVO {
private String dept;
private String userid;
private String st;
private String et;
private String yljg;
private String queryType; //1.brdh,2.ch,3.brxm
private String queryValue;
}

4
zycx/src/main/java/com/czlis/zycx/pojo/Web_getBarcode.java
View File

@ -73,8 +73,4 @@ public class Web_getBarcode {
private Date st;
private Date et;
private String jymd;
private String queryType;
private String queryValue;
}

3
zycx/src/main/java/com/czlis/zycx/service/ZycxService.java
View File

@ -2,13 +2,12 @@ package com.czlis.zycx.service;
import com.czlis.common.core.domain.Result;
import com.czlis.common.core.domain.entity.lis.LabReqmain;
import com.czlis.zycx.pojo.QuerySqdVO;
import com.czlis.zycx.pojo.Web_getBarcode;
import java.util.List;
public interface ZycxService {
List<Web_getBarcode> getSQDInfo(QuerySqdVO querySqdVO);
List<Web_getBarcode> getSQDInfo(String dept, String userid, String st, String et, String yljg);
Result createSQD(String dept, String userid, String st, String et, String yljg);

13
zycx/src/main/java/com/czlis/zycx/service/impl/ZycxServiceImpl.java
View File

@ -13,7 +13,6 @@ import com.czlis.interfaceCommon.utils.LisInterfaceUtil;
import com.czlis.interfaceCommon.utils.LisUtil;
import com.czlis.interfaceCommon.utils.ReportUtil;
import com.czlis.zycx.mapper.ZycxMapper;
import com.czlis.zycx.pojo.QuerySqdVO;
import com.czlis.zycx.pojo.Web_getBarcode;
import com.czlis.zycx.service.ZycxService;
import lombok.extern.slf4j.Slf4j;
@ -44,15 +43,13 @@ public class ZycxServiceImpl implements ZycxService {
@Override
public List<Web_getBarcode> getSQDInfo(QuerySqdVO querySqdVO) {
public List<Web_getBarcode> getSQDInfo(String dept, String userid, String st, String et, String yljg) {
Web_getBarcode webGetBarcode = new Web_getBarcode();
webGetBarcode.setKsdh(querySqdVO.getDept());
webGetBarcode.setSt(DateUtil.parse(querySqdVO.getSt(),"yyyy-MM-dd HH:mm:ss"));
webGetBarcode.setEt(DateUtil.parse(querySqdVO.getEt(),"yyyy-MM-dd HH:mm:ss"));
webGetBarcode.setYljg(querySqdVO.getYljg());
webGetBarcode.setKsdh(dept);
webGetBarcode.setSt(DateUtil.parse(st,"yyyy-MM-dd HH:mm:ss"));
webGetBarcode.setEt(DateUtil.parse(et,"yyyy-MM-dd HH:mm:ss"));
webGetBarcode.setYljg(yljg);
webGetBarcode.setBrly("3");
webGetBarcode.setQueryType(querySqdVO.getQueryType());
webGetBarcode.setQueryValue(querySqdVO.getQueryValue());
return zycxMapper.getSQDInfo(webGetBarcode);
}

3
zycx/src/main/resources/mapper/ZycxMapper.xml
View File

@ -29,9 +29,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="et != null"><!-- 结束时间检索 -->
AND a.sqsj &lt;= CONVERT(varchar(100), #{et}, 120)
</if>
<if test="queryType == 'brdh'"> and brdh = #{queryValue}</if>
<if test="queryType == 'ch'"> and ch = #{queryValue}</if>
<if test="queryType == 'brxm'"> and brxm = #{queryValue}</if>
</select>
<select id="createSQD" parameterType="map" statementType="CALLABLE" useCache="false">