Merge remote-tracking branch 'origin/master' into master

@@ -245,7 +245,7 @@ public class SuddenDescentAlarmJob implements Job {
     /**
     /**
      * 判断是否需要发送短信和通知
      * 判断是否需要发送短信和通知
      *
      *
-     * @param resultList
+     * @param
      */
      */
     public void sendMessage(List<AlarmRuleConfigAndLevelVO> excessList) {
     public void sendMessage(List<AlarmRuleConfigAndLevelVO> excessList) {
         //超标报警
         //超标报警

@@ -206,11 +206,10 @@ public class ErpSettlementController {
 	}
 	}
 	@AutoLog(value = "药剂结算单详情-验收审批")
 	@AutoLog(value = "药剂结算单详情-验收审批")
 	@ApiOperation(value="药剂结算单详情-验收审批", notes="药剂结算单详情-验收审批")
 	@ApiOperation(value="药剂结算单详情-验收审批", notes="药剂结算单详情-验收审批")
-	@DeleteMapping(value = "/auditAccept")
+	@GetMapping(value = "/auditAccept")
 	public Result<?> auditAccept(@RequestParam(name="id",required=true) String id) {
 	public Result<?> auditAccept(@RequestParam(name="id",required=true) String id) {
 		Result<ErpSettlementVO> result = new Result<ErpSettlementVO>();
 		Result<ErpSettlementVO> result = new Result<ErpSettlementVO>();
 		ErpSettlement erpSettlementEntity = erpSettlementService.getById(id);
 		ErpSettlement erpSettlementEntity = erpSettlementService.getById(id);
-
 		erpSettlementEntity.setInspectTime(DateUtils.format(new Date(), HolidaysUtils.DATE_TIME_PATTERN));
 		erpSettlementEntity.setInspectTime(DateUtils.format(new Date(), HolidaysUtils.DATE_TIME_PATTERN));
 		erpSettlementEntity.setInspectorSign(BaseContextHandler.getUserName());
 		erpSettlementEntity.setInspectorSign(BaseContextHandler.getUserName());
 		if(erpSettlementEntity==null) {
 		if(erpSettlementEntity==null) {
@@ -226,11 +225,10 @@ public class ErpSettlementController {
 
 
 	@AutoLog(value = "药剂结算单详情-经理审批")
 	@AutoLog(value = "药剂结算单详情-经理审批")
 	@ApiOperation(value="药剂结算单详情-经理审批", notes="药剂结算单详情-经理审批")
 	@ApiOperation(value="药剂结算单详情-经理审批", notes="药剂结算单详情-经理审批")
-	@DeleteMapping(value = "/auditManager")
+	@GetMapping(value = "/auditManager")
 	public Result<?> auditManager(@RequestParam(name="id",required=true) String id) {
 	public Result<?> auditManager(@RequestParam(name="id",required=true) String id) {
 		Result<ErpSettlementVO> result = new Result<ErpSettlementVO>();
 		Result<ErpSettlementVO> result = new Result<ErpSettlementVO>();
 		ErpSettlement erpSettlementEntity = erpSettlementService.getById(id);
 		ErpSettlement erpSettlementEntity = erpSettlementService.getById(id);
-
 		erpSettlementEntity.setApproveTime(DateUtils.format(new Date(), HolidaysUtils.DATE_TIME_PATTERN));
 		erpSettlementEntity.setApproveTime(DateUtils.format(new Date(), HolidaysUtils.DATE_TIME_PATTERN));
 		erpSettlementEntity.setApproverSign(BaseContextHandler.getUserName());
 		erpSettlementEntity.setApproverSign(BaseContextHandler.getUserName());
 		if(erpSettlementEntity==null) {
 		if(erpSettlementEntity==null) {
@@ -245,7 +243,7 @@ public class ErpSettlementController {
 	}
 	}
 	@AutoLog(value = "药剂结算单详情-结算")
 	@AutoLog(value = "药剂结算单详情-结算")
 	@ApiOperation(value="药剂结算单详情-结算", notes="药剂结算单详情-结算")
 	@ApiOperation(value="药剂结算单详情-结算", notes="药剂结算单详情-结算")
-	@DeleteMapping(value = "/settlement")
+	@GetMapping(value = "/settlement")
 	public Result<?> settlement(@RequestParam(name="id",required=true) String id) {
 	public Result<?> settlement(@RequestParam(name="id",required=true) String id) {
 		Result<ErpSettlementVO> result = new Result<ErpSettlementVO>();
 		Result<ErpSettlementVO> result = new Result<ErpSettlementVO>();
 		ErpSettlement erpSettlementEntity = erpSettlementService.getById(id);
 		ErpSettlement erpSettlementEntity = erpSettlementService.getById(id);
@@ -255,7 +253,6 @@ public class ErpSettlementController {
 			result.error500("未找到对应实体");
 			result.error500("未找到对应实体");
 		}else {
 		}else {
 			//修改 入库表状态
 			//修改 入库表状态
-
 			boolean ok = erpSettlementService.settlement(erpSettlementEntity);
 			boolean ok = erpSettlementService.settlement(erpSettlementEntity);
 			if(ok) {
 			if(ok) {
 				result.success("结算成功!");
 				result.success("结算成功!");

@@ -40,6 +40,7 @@ public class ErpSettlement {
 	/**水厂编号*/
 	/**水厂编号*/
 	@Excel(name = "水厂编号", width = 15)
 	@Excel(name = "水厂编号", width = 15)
     @ApiModelProperty(value = "水厂编号")
     @ApiModelProperty(value = "水厂编号")
+	@Dict(dictTable="sys_depart",dicCode = "id",dicText = "depart_name")
 	private String departId;
 	private String departId;
 	/**采购合同*/
 	/**采购合同*/
 	@ApiModelProperty(value = "采购合同")
 	@ApiModelProperty(value = "采购合同")

@@ -175,7 +175,7 @@ skua:
       appKey: 3a2653ad36727
       appKey: 3a2653ad36727
       pushHostName: http://api.push.mob.com/v3/push/createPush
       pushHostName: http://api.push.mob.com/v3/push/createPush
       packageName: com.kingtrol.flutter_zhongye
       packageName: com.kingtrol.flutter_zhongye
-      iosProduction: 0
+      iosProduction: 1
   # 自定义逻辑,以','分割(e.g: messagePush:消息推送完后处理)
   # 自定义逻辑,以','分割(e.g: messagePush:消息推送完后处理)
   flow:
   flow:
     custom-logic: messagePush
     custom-logic: messagePush

@@ -18,26 +18,19 @@ import java.util.List;
 public class JnhbLargeScreenVO {
 public class JnhbLargeScreenVO {
 	@ApiModelProperty(value = "头部统计数值")
 	@ApiModelProperty(value = "头部统计数值")
 	private List<ResultNumberVO> headStatisticsList = null;
 	private List<ResultNumberVO> headStatisticsList = null;
-
 	@ApiModelProperty(value = "各站点能源消耗排名")
 	@ApiModelProperty(value = "各站点能源消耗排名")
 	private  List<PowerConsumeVO>  powerConsumeVOList = null;
 	private  List<PowerConsumeVO>  powerConsumeVOList = null;
-
 	@ApiModelProperty(value = "负荷率对象")
 	@ApiModelProperty(value = "负荷率对象")
 	private List<LoadRateVO>  loadRateVOList = null;
 	private List<LoadRateVO>  loadRateVOList = null;
-
 	@ApiModelProperty(value = "CO2排放排名")
 	@ApiModelProperty(value = "CO2排放排名")
 	private List<ResultNumberVO> co2DataList = null;
 	private List<ResultNumberVO> co2DataList = null;
-
-
 	@ApiModelProperty(value = "消减量统计")
 	@ApiModelProperty(value = "消减量统计")
 	private List<ResultNumberVO> reduceStatisticsList = null;
 	private List<ResultNumberVO> reduceStatisticsList = null;
 
 
 	@ApiModelProperty(value = "ESG减排趋势")
 	@ApiModelProperty(value = "ESG减排趋势")
 	private List<ResultChartsVO> esgChartsList= null;
 	private List<ResultChartsVO> esgChartsList= null;
-
 	@ApiModelProperty(value = "吨消减能耗")
 	@ApiModelProperty(value = "吨消减能耗")
 	private List<ResultChartsVO> energyConsumeChartsList = null;
 	private List<ResultChartsVO> energyConsumeChartsList = null;
-
 	@ApiModelProperty(value = "废物处理对象集合")
 	@ApiModelProperty(value = "废物处理对象集合")
 	private  List<WasteMaterialVO> wasteMaterialList  = null;//废物处理对象集合
 	private  List<WasteMaterialVO> wasteMaterialList  = null;//废物处理对象集合
 	@ApiModelProperty(value = "一级能耗设备数量")
 	@ApiModelProperty(value = "一级能耗设备数量")