diff --git a/lis-common/src/main/java/com/czlis/common/constant/HttpStatus.java b/lis-common/src/main/java/com/czlis/common/constant/HttpStatus.java index 945c807..2e4298e 100644 --- a/lis-common/src/main/java/com/czlis/common/constant/HttpStatus.java +++ b/lis-common/src/main/java/com/czlis/common/constant/HttpStatus.java @@ -10,7 +10,7 @@ public class HttpStatus /** * 操作成功 */ - public static final int SUCCESS = 200; + public static final int SUCCESS = 0; /** * 对象创建成功 @@ -50,12 +50,12 @@ public class HttpStatus /** * 未授权 */ - public static final int UNAUTHORIZED = 401; + public static final int UNAUTHORIZED = -1; /** * 访问受限,授权过期 */ - public static final int FORBIDDEN = 403; + public static final int FORBIDDEN = -1; /** * 资源,服务未找到 @@ -80,7 +80,7 @@ public class HttpStatus /** * 系统内部错误 */ - public static final int ERROR = 500; + public static final int ERROR = -1; /** * 接口未实现 @@ -90,5 +90,5 @@ public class HttpStatus /** * 系统警告消息 */ - public static final int WARN = 601; + public static final int WARN = -1; } diff --git a/mzcx/src/main/java/com/czlis/mzcx/controller/FeeitemVsClassController.java b/mzcx/src/main/java/com/czlis/mzcx/controller/FeeitemVsClassController.java new file mode 100644 index 0000000..2a84fa7 --- /dev/null +++ b/mzcx/src/main/java/com/czlis/mzcx/controller/FeeitemVsClassController.java @@ -0,0 +1,48 @@ +package com.czlis.mzcx.controller; + +import com.czlis.common.core.controller.BaseController; +import com.czlis.common.core.domain.Result; +import com.czlis.common.core.page.TableDataInfo; +import com.czlis.mzcx.pojo.LabFeeitemVsClass; +import com.czlis.mzcx.service.FeeitemVsClassService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 条码类别与项目对照 + */ +@Api(tags = "条码类别与项目对照") +@RestController +@RequestMapping("/feeitemvsclass") +@Slf4j +public class FeeitemVsClassController extends BaseController { + + @Autowired + private FeeitemVsClassService feeitemVsClassService; + + @ApiOperation("查询条码类别与项目对照") + @GetMapping("/query") + public TableDataInfo query(LabFeeitemVsClass labFeeitemVsClass) { + startPage(); + List labFeeitemVsClassList = feeitemVsClassService.query(labFeeitemVsClass); + return getDataTable(labFeeitemVsClassList); + } + + @ApiOperation("新增条码类别与项目对照") + @PostMapping("/add") + public Result add(@RequestBody LabFeeitemVsClass labFeeitemVsClass) { + feeitemVsClassService.add(labFeeitemVsClass); + return new Result("0","添加成功!"); + } + + @ApiOperation("删除条码类别与项目对照") + @DeleteMapping("/del") + public Result del(){ + return null; + } +} diff --git a/mzcx/src/main/java/com/czlis/mzcx/controller/RptgetRuleController.java b/mzcx/src/main/java/com/czlis/mzcx/controller/RptgetRuleController.java index 77c3f7c..317cb94 100644 --- a/mzcx/src/main/java/com/czlis/mzcx/controller/RptgetRuleController.java +++ b/mzcx/src/main/java/com/czlis/mzcx/controller/RptgetRuleController.java @@ -1,22 +1,72 @@ package com.czlis.mzcx.controller; import com.czlis.common.core.controller.BaseController; +import com.czlis.common.core.domain.Result; import com.czlis.common.core.page.TableDataInfo; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import com.czlis.mzcx.pojo.LabRptgetRule; +import com.czlis.mzcx.pojo.LabRptgetRuleDTO; +import com.czlis.mzcx.pojo.LabRptgetRuleDetail; +import com.czlis.mzcx.service.RptgetRuleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.validation.constraints.NotBlank; +import java.util.List; /** * 报告领取规则 */ +@Api(tags = "报告领取规则") @RestController @RequestMapping("/rptgetrule") public class RptgetRuleController extends BaseController { + @Autowired + private RptgetRuleService rptgetRuleService; + + @ApiOperation("查询报告领取规则列表") @GetMapping("/query") - public TableDataInfo query(){ + public TableDataInfo query(LabRptgetRule rule) { startPage(); - return null; + List labRptgetRuleList = rptgetRuleService.query(rule); + return getDataTable(labRptgetRuleList); } + + @ApiOperation("根据代号查询报告领取规则明细") + @GetMapping("/queryDetail") + public Result queryDetail(@NotBlank(message = "参数名称不能为空") String bglqdh) { + List labRptgetRuleDetailList = rptgetRuleService.queryDetail(bglqdh); + if(labRptgetRuleDetailList != null && labRptgetRuleDetailList.size() > 0){ + return new Result("0","查询成功!",labRptgetRuleDetailList); + } + return new Result("-1","没有查询到对应的明细数据!"); + } + + @ApiOperation("新增报告领取规则") + @PostMapping("/add") + public Result add(@RequestBody LabRptgetRuleDTO labRptgetRuleDTO) { + return rptgetRuleService.add(labRptgetRuleDTO); + } + + + @ApiOperation("修改报告领取规则") + @PostMapping("/update") + public Result update(@RequestBody LabRptgetRuleDTO labRptgetRuleDTO) { + return rptgetRuleService.update(labRptgetRuleDTO); + } + + @ApiOperation("删除报告领取规则列表") + @DeleteMapping("/del") + public Result delete(String bglqdh){ + return rptgetRuleService.delete(bglqdh); + } + + @ApiOperation("删除报告领取规则明细") + @DeleteMapping("/delDetail") + public Result deleteDetail(String bglqdh,Integer xh){ + return rptgetRuleService.deleteDetail(bglqdh,xh); + } + } diff --git a/mzcx/src/main/java/com/czlis/mzcx/mapper/FeeitemVsClassMapper.java b/mzcx/src/main/java/com/czlis/mzcx/mapper/FeeitemVsClassMapper.java new file mode 100644 index 0000000..169a66c --- /dev/null +++ b/mzcx/src/main/java/com/czlis/mzcx/mapper/FeeitemVsClassMapper.java @@ -0,0 +1,11 @@ +package com.czlis.mzcx.mapper; + +import com.czlis.mzcx.pojo.LabFeeitemVsClass; + +import java.util.List; + +public interface FeeitemVsClassMapper { + List query(LabFeeitemVsClass labFeeitemVsClass); + + void add(LabFeeitemVsClass labFeeitemVsClass); +} diff --git a/mzcx/src/main/java/com/czlis/mzcx/mapper/RptgetRuleMapper.java b/mzcx/src/main/java/com/czlis/mzcx/mapper/RptgetRuleMapper.java new file mode 100644 index 0000000..3e63145 --- /dev/null +++ b/mzcx/src/main/java/com/czlis/mzcx/mapper/RptgetRuleMapper.java @@ -0,0 +1,18 @@ +package com.czlis.mzcx.mapper; + +import com.czlis.mzcx.pojo.LabRptgetRule; +import com.czlis.mzcx.pojo.LabRptgetRuleDetail; + +import java.util.List; + +public interface RptgetRuleMapper { + List query(LabRptgetRule rule); + List queryDetail(String bglqdh); + void insert(LabRptgetRule rule); + void insertDetail(LabRptgetRuleDetail ruleDetail); + void update(LabRptgetRule rule); + void updateDetail(LabRptgetRuleDetail ruleDetail); + void delete(String bglqdh); + void deleteDetail(String bglqdh, Integer xh); + Long getLabRptgetRuleDetailCount(String bglqdh); +} diff --git a/mzcx/src/main/java/com/czlis/mzcx/pojo/LabFeeitemVsClass.java b/mzcx/src/main/java/com/czlis/mzcx/pojo/LabFeeitemVsClass.java new file mode 100644 index 0000000..1d347f8 --- /dev/null +++ b/mzcx/src/main/java/com/czlis/mzcx/pojo/LabFeeitemVsClass.java @@ -0,0 +1,19 @@ +package com.czlis.mzcx.pojo; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.NotBlank; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class LabFeeitemVsClass { + @NotBlank(message = "sflbdh不能为空") + private String sflbdh; + @NotBlank(message = "xh不能为空") + private Integer xh; + @NotBlank(message = "sfxmdh不能为空") + private String sfxmdh; +} diff --git a/mzcx/src/main/java/com/czlis/mzcx/pojo/LabRptgetRuleDTO.java b/mzcx/src/main/java/com/czlis/mzcx/pojo/LabRptgetRuleDTO.java new file mode 100644 index 0000000..731a1d8 --- /dev/null +++ b/mzcx/src/main/java/com/czlis/mzcx/pojo/LabRptgetRuleDTO.java @@ -0,0 +1,15 @@ +package com.czlis.mzcx.pojo; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class LabRptgetRuleDTO { + List ruleList; + List ruleDetailList; +} diff --git a/mzcx/src/main/java/com/czlis/mzcx/service/FeeitemVsClassService.java b/mzcx/src/main/java/com/czlis/mzcx/service/FeeitemVsClassService.java new file mode 100644 index 0000000..05d1316 --- /dev/null +++ b/mzcx/src/main/java/com/czlis/mzcx/service/FeeitemVsClassService.java @@ -0,0 +1,12 @@ +package com.czlis.mzcx.service; + +import com.czlis.mzcx.pojo.LabFeeitemVsClass; + +import java.util.List; + +public interface FeeitemVsClassService { + List query(LabFeeitemVsClass labFeeitemVsClass); + + void add(LabFeeitemVsClass labFeeitemVsClass); + +} diff --git a/mzcx/src/main/java/com/czlis/mzcx/service/RptgetRuleService.java b/mzcx/src/main/java/com/czlis/mzcx/service/RptgetRuleService.java new file mode 100644 index 0000000..a09aeca --- /dev/null +++ b/mzcx/src/main/java/com/czlis/mzcx/service/RptgetRuleService.java @@ -0,0 +1,22 @@ +package com.czlis.mzcx.service; + +import com.czlis.common.core.domain.Result; +import com.czlis.mzcx.pojo.LabRptgetRule; +import com.czlis.mzcx.pojo.LabRptgetRuleDTO; +import com.czlis.mzcx.pojo.LabRptgetRuleDetail; + +import java.util.List; + +public interface RptgetRuleService { + List query(LabRptgetRule rule); + + List queryDetail(String bglqdh); + + Result add(LabRptgetRuleDTO labRptgetRuleDTO); + + Result update(LabRptgetRuleDTO labRptgetRuleDTO); + + Result delete(String bglqdh); + + Result deleteDetail(String bglqdh, Integer xh); +} diff --git a/mzcx/src/main/java/com/czlis/mzcx/service/impl/FeeitemVsClassServiceImpl.java b/mzcx/src/main/java/com/czlis/mzcx/service/impl/FeeitemVsClassServiceImpl.java new file mode 100644 index 0000000..4bef5c9 --- /dev/null +++ b/mzcx/src/main/java/com/czlis/mzcx/service/impl/FeeitemVsClassServiceImpl.java @@ -0,0 +1,30 @@ +package com.czlis.mzcx.service.impl; + +import com.czlis.mzcx.mapper.FeeitemVsClassMapper; +import com.czlis.mzcx.pojo.LabFeeitemVsClass; +import com.czlis.mzcx.service.FeeitemVsClassService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + + +import javax.validation.constraints.NotBlank; +import java.util.List; + +@Service +@Slf4j +public class FeeitemVsClassServiceImpl implements FeeitemVsClassService { + + @Autowired + FeeitemVsClassMapper feeitemVsClassMapper; + + @Override + public List query(LabFeeitemVsClass labFeeitemVsClass) { + return feeitemVsClassMapper.query(labFeeitemVsClass); + } + + @Override + public void add(LabFeeitemVsClass labFeeitemVsClass) { + feeitemVsClassMapper.add(labFeeitemVsClass); + } +} diff --git a/mzcx/src/main/java/com/czlis/mzcx/service/impl/RptgetRuleServiceImpl.java b/mzcx/src/main/java/com/czlis/mzcx/service/impl/RptgetRuleServiceImpl.java new file mode 100644 index 0000000..1e49da7 --- /dev/null +++ b/mzcx/src/main/java/com/czlis/mzcx/service/impl/RptgetRuleServiceImpl.java @@ -0,0 +1,88 @@ +package com.czlis.mzcx.service.impl; + +import com.czlis.common.core.domain.Result; +import com.czlis.mzcx.mapper.RptgetRuleMapper; +import com.czlis.mzcx.pojo.LabRptgetRule; +import com.czlis.mzcx.pojo.LabRptgetRuleDTO; +import com.czlis.mzcx.pojo.LabRptgetRuleDetail; +import com.czlis.mzcx.service.RptgetRuleService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +@Service +@Slf4j +public class RptgetRuleServiceImpl implements RptgetRuleService { + + @Autowired + private RptgetRuleMapper rptgetRuleMapper; + + + @Override + public List query(LabRptgetRule rule) { + return rptgetRuleMapper.query(rule); + } + + @Override + public List queryDetail(String bglqdh) { + return rptgetRuleMapper.queryDetail(bglqdh); + } + + @Transactional(rollbackFor = Exception.class) + @Override + public Result add(LabRptgetRuleDTO labRptgetRuleDTO) { + List ruleList = labRptgetRuleDTO.getRuleList(); + for (LabRptgetRule labRptgetRule : ruleList) { + Integer bglqdh = labRptgetRule.getBglqdh(); + if(bglqdh == null || bglqdh == 0) return new Result("-1","报告列表中的报告领取代码不可以为空!"); + rptgetRuleMapper.insert(labRptgetRule); + } + + List ruleDetailList = labRptgetRuleDTO.getRuleDetailList(); + for (LabRptgetRuleDetail labRptgetRuleDetail : ruleDetailList) { + Integer bglqdh = labRptgetRuleDetail.getBglqdh(); + if(bglqdh == null || bglqdh == 0) return new Result("-1","报告明细表中的报告领取代码不可以为空!"); + rptgetRuleMapper.insertDetail(labRptgetRuleDetail); + } + + return new Result("0","添加成功!"); + + } + + @Transactional(rollbackFor = Exception.class) + @Override + public Result update(LabRptgetRuleDTO labRptgetRuleDTO) { + List ruleList = labRptgetRuleDTO.getRuleList(); + for (LabRptgetRule labRptgetRule : ruleList) { + Integer bglqdh = labRptgetRule.getBglqdh(); + if(bglqdh == null || bglqdh == 0) return new Result("-1","报告列表中的报告领取代码不可以为空!"); + rptgetRuleMapper.update(labRptgetRule); + } + + List ruleDetailList = labRptgetRuleDTO.getRuleDetailList(); + for (LabRptgetRuleDetail labRptgetRuleDetail : ruleDetailList) { + Integer bglqdh = labRptgetRuleDetail.getBglqdh(); + if(bglqdh == null || bglqdh == 0) return new Result("-1","报告明细表中的报告领取代码不可以为空!"); + rptgetRuleMapper.updateDetail(labRptgetRuleDetail); + } + return new Result("0","修改成功!"); + } + + @Override + public Result delete(String bglqdh) { + Long labRptgetRuleDetailCount = rptgetRuleMapper.getLabRptgetRuleDetailCount(bglqdh); + if(labRptgetRuleDetailCount > 0) return new Result("-1","存在报告领取规则明细数据,请先删除明细数据再删除列表数据!"); + rptgetRuleMapper.delete(bglqdh); + return new Result("0","删除报告领取规则列表成功!"); + } + + @Override + public Result deleteDetail(String bglqdh, Integer xh) { + rptgetRuleMapper.deleteDetail(bglqdh,xh); + return new Result("0","删除报告领取规则明细成功!"); + } + +} diff --git a/mzcx/src/main/resources/mapper/FeeitemVsClassMapper.xml b/mzcx/src/main/resources/mapper/FeeitemVsClassMapper.xml new file mode 100644 index 0000000..5f9db74 --- /dev/null +++ b/mzcx/src/main/resources/mapper/FeeitemVsClassMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + insert into lab_feeitem_vs_class( + xh, + sfxmdh, + sflbdh + )values( + #{xh}, + #{sfxmdh}, + sflbdh + ) + + + + \ No newline at end of file diff --git a/mzcx/src/main/resources/mapper/RptgetRuleMapper.xml b/mzcx/src/main/resources/mapper/RptgetRuleMapper.xml new file mode 100644 index 0000000..3a42a48 --- /dev/null +++ b/mzcx/src/main/resources/mapper/RptgetRuleMapper.xml @@ -0,0 +1,93 @@ + + + + + + + + + + insert into lab_rptgetrule( + bglqmc, + bz, + bglqdh + ) + values( + #{bglqmc}, + #{bz}, + #{bglqdh} + ) + + + + insert into lab_rptgetruledetail( + kssj, + jssj, + bgxss, + bglqsm, + bz, + weekday, + weekday1, + bglqdh,xh + )values( + #{kssj}, + #{jssj}, + #{bgxss}, + #{bglqsm}, + #{bz}, + #{weekday}, + #{weekday1}, + #{bglqdh},#{xh} + ) + + + + + update lab_rptgetrule + + bglqmc = #{bglqmc}, + bz = #{bz}, + #{bglqdh} + + where bglqdh = #{bglqdh} + + + + update lab_rptgetruledetail + + kssj = #{kssj}, + jssj = #{jssj}, + bgxss = #{bgxss}, + bglqsm = #{bglqsm}, + bz = #{bz}, + weekday = #{weekday}, + weekday1 = #{weekday1}, + #{bglqdh} + + where bglqdh = #{bglqdh} and xh = #{xh} + + + + delete from lab_rptgetrule where bglqdh = #{bglqdh} + + + + delete from lab_rptgetruledetail where bglqdh = #{bglqdh} and xh = #{xh} + + + + + \ No newline at end of file