Merge remote-tracking branch 'lis8.0/master'

liswork/src/main/java/com/czlis/liswork/controller/dict/ReportItemController.java

@@ -70,6 +70,7 @@ public class ReportItemController extends BaseController {
     @ApiOperation("修改检验项目")
     @PostMapping("/update")
     public Result update(@RequestBody XmInfoNewDTO xmInfoNewDTO){
+        log.info("入参xmInfoNewDTO：{}",xmInfoNewDTO);
         return reportItemService.update(xmInfoNewDTO);
     }
 
@@ -146,4 +147,11 @@ public class ReportItemController extends BaseController {
     public Result delXmAlarmdetailNew(XmAlarmdetailNew xmAlarmdetailNew){
         return reportItemService.delXmAlarmdetailNew(xmAlarmdetailNew);
     }
+
+    @Log(title = SysLogConstants.REPORTITEM_LOG,businessType = BusinessType.DELETE)
+    @ApiOperation("删除常用取值")
+    @GetMapping("/delXmValNew")
+    public Result delXmValNew(XmValNew xmValNew){
+        return reportItemService.delXmValNew(xmValNew);
+    }
 }

liswork/src/main/java/com/czlis/liswork/mapper/dict/ReportItemMapper.java

@@ -16,8 +16,8 @@ public interface ReportItemMapper {
     void addXmInfoNew(XmInfoNew xmInfoNew);
     void addXmDoubleRow(XmDouble xmDoubleRow);
     void addXmInterRow(XmInter xmInterRow);
-    void addXmRefRow(XmRef xmRefRow);
-    void addXmValRow(XmVal xmValRow);
+    void addXmRefNewRow(XmRefNew xmRefRow);
+    void addXmValNewRow(XmValNew xmValRow);
     void addXmTextResultRow(XmTextResult xmTextResultRow);
 
     void deleteXmInfoNew(Integer xmid);
@@ -25,15 +25,15 @@ public interface ReportItemMapper {
     void deleteXmInter(Integer xmid);
     void deleteXmTextResult(Integer xmid);
     void deleteXmRef(Integer xmid);
-    void deleteXmVal(Integer xmid);
+    void deleteXmValNew(XmValNew xmValNew);
 
     Long getXmInfoVsCount(Integer xmid);
 
     void updateXmInfoNew(XmInfoNew xmInfoNewRow);
     void updateXmDoubleRow(XmDouble xmDoubleRow);
     void updateXmInterRow(XmInter xmInterRow);
-    void updateXmRefRow(XmRef xmRefRow);
-    void updateXmValRow(XmVal xmValRow);
+    void updateXmRefNewRow(XmRefNew xmRefRow);
+    void updateXmValNewRow(XmValNew xmValRow);
     void updateXmTextResultRow(XmTextResult xmTextResultRow);
 
     void addXmInfoVs(XmInfoVs xmInfoVs);

liswork/src/main/java/com/czlis/liswork/pojo/DTO/XmInfoNewDTO.java

@@ -11,7 +11,7 @@ import java.util.List;
 @AllArgsConstructor
 @NoArgsConstructor
 public class XmInfoNewDTO {
-    private List<XmInfoNew> xmInfoNewRows;
+    private XmInfoNew xmInfoNew;
     private List<XmDouble> xmDoubleRows;
     private List<XmVal> xmValRows;
     private List<XmInter> xmInterRows;

liswork/src/main/java/com/czlis/liswork/service/ReportItemService.java

@@ -41,4 +41,6 @@ public interface ReportItemService {
     Result addXmAlarmdetailNew(List<XmAlarmdetailNew> xmAlarmdetailNew);
 
     Result delXmAlarmdetailNew(XmAlarmdetailNew xmAlarmdetailNew);
+
+    Result delXmValNew(XmValNew xmValNew);
 }

liswork/src/main/java/com/czlis/liswork/service/impl/ReportItemServiceImpl.java

@@ -30,9 +30,9 @@ public class ReportItemServiceImpl implements ReportItemService {
         xmDouble.setYq(yq);
         xmDouble.setXmdh(xmdh);
         List<XmDouble> xmDoubles = reportItemMapper.queryXmDouble(xmDouble);
-//        XmValNew xmValNew = new XmValNew();
-//        xmValNew.setXmid(Integer.parseInt(xmid));
-//        List<XmValNew> xmValNews = reportItemMapper.queryXmValNew(xmValNew);
+        XmValNew xmValNew = new XmValNew();
+        xmValNew.setXmid(Integer.parseInt(xmid));
+        List<XmValNew> xmValNews = reportItemMapper.queryXmValNew(xmValNew);
 //        XmInter xmInter = new XmInter();
 //        xmInter.setXmid(Integer.parseInt(xmid));
 //        List<XmInter> xmInters = reportItemMapper.queryXmInter(xmInter);
@@ -46,12 +46,13 @@ public class ReportItemServiceImpl implements ReportItemService {
         xmTextresultNew.setXmid(Integer.parseInt(xmid));
         List<XmTextresultNew> xmTextresultNews = reportItemMapper.queryXmTextresultNew(xmTextresultNew);
         XmInfoNewDTO xmInfoNewDTO = new XmInfoNewDTO();
-        xmInfoNewDTO.setXmInfoNewRows(xmInfoNews);
+        xmInfoNewDTO.setXmInfoNew(xmInfoNews.get(0));
         xmInfoNewDTO.setXmDoubleRows(xmDoubles);
        // xmInfoNewDTO.setXmValNewRows(xmValNews);
        // xmInfoNewDTO.setXmInterRows(xmInters);
         xmInfoNewDTO.setXmRefNewRows(xmRefNews);
         xmInfoNewDTO.setXmInfoVsRows(xmInfoVss);
+        xmInfoNewDTO.setXmValNewRows(xmValNews);
         xmInfoNewDTO.setXmTextresultNewRows(xmTextresultNews);
         return xmInfoNewDTO;
     }
@@ -59,16 +60,14 @@ public class ReportItemServiceImpl implements ReportItemService {
     @Transactional(rollbackFor = Exception.class)
     @Override
     public Result add(XmInfoNewDTO xmInfoNewDTO) {
-        List<XmInfoNew> xmInfoNewRows = xmInfoNewDTO.getXmInfoNewRows();
-        for (XmInfoNew xmInfoNewRow : xmInfoNewRows) {
-            if(xmInfoNewRow.getCkxx().compareTo(xmInfoNewRow.getCksx()) >= 1  ){
-                return new Result("-1","新增失败，项目的参考下限："+xmInfoNewRow.getCkxx()+"不能大于参考上限："+xmInfoNewRow.getCksx());
+        XmInfoNew xmInfoNew = xmInfoNewDTO.getXmInfoNew();
+        if(xmInfoNew.getCkxx().compareTo(xmInfoNew.getCksx()) >= 1  ){
+            return new Result("-1","新增失败，项目的参考下限："+xmInfoNew.getCkxx()+"不能大于参考上限："+xmInfoNew.getCksx());
         }
-            if(xmInfoNewRow.getXjx().compareTo(xmInfoNewRow.getSjx()) >= 1){
+        if(xmInfoNew.getXjx().compareTo(xmInfoNew.getSjx()) >= 1){
             return new Result("-1","审核条件逻辑错误，项目下极限限不可大于项目上极限！");
         }
-            reportItemMapper.addXmInfoNew(xmInfoNewRow);
-        }
+        reportItemMapper.addXmInfoNew(xmInfoNew);
 
         List<XmDouble> xmDoubleRows = xmInfoNewDTO.getXmDoubleRows();
         for (XmDouble xmDoubleRow : xmDoubleRows) {
@@ -81,14 +80,14 @@ public class ReportItemServiceImpl implements ReportItemService {
             reportItemMapper.addXmInterRow(xmInterRow);
         }
 
-        List<XmRef> xmRefRows = xmInfoNewDTO.getXmRefRows();
-        for (XmRef xmRefRow : xmRefRows) {
-            reportItemMapper.addXmRefRow(xmRefRow);
+        List<XmRefNew> xmRefNewRows = xmInfoNewDTO.getXmRefNewRows();
+        for (XmRefNew xmRefRow : xmRefNewRows) {
+            reportItemMapper.addXmRefNewRow(xmRefRow);
         }
 
-        List<XmVal> xmValRows = xmInfoNewDTO.getXmValRows();
-        for (XmVal xmValRow : xmValRows) {
-            reportItemMapper.addXmValRow(xmValRow);
+        List<XmValNew> xmValNewRows = xmInfoNewDTO.getXmValNewRows();
+        for (XmValNew xmValRow : xmValNewRows) {
+            reportItemMapper.addXmValNewRow(xmValRow);
         }
 
         List<XmTextResult> xmTextResultRows = xmInfoNewDTO.getXmTextResultRows();
@@ -114,7 +113,9 @@ public class ReportItemServiceImpl implements ReportItemService {
             reportItemMapper.deleteXmInter(xmid);
             reportItemMapper.deleteXmTextResult(xmid);
             reportItemMapper.deleteXmRef(xmid);
-            reportItemMapper.deleteXmVal(xmid);
+            XmValNew xmValNew = new XmValNew();
+            xmValNew.setXmid(xmid);
+            reportItemMapper.deleteXmValNew(xmValNew);
         }
 
         return new Result("0","删除成功！");
@@ -123,30 +124,76 @@ public class ReportItemServiceImpl implements ReportItemService {
     @Transactional(rollbackFor = Exception.class)
     @Override
     public Result update(XmInfoNewDTO xmInfoNewDTO) {
-        List<XmInfoNew> xmInfoNewRows = xmInfoNewDTO.getXmInfoNewRows();
-        for (XmInfoNew xmInfoNewRow : xmInfoNewRows) {
-            reportItemMapper.updateXmInfoNew(xmInfoNewRow);
+        XmInfoNew xmInfoNew = xmInfoNewDTO.getXmInfoNew();
+        XmInfoNew xmInfoNew1 = new 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();
+        if(xmDoubleRows != null){
             for (XmDouble xmDoubleRow : xmDoubleRows) {
+                XmDouble newXmDouble = new XmDouble();
+                newXmDouble.setXmid(xmDoubleRow.getXmid());
+                List<XmDouble> xmDoubles = reportItemMapper.queryXmDouble(newXmDouble);
+                if(xmDoubles.size() > 0){
                     reportItemMapper.updateXmDoubleRow(xmDoubleRow);
+                }else{
+                    reportItemMapper.addXmDoubleRow(xmDoubleRow);
                 }
+            }
+        }
+
 
         List<XmInter> xmInterRows = xmInfoNewDTO.getXmInterRows();
+        if(xmInterRows != null){
             for (XmInter xmInterRow : xmInterRows) {
+                XmInter newXmInter = new XmInter();
+                newXmInter.setXmid(xmInterRow.getXmid());
+                List<XmInter> xmInters = reportItemMapper.queryXmInter(newXmInter);
+                if(xmInters.size() > 0){
                     reportItemMapper.updateXmInterRow(xmInterRow);
+                }else{
+                    reportItemMapper.addXmInterRow(xmInterRow);
+                }
+            }
         }
 
-        List<XmRef> xmRefRows = xmInfoNewDTO.getXmRefRows();
-        for (XmRef xmRefRow : xmRefRows) {
-            reportItemMapper.updateXmRefRow(xmRefRow);
+
+        List<XmRefNew> xmRefNewRows = xmInfoNewDTO.getXmRefNewRows();
+        if(xmRefNewRows != null){
+            for (XmRefNew xmRefNewRow : xmRefNewRows) {
+                XmRefNew newXmRef = new XmRefNew();
+                newXmRef.setXmid(xmRefNewRow.getXmid());
+                List<XmRefNew> xmRefNews = reportItemMapper.queryXmRefNew(newXmRef);
+                if(xmRefNews.size() > 0){
+                    reportItemMapper.updateXmRefNewRow(xmRefNewRow);
+                }else{
+                    reportItemMapper.addXmRefNewRow(xmRefNewRow);
+                }
+            }
         }
 
-        List<XmVal> xmValRows = xmInfoNewDTO.getXmValRows();
-        for (XmVal xmValRow : xmValRows) {
-            reportItemMapper.updateXmValRow(xmValRow);
+
+        List<XmValNew> xmValNewRows = xmInfoNewDTO.getXmValNewRows();
+        if(xmValNewRows != null){
+            for (XmValNew xmValRow : xmValNewRows) {
+                XmValNew newXmVal = new XmValNew();
+                newXmVal.setXmid(xmValRow.getXmid());
+                newXmVal.setXh(xmValRow.getXh());
+                List<XmValNew> xmValNews = reportItemMapper.queryXmValNew(newXmVal);
+                if(xmValNews.size() > 0){
+                    reportItemMapper.updateXmValNewRow(xmValRow);
+                }else{
+                    reportItemMapper.addXmValNewRow(xmValRow);
                 }
+            }
+        }
+
 
         List<XmTextResult> xmTextResultRows = xmInfoNewDTO.getXmTextResultRows();
         for (XmTextResult xmTextResultRow : xmTextResultRows) {
@@ -245,5 +292,11 @@ public class ReportItemServiceImpl implements ReportItemService {
         return new Result("0","删除数据成功！");
     }
 
+    @Override
+    public Result delXmValNew(XmValNew xmValNew) {
+        reportItemMapper.deleteXmValNew(xmValNew);
+        return new Result("0","删除成功！");
+    }
+
 
 }

liswork/src/main/resources/mapper/ReportItemMapper.xml

@@ -30,6 +30,7 @@
         select * from xm_val_new
         <where>
             <if test="xmid != null">and xmid = #{xmid}</if>
+            <if test="xh != null">and xh = #{xh}</if>
             <if test="xmdh != null and xmdh != ''">and xmdh = #{xmdh}</if>
             <if test="qz != null and qz != ''">and qz = #{qz}</if>
         </where>
@@ -248,7 +249,7 @@
     </insert>
 
 
-    <insert id="addXmRefRow">
+    <insert id="addXmRefNewRow">
         insert into xm_ref_new (
         <if test="xb != null and xb != ''">xb,</if>
         <if test="nl1 != null">nl1,</if>
@@ -288,7 +289,7 @@
         )
     </insert>
 
-    <insert id="addXmValRow">
+    <insert id="addXmValNewRow">
         insert into xm_val_new(
         <if test="srm != null and srm != ''">srm,</if>
         <if test="xh != null">xh,</if>
@@ -343,8 +344,9 @@
         delete from xm_ref_new where xmid = #{xmid}
     </delete>
 
-    <delete id="deleteXmVal">
+    <delete id="deleteXmValNew">
         delete from xm_val_new where xmid = #{xmid}
+        <if test="xh != null">and xh = #{xh}</if>
     </delete>
 
     <select id="getXmInfoVsCount" resultType="Long">
@@ -449,7 +451,7 @@
         where xmid = #{xmid}
     </update>
 
-    <update id="updateXmRefRow">
+    <update id="updateXmRefNewRow">
         update xm_ref_new
         <set>
             <if test="xb != null and xb != ''">xb = #{xb},</if>
@@ -473,15 +475,14 @@
         where xmid = #{xmid}
     </update>
 
-    <update id="updateXmValRow">
+    <update id="updateXmValNewRow">
         update xm_val_new
         <set>
             <if test="srm != null and srm != ''">srm = #{srm},</if>
-            <if test="xh != null">xh = #{xh},</if>
             <if test="jgbz != null and jgbz != ''">jgbz = #{jgbz},</if>
             xmdh = #{xmdh},qz = #{qz}
         </set>
-        where xmid = #{xmid}
+        where xmid = #{xmid} and xh = #{xh}
     </update>
 
     <update id="updateXmTextResultRow">