Browse Source

导入模版替换

anderx 3 years ago
parent
commit
57bda7da8c

+ 9 - 0
src/main/java/com/goafanti/RD/bo/InputRdList.java

@@ -4,9 +4,18 @@ public class InputRdList {
     private String rdStart;
     private String rdEnd;
     private String rdName;
+    private String rdNo;
     private Integer pageSize;
     private Integer pageNo;
 
+    public String getRdNo() {
+        return rdNo;
+    }
+
+    public void setRdNo(String rdNo) {
+        this.rdNo = rdNo;
+    }
+
     public Integer getPageSize() {
         return pageSize;
     }

+ 2 - 1
src/main/java/com/goafanti/RD/service/impl/RDServiceImpl.java

@@ -82,7 +82,8 @@ public class RDServiceImpl extends BaseMybatisDao<RdDetailsMapper> implements RD
     private Map<String, Object> getParam(InputRdList in) {
         Map<String,Object> param=new HashMap<>();
         param.put("RdStart", in.getRdStart());
-        param.put("RdEnd", in.getRdStart());
+        param.put("RdNo", in.getRdNo());
+        param.put("RdEnd", in.getRdEnd());
         param.put("RdName", in.getRdName());
         if (TokenManager.hasRole(AFTConstants.SUPERADMIN)||TokenManager.hasRole(AFTConstants.APPROVAL_DECISION_AUDITOR)||TokenManager.hasRole(AFTConstants.CED)){
 

+ 8 - 2
src/main/java/com/goafanti/common/mapper/RdDetailsMapper.xml

@@ -302,11 +302,14 @@
     from rd_details a
     where 1=1
     <if test="RdStart !=null and RdEnd !=null">
-      and a.rd_start >= #{RdStart} and a.rd_end <![CDATA[ <= ]]> #{RdEnd}
+      and a.rd_start  <![CDATA[ <= ]]> #{RdStart} and a.rd_end <![CDATA[ <= ]]> #{RdEnd}
     </if>
     <if test="RdName !=null ">
       and a.rd_name =#{RdName}
     </if>
+    <if test="RdNo !=null ">
+      and a.rd_no =#{RdNo}
+    </if>
     <if test="aid !=null ">
       and a.aid =#{aid}
     </if>
@@ -320,11 +323,14 @@
     from rd_details a
     where 1=1
     <if test="RdStart !=null and RdEnd !=null">
-      and a.rd_start >= #{RdStart} and a.rd_end <![CDATA[ <= ]]> #{RdEnd}
+      and a.rd_start  <![CDATA[ <= ]]> #{RdStart} and a.rd_end <![CDATA[ <= ]]> #{RdEnd}
     </if>
     <if test="RdName !=null ">
       and a.rd_name =#{RdName}
     </if>
+    <if test="RdNo !=null ">
+      and a.rd_no =#{RdNo}
+    </if>
     <if test="aid !=null ">
       and a.aid =#{aid}
     </if>