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

Compare commits

base: jiangs:c29ced658a2e3f79ba884f00816a0e5474ade92b
Branches Tags
jiangs:master
jiangs:wy
jiangs:lis8.0_test
..
compare: jiangs:9dd8b96f43b23e9a5ce2f1fbf640a4faf07b01fb
Branches Tags
jiangs:master
jiangs:wy
jiangs:lis8.0_test

No commits in common. "c29ced658a2e3f79ba884f00816a0e5474ade92b" and "9dd8b96f43b23e9a5ce2f1fbf640a4faf07b01fb" have entirely different histories.
c29ced658a ... 9dd8b96f43

8 changed files with 8 additions and 152 deletions
Show Stats Expand all files Collapse all files

15
lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmAlarmdetailNew.java
View File

@ -1,15 +0,0 @@
package com.czlis.common.core.domain.entity.lis;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@AllArgsConstructor
@NoArgsConstructor
public class XmAlarmdetailNew {
private Integer xmid;
private Integer seq;
private String samplecondition;
private String resultcondition;
}

1
lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmInfoNew.java
View File

@ -70,6 +70,5 @@ public class XmInfoNew {
private String val5;
private String isWsw;
private String inputcode;
private String jsxm;
}

28
lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmKnowledge.java
View File

@ -1,28 +0,0 @@
package com.czlis.common.core.domain.entity.lis;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.math.BigDecimal;
@Data
@AllArgsConstructor
@NoArgsConstructor
public class XmKnowledge {
private String xmid;
private String xmdh;
private String xmmc;
private String xmlb;
private String xmz;
private String dw;
private BigDecimal cksx;
private BigDecimal ckxx;
private String dyckz;
private Integer dyxh;
private String jsgs;
private String lcyy;
private String bz;
private String zjf;
private String xsbz;
}

30
liswork/src/main/java/com/czlis/liswork/controller/dict/ReportItemController.java
View File

@ -4,10 +4,13 @@ import com.czlis.common.annotation.Anonymous;
import com.czlis.common.annotation.Log;
import com.czlis.common.core.controller.BaseController;
import com.czlis.common.core.domain.Result;
import com.czlis.common.core.domain.entity.lis.*;
import com.czlis.common.core.domain.entity.lis.XmFilter;
import com.czlis.common.core.domain.entity.lis.XmLot;
import com.czlis.common.core.page.TableDataInfo;
import com.czlis.common.enums.BusinessType;
import com.czlis.liswork.pojo.DTO.XmInfoNewDTO;
import com.czlis.common.core.domain.entity.lis.XmInfoNew;
import com.czlis.common.core.domain.entity.lis.XmInfoVs;
import com.czlis.liswork.service.ReportItemService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@ -45,12 +48,6 @@ public class ReportItemController extends BaseController {
return new Result("0","查询成功！",xmInfoNewDTO);
}
@ApiOperation("查询项目基础信息")
@GetMapping("/queryXmInfoNew")
public Result queryXmInfoNew(XmInfoNew xmInfoNew) {
return reportItemService.queryXmInfoNew(xmInfoNew);
}
@Log(title = "检验项目",businessType = BusinessType.INSERT)
@ApiOperation("新增检验项目")
@PostMapping("/add")
@ -126,23 +123,4 @@ public class ReportItemController extends BaseController {
return reportItemService.deleteXmLot(yq,sjph);
}
@ApiOperation("获取危急值特定判断条件")
@GetMapping("/queryXmAlarmdetailNew")
public Result queryXmAlarmdetailNew(XmAlarmdetailNew xmAlarmdetailNew){
return reportItemService.queryXmAlarmdetailNew(xmAlarmdetailNew);
}
@Log(title = "危急值特定判断条件",businessType = BusinessType.INSERT)
@ApiOperation("新增危急值特定判断条件")
@PostMapping("/addXmAlarmdetailNew")
public Result addXmAlarmdetailNew(@RequestBody List<XmAlarmdetailNew> xmAlarmdetailNew){
return reportItemService.addXmAlarmdetailNew(xmAlarmdetailNew);
}
@Log(title = "危急值特定判断条件",businessType = BusinessType.DELETE)
@ApiOperation("修改危急值特定判断条件")
@GetMapping("/delXmAlarmdetailNew")
public Result delXmAlarmdetailNew(XmAlarmdetailNew xmAlarmdetailNew){
return reportItemService.delXmAlarmdetailNew(xmAlarmdetailNew);
}
}

8
liswork/src/main/java/com/czlis/liswork/mapper/dict/ReportItemMapper.java
View File

@ -50,12 +50,4 @@ public interface ReportItemMapper {
void addXmLot(XmLot xmLot);
void deleteXmLot(@Param("yq") String yq,@Param("sjph") String sjph);
List<XmAlarmdetailNew> queryXmAlarmdetailNew(XmAlarmdetailNew xmAlarmdetailNew);
void addXmAlarmdetailNew(XmAlarmdetailNew xmAlarmdetailNew);
void updateXmAlarmdetailNew(XmAlarmdetailNew xmAlarmdetailNew);
void delXmAlarmdetailNew(XmAlarmdetailNew xmAlarmdetailNew);
}

13
liswork/src/main/java/com/czlis/liswork/service/ReportItemService.java
View File

@ -1,8 +1,11 @@
package com.czlis.liswork.service;
import com.czlis.common.core.domain.Result;
import com.czlis.common.core.domain.entity.lis.*;
import com.czlis.common.core.domain.entity.lis.XmFilter;
import com.czlis.common.core.domain.entity.lis.XmLot;
import com.czlis.liswork.pojo.DTO.XmInfoNewDTO;
import com.czlis.common.core.domain.entity.lis.XmInfoNew;
import com.czlis.common.core.domain.entity.lis.XmInfoVs;
import java.util.List;
@ -33,12 +36,4 @@ public interface ReportItemService {
Result deleteXmLot(String yq, String sjph);
List<XmInfoNew> query(XmInfoNew xmInfoNew);
Result queryXmInfoNew(XmInfoNew xmInfoNew);
Result queryXmAlarmdetailNew(XmAlarmdetailNew xmAlarmdetailNew);
Result addXmAlarmdetailNew(List<XmAlarmdetailNew> xmAlarmdetailNew);
Result delXmAlarmdetailNew(XmAlarmdetailNew xmAlarmdetailNew);
}

32
liswork/src/main/java/com/czlis/liswork/service/impl/ReportItemServiceImpl.java
View File

@ -213,37 +213,5 @@ public class ReportItemServiceImpl implements ReportItemService {
}
@Override
public Result queryXmInfoNew(XmInfoNew xmInfoNew) {
List<XmInfoNew> xmInfoNewList = reportItemMapper.query(xmInfoNew);
return new Result("0","获取数据成功！",xmInfoNewList);
}
@Override
public Result queryXmAlarmdetailNew(XmAlarmdetailNew xmAlarmdetailNew) {
List<XmAlarmdetailNew> xmAlarmdetailNewList = reportItemMapper.queryXmAlarmdetailNew(xmAlarmdetailNew);
return new Result("0","获取数据成功!",xmAlarmdetailNewList);
}
@Override
public Result addXmAlarmdetailNew(List<XmAlarmdetailNew> xmAlarmdetailNewList) {
for (XmAlarmdetailNew xmAlarmdetailNew : xmAlarmdetailNewList) {
List<XmAlarmdetailNew> xmAlarmdetailNewOneList = reportItemMapper.queryXmAlarmdetailNew(xmAlarmdetailNew);
log.info("列表数据个数：{}",xmAlarmdetailNewOneList.size());
if(xmAlarmdetailNewOneList.size() > 0){
reportItemMapper.updateXmAlarmdetailNew(xmAlarmdetailNew);
}else{
reportItemMapper.addXmAlarmdetailNew(xmAlarmdetailNew);
}
}
return new Result("0","变更数据成功！");
}
@Override
public Result delXmAlarmdetailNew(XmAlarmdetailNew xmAlarmdetailNew) {
reportItemMapper.delXmAlarmdetailNew(xmAlarmdetailNew);
return new Result("0","删除数据成功！");
}
}

33
liswork/src/main/resources/mapper/ReportItemMapper.xml
View File

@ -565,37 +565,4 @@
<delete id="deleteXmLot">
delete from xm_log where yq = #{yq} and sjph = #{sjph}
</delete>
<select id="queryXmAlarmdetailNew" resultType="com.czlis.common.core.domain.entity.lis.XmAlarmdetailNew">
select * from xm_alarmdetail_new
<where>
<if test="xmid != null">and xmid = #{xmid}</if>
<if test="seq != null">and seq = #{seq}</if>
</where>
</select>
<insert id="addXmAlarmdetailNew">
insert into xm_alarmdetail_new(
<if test="samplecondition != null and samplecondition != ''">samplecondition,</if>
<if test="resultcondition != null and resultcondition != ''">resultcondition,</if>
xmid, seq
)values(
<if test="samplecondition != null and samplecondition != ''">#{samplecondition},</if>
<if test="resultcondition != null and resultcondition != ''">#{resultcondition},</if>
#{xmid},#{seq})
</insert>
<update id="updateXmAlarmdetailNew">
update xm_alarmdetail_new
<set>
<if test="samplecondition != null and samplecondition != ''">samplecondition = #{samplecondition},</if>
<if test="resultcondition != null and resultcondition != ''">resultcondition = #{resultcondition},</if>
xmid = #{xmid}
</set>
where xmid = #{xmid} and seq = #{seq}
</update>
<delete id="delXmAlarmdetailNew">
delete from xm_alarmdetail_new where xmid = #{xmid} and seq = #{seq}
</delete>
</mapper>