ソースを参照

项目修改接口新增等级分类

anderx 1 年間 前
コミット
1152c0c5c1

+ 0 - 1
src/main/java/com/goafanti/common/dao/BusinessProjectMapper.java

@@ -90,7 +90,6 @@ public interface BusinessProjectMapper {
     int insertSelective(BusinessProject record);
 
 
-    int updateByPrimaryKeySelective(BusinessProject record);
 
     int getBnamecount(String bname);
 

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

@@ -718,12 +718,12 @@
     </if>
   </select>
   <select id="selectStatisticsOrderProjectList" resultType="com.goafanti.order.bo.OutOrderProject">
-    SELECT a.order_no as orderNo, a.order_type orderType,a.sales_type as salesType, b.service_type AS serviceType,
+    SELECT a.order_no as orderNo, bc.sort sortType,a.sales_type as salesType, b.service_type AS serviceType,
     a.liquidation_status as liquidationStatus,b2.big_customer as bigCustomer,b.project_type as projectType,b.dun_node_content DunNodeContent,
     a.total_amount as totalAmount,a.approval ,a.sign_time as signTime,date_format(a.create_time ,'%Y-%m-%d %H:%i:%S')  as createTime,
     b.buyer_name as buyerName,a.contract_no as contractNo, c.cname htlx,b.province_name province ,b.dep_name depName,
     b.order_receivables orderReceivables,a.refund_amount refundAmount,a.settlement_amount as settlementAmount,
-    b.invoice_amount as invicueAmount, b.cost_amount as costAmount,b.payment_amount as paymentAmount,
+    b.invoice_amount as invicueAmount, b.cost_amount as costAmount,b.payment_amount as paymentAmount,bp.lvl_type lvlType,
     b.finance_name as financeName,b.salesman_name as salesmanName,b.expense_amount as expenseAmount,
     e.commodity_name as commodityName,ttm.service_year as serviceYear,ttm.service_life as serviceLife,ttm.year_sum as yearSum,
     date_format(e.task_distribution_time ,'%Y-%m-%d %H:%i:%S')  as taskDistributionTime ,e.commodity_quantity as commodityQuantity,
@@ -737,6 +737,7 @@
     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)
     left join business_project bp on e.commodity_id =bp.id
+    left join business_category bc on bp.cid=bc.id
     <if test="liabilitiesDepId !=null">
       left join admin e2 on e.task_receiver=e2.id
     </if>

+ 17 - 5
src/main/java/com/goafanti/order/bo/OutOrderProject.java

@@ -194,7 +194,12 @@ public class OutOrderProject {
      * 是否科技项目(订单类型) 0认证项目 1科技项目 2 两化融化管理体系认证项目
      */
     @Excel(name = "是否科技项目")
-    private String orderType;
+    private String sortType;
+
+    /**
+     * 层级类型 0=否,1=国家级,2=省级,3=市级
+     */
+    private Integer lvlType;
     /**
      * 项目名称
      */
@@ -267,6 +272,13 @@ public class OutOrderProject {
     @Excel(name = "项目备注")
     private String taskComment;
 
+    public Integer getLvlType() {
+        return lvlType;
+    }
+
+    public void setLvlType(Integer lvlType) {
+        this.lvlType = lvlType;
+    }
 
     public String getOrderNo() {
         return orderNo;
@@ -549,12 +561,12 @@ public class OutOrderProject {
     }
 
 
-    public String getOrderType() {
-        return orderType;
+    public String getSortType() {
+        return sortType;
     }
 
-    public void setOrderType(String orderType) {
-        this.orderType = orderType;
+    public void setSortType(String sortType) {
+        this.sortType = sortType;
     }
 
     public String getCommodityQuantity() {

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

@@ -131,10 +131,15 @@ public class UserStatisticsServiceImpl extends BaseMybatisDao<UserMidMapper> imp
 			}else {
 				e.setRestatementType("否");
 			}
-			if (e.getOrderType()!=null&&e.getOrderType().equals("1")){
-				e.setOrderType("是");
+			if (e.getSortType()!=null&&e.getSortType().equals("3")){
+				StringBuilder sb = new StringBuilder();
+				sb.append("是");
+				if (e.getLvlType()==1)sb.append(",国家级");
+				if (e.getLvlType()==2)sb.append(",省级");
+				if (e.getLvlType()==3)sb.append(",市级");
+				e.setSortType(sb.toString());
 			}else {
-				e.setOrderType("否");
+				e.setSortType("否");
 			}
 			if (e.getProjectStatus()!=null){
 				String valueByCode = NewProjectStatus.getValueByCode(Integer.valueOf(e.getProjectStatus()));