Merge remote-tracking branch 'origin/master'

RMS/src/main/resources/mapper/InvalidRecord.xml

@@ -5,16 +5,15 @@
     <delete id="deleteInvalidRecord">
         delete from INVALID_RECORD where ID=#{id}
     </delete>
-<!--    int updateInvalidRecord(InvalidRecord invalidRecord);-->
-    <update id="updateInvalidRecord" parameterType="cn.cslg.report.entity.InvalidRecord">
-     update INVALID_RECORD set(PATENT_NO,PERSON,PERSON_ID,INVALID_TIME,JUDGMENT_TIME,RESULT,FILE_ID,REPORT_ID)
-
-        value (#{patentNo},#{person},#{personId},#{invalidTime},#{judgmentTime},#{resultS},#{fileId},#{reportId})
+    int updateInvalidRecord(InvalidRecord invalidRecord);
+    <update id="updateInvalidRecord">
+     update INVALID_RECORD set
+         PATENT_NO=#{patentNo},PERSON=#{person},PERSON_ID=#{personId},INVALID_TIME={invalidTime},JUDGMENT_TIME=#{judgmentTime},RESULT=#{resultS},FILE_ID=#{fileId},REPORT_ID=#{reportId}
        where ID=#{id}
     </update>
 <!--    int addInvalidRecord(InvalidRecord invalidRecord);-->
-    <insert id="addInvalidRecord" parameterType="cn.cslg.report.entity.InvalidRecord">
-        insert into INVALID_RECORD(PATENT_NO,PERSON,PERSON_ID,INVALID_TIME,JUDGMENT_TIME,`RESULT`,FILE_ID,REPORT_ID)
+    <insert id="addInvalidRecord" parameterType="cn.cslg.report.entity.InvalidRecord" keyProperty="ID">
+        insert into INVALID_RECORD (PATENT_NO,PERSON,PERSON_ID,INVALID_TIME,JUDGMENT_TIME,`RESULT`,FILE_ID,REPORT_ID)
         values(#{patentNo},#{person},#{personId},#{invalidTime},#{judgmentTime},#{resultS},#{fileId},#{reportId})
     </insert>
     <select id="select" resultType="cn.cslg.report.entity.InvalidRecord">

RMS/src/main/resources/mapper/LitigationHistory.xml

@@ -6,15 +6,18 @@
         delete from LITIGATION_HISTORY where ID=#{id}
     </delete>
 <!--    int addLitigationHistory(LitigationHistory litigationHistory);-->
-    <insert id="addLitigationHistory">
+    <insert id="addLitigationHistory" parameterType="cn.cslg.report.entity.LitigationHistory" keyProperty="ID" >
         insert into LITIGATION_HISTORY(PLAINTIFF,DEFENDANT,CAUSE_OF_ACTION,PROSECUTORIAL_TIME,`RESULT`,CASE_DETAILS,FILE_ID)
             values (plaintiff,defendant,causeOfAction,prosecutorialTime,`result`,caseDetails,fileId)
     </insert>
 <!--    int updateLitigationHistory(LitigationHistory litigationHistory);-->
-    <update id="updateLitigationHistory">
-        update LITIGATION_HISTORY set(PLAINTIFF,DEFENDANT,CAUSE_OF_ACTION,PROSECUTORIAL_TIME,`RESULT`,CASE_DETAILS,FILE_ID)
-         values (plaintiff,defendant,causeOfAction,prosecutorialTime,`result`,caseDetails,fileId)
-        where ID=#{id}
+    <update id="updateLitigationHistory" parameterType="cn.cslg.report.entity.LitigationHistory">
+        update LITIGATION_HISTORY set PLAINTIFF=#{plaintiff},
+                                     DEFENDANT=#{defendant},
+                                     CAUSE_OF_ACTION=#{causeOfAction},
+                                     `RESULT`=#{result},
+                                     CASE_DETAILS=#{caseDetails}
+                                       FILE_IDFILE_ID=#{fileId}
     </update>
     <select id="select" resultType="cn.cslg.report.entity.LitigationHistory">
         <bind name="n" value="(pageNO-1)pageSize"/>