山西新需求修改

src/main/java/com/chinaitop/depot/business/controller/BusinessContractController.java

@@ -966,32 +966,21 @@ public class BusinessContractController {
         PageInfo<BusinessContract> pageInfo = new PageInfo<BusinessContract>(list);
         return pageInfo;
     }
-    
-    
-    
-   /* //合同信息同步
-  	@RequestMapping("/contractInfoSynchronization")
-  	public void contractInfoSynchronization() {
-  		SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ");
-  		List list = DataSynchronization.queryContractInfo();
-  		List<BusinessContract> contractList = contractService.getAllContractInfo();
-  		for(BusinessContract contractInfo:contractList) {
-  			int num = 0;
-  			for(int i=0;i<list.size();i++) {
-  				Map<String,Object> map = (Map<String,Object>)list.get(i);
-  				String kdbm = ObjectUtils.toString(map.get("kdbm"),"");//库点编码
-  				String refreshTime = ObjectUtils.toString(map.get("refreshTime"),"");
-  				if(kdbm.equals(ObjectUtils.toString(orgInfo.getOrgId(),""))) {
-  					if(!refreshTime.equals(format.format(orgInfo.getUpdateTime()))) {
-  						DataSynchronization.orgInfoSynchronizationUpdate(map, orgInfo);
-  					}
-  					break;
-  				}else if(num == (list.size()-1)){
-  					DataSynchronization.orgInfoSynchronizationInsert(orgInfo);
-  				}else {
-  					num = num+1;
-  				}
-  			}
-  		}
-  	}*/
+
+	/**
+	 * 查询合同完成启用数量总数
+	 * @param orgId  组织id
+	 * @param contractNumber  计划编号
+	 * @return
+	 * @throws Exception
+	 */
+	@RequestMapping(value="/getCountQYzl",produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+	@ApiOperation(value="查询合同完成启用数量总数", notes = "查询合同完成启用数量总数")
+	@ApiImplicitParams({
+			@ApiImplicitParam(name = "orgId", value = "组织id", paramType = "query"),
+			@ApiImplicitParam(name = "contractNumber", value = "合同编号", paramType = "query")
+	})
+	public String getCountQYzl(Integer orgId, String contractNumber) throws Exception {
+		return contractService.getCountQYzl(orgId,contractNumber);
+	}
 }

src/main/java/com/chinaitop/depot/business/controller/BusinessDeliveryStorageNoticeController.java

@@ -778,4 +778,22 @@ public class BusinessDeliveryStorageNoticeController {
         }
         return modelMap;
     }
+
+	/**
+	 * 查询通知单完成启用数量总数
+	 * @param orgId  组织id
+	 * @param billNumber  计划编号
+	 * @return
+	 * @throws Exception
+	 */
+	@RequestMapping(value="/getCountQYzl",produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+	@ApiOperation(value="查询通知单完成启用数量总数", notes = "查询通知单完成启用数量总数")
+	@ApiImplicitParams({
+			@ApiImplicitParam(name = "orgId", value = "组织id", paramType = "query"),
+			@ApiImplicitParam(name = "billNumber", value = "通知单编号", paramType = "query"),
+			@ApiImplicitParam(name = "billType", value = "通知单类型", paramType = "query")
+	})
+	public String getCountQYzl(Integer orgId, String billNumber, String billType) throws Exception {
+		return deliveryStorageNoticeService.getCountQYzl(orgId,billNumber,billType);
+	}
 }

src/main/java/com/chinaitop/depot/business/controller/BusinessPlanController.java

@@ -689,5 +689,23 @@ public class BusinessPlanController {
     public List<Map<String,Object>> getWarehouseByPlan(String warehouseId,Integer orgId, String ckOrRk) throws Exception {
     	return businessPlanService.getHouseByPlan(warehouseId,orgId,ckOrRk);
     }
+
+
+    /**
+     * 查询计划完成启用数量总数
+     * @param orgId  组织id
+     * @param planNumber  计划编号
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping(value="/getCountQYzl",produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+    @ApiOperation(value="查询计划完成启用数量总数", notes = "查询计划完成启用数量总数")
+    @ApiImplicitParams({
+    	@ApiImplicitParam(name = "orgId", value = "组织id", paramType = "query"),
+    	@ApiImplicitParam(name = "planNumber", value = "计划编号", paramType = "query")
+    })
+    public Map<String, Object> getCountQYzl(Integer orgId, String planNumber) throws Exception {
+    	return businessPlanService.getCountQYzl(orgId,planNumber);
+    }
     
 }

src/main/java/com/chinaitop/depot/business/mapper/BusinessContractMapper.java

@@ -124,5 +124,6 @@ public interface BusinessContractMapper {
     //根据通知单状态查询合同数据
     List<Map<String,Object>> contractData(Map<String,Object> map);
 
-	/*List<BusinessContract> getAllContractInfo();*/
+    String getCountQYzl(Map<String,Object> map);
+
 }

src/main/java/com/chinaitop/depot/business/mapper/BusinessContractMapper.xml

@@ -1266,16 +1266,16 @@
       </foreach>
     </if>
   </select>
-  
-  
-  <!-- <select id="getAllContractInfo" resultMap="BaseResultMap" parameterType="map" >
-    select contract.id,contract_number,contract_title,customer_id,customer_bid,customer_number,customer_name, grain_quantity,money_quantity,
-    signing_man,signing_time,enable_date,disable_date,contract_type,original_contract,original_contract_bid,
-    root_contract_bid,shipping_type,contract_pay_type,finished_quantity,money_of_finished_quantity,remark,plant_acreage,
-    plan_number,mobile,bank_name,account_name,account_number,breach_liability,dissolution_conditions,dispute_settlement_method,change_record_flag
-    change_reason,change_time,change_content,changing,plan_bid,audit_state,process_instance_id,process_definition_id,agree_time,
-    create_man,creater,create_time,create_unit,create_depot,update_time,org_id,in_application,
-    creater_id,identification,updatetime
-    from business_contract contract 
-  </select> -->
+
+  <select id="getCountQYzl" parameterType="java.util.Map" resultType="java.lang.String">
+    SELECT
+    sum(grain_quantity) qyzl
+    FROM
+    business_contract
+    WHERE
+    org_id = #{orgId} AND in_application = '1'
+    <if test="contractNumber != null and contractNumber != ''">
+      AND contract_number = #{contractNumber}
+    </if>
+  </select>
 </mapper>

src/main/java/com/chinaitop/depot/business/mapper/BusinessDeliveryStorageNoticeMapper.java

@@ -130,4 +130,6 @@ public interface BusinessDeliveryStorageNoticeMapper {
 	Integer selectCustomer(Map<String, Object> mapCustomer);
 
     List<BusinessDeliveryStorageNotice> selectByExampleDetails(Map<String,Object> map);
+
+    String getCountQYzl(Map<String,Object> map);
 }

src/main/java/com/chinaitop/depot/business/mapper/BusinessDeliveryStorageNoticeMapper.xml

@@ -1265,4 +1265,19 @@
     </foreach>
     group by notice.id
   </select>
+
+  <select id="getCountQYzl" parameterType="java.util.Map" resultType="java.lang.String">
+    SELECT
+    sum(shiping_count) qyzl
+    FROM
+    business_delivery_storage_notice
+    WHERE
+    org_id = #{orgId} AND in_application = '1'
+    <if test="billNumber != null and billNumber != ''">
+      AND bill_number = #{billNumber}
+    </if>
+    <if test="billType != null and billType != ''">
+      AND bill_type = #{billType}
+    </if>
+  </select>
 </mapper>

src/main/java/com/chinaitop/depot/business/mapper/BusinessPlanMapper.java

@@ -124,4 +124,6 @@ public interface BusinessPlanMapper {
 
     List<Map<String, Object>> getHouseByPlanRK(Map<String, Object> map);
     List<Map<String, Object>> getHouseByPlanCK(Map<String, Object> map);
+
+    Map<String, Object> getCountQYzl(Map<String, Object> map);
 }

src/main/java/com/chinaitop/depot/business/mapper/BusinessPlanMapper.xml

@@ -1258,4 +1258,17 @@
     </where>
     ORDER BY DATE_FORMAT(plan.create_time,'%Y-%m-%d') DESC
   </select>
+
+  <select id="getCountQYzl" parameterType="java.util.Map" resultType="java.util.Map">
+    SELECT
+      sum(out_amount) outAmount,
+      sum(in_amount) inAmount
+    FROM
+      business_plan
+    WHERE
+          org_id = #{orgId} AND in_application = '1'
+    <if test="planNumber != null and planNumber != ''">
+      AND plan_number = #{planNumber}
+    </if>
+  </select>
 </mapper>

src/main/java/com/chinaitop/depot/business/service/BusinessContractService.java

@@ -177,6 +177,6 @@ public interface BusinessContractService {
 
 	List<BusinessContract> queryContractChangeList(Integer userId, Integer pageNum, Integer pageSize);
 
-	/*List<BusinessContract> getAllContractInfo();*/
+	String getCountQYzl(Integer orgId, String contractNumber);
 
 }

src/main/java/com/chinaitop/depot/business/service/BusinessDeliveryStorageNoticeService.java

@@ -118,4 +118,6 @@ public interface BusinessDeliveryStorageNoticeService {
 			
     List<BusinessDeliveryStorageNotice> queryNoticeChangeList(Integer userId, Integer pageNum, Integer pageSize);
     List<BusinessDeliveryStorageNotice> getChangeDetailList(Integer id, String type);
+
+    String getCountQYzl(Integer orgId, String billNumber, String billType);
 }

src/main/java/com/chinaitop/depot/business/service/BusinessPlanService.java

@@ -160,4 +160,6 @@ public interface BusinessPlanService {
 
 	List<Map<String,Object>> getHouseByPlan(String warehouseId,Integer orgId,String ckOrRk);
 
+	Map<String, Object> getCountQYzl(Integer orgId,String planNumber);
+
 }

src/main/java/com/chinaitop/depot/business/service/impl/BusinessContractServiceImpl.java

@@ -10,6 +10,7 @@ import java.util.Map;
 
 import javax.annotation.Resource;
 
+import com.chinaitop.depot.utils.ParameterUtil;
 import org.activiti.engine.runtime.ProcessInstance;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Service;
@@ -1522,10 +1523,14 @@ public class BusinessContractServiceImpl implements BusinessContractService {
 		return list;
 	}
 
-	/*@Override
-	public List<BusinessContract> getAllContractInfo() {
-		// TODO Auto-generated method stub
-		return contractMapper.getAllContractInfo();
-	}*/
+    @Override
+    public String getCountQYzl(Integer orgId,String contractNumber) {
+        Map<String,Object> paramMap = new HashMap<String, Object>();
+        paramMap.put("orgId",orgId);
+        if (ParameterUtil.isnotnull(contractNumber)) {
+            paramMap.put("contractNumber",contractNumber);
+        }
+        return contractMapper.getCountQYzl(paramMap);
+    }
 
 }

src/main/java/com/chinaitop/depot/business/service/impl/BusinessDeliveryStorageNoticeServiceImpl.java

@@ -1453,5 +1453,16 @@ public class BusinessDeliveryStorageNoticeServiceImpl implements BusinessDeliver
         return null;
     }
 
-    
+    @Override
+    public String getCountQYzl(Integer orgId, String billNumber, String billType) {
+        Map<String,Object> paramMap = new HashMap<String, Object>();
+        paramMap.put("orgId",orgId);
+        if (ParameterUtil.isnotnull(billNumber)) {
+            paramMap.put("billNumber",billNumber);
+        }
+        if (ParameterUtil.isnotnull(billType)) {
+            paramMap.put("billType",billType);
+        }
+        return businessDeliveryStorageNoticeMapper.getCountQYzl(paramMap);
+    }
 }

src/main/java/com/chinaitop/depot/business/service/impl/BusinessPlanServiceImpl.java

@@ -1007,6 +1007,8 @@ public class BusinessPlanServiceImpl implements BusinessPlanService {
 			}
         	createCriteria.andCustomerPlanStateIn(list);
         }
+
+        example.setOrderByClause("report_date asc");
         
         PageHelper.startPage(pageNum, pageSize);
         
@@ -1107,4 +1109,14 @@ public class BusinessPlanServiceImpl implements BusinessPlanService {
 		return businessPlanList;
 	}
 
+	@Override
+	public Map<String, Object> getCountQYzl(Integer orgId,String planNumber) {
+        Map<String,Object> paramMap = new HashMap<String, Object>();
+        paramMap.put("orgId",orgId);
+        if (ParameterUtil.isnotnull(planNumber)) {
+            paramMap.put("planNumber",planNumber);
+        }
+		return planMapper.getCountQYzl(paramMap);
+	}
+
 }

src/main/java/com/chinaitop/depot/pushs/service/impl/PushServiceImpl.java

@@ -143,16 +143,18 @@ public class PushServiceImpl implements PushsService{
 				}
 
 				//获取数据
-				String ids = json_object.get("tzdId").toString();
+//				String ids = json_object.get("tzdId").toString();
+				String numbers = json_object.get("tzdNumber").toString();
 				String inApplication = json_object.get("inApplication").toString();
 
 				//添加查询通知单id方法
 				BusinessDeliveryStorageNoticeExample noticeExample = new BusinessDeliveryStorageNoticeExample();
 				com.chinaitop.depot.business.model.BusinessDeliveryStorageNoticeExample.Criteria noticeCriteria = noticeExample.createCriteria();
 				//传输过来的ids转换成list<Integer>类型的。
-				int[] intIds = Arrays.stream(ids.split(",")).mapToInt(Integer::parseInt).toArray();
-				Integer[] IntegerIds = ArrayUtils.toObject(intIds);
-				noticeCriteria.andIdIn(Arrays.asList(IntegerIds));
+//				int[] intIds = Arrays.stream(ids.split(",")).mapToInt(Integer::parseInt).toArray();
+				String[] strNumbers = numbers.split(",");
+//				Integer[] IntegerIds = ArrayUtils.toObject(intIds);
+				noticeCriteria.andBillNumberIn(Arrays.asList(strNumbers));
 				noticeExample.setOrderByClause(" create_time DESC");
 				//添加要修改的状态值
 				BusinessDeliveryStorageNotice businessDeliveryStorageNotice = new BusinessDeliveryStorageNotice();