소스 검색

列表修改

anderx 1 년 전
부모
커밋
a08002bf15

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

@@ -736,7 +736,7 @@
     left join t_order_task c on a.order_no =c.order_no and c.main =1
     left join user_mid b2 on a.buyer_id=b2.uid
     left join t_order_task e on a.order_no =e.order_no and e.split_status in (0,2)
-    <if test="projectType !=null">
+    <if test="projectType !=null or businessCategory !=null">
     left join business_project bp on e.commodity_id =bp.id
     </if>
     <if test="liabilitiesDepId !=null">
@@ -767,9 +767,6 @@
     <if test="userName !=null">
       and b.buyer_name like CONCAT('%',#{userName},'%')
     </if>
-    <if test="businessCategory !=null">
-      and d2.id = #{businessCategory}
-    </if>
     <if test="projectName !=null">
       and e.commodity_name like CONCAT('%',#{projectName},'%')
     </if>
@@ -863,6 +860,9 @@
     <if test="projectType ==1">
       and bp.type in (7)
     </if>
+    <if test="businessCategory !=null">
+      and bp.cid = #{businessCategory}
+    </if>
     <if test="bigCustomer !=null">
       and b2.big_customer = #{bigCustomer}
     </if>
@@ -901,7 +901,7 @@
     left join t_order_task c on a.order_no =c.order_no and c.main =1
     left join user_mid b2 on a.buyer_id=b2.uid
     left join t_order_task e on a.order_no =e.order_no and e.split_status in (0,2)
-    <if test="projectType !=null">
+    <if test="projectType !=null or businessCategory !=null">
       left join business_project bp on e.commodity_id =bp.id
     </if>
     <if test="liabilitiesDepId !=null">

+ 3 - 3
src/main/java/com/goafanti/order/bo/InputOrderProject.java

@@ -17,7 +17,7 @@ public class InputOrderProject {
     /**
      * 项目分类
      */
-    private Integer businessCategory;
+    private String businessCategory;
     /**
      * 项目名称
      */
@@ -187,11 +187,11 @@ public class InputOrderProject {
         this.userName = userName;
     }
 
-    public Integer getBusinessCategory() {
+    public String getBusinessCategory() {
         return businessCategory;
     }
 
-    public void setBusinessCategory(Integer businessCategory) {
+    public void setBusinessCategory(String businessCategory) {
         this.businessCategory = businessCategory;
     }
 

+ 6 - 6
src/main/java/com/goafanti/order/service/impl/UserStatisticsServiceImpl.java

@@ -122,19 +122,19 @@ public class UserStatisticsServiceImpl extends BaseMybatisDao<UserMidMapper> imp
 				e.setContractAmountProportion("100%");
 			}
 			if (e.getRefundType()!=null&&e.getRefundType().equals("1")){
-				e.setRefundType("");
+				e.setRefundType("");
 			}else {
-				e.setRefundType("");
+				e.setRefundType("");
 			}
 			if (e.getRestatementType()!=null&&e.getRestatementType().equals("1")){
-				e.setRestatementType("");
+				e.setRestatementType("");
 			}else {
-				e.setRestatementType("");
+				e.setRestatementType("");
 			}
 			if (e.getOrderType()!=null&&e.getOrderType().equals("1")){
-				e.setOrderType("");
+				e.setOrderType("");
 			}else {
-				e.setOrderType("");
+				e.setOrderType("");
 			}
 			if (e.getProjectStatus()!=null){
 				String valueByCode = NewProjectStatus.getValueByCode(Integer.valueOf(e.getProjectStatus()));