Kaynağa Gözat

非公出协单开发

anderx 1 gün önce
ebeveyn
işleme
b6135294c0

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

@@ -70,9 +70,7 @@ public class RDServiceImpl extends BaseMybatisDao<RdDetailsMapper> implements RD
 
     @Override
     public Pagination<OutExcelRdDetails> list(InputRdList in) {
-        Map<String, Object> param = getParam(in);
-
-        return (Pagination<OutExcelRdDetails>) findPage("RdDetailsList","RdDetailsCount",param,in.getPageNo(), in.getPageSize());
+        return (Pagination<OutExcelRdDetails>) findPage("RdDetailsList","RdDetailsCount",in);
     }
 
     private Map<String, Object> getParam(InputRdList in) {

+ 5 - 5
src/main/java/com/goafanti/common/mapper/PublicReleaseMapper.xml

@@ -1298,7 +1298,7 @@
     </select>
 
     <select id="findAssistList" resultType="com.goafanti.weChat.bo.OutListAssist">
-        select a.id ,if(a.`type` &lt; 5,0,1) type,c.type assistType,
+        select a.id ,a.`type`,c.type assistType,
                c.content_type contentType,c.content ,a.aname,a.assist_aid_name assistAidName,
         a.user_names userNames ,d.sign_number signNumber ,d.public_count publicCount,d.assist_count assistCount ,
         d.public_assist_count  publicAssistCount ,d.non_public_count nonPublicCount,a.release_start releaseStart,
@@ -1314,10 +1314,10 @@
         </if>
     </select>
     <sql id="findAssistListSql">
-        <if test="assistType==0">
+        <if test="type==0">
             and a.type &lt; 5
         </if>
-        <if test="assistType==1">
+        <if test="type==1">
             and a.type &gt; 4
         </if>
         <if test="contentType!=null">
@@ -1332,10 +1332,10 @@
         <if test="uid !=null">
             and b.uid = #{uid}
         </if>
-        <if test="projectType !=null">
+        <if test="assistType !=null">
             and a.id in (select DISTINCT prid from public_release_type
             where `type` in
-            <foreach item="item" collection="projectType" separator="," open="(" close=")">
+            <foreach item="item" collection="assistType" separator="," open="(" close=")">
                 #{item}
             </foreach>
         </if>

+ 14 - 12
src/main/java/com/goafanti/weChat/bo/InputListAssist.java

@@ -7,7 +7,7 @@ public class InputListAssist {
     /**
      * 协单类型 0协单公出 1=非协单公出
      */
-    private Integer assistType;
+    private Integer type;
     /**
      * 协单内容类型
      */
@@ -27,7 +27,7 @@ public class InputListAssist {
     /**
      * 项目类型
      */
-    private String projectType;
+    private String assistType;
     /**
      * 协单开始时间
      */
@@ -61,13 +61,7 @@ public class InputListAssist {
         this.pageNo = pageNo;
     }
 
-    public Integer getAssistType() {
-        return assistType;
-    }
 
-    public void setAssistType(Integer assistType) {
-        this.assistType = assistType;
-    }
 
     public Integer getContentType() {
         return contentType;
@@ -101,12 +95,20 @@ public class InputListAssist {
         this.uid = uid;
     }
 
-    public String getProjectType() {
-        return projectType;
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
     }
 
-    public void setProjectType(String projectType) {
-        this.projectType = projectType;
+    public String getAssistType() {
+        return assistType;
+    }
+
+    public void setAssistType(String assistType) {
+        this.assistType = assistType;
     }
 
     public String getStartTime() {

+ 4 - 4
src/main/java/com/goafanti/weChat/bo/OutListAssist.java

@@ -5,8 +5,8 @@ import com.goafanti.common.utils.excel.Excel;
 public class OutListAssist {
     private Integer id;
 
-    @Excel(name = "协单类型",readConverterExp = "0=公出协单,1=非公出协单")
-    private  Integer type;
+    @Excel(name = "协单类型")
+    private  String type;
 
     /**
      * 协单内容类型
@@ -72,11 +72,11 @@ public class OutListAssist {
     private String taskNames;
 
 
-    public Integer getType() {
+    public String getType() {
         return type;
     }
 
-    public void setType(Integer type) {
+    public void setType(String type) {
         this.type = type;
     }
 

+ 6 - 0
src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

@@ -1754,6 +1754,12 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 	}
 
 	private void pushTypeName(OutListAssist e) {
+		//处理公出类型
+		if (Integer.valueOf(e.getType())<5){
+			e.setType("非公出协单");
+		}else {
+			e.setType("公出协单");
+		}
 		//处理公出项目分类
 		e.setAssistType(pushAssistTypeName(e.getAssistType()));