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

Compare commits

base: jiangs:e15d2909af8ce3e34e11d599a997cdd9c06b8a5a
Branches Tags
jiangs:master
jiangs:wy
jiangs:lis8.0_test
..
compare: jiangs:5e2f3dc381f483e3efe09128b383417db90e034a
Branches Tags
jiangs:master
jiangs:wy
jiangs:lis8.0_test

No commits in common. "e15d2909af8ce3e34e11d599a997cdd9c06b8a5a" and "5e2f3dc381f483e3efe09128b383417db90e034a" have entirely different histories.
e15d2909af ... 5e2f3dc381

3 changed files with 31 additions and 48 deletions
Show Stats Expand all files Collapse all files

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

@ -20,11 +20,11 @@ public interface ReportItemMapper {
void addXmValNewRow(XmValNew xmValRow); void addXmValNewRow(XmValNew xmValRow);
void addXmTextResultRow(XmTextresultNew xmTextResultRow); void addXmTextResultRow(XmTextresultNew xmTextResultRow);
void deleteXmInfoNew(XmInfoNew xmInfoNew); void deleteXmInfoNew(Integer xmid);
void deleteXmDouble(XmDouble xmDouble); void deleteXmDouble(@Param("yq") String yq,@Param("xmdh") String xmdh);
void deleteXmInter(XmInter xmInter); void deleteXmInter(Integer xmid);
void deleteXmTextResult(XmTextresultNew xmTextresultNew); void deleteXmTextResult(Integer xmid);
void deleteXmRef(XmRefNew xmRefNew); void deleteXmRef(Integer xmid);
void deleteXmValNew(XmValNew xmValNew); void deleteXmValNew(XmValNew xmValNew);
Long getXmInfoVsCount(Integer xmid); Long getXmInfoVsCount(Integer xmid);

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

@ -39,9 +39,6 @@ public class ReportItemServiceImpl implements ReportItemService {
XmRefNew xmRefNew = new XmRefNew(); XmRefNew xmRefNew = new XmRefNew();
xmRefNew.setXmid(Integer.parseInt(xmid)); xmRefNew.setXmid(Integer.parseInt(xmid));
List<XmRefNew> xmRefNews = reportItemMapper.queryXmRefNew(xmRefNew); List<XmRefNew> xmRefNews = reportItemMapper.queryXmRefNew(xmRefNew);
for (XmRefNew refNew : xmRefNews) {
refNew.setXb(refNew.getXb().trim());
}
XmInfoVs xmInfoVs = new XmInfoVs(); XmInfoVs xmInfoVs = new XmInfoVs();
xmInfoVs.setXmid(Integer.parseInt(xmid)); xmInfoVs.setXmid(Integer.parseInt(xmid));
List<XmInfoVs> xmInfoVss = reportItemMapper.queryXmInfoVs(xmInfoVs); List<XmInfoVs> xmInfoVss = reportItemMapper.queryXmInfoVs(xmInfoVs);
@ -109,17 +106,13 @@ public class ReportItemServiceImpl implements ReportItemService {
xmInfoNew1.setXmid(xmid); xmInfoNew1.setXmid(xmid);
List<XmInfoNew> xmInfoNewList = reportItemMapper.query(xmInfoNew1); List<XmInfoNew> xmInfoNewList = reportItemMapper.query(xmInfoNew1);
for (XmInfoNew xmInfoNew : xmInfoNewList) { for (XmInfoNew xmInfoNew : xmInfoNewList) {
XmInfoNew xmInfoNew2 = new XmInfoNew(); String yq = xmInfoNew.getYq();
xmInfoNew2.setXmid(xmInfoNew.getXmid()); String xmdh = xmInfoNew.getXmdh();
reportItemMapper.deleteXmInfoNew(xmInfoNew2); reportItemMapper.deleteXmInfoNew(xmid);
//reportItemMapper.deleteXmDouble(yq,xmdh); reportItemMapper.deleteXmDouble(yq,xmdh);
//reportItemMapper.deleteXmInter(xmid); reportItemMapper.deleteXmInter(xmid);
XmTextresultNew xmTextresultNew = new XmTextresultNew(); reportItemMapper.deleteXmTextResult(xmid);
xmTextresultNew.setXmid(xmInfoNew.getXmid()); reportItemMapper.deleteXmRef(xmid);
reportItemMapper.deleteXmTextResult(xmTextresultNew);
XmRefNew xmRefNew = new XmRefNew();
xmRefNew.setXmid(xmInfoNew.getXmid());
reportItemMapper.deleteXmRef(xmRefNew);
XmValNew xmValNew = new XmValNew(); XmValNew xmValNew = new XmValNew();
xmValNew.setXmid(xmid); xmValNew.setXmid(xmid);
reportItemMapper.deleteXmValNew(xmValNew); reportItemMapper.deleteXmValNew(xmValNew);
@ -132,26 +125,18 @@ public class ReportItemServiceImpl implements ReportItemService {
@Override @Override
public Result update(XmInfoNewDTO xmInfoNewDTO) { public Result update(XmInfoNewDTO xmInfoNewDTO) {
XmInfoNew xmInfoNew = xmInfoNewDTO.getXmInfoNew(); XmInfoNew xmInfoNew = xmInfoNewDTO.getXmInfoNew();
if(xmInfoNew.getXmid() == null || xmInfoNew.getXmid().equals("")){ XmInfoNew xmInfoNew1 = new XmInfoNew();
reportItemMapper.addXmInfoNew(xmInfoNew); xmInfoNew1.setXmid(xmInfoNew.getXmid());
Integer xmid = xmInfoNew.getXmid(); List<XmInfoNew> xmInfoNews = reportItemMapper.query(xmInfoNew1);
xmInfoNewDTO.getXmInfoNew().setXmid(xmid); if(xmInfoNews != null){
reportItemMapper.updateXmInfoNew(xmInfoNew);
}else{ }else{
XmInfoNew xmInfoNew1 = new XmInfoNew(); reportItemMapper.addXmInfoNew(xmInfoNew);
xmInfoNew1.setXmid(xmInfoNew.getXmid());
List<XmInfoNew> xmInfoNews = reportItemMapper.query(xmInfoNew1);
if(xmInfoNews != null){
reportItemMapper.updateXmInfoNew(xmInfoNew);
}else{
reportItemMapper.addXmInfoNew(xmInfoNew);
}
} }
List<XmDouble> xmDoubleRows = xmInfoNewDTO.getXmDoubleRows(); List<XmDouble> xmDoubleRows = xmInfoNewDTO.getXmDoubleRows();
if(xmDoubleRows != null){ if(xmDoubleRows != null){
for (XmDouble xmDoubleRow : xmDoubleRows) { for (XmDouble xmDoubleRow : xmDoubleRows) {
if(xmDoubleRow.getXmid() == null || xmDoubleRow.getXmid().equals("")) xmDoubleRow.setXmid(xmInfoNew.getXmid());
XmDouble newXmDouble = new XmDouble(); XmDouble newXmDouble = new XmDouble();
newXmDouble.setXmid(xmDoubleRow.getXmid()); newXmDouble.setXmid(xmDoubleRow.getXmid());
List<XmDouble> xmDoubles = reportItemMapper.queryXmDouble(newXmDouble); List<XmDouble> xmDoubles = reportItemMapper.queryXmDouble(newXmDouble);
@ -167,7 +152,6 @@ public class ReportItemServiceImpl implements ReportItemService {
List<XmInter> xmInterRows = xmInfoNewDTO.getXmInterRows(); List<XmInter> xmInterRows = xmInfoNewDTO.getXmInterRows();
if(xmInterRows != null){ if(xmInterRows != null){
for (XmInter xmInterRow : xmInterRows) { for (XmInter xmInterRow : xmInterRows) {
if(xmInfoNew.getXmid() == null || xmInfoNew.getXmid().equals("")) xmInterRow.setXmid(xmInfoNew.getXmid());
XmInter newXmInter = new XmInter(); XmInter newXmInter = new XmInter();
newXmInter.setXmid(xmInterRow.getXmid()); newXmInter.setXmid(xmInterRow.getXmid());
List<XmInter> xmInters = reportItemMapper.queryXmInter(newXmInter); List<XmInter> xmInters = reportItemMapper.queryXmInter(newXmInter);
@ -183,7 +167,6 @@ public class ReportItemServiceImpl implements ReportItemService {
List<XmRefNew> xmRefNewRows = xmInfoNewDTO.getXmRefNewRows(); List<XmRefNew> xmRefNewRows = xmInfoNewDTO.getXmRefNewRows();
if(xmRefNewRows != null){ if(xmRefNewRows != null){
for (XmRefNew xmRefNewRow : xmRefNewRows) { for (XmRefNew xmRefNewRow : xmRefNewRows) {
if(xmRefNewRow.getXmid() == null || xmRefNewRow.getXmid().equals("")) xmRefNewRow.setXmid(xmInfoNew.getXmid());
XmRefNew newXmRef = new XmRefNew(); XmRefNew newXmRef = new XmRefNew();
newXmRef.setXmid(xmRefNewRow.getXmid()); newXmRef.setXmid(xmRefNewRow.getXmid());
List<XmRefNew> xmRefNews = reportItemMapper.queryXmRefNew(newXmRef); List<XmRefNew> xmRefNews = reportItemMapper.queryXmRefNew(newXmRef);
@ -199,7 +182,6 @@ public class ReportItemServiceImpl implements ReportItemService {
List<XmValNew> xmValNewRows = xmInfoNewDTO.getXmValNewRows(); List<XmValNew> xmValNewRows = xmInfoNewDTO.getXmValNewRows();
if(xmValNewRows != null){ if(xmValNewRows != null){
for (XmValNew xmValRow : xmValNewRows) { for (XmValNew xmValRow : xmValNewRows) {
if(xmValRow.getXmid() == null || xmValRow.getXmid().equals("")) xmValRow.setXmid(xmInfoNew.getXmid());
XmValNew newXmVal = new XmValNew(); XmValNew newXmVal = new XmValNew();
newXmVal.setXmid(xmValRow.getXmid()); newXmVal.setXmid(xmValRow.getXmid());
newXmVal.setXh(xmValRow.getXh()); newXmVal.setXh(xmValRow.getXh());
@ -215,7 +197,6 @@ public class ReportItemServiceImpl implements ReportItemService {
List<XmInfoVs> xmInfoVsRows = xmInfoNewDTO.getXmInfoVsRows(); List<XmInfoVs> xmInfoVsRows = xmInfoNewDTO.getXmInfoVsRows();
if(xmInfoVsRows != null){ if(xmInfoVsRows != null){
for (XmInfoVs xmInfoVs : xmInfoVsRows) { for (XmInfoVs xmInfoVs : xmInfoVsRows) {
if(xmInfoVs.getXmid() == null || xmInfoVs.getXmid().equals("")) xmInfoVs.setXmid(xmInfoNew.getXmid());
XmInfoVs newXmInfoVs = new XmInfoVs(); XmInfoVs newXmInfoVs = new XmInfoVs();
newXmInfoVs.setYq(xmInfoVs.getYq()); newXmInfoVs.setYq(xmInfoVs.getYq());
newXmInfoVs.setXmid(xmInfoVs.getXmid()); newXmInfoVs.setXmid(xmInfoVs.getXmid());
@ -232,7 +213,6 @@ public class ReportItemServiceImpl implements ReportItemService {
List<XmTextresultNew> xmTextresultNewRows = xmInfoNewDTO.getXmTextresultNewRows(); List<XmTextresultNew> xmTextresultNewRows = xmInfoNewDTO.getXmTextresultNewRows();
if(xmTextresultNewRows != null){ if(xmTextresultNewRows != null){
for (XmTextresultNew xmTextresultNewRow : xmTextresultNewRows) { for (XmTextresultNew xmTextresultNewRow : xmTextresultNewRows) {
if(xmTextresultNewRow.getXmid() == null || xmTextresultNewRow.equals("")) xmTextresultNewRow.setXmid(xmInfoNew.getXmid());
XmTextresultNew newXmTextresult = new XmTextresultNew(); XmTextresultNew newXmTextresult = new XmTextresultNew();
newXmTextresult.setXmid(xmTextresultNewRow.getXmid()); newXmTextresult.setXmid(xmTextresultNewRow.getXmid());
newXmTextresult.setXh(xmTextresultNewRow.getXh()); newXmTextresult.setXh(xmTextresultNewRow.getXh());
@ -247,7 +227,6 @@ public class ReportItemServiceImpl implements ReportItemService {
return new Result("0","添加项目成功！"); return new Result("0","添加项目成功！");
} }

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

@ -71,14 +71,16 @@
</where> </where>
</select> </select>
<insert id="addXmInfoNew" useGeneratedKeys="true" keyProperty="xmid" parameterType="com.czlis.common.core.domain.entity.lis.XmInfoNew"> <insert id="addXmInfoNew">
insert into xm_info_new( insert into xm_info_new(
<if test="yq != null and yq != ''">yq,</if> <if test="yq != null and yq != ''">yq,</if>
<if test="zhbdh != null">zhbdh,</if> <if test="xmdh != null and xmdh != ''">xmdh,</if>
<if test="bgdh != null">bgdh,</if> <if test="xmmc != null and xmmc != ''">xmmc,</if>
<if test="zhbdh != null and zhbdh != ''">zhbdh,</if>
<if test="bgdh != null and bgdh != ''">bgdh,</if>
<if test="cksx != null">cksx,</if> <if test="cksx != null">cksx,</if>
<if test="ckxx != null">ckxx,</if> <if test="ckxx != null">ckxx,</if>
<if test="dyckz != null">dyckz,</if> <if test="dyckz != null and dyckz != ''">dyckz,</if>
<if test="dylx != null and dylx != ''">dylx,</if> <if test="dylx != null and dylx != ''">dylx,</if>
<if test="dyxh != null ">dyxh,</if> <if test="dyxh != null ">dyxh,</if>
<if test="zjf != null and zjf != ''">zjf,</if> <if test="zjf != null and zjf != ''">zjf,</if>
@ -128,14 +130,16 @@
<if test="val3 != null and val3 != ''" >val3,</if> <if test="val3 != null and val3 != ''" >val3,</if>
<if test="val4 != null and val4 != ''" >val4,</if> <if test="val4 != null and val4 != ''" >val4,</if>
<if test="val5 != null and val5 != ''" >val5,</if> <if test="val5 != null and val5 != ''" >val5,</if>
xmdh,xmmc xmid
)values ( )values (
<if test="yq != null and yq != ''">#{yq},</if> <if test="yq != null and yq != ''">#{yq},</if>
<if test="zhbdh != null">#{zhbdh},</if> <if test="xmdh != null and xmdh != ''">#{xmdh},</if>
<if test="bgdh != null">#{bgdh},</if> <if test="xmmc != null and xmmc != ''">#{xmmc},</if>
<if test="zhbdh != null and zhbdh != ''">#{zhbdh},</if>
<if test="bgdh != null and bgdh != ''">#{bgdh},</if>
<if test="cksx != null">#{cksx},</if> <if test="cksx != null">#{cksx},</if>
<if test="ckxx != null">#{ckxx},</if> <if test="ckxx != null">#{ckxx},</if>
<if test="dyckz != null">#{dyckz},</if> <if test="dyckz != null and dyckz != ''">#{dyckz},</if>
<if test="dylx != null and dylx != ''">#{dylx},</if> <if test="dylx != null and dylx != ''">#{dylx},</if>
<if test="dyxh != null ">#{dyxh},</if> <if test="dyxh != null ">#{dyxh},</if>
<if test="zjf != null and zjf != ''">#{zjf},</if> <if test="zjf != null and zjf != ''">#{zjf},</if>
@ -185,7 +189,7 @@
<if test="val3 != null and val3 != ''" >#{val3},</if> <if test="val3 != null and val3 != ''" >#{val3},</if>
<if test="val4 != null and val4 != ''" >#{val4},</if> <if test="val4 != null and val4 != ''" >#{val4},</if>
<if test="val5 != null and val5 != ''" >#{val5},</if> <if test="val5 != null and val5 != ''" >#{val5},</if>
#{xmdh},#{xmmc} #{xmid}
) )
</insert> </insert>