Browse Source

订单审核负责人开发

anderx 3 years ago
parent
commit
3cdaa90e2d

+ 5 - 0
src/main/java/com/goafanti/common/controller/WebpageController.java

@@ -198,6 +198,11 @@ public class WebpageController extends BaseController {
 		modelview.setViewName("/admin/index");
 		return modelview;
 	}
+	@RequestMapping(value = "/admin/amiba", method = RequestMethod.GET)
+	public ModelAndView adminAmiba(HttpServletRequest request, ModelAndView modelview) {
+		modelview.setViewName("/admin/amiba");
+		return modelview;
+	}
 
 	@RequestMapping(value = "/admin/idea", method = RequestMethod.GET)
 	public ModelAndView adminIdea(HttpServletRequest request, ModelAndView modelview) {

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

@@ -152,5 +152,5 @@ public interface AdminMapper {
 
     int selectByAmbIdCount(String id);
 
-    List<Admin> selectAdminByRoleType(String roleType);
+    List<Admin> selectAdminByRoleType(@Param("roleType") String roleType);
 }

+ 1 - 1
src/main/java/com/goafanti/common/mapper/AdminMapper.xml

@@ -1102,7 +1102,7 @@
   <select id="selectByAmbIdCount" resultType="java.lang.Integer">
     SELECT count(*) from admin where amb_id= #{ambId}
   </select>
-  <select id="selectAdminByRoleType" resultType="com.goafanti.common.model.Admin">
+  <select id="selectAdminByRoleType" parameterType="java.lang.String" resultType="com.goafanti.common.model.Admin">
     SELECT a.id,a.name ,a.mobile ,a.email
     FROM admin a left join user_role b on a.id=b.uid
                  left join `role` c on b.rid =c.id

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

@@ -757,7 +757,7 @@
       date_format(a.`final_Receivables_time`, '%Y-%m-%d %H:%i:%s')finalReceivablesTime,a.patent_cost patentCost,a.patent_cost_actual patentCostActual ,
       a.soft_cost softCost ,a.soft_cost_actual softCostActual ,a.audit_cost auditCost ,a.audit_cost_actual auditCostActual ,a.other_cost otherCost ,
       a.other_cost_actual otherCostActual , a.expect_profit expectProfit ,a.actual_profit  actualProfit,a.service_type serviceType,
-      a.service_project serviceProject
+      a.service_project serviceProject,o.examine_name examineName
     from t_order_new o left join department d on o.order_dep = d.id left join `user` u on o.buyer_id = u.id left join t_order_mid a on o.order_no=a.order_no
     left join (select * from  t_order_outsource where type=0) too on o.order_no=too.order_no where delete_sign in(0,2) and approval in(0,1,2,4,5)
     and outsource=   #{o.outsource,jdbcType=INTEGER}
@@ -1503,7 +1503,8 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
   </select>
 
   <select id="countTotalAndActually" parameterType="Map" resultType="java.util.Map">
-    select sum(o.settlement_amount) actuallyTotalAmount,sum(o.total_amount) signTotalAmount from t_order_new o
+    select IFNULL( sum(o.settlement_amount),0) actuallyTotalAmount,IFNULL(sum(o.total_amount),0)  signTotalAmount
+    from t_order_new o
     left join department d   on o.order_dep=d.id left join `user` u on o.buyer_id = u.id  left join t_order_mid a on o.order_no=a.order_no
     where o.delete_sign in(0,2,3)  and (o.approval = 0 or o.approval = 2) and outsource=  #{o.outsource,jdbcType=INTEGER}
     <if test="o.processStatus == 3">

+ 9 - 0
src/main/java/com/goafanti/order/bo/OrderListBo.java

@@ -146,10 +146,19 @@ public class OrderListBo {
 	private Integer salesType;
 	@Excel(name="销售说明")
 	private String other;
+	private String examineName;
 
 
 	private String departmentId;
 
+	public String getExamineName() {
+		return examineName;
+	}
+
+	public void setExamineName(String examineName) {
+		this.examineName = examineName;
+	}
+
 	public String getServiceType() {
 		return serviceType;
 	}

+ 1 - 0
src/main/java/com/goafanti/order/service/impl/FundManagerOrderServiceImpl.java

@@ -478,6 +478,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 			throw new BusinessException("订单流程不正确。");
 		}
 		t.setOrderNo(orderNo);
+		t.setApproval(new1.getApproval());
 		if (new1.getBackStatus()==3) {
 			t.setBackStatus(0);
 		}

+ 18 - 0
src/main/webapp/WEB-INF/views/admin/amiba.html

@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:th="http://www.thymeleaf.org">
+<head th:replace="common::header(~{::title},~{::link})">
+	<title>管理中心首页</title>
+	<link th:href="${staticHost+'/dll/dll.css'}" rel="stylesheet">
+	<link th:href="${staticHost+'/admin/index.css'}" rel="stylesheet">
+</head>
+<body>
+	<div id="root"></div>
+
+	<div th:replace="common::footer(~{::script})">
+		<script type="text/javascript" th:src="${staticHost+'/vendors.js'}"></script>
+		<script type="text/javascript" th:src="${staticHost+'/dll/dll.js'}"></script>
+		<script type="text/javascript" th:src="${staticHost+'/admin/amiba.js'}"></script>
+	</div>
+</body>
+</html>