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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
tangw 2025-12-03 10:39:08 +08:00
commit afc5235992
6 changed files with 109 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmInfoVs.java
View File

@ -22,4 +22,7 @@ public class XmInfoVs {
private String zkxm;
private String qccv;
private String qcvs;
private String cksx;
private String ckxx;
private String dyckz;
}

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

@ -154,4 +154,11 @@ public class ReportItemController extends BaseController {
public Result delXmValNew(XmValNew xmValNew){
return reportItemService.delXmValNew(xmValNew);
}
@Log(title = SysLogConstants.REPORTITEM_LOG,businessType = BusinessType.DELETE)
@ApiOperation("删除常见描述")
@GetMapping("/delXmTextresultNew")
public Result delXmTextresultNew(XmTextresultNew xmTextresultNew){
return reportItemService.delXmTextresultNew(xmTextresultNew);
}
}

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

@ -18,7 +18,7 @@ public interface ReportItemMapper {
void addXmInterRow(XmInter xmInterRow);
void addXmRefNewRow(XmRefNew xmRefRow);
void addXmValNewRow(XmValNew xmValRow);
void addXmTextResultRow(XmTextResult xmTextResultRow);
void addXmTextResultRow(XmTextresultNew xmTextResultRow);
void deleteXmInfoNew(Integer xmid);
void deleteXmDouble(@Param("yq") String yq,@Param("xmdh") String xmdh);
@ -34,7 +34,8 @@ public interface ReportItemMapper {
void updateXmInterRow(XmInter xmInterRow);
void updateXmRefNewRow(XmRefNew xmRefRow);
void updateXmValNewRow(XmValNew xmValRow);
void updateXmTextResultRow(XmTextResult xmTextResultRow);
void updateXmTextResultRow(XmTextresultNew xmTextResultRow);
void updateXminfoVs(XmInfoVs xmInfoVs);
void addXmInfoVs(XmInfoVs xmInfoVs);
void deleteXmInfoVs(Integer vsid);
@ -58,4 +59,6 @@ public interface ReportItemMapper {
void updateXmAlarmdetailNew(XmAlarmdetailNew xmAlarmdetailNew);
void delXmAlarmdetailNew(XmAlarmdetailNew xmAlarmdetailNew);
void delXmTextresultNew(XmTextresultNew xmTextresultNew);
}

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

@ -43,4 +43,6 @@ public interface ReportItemService {
Result delXmAlarmdetailNew(XmAlarmdetailNew xmAlarmdetailNew);
Result delXmValNew(XmValNew xmValNew);
Result delXmTextresultNew(XmTextresultNew xmTextresultNew);
}

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

@ -90,10 +90,10 @@ public class ReportItemServiceImpl implements ReportItemService {
reportItemMapper.addXmValNewRow(xmValRow);
}
List<XmTextResult> xmTextResultRows = xmInfoNewDTO.getXmTextResultRows();
for (XmTextResult xmTextResultRow : xmTextResultRows) {
reportItemMapper.addXmTextResultRow(xmTextResultRow);
}
// List<XmTextResult> xmTextResultRows = xmInfoNewDTO.getXmTextResultRows();
// for (XmTextResult xmTextResultRow : xmTextResultRows) {
// reportItemMapper.addXmTextResultRow(xmTextResultRow);
// }
return new Result("0","添加项目成功！");
}
@ -194,11 +194,39 @@ public class ReportItemServiceImpl implements ReportItemService {
}
}
List<XmTextResult> xmTextResultRows = xmInfoNewDTO.getXmTextResultRows();
for (XmTextResult xmTextResultRow : xmTextResultRows) {
reportItemMapper.updateXmTextResultRow(xmTextResultRow);
List<XmInfoVs> xmInfoVsRows = xmInfoNewDTO.getXmInfoVsRows();
if(xmInfoVsRows != null){
for (XmInfoVs xmInfoVs : xmInfoVsRows) {
XmInfoVs newXmInfoVs = new XmInfoVs();
newXmInfoVs.setYq(xmInfoVs.getYq());
newXmInfoVs.setXmid(xmInfoVs.getXmid());
List<XmInfoVs> xmInfoVs1 = reportItemMapper.queryXmInfoVs(newXmInfoVs);
if(xmInfoVs1.size() > 0){
reportItemMapper.updateXminfoVs(xmInfoVs);
}else{
xmInfoVs.setUflag("0");
reportItemMapper.addXmInfoVs(xmInfoVs);
}
}
}
List<XmTextresultNew> xmTextresultNewRows = xmInfoNewDTO.getXmTextresultNewRows();
if(xmTextresultNewRows != null){
for (XmTextresultNew xmTextresultNewRow : xmTextresultNewRows) {
XmTextresultNew newXmTextresult = new XmTextresultNew();
newXmTextresult.setXmid(xmTextresultNewRow.getXmid());
newXmTextresult.setXh(xmTextresultNewRow.getXh());
List<XmTextresultNew> xmTextresultNews = reportItemMapper.queryXmTextresultNew(newXmTextresult);
if(xmTextresultNews.size() > 0){
reportItemMapper.updateXmTextResultRow(xmTextresultNewRow);
}else{
reportItemMapper.addXmTextResultRow(xmTextresultNewRow);
}
}
}
return new Result("0","添加项目成功！");
}
@ -298,5 +326,11 @@ public class ReportItemServiceImpl implements ReportItemService {
return new Result("0","删除成功！");
}
@Override
public Result delXmTextresultNew(XmTextresultNew xmTextresultNew) {
reportItemMapper.delXmTextresultNew(xmTextresultNew);
return new Result("0","删除成功！");
}
}

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

@ -58,6 +58,7 @@
select * from xm_info_vs
<where>
<if test="xmid != null">and xmid = #{xmid}</if>
<if test="yq != null">and yq = #{yq}</if>
</where>
</select>
@ -321,6 +322,32 @@
)
</insert>
<insert id="addXmInfoVs">
insert into xm_info_vs(
<if test="dylx != null and dylx !=''">dylx,</if>
<if test="dyxh != null">dyxh,</if>
<if test="xs != null">xs,</if>
<if test="xsws != null">xsws,</if>
<if test="fzdyxh != null">fzdyxh,</if>
<if test="zkxm != null and zkxm !=''">zkxm,</if>
<if test="cksx != null and cksx !=''">cksx,</if>
<if test="ckxx != null and ckxx !=''">ckxx,</if>
<if test="dyckz != null and dyckz !=''">dyckz,</if>
yq, xmid,uflag
)values (
<if test="dylx != null and dylx !=''">#{dylx},</if>
<if test="dyxh != null">#{dyxh},</if>
<if test="xs != null">#{xs},</if>
<if test="xsws != null">#{xsws},</if>
<if test="fzdyxh != null">#{fzdyxh},</if>
<if test="zkxm != null and zkxm !=''">#{zkxm},</if>
<if test="cksx != null and cksx !=''">#{cksx},</if>
<if test="ckxx != null and ckxx !=''">#{ckxx},</if>
<if test="dyckz != null and dyckz !=''">#{dyckz},</if>
#{yq},#{xmid},#{uflag}
)
</insert>
<delete id="deleteXmInfoNew">
delete from xm_info_new where xmid = #{xmid}
@ -488,41 +515,31 @@
<update id="updateXmTextResultRow">
update xm_textresult_new
<set>
<if test="textresult != null and textresult != ''">textresult #{textresult},</if>
<if test="textresult != null and textresult != ''">textresult = #{textresult},</if>
<if test="reserve != null and reserve != ''">reserve = #{reserve},</if>
<if test="yxjs != null and yxjs != ''">yxjs = #{yxjs},</if>
<if test="cjyy != null and cjyy != ''">cjyy = #{cjyy},</if>
<if test="zd != null and zd != ''">zd,</if>
xmid,xmdh,xh
<if test="zd != null and zd != ''">zd = #{zd},</if>
xmid = #{xmid},xh = #{xh}
</set>
where xmid = #{xmid}
where xmid = #{xmid} and xh = #{xh}
</update>
<update id="updateXminfoVs">
update xm_info_vs set
<if test="dylx != null and dylx !=''">dylx = #{dylx},</if>
<if test="dyxh != null">dyxh = #{dyxh},</if>
<if test="xs != null">xs = #{xs},</if>
<if test="xsws != null">xsws = #{xsws},</if>
<if test="fzdyxh != null">fzdyxh = #{fzdyxh},</if>
<if test="zkxm != null and zkxm !=''">zkxm = #{zkxm},</if>
<if test="cksx != null and cksx !=''">cksx = #{cksx},</if>
<if test="ckxx != null and ckxx !=''">ckxx = #{ckxx},</if>
<if test="dyckz != null and dyckz !=''">dyckz = #{dyckz},</if>
xmid = #{xmid}, yq = #{yq}
where xmid = #{xmid} and yq = #{yq}
</update>
<insert id="addXmInfoVs">
insert into xm_info_vs(
<if test="dylx != null and dylx != ''">dylx,</if>
<if test="dyxh != null ">dyxh,</if>
<if test="uflag != null and uflag != ''">uflag,</if>
<if test="xs != null">xs,</if>
<if test="xsws != null">xsws,</if>
<if test="fzdyxh != null">fzdyxh,</if>
<if test="zkxm != null and zkxm != ''">zkxm,</if>
<if test="qccv != null and qccv != ''">qccv,</if>
<if test="qcvs != null and qcvs != ''">qcvs,</if>
xmid,yq,xmid
)values(
<if test="dylx != null and dylx != ''">#{dylx},</if>
<if test="dyxh != null ">#{dyxh},</if>
<if test="uflag != null and uflag != ''">#{uflag},</if>
<if test="xs != null">#{xs},</if>
<if test="xsws != null">#{xsws},</if>
<if test="fzdyxh != null">#{fzdyxh},</if>
<if test="zkxm != null and zkxm != ''">#{zkxm},</if>
<if test="qccv != null and qccv != ''">#{qccv},</if>
<if test="qcvs != null and qcvs != ''">#{qcvs},</if>
#{xmid},#{yq},#{xmid}
)
</insert>
<delete id="deleteXmInfoVs">
delete from xm_info_vs where vsid = #{vsid}
@ -599,4 +616,8 @@
<delete id="delXmAlarmdetailNew">
delete from xm_alarmdetail_new where xmid = #{xmid} and seq = #{seq}
</delete>
<delete id="delXmTextresultNew">
delete from xm_textresult_new where xmid = #{xmid} and xh = #{xh}
</delete>
</mapper>