销售合同分析详情接口

backend/inz.common/src/main/java/com/beecode/inz/common/dao/QueryComponentDao.java

@@ -11,6 +11,6 @@ import com.beecode.inz.common.pojo.QueryComponentCoulmnData;
 public interface QueryComponentDao {
 
 	JSONObject queryDetailByMasterId(UUID masterId, String detailModelName, List<QueryComponentCoulmnData> columnList,
-			int pageSize, int current);
+			int pageSize, int current, String orderCoulmnName, String orderType);
 
 }

backend/inz.common/src/main/java/com/beecode/inz/common/internal/dao/QueryComponentDaoImpl.java

@@ -22,7 +22,7 @@ public class QueryComponentDaoImpl implements QueryComponentDao{
 
 	@Override
 	public JSONObject queryDetailByMasterId(UUID masterId, String detailModelName, List<QueryComponentCoulmnData> columnList, int pageSize,
-			int current) {
+			int current, String orderCoulmnName, String orderType) {
 		return template.execute(session ->{
 			String hql = "SELECT ";
 			int i = 0;
@@ -34,6 +34,9 @@ public class QueryComponentDaoImpl implements QueryComponentDao{
 				i++;
 			}
 			hql += " from " + detailModelName + " where master.id =:masterId ";
+			if(null != orderCoulmnName && null != orderType) {
+				hql += " ORDER BY " + orderCoulmnName + " "+orderType;
+			}
 			Query<Tuple> query = session.createQuery(hql, Tuple.class).setFirstResult((current - 1) * pageSize).setMaxResults(pageSize);
 			query.setParameter("masterId", masterId);
 			List<Tuple> queryList = query.getResultList();

backend/inz.common/src/main/java/com/beecode/inz/common/internal/service/QueryComponentServiceImpl.java

@@ -18,11 +18,11 @@ public class QueryComponentServiceImpl implements QueryComponentService  {
 	@Autowired
 	private QueryComponentDao queryComponentDao;
 	
-	@Override 
+	@Override
 	public JSONObject queryDetailByMasterId(UUID masterId, String detailModelName, List<QueryComponentCoulmnData> columnList, int pageSize,
-			int current) {
+			int current, String orderCoulmnName, String orderType) {
 		// TODO Auto-generated method stub
-		return queryComponentDao.queryDetailByMasterId(masterId, detailModelName, columnList, pageSize, current);
+		return queryComponentDao.queryDetailByMasterId(masterId, detailModelName, columnList, pageSize, current, orderCoulmnName, orderType);
 	}
 	
 }

backend/inz.common/src/main/java/com/beecode/inz/common/service/QueryComponentService.java

@@ -4,13 +4,14 @@ import java.util.List;
 import java.util.UUID;
 
 import org.json.JSONArray;
+import org.json.JSONObject;
 
 import com.beecode.inz.common.pojo.QueryComponentCoulmnData;
 
 public interface QueryComponentService {
 
 
-	Object queryDetailByMasterId(UUID masterId, String detailModelName, List<QueryComponentCoulmnData> columnList, int pageSize,
-			int current);
+	Object queryDetailByMasterId(UUID masterId, String detailModelName, List<QueryComponentCoulmnData> columnList,
+			int pageSize, int current, String orderCoulmnName, String orderType);
 
 }

backend/inz.common/src/main/java/com/beecode/inz/common/web/QueryComponentController.java

@@ -16,26 +16,42 @@ import com.beecode.inz.common.service.QueryComponentService;
 import net.sf.json.JSONArray;
 import net.sf.json.JsonConfig;
 
-
 @RestController
 public class QueryComponentController {
-	
+
 	@Autowired
 	private QueryComponentService queryComponentService;
-	
+
 	@PostMapping("/queryComponent/queryDetailByMasterId/{masterId}")
 	public Object queryDetailByMasterId(@PathVariable UUID masterId, @RequestBody String body) {
 		JSONObject list = new JSONObject(body);
+		String orderCoulmnName = null, orderType = null;
+		
+		if (list.has("orderCoulmnName") && list.has("orderType")) {
+			orderCoulmnName = list.getString("orderCoulmnName");
+			orderType = list.getString("orderType");
+		}
 		JSONArray array = JSONArray.fromObject(list.get("columnList").toString());
 		List<QueryComponentCoulmnData> columnList = JSONArray.toList(array, QueryComponentCoulmnData.class);
-		return queryComponentService.queryDetailByMasterId(masterId, list.getString("detailModelName"), columnList, list.getInt("pageSize"), list.getInt("current")).toString();
+		return queryComponentService
+				.queryDetailByMasterId(masterId, list.getString("detailModelName"), columnList, list.getInt("pageSize"),
+						list.getInt("current"), orderCoulmnName, orderType)
+				.toString();
 	}
-	
+
 	@PostMapping("/sand/user/queryComponent/queryDetailByMasterId/{masterId}")
 	public Object queryDetailByMasterIdComcompany(@PathVariable UUID masterId, @RequestBody String body) {
 		JSONObject list = new JSONObject(body);
+		String orderCoulmnName = null, orderType = null;
+		if (null != list.get("orderCoulmnName") && null != list.get("orderType")) {
+			orderCoulmnName = list.getString("orderCoulmnName");
+			orderType = list.getString("orderType");
+		}
 		JSONArray array = JSONArray.fromObject(list.get("columnList").toString());
 		List<QueryComponentCoulmnData> columnList = JSONArray.toList(array, QueryComponentCoulmnData.class);
-		return queryComponentService.queryDetailByMasterId(masterId, list.getString("detailModelName"), columnList, list.getInt("pageSize"), list.getInt("current")).toString();
+		return queryComponentService
+				.queryDetailByMasterId(masterId, list.getString("detailModelName"), columnList, list.getInt("pageSize"),
+						list.getInt("current"), orderCoulmnName, orderType)
+				.toString();
 	}
 }

backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/advanquery/SalesPlanQueryView.jmx

@@ -42,6 +42,7 @@
                             "enable": "ALL",
                             "name": "query_export",
                             "action": "query_export",
+                            "permissions":"test",
                             "title": "导出",
                             "type": ""
                         }
@@ -149,6 +150,22 @@
 					              "param" : {
 					                "detailModelName" : "com.xyst.dinas.sales.datamodel.SalesPlanAssociatedSalesPlanDetail",
 					                "columnList":[
+					                		{
+									            "key":"purchaseSandUnit.name",
+									            "title":"购砂单位"
+									        },
+					                		{
+									            "key":"project.projectName",
+									            "title":"项目"
+									        },
+									        {
+									            "key":"project.projectType.title",
+									            "title":"项目类型"
+									        },
+									        {
+									            "key":"contractName",
+									            "title":"合同名称"
+									        },
 									        {
 									            "key":"dinasType.dinasTypeName",
 									            "title":"砂石种类"