kangwei ：修改bug

@@ -217,17 +217,31 @@ public class ReportViewUtil {
 		return sb.toString();
 	}
 
-	/*****************************************************/
-	/***
-	 * 构造填报报表视图：按照部门分组统计
-	 * @param reportId 报表编号
-	 * @param fields  查询字段
-	 * @param startTime  开始时间
-	 * @param endTime 结束时间
+
+	/**
+	 * 构造填报报表视图,时间模糊搜索
+	 * 	 * </pre>
+	 * 	 * @param reportId		报表id
+	 * 	 * @param fields		查询字段
+	 * 	 * @param departIds	厂站集合
+	 * 	 * @param dataTime		开始时间
+	 * 	 * @param dataTime		结束时间
+	 * @param operatorSign 运算符号 avg  sum  max  min
 	 * @return
 	 */
-	public static String buildViewByStatistics(String reportId,String fields,String startTime,String endTime) {
+	public static String buildViewLike(String reportId,String fields,String departIds,String startTime,String endTime,String operatorSign) {
+
+		//运算符号operatorSign
+		if(StringUtils.isEmpty(operatorSign)) operatorSign = "sum";
+		String inSqlPart = "";
 		String inItemSqlPart = "";
+		if(StringUtils.isNotEmpty(departIds)){
+			String[] departIdArray = departIds.split(",");
+			for(String departId : departIdArray) {
+				inSqlPart = inSqlPart + ",'"+departId+"'";
+			}
+			inSqlPart = inSqlPart.substring(1);
+		}
 		if(!StringUtils.isEmpty(fields)) {
 			String[] fieldArray = fields.split(",");
 			for(String field : fieldArray) {
@@ -242,6 +256,7 @@ public class ReportViewUtil {
 			}
 			inItemSqlPart = inItemSqlPart.substring(1);
 		}
+
 		JdbcTemplate masterDB = (JdbcTemplate)SpringContextUtils.getBean("master");
 		String itemSql = "select item_code,id from f_report_item where report_id = '"+reportId+"' and required = 1 ";
 		if(!StringUtils.isEmpty(inItemSqlPart)) {
@@ -256,18 +271,27 @@ public class ReportViewUtil {
 		for(Map<String,Object> itemMap : itemList) {
 			itemCodes = itemCodes + ",'"+itemMap.get("item_code")+"'";
 			itemIds = itemIds +",'"+itemMap.get("id")+"'";
-			sb.append("sum(if((`d`.`item_code` = '"+itemMap.get("item_code")+"'),`a`.`item_value`,NULL)) AS `"+itemMap.get("item_code")+"`,");
+			sb.append( operatorSign + "(if((`d`.`item_code` = '"+itemMap.get("item_code")+"'),`a`.`item_value`,NULL)) AS `"+itemMap.get("item_code")+"`,");
 		}
 		if(!StringUtils.isEmpty(itemIds)) {
 			itemIds = itemIds.substring(1);
 		}
-		sb.append("`a`.`depart_id` AS `depart_id`  from (( ");
+		sb.append("`a`.`depart_id` AS `depart_id` from (( ");
+		sb.append("SELECT data_id,reit_id,item_value,data_time,depart_id FROM f_report_itemv WHERE 1=1 ");
 
-		sb.append("SELECT data_id,reit_id,item_value,data_time,depart_id FROM f_report_itemv v WHERE 1=1 ");
+		if(!StringUtils.isEmpty(departIds)) {
+			sb.append(" and depart_id in ("+inSqlPart+")");
+		}
 		if(!StringUtils.isEmpty(startTime)) {
-			sb.append("and data_time>='"+startTime+"' and data_time<='"+endTime+"' ");
+			sb.append("and data_time >='"+startTime+"'");
 		}
-		sb.append("and reit_id in ("+itemIds+")) `a` left join `f_report_item` `d` on(`a`.`reit_id` = `d`.`id`)) where 1=1  group by `a`.`depart_id`)");
+		if(!StringUtils.isEmpty(endTime)) {
+			sb.append("and data_time <='"+endTime+"'");
+		}
+		sb.append("and reit_id in ("+itemIds+")");
+
+		sb.append(") `a` left join `f_report_item` `d` on((`a`.`reit_id` = `d`.`id`))) where 1=1  group by `a`.`depart_id`)");
 		return sb.toString();
 	}
+
 }

@@ -27,11 +27,18 @@ public interface CommonSqlMapper {
 
     Page<Map<String, Object>> queryWrapperForPage(Page<?> page, @Param("sql") String sql, @Param(Constants.WRAPPER) QueryWrapper<?> queryWrapper);
 
+
     @Anonymous
     List<Map<String, Object>> queryForList(@Param("sql") String sql);
 
     List<Map<String, Object>> queryWrapperForList(@Param("sql") String sql, @Param(Constants.WRAPPER) QueryWrapper<?> queryWrapper);
 
+    String queryForString(@Param("sql") String sql);
+
+    String queryWrapperForString(@Param("sql") String sql, @Param(Constants.WRAPPER) QueryWrapper<?> queryWrapper);
+
+
+
     Integer update(@Param("sql") String sql);
 
     Integer updateWrapper(@Param("tableName") String tableName, @Param(Constants.WRAPPER) UpdateWrapper<?> updateWrapper);

@@ -26,6 +26,14 @@
        ${sql} ${ew.customSqlSegment}
     </select>
 
+
+    <select id="queryForString" resultType="java.lang.String">
+       ${sql}
+    </select>
+    <select id="queryWrapperForString" resultType="java.lang.String" parameterType="java.lang.String">
+       ${sql} ${ew.customSqlSegment}
+    </select>
+
     <update id="update">
          ${sql}
     </update>

@@ -28,6 +28,10 @@ public interface ICommonSqlService {
 
     List<Map<String, Object>> queryWrapperForList(String sql, QueryWrapper<?> queryWrapper);
 
+    String queryForString(String sql);
+
+    String queryWrapperForString(String sql, QueryWrapper<?> queryWrapper);
+
     Integer update(String sql);
 
     Integer updateWrapper(String tableName, UpdateWrapper<?> updateWrapper);

@@ -46,12 +46,23 @@ public class CommonSqlServiceImpl implements ICommonSqlService {
         return commonSqlMapper.queryForList(sql);
     }
 
+
     @Override
     public List<Map<String, Object>> queryWrapperForList(String sql, QueryWrapper<?> queryWrapper) {
         return commonSqlMapper.queryWrapperForList(sql, queryWrapper);
     }
 
     @Override
+    public String queryForString(String sql) {
+        return commonSqlMapper.queryForString(sql);
+    }
+
+    @Override
+    public String queryWrapperForString(String sql, QueryWrapper<?> queryWrapper) {
+        return commonSqlMapper.queryWrapperForString(sql, queryWrapper);
+    }
+
+    @Override
     public Integer update(String sql) {
         return commonSqlMapper.update(sql);
     }

+package com.skua.modules.common.vo;
+
+import com.skua.core.util.DateUtils;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.apache.commons.lang3.StringUtils;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+
+@Data
+public class DateVO {
+
+    @ApiModelProperty(value = "去年(yyyy)")
+    private int lastYear;
+
+    @ApiModelProperty(value = "去年(yyyy-MM)")
+    private String lastYearMonth;
+    @ApiModelProperty(value = "去年(yyyy-MM-dd)")
+    private String lastYearStartDate;
+    @ApiModelProperty(value = "去年(yyyy-MM-dd)")
+    private String lastYearEndDate;
+
+
+    @ApiModelProperty(value = "上月(yyyy-MM)")
+    private String lastMonth;
+
+    @ApiModelProperty(value = "上月(yyyy-MM-dd)")
+    private String lastMonthDay;
+
+
+    @ApiModelProperty(value = "昨天")
+    private String yesterday;
+
+    @ApiModelProperty(value = "当月(yyyy)")
+    private int nowYear;
+
+    @ApiModelProperty(value = "当月(yyyy-MM)")
+    private String nowMonth;
+
+    @ApiModelProperty(value = "当月(yyyy-MM-dd)")
+    private String nowMonthStartDate;
+
+    @ApiModelProperty(value = "当月(yyyy-MM-dd)")
+    private String nowMonthEndDate;
+
+    @ApiModelProperty(value = "当月(yyyy-MM-dd)")
+    private String nowYearStartDate;
+    @ApiModelProperty(value = "当月(yyyy-MM-dd)")
+    private String nowYearEndDate;
+
+
+    public DateVO(String currentDate) {
+        this.nowMonth = DateUtils.dateformat(currentDate,"yyyy-MM");
+        this.nowMonthStartDate = nowMonth+"-01";
+        this.nowMonthEndDate = nowMonth+"-31";
+
+
+        //this.lastYear = getYear(nowMonth,"yyyy-MM")-1;
+        //this.lastMonth = DateUtils.getLastMonthOfMonth(nowMonth);
+        nowYear = Integer.parseInt( DateUtils.dateformat(currentDate,"yyyy") ) ;
+        nowYearStartDate = nowYear + "-01-01";
+        nowYearEndDate = nowYear + "-12-31";
+    /*    this.lastMonthStartTime = lastMonth+"-01";
+        this.lastMonthEndTime = lastMonth+"-31";
+
+        this.lastYearStartTime = lastYear+"-01";
+        this.lastYearEndTime = lastYear +"-31";*/
+    }
+}

 package com.skua.tool.util;
 
 import com.skua.constant.BaseConstant;
-
 import java.math.BigDecimal;
+import java.text.ParseException;
 import java.text.ParsePosition;
 import java.text.SimpleDateFormat;
 import java.time.DayOfWeek;
-import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.YearMonth;
 import java.time.format.DateTimeFormatter;

@@ -25,7 +25,9 @@
     <!-- 校验货号是否唯一 -->
     <select id="checkGoodCodeAndDepartId" resultType="java.lang.Integer">
         select count(1) from erp_distribut_material
-        where good_code =  #{goodCode} and  depart_id = #{departId}
+        where good_code =  #{goodCode}
+        <if test="departId != null and  departId !=''">a and  depart_id = #{departId}</if>
+
     </select>
 
 

@@ -6,7 +6,7 @@
     <select id="getListByDistributId" resultType="com.skua.modules.erp.entity.ERPPurchaseContract">
         select pc.* from erp_purchase_contract  pc where pc.id in (
         select DISTINCT pm.contract_id  from erp_purchase_material pm , erp_distribut_material dm
-            where dm.good_code  = dm.good_code  and  dm.contract_id = '1849328644967497730'
+            where pm.good_code  = dm.good_code  and  dm.contract_id = #{distributContractId}
         )
         and  pc.status = 3
         order by pc.create_time desc

@@ -13,6 +13,7 @@ import com.skua.modules.erp.service.IDistributContractService;
 import com.skua.modules.erp.vo.DistributContractVO;
 import com.skua.modules.erp.vo.PurchasePlanVO;
 import com.skua.modules.system.mapper.SysDepartMapper;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -47,26 +48,34 @@ public class DistributContractServiceImpl extends ServiceImpl<DistributContractM
         String goodsCode = checkSameGoodCode(distributContractVO.getMaterialList());
         if(goodsCode != null ){
             errMsg ="操作失败,货号["+ goodsCode +"]重复!";
+            return errMsg;
         }
         int count = 0;
-        if(!distributContractVO.getContractCode().equals(oldContractCode)){
+
+        if(StringUtils.isNotEmpty(oldContractCode)) {
+            if (!oldContractCode.equals(distributContractVO.getContractCode())) {//修改
+                count = this.baseMapper.checkContractCode(distributContractVO.getContractCode() );
+                if(count > 0 ){
+                    errMsg = "合同编号["+distributContractVO.getContractCode()+"]重复";
+                }
+            }
+        }else{//新增
             count = this.baseMapper.checkContractCode(distributContractVO.getContractCode() );
-            if(count > checkCount ){
+            if(count > 0 ){
                 errMsg = "合同编号["+distributContractVO.getContractCode()+"]重复";
             }
         }
 
-        if( errMsg == null &&   distributContractVO.getMaterialList() != null  && !distributContractVO.getMaterialList().isEmpty()){
+        if(   distributContractVO.getMaterialList() != null  && !distributContractVO.getMaterialList().isEmpty()){
             for(DistributMaterial material  : distributContractVO.getMaterialList()){
                 //根据deptid与goodscode校验
-                count = checkGoodCodeAndDepartId( material.getGoodCode(),distributContractVO.getDepartId() );
-                if(count > 0 ){
+                count = checkGoodCodeAndDepartId( material.getGoodCode(),null );
+                if(count > checkCount ){
                     errMsg = "所属厂站["+departMapper.selectById(distributContractVO.getDepartId()).getDepartName()+"]下的货号["+material.getGoodCode()+"]已经分销过！";
                     break;
                 }
             }
         }
-
         return errMsg;
     }
 

@@ -51,17 +51,25 @@ public class ERPPurchaseContractServiceImpl extends ServiceImpl<ERPPurchaseContr
         String result = null;
         int count = 0;
 
-        if(!purchaseContractVO.getContractCode().equals(oldContractCode)){
+        if(StringUtils.isNotEmpty(oldContractCode)){
+            if( ! oldContractCode.equals( purchaseContractVO.getContractCode() )){
+                count = purchaseMaterialMapper.checkContractCode(purchaseContractVO.getContractCode() );
+                if(count > 0 ){
+                    result = "合同编号["+purchaseContractVO.getContractCode()+"]重复";
+                    return result;
+                }
+            }
+        }else{
             count = purchaseMaterialMapper.checkContractCode(purchaseContractVO.getContractCode() );
-            if(count > checkCount ){
+            if(count > 0 ){
                 result = "合同编号["+purchaseContractVO.getContractCode()+"]重复";
+                return result;
             }
         }
-
-        if( result == null &&  purchaseContractVO.getMaterialList()!= null && !purchaseContractVO.getMaterialList().isEmpty()){
+        if(  purchaseContractVO.getMaterialList()!= null && !purchaseContractVO.getMaterialList().isEmpty()){
             for(PurchaseMaterial  purchaseMaterial :   purchaseContractVO.getMaterialList()){
                 if(StringUtils.isNotEmpty(purchaseMaterial.getGoodCode())){
-                    count =  purchaseMaterialMapper.checkGoodCode(purchaseMaterial.getId(),purchaseMaterial.getGoodCode());
+                    count =  purchaseMaterialMapper.checkGoodCode(null,purchaseMaterial.getGoodCode());
                     if(count > checkCount ){
                         result =  "校验失败，货号[ "+purchaseMaterial.getGoodCode()+" ]已经存在！" ;
                         break;

@@ -152,6 +152,7 @@ public class MaterialINServiceImpl extends ServiceImpl<MaterialINMapper, Materia
                     equipmentOutDTO.setUseBy( BaseContextHandler.getUserId() );//使用人
                     equipmentOutDTO.setOutDate( BaseUtil.getCurrentDate() );
                     equipmentOutDTO.setInventoryUpdateTimeEnd( BaseUtil.getCurrentDate());
+
                     equipmentOutDTO.setSuppliesWarehouseId( equipmentIn.getSuppliesWarehouseId() );// this.suppliesWarehouseId = suppliesWarehouseId;//所属仓库
                     //this.outOrder = outOrder;
                     // this.recipient = recipient;//领用人
@@ -180,6 +181,7 @@ public class MaterialINServiceImpl extends ServiceImpl<MaterialINMapper, Materia
             }
         }catch(ServiceException e){
             e.printStackTrace();
+            throw new ServiceException("入库失败："+e.getMessage());
         }
         //equipmentOutService.saveEquipmentOut(equipmentOutDTO);
         return errMsg;
@@ -200,7 +202,7 @@ public class MaterialINServiceImpl extends ServiceImpl<MaterialINMapper, Materia
 
         equipmentInDTO.setSuppliesWarehouseId(  inWarehouseId  ) ;//入库仓库
         equipmentInDTO.setInDate(  DateUtil.formatDate(new Date(),"yyyy-MM-dd HH:mm:ss"));
-        equipmentInDTO.setUseBy( BaseContextHandler.getUserId() ) ;//经办人
+        equipmentInDTO.setUseBy( materialINVO.getReceiver() ) ;//经办人(收货人)
         equipmentInDTO.setChooseTime( DateUtil.formatDate(new  Date(),"yyyy-MM-dd HH:mm:ss") );//经办时间
         equipmentInDTO.setRemark( materialINVO.getRemark()  );//备注
 

@@ -310,4 +310,41 @@ public class DateUtil {
         }
         return date;
     }
+
+
+    /**
+     * 格式化
+     * @param date
+     * @param format
+     * @return
+     */
+    public static String dateformat(String date, String format) {
+        SimpleDateFormat sformat = new SimpleDateFormat(format);
+        Date _date = null;
+        try {
+            _date = sformat.parse(date);
+        } catch (ParseException var5) {
+            var5.printStackTrace();
+        }
+        return sformat.format(_date);
+    }
+
+    /***
+     * 两个时间差
+     * @param date1
+     * @param date2
+     * @return
+     */
+    public static int differenceTime(String  date1,String date2){
+        int daysDifference = 1;
+        try{
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+            // 计算两个日期之间的差值
+            daysDifference = org.apache.commons.lang3.time.DateUtils.toCalendar( sdf.parse(date2)).get(Calendar.DAY_OF_YEAR)
+                    - org.apache.commons.lang3.time.DateUtils.toCalendar( sdf.parse(date1)).get(Calendar.DAY_OF_YEAR); // 直接计算天数差值
+        }catch(Exception e){
+            e.printStackTrace();
+        }
+        return daysDifference;
+    }
 }

@@ -14,6 +14,17 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 public class BaseUtil {
+
+	public static String dateformat(String date, String format) {
+		SimpleDateFormat sformat = new SimpleDateFormat(format);
+		Date _date = null;
+		try {
+			_date = sformat.parse(date);
+		} catch (ParseException var5) {
+			var5.printStackTrace();
+		}
+		return sformat.format(_date);
+	}
 	/**
 	 * 保留两位小数方法
 	 *
@@ -419,6 +430,8 @@ public class BaseUtil {
 	    return calendar.get(Calendar.SECOND);
 	}
 
+
+
 	/**
 	 * 过滤html标签
 	 * @param htmlStr

@@ -23,12 +23,12 @@ public class JTDisplayScreenController {
     @Autowired
     private IJTDisplayScreenService displayScreenService ;
 
-    @AutoLog(value = "厂站记录")
-    @ApiOperation(value = "厂长列表", notes = "厂长列表")
+    @AutoLog(value = "厂站地图列表")
+    @ApiOperation(value = "厂长地图列表", notes = "厂长地图列表")
     @GetMapping(value = "/factoryList")
-    public Result<List<SysFactoryInfoVO>> factoryList(String time) {
+    public Result<List<SysFactoryInfoVO>> factoryList() {
         Result<List<SysFactoryInfoVO>> result = new Result<>();
-        List<SysFactoryInfoVO> list = displayScreenService.getFactoryList(time);
+        List<SysFactoryInfoVO> list = displayScreenService.getFactoryList();
         result.setResult(list);
         return result;
     }

 package com.skua.modules.threedimensional.service;
 
+import com.skua.modules.threedimensional.vo.ProjectOperationInfoVO;
 import com.skua.modules.threedimensional.vo.SysFactoryInfoVO;
 import java.util.List;
 
+/**
+ * 对外展示集团大屏
+ */
 public interface IJTDisplayScreenService {
 
     /***
-     * 厂站列表
-     * @param time
+     * 厂站列表 以及出水量统计
      * @return
      */
-    List<SysFactoryInfoVO> getFactoryList(String time );
+    List<SysFactoryInfoVO> getFactoryList( );
+
+    /**
+     *对外展示集团大屏 : 项目运营情况
+     * @return
+     */
+    ProjectOperationInfoVO getProjectOperationInfo();
 }

@@ -2,13 +2,25 @@ package com.skua.modules.threedimensional.service.impl;
 
 import com.skua.common.report.ReportViewUtil;
 import com.skua.core.context.SpringContextUtils;
+import com.skua.core.util.ConvertUtils;
 import com.skua.core.util.DateUtils;
+import com.skua.modules.common.mapper.CommonSqlMapper;
+import com.skua.modules.common.service.ICommonSqlService;
+import com.skua.modules.common.vo.DateVO;
+import com.skua.modules.guest.util.DateUtil;
 import com.skua.modules.threedimensional.service.IJTDisplayScreenService;
+import com.skua.modules.threedimensional.vo.ProjectOperationInfoVO;
 import com.skua.modules.threedimensional.vo.SysFactoryInfoVO;
+import com.skua.tool.util.DigitalUtils;
+import io.swagger.annotations.ApiModelProperty;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 
 /**
@@ -16,32 +28,83 @@ import java.util.List;
  */
 @Service
 public class JTDisplayScreenServiceImpl implements IJTDisplayScreenService {
+
+    @Autowired
+    private ICommonSqlService commonSqlService;
+
     private static String view2119 = "2119ecbf53a1d2d0708258ff67cfd9e1";
     /***
-     *
+     *厂站列表 以及出水量统计
      * @return
      */
-    public  List<SysFactoryInfoVO> getFactoryList(String time ){
+    public  List<SysFactoryInfoVO> getFactoryList( ){
         List<SysFactoryInfoVO>  factoryInfoVOList = null;
-        String startDate = time+"-01";
-        String endDate = time+"-31";;
-        String departId = null;
+        Map<String, SysFactoryInfoVO> factoryInfoMap = new HashMap<>();
+        SysFactoryInfoVO  factoryInfoVO = null;
 
-        String yesterday = DateUtils.getYesterday();
+        String lastDay = DateUtils.getLastDay();//昨天
+        String currentDate = DateUtil.getCurrentDate();//今天
+        DateVO dateVO = new DateVO( DateUtil.getCurrentDate() );
+        //时间差
+        int differenceTime = DateUtil.differenceTime( dateVO.getNowYearStartDate(),currentDate);
+        //主库数据源
+        JdbcTemplate masterDB = (JdbcTemplate) SpringContextUtils.getBean("master");
 
-        //
+        String factorySql = "select  fi.id,fi.depart_id,d.depart_name, fi.pro_longitude,fi.pro_latitude  from sys_factory_info fi ,sys_depart d where fi.depart_id = d.id and d.depart_type =1";
+        List<Map<String, Object>> dataList = masterDB.queryForList(factorySql);
+        for(Map<String, Object> dataMap : dataList) {
+            // resultMap.put(ConvertUtils.getString(dataMap.get("id")), ConvertUtils.getString(dataMap.get("create_by"))+""+ConvertUtils.getString(dataMap.get("title")));
+            factoryInfoVO = new SysFactoryInfoVO(dataMap.get("id")+"",dataMap.get("depart_id").toString(),dataMap.get("depart_name").toString(),dataMap.get("pro_longitude").toString(),dataMap.get("pro_latitude").toString());
+            factoryInfoMap.put(factoryInfoVO.getDepartId(),factoryInfoVO);
+        }
+        //查询部门集合
         String departIdSql  ="select  GROUP_CONCAT(fi.depart_id )  from sys_factory_info fi ,sys_depart d where fi.depart_id = d.id and d.depart_type =1 ";
-        String departIds = null;
-        String dataViewName2119 = ReportViewUtil.buildViewLike(view2119,"CSL", departIds, startDate, endDate);
-        System.out.println("********************************************");
-        System.out.println(dataViewName2119);
+        String departIds = masterDB.queryForObject( departIdSql,String.class);
 
-        //主库数据源
-        JdbcTemplate masterDB = (JdbcTemplate) SpringContextUtils.getBean("master");
+        //昨天处理水量(m³)
+        String dataViewName2119 = ReportViewUtil.buildViewLike(view2119,"CSL", departIds, lastDay, lastDay);//depart_id  CSL
+        dataList = masterDB.queryForList(dataViewName2119);
+        for(Map<String, Object> dataMap : dataList) {
+            factoryInfoVO =  factoryInfoMap.get(dataMap.get("depart_id").toString());
+            if(factoryInfoVO != null ) factoryInfoVO.setCsl_lastDay(dataMap.get("CSL").toString() ) ;
+            // resultMap.put(ConvertUtils.getString(dataMap.get("id")), ConvertUtils.getString(dataMap.get("create_by"))+""+ConvertUtils.getString(dataMap.get("title")));
+        }
+        //本月处理水量(m³)
+        dataViewName2119 = ReportViewUtil.buildViewLike(view2119,"CSL", departIds, dateVO.getNowMonthStartDate(), dateVO.getNowMonthEndDate());
+        dataList = masterDB.queryForList(dataViewName2119);
+        for(Map<String, Object> dataMap : dataList) {
+            factoryInfoVO =  factoryInfoMap.get(dataMap.get("depart_id").toString());
+            if(factoryInfoVO != null ) factoryInfoVO.setCsl_month(dataMap.get("CSL").toString() ) ;
+            // resultMap.put(ConvertUtils.getString(dataMap.get("id")), ConvertUtils.getString(dataMap.get("create_by"))+""+ConvertUtils.getString(dataMap.get("title")));
+        }
+        //本年处理水量(万m³)
+        dataViewName2119 = ReportViewUtil.buildViewLike(view2119,"CSL", departIds, dateVO.getNowYearStartDate(), currentDate);
+        dataList = masterDB.queryForList(dataViewName2119);
+        for(Map<String, Object> dataMap : dataList) {
+            factoryInfoVO =  factoryInfoMap.get(dataMap.get("depart_id").toString());
+            if(factoryInfoVO != null ){
+                factoryInfoVO.setCsl_year(dataMap.get("CSL").toString() ) ;
+                factoryInfoVO.setCsl_avg_day(DigitalUtils.division( dataMap.get("CSL").toString() ,differenceTime+""  ) );
+            }
+            // resultMap.put(ConvertUtils.getString(dataMap.get("id")), ConvertUtils.getString(dataMap.get("create_by"))+""+ConvertUtils.getString(dataMap.get("title")));
+        }
+        factoryInfoVOList = new ArrayList(factoryInfoMap.values());
+        return factoryInfoVOList;
+    }
 
-        String sql = "select  " + 	" sum(v1.CSL)/10000 " + 	" from "+dataViewName2119+" v1  "  ;
 
+    /**
+     *对外展示集团大屏 : 项目运营情况
+     * @return
+     */
+    public ProjectOperationInfoVO getProjectOperationInfo(){
+        ProjectOperationInfoVO  projectOperationInfoVO = new ProjectOperationInfoVO();
 
-        return factoryInfoVOList;
+
+
+
+
+        return projectOperationInfoVO;
     }
+
 }

+package com.skua.modules.threedimensional.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 对外展示集团大屏
+ */
+@Data
+@ApiModel(value="对外展示集团大屏：项目运营情况", description="对外展示集团大屏：项目运营情况")
+public class ProjectOperationInfoVO {
+    @ApiModelProperty(value = "水厂数")
+    private String departCount;
+
+    @ApiModelProperty(value = "污水处理能力")
+    private String wsclnl;
+
+    @ApiModelProperty(value = "月产水量")
+    private String ycsl;
+
+    @ApiModelProperty(value = "水质综合达标率")
+    private String szzhdbl;
+
+    @ApiModelProperty(value = "运行负荷率")
+    private String yxfhl;
+
+    @ApiModelProperty(value = "污泥含水率")
+    private String wnhsl;
+}

@@ -15,6 +15,9 @@ public class SysFactoryInfoVO {
     private String id;
 
     @ApiModelProperty(value = "水厂名称")
+    private String departId;
+
+    @ApiModelProperty(value = "水厂名称")
     private String departName;
 
     @ApiModelProperty(value = "经度")
@@ -35,4 +38,15 @@ public class SysFactoryInfoVO {
     @ApiModelProperty(value = "本年处理水量")
     private String csl_year;
 
+
+    public SysFactoryInfoVO() {
+    }
+
+    public SysFactoryInfoVO(String id, String departId, String departName, String proLongitude, String proLatitude) {
+        this.id = id;
+        this.departId = departId;
+        this.departName = departName;
+        this.proLongitude = proLongitude;
+        this.proLatitude = proLatitude;
+    }
 }

@@ -48,7 +48,7 @@ public class FactoryCenterServiceImpl implements IFactoryCenterService {
         List<WaterQualityMonitoringDetailVO> list = new ArrayList<>();
         Map<String, Object> monitorTagMap = new HashMap<String,Object>();
         QueryWrapper<SysMonitorMetricInfo> qw = new QueryWrapper<>();
-        qw.in("metric_uid_tag", "JSTP,JSTN,JSPH,JSNH3N,JSCOD,CSTP,CSTN,CSPH,CSNH3N,CSCOD".split(","));
+        qw.in("metric_uid_tag", "JSTP,JSTN,JSPH,JSNH3N,JSCOD,CSTP,CSTN,CSPH,CSNH3N,CSCOD".split(",")); //CSLL 出水瞬时流量（）  CSLJLL出水流量累计JSLL（JSLJLL）  JSSS 进水浊度  CSSS 出水浊度
         qw.eq("depart_id", departId);
         qw.groupBy("depart_id","metric_uid_tag");
         List<SysMonitorMetricInfo> monitorList = sysMonitorMetricInfoService.list(qw);

@@ -49,7 +49,5 @@ public class DataVO {
 
         this.lastYearStartTime = lastYear+"-01";
         this.lastYearEndTime = lastYear +"-31";
-
-
     }
 }

@@ -77,7 +77,6 @@ public class EquipmentInServiceImpl extends ServiceImpl<EquipmentInMapper, Equip
     public  int  saveEquipmentIn(EquipmentInDTO equipmentInDTO) throws Exception {
         List<SuppliesWarehouse> suppliesWarehouseList = suppliesWarehouseService.list();//供应商列表
         Map<String, String> warehouseDictMap = suppliesWarehouseList.stream().collect(Collectors.toMap(SuppliesWarehouse::getId, SuppliesWarehouse::getDepartId));
-
         if (equipmentInDTO.getEquipmentInChildList() == null || equipmentInDTO.getEquipmentInChildList().isEmpty()) {
             throw new JeecgBootException("请选择入库备件！");
         }
@@ -102,7 +101,7 @@ public class EquipmentInServiceImpl extends ServiceImpl<EquipmentInMapper, Equip
             this.baseMapper.insert(equipmentIn);
             return 1;
         }));
-        CountDownLatch countDownLatch = new CountDownLatch(equipmentInDTO.getEquipmentInChildList().size());
+       // CountDownLatch countDownLatch = new CountDownLatch(equipmentInDTO.getEquipmentInChildList().size());
        /* //如果是采购入库
         Map<String, PurchaseInfoDetail> purchaseMap = Maps.newHashMap();
         if ("cg".equals(equipmentInDTO.getInType()) && StringUtils.isNotEmpty(equipmentInDTO.getPurchaseCode())) {
@@ -116,7 +115,6 @@ public class EquipmentInServiceImpl extends ServiceImpl<EquipmentInMapper, Equip
         for (EquipmentInChild equipmentInChild : equipmentInDTO.getEquipmentInChildList()) {
             equipmentInChild.setInId(inId);
            // taskExecutor.execute(() -> {
-                try {
                     String sparepartId = equipmentInChild.getSparepartId();
                     String suppliesWarehouseId = equipmentInDTO.getSuppliesWarehouseId();
                     //根据物资id和仓库id获取库存
@@ -167,15 +165,10 @@ public class EquipmentInServiceImpl extends ServiceImpl<EquipmentInMapper, Equip
                         //=============
                         return 1;
                     });
-                } catch (Exception e1) {
-                    e1.printStackTrace();
-                   // log.error("异常error: {}", e1.getMessage());
-                } finally {
-                    countDownLatch.countDown();
-                }
+
           //  });
         }
-        countDownLatch.await();
+       //countDownLatch.await();
         return 1;
     }
 

@@ -61,26 +61,27 @@ public class EquipmentOutServiceImpl extends ServiceImpl<EquipmentOutMapper, Equ
     @Transactional
     public String saveEquipmentOut(EquipmentOutDTO equipmentOutDTO) throws Exception {
         String errMsg = null;
-        if (equipmentOutDTO.getEquipmentOutChildList() == null || equipmentOutDTO.getEquipmentOutChildList().isEmpty()) {
-            errMsg = "请选择出库备件";
-            return errMsg;
-        }
-        // 出库单号
-        if (StringUtils.isEmpty(equipmentOutDTO.getOutOrder())) {
-            String outOrder = "CK-" + DateUtils.format(new Date(), "YYYYMMdd" + "-" + System.currentTimeMillis());
-            equipmentOutDTO.setOutOrder(outOrder);
-        }
-        // 出库表主键
-        String outId = UUID.randomUUID().toString().replaceAll("-", "");
-        equipmentOutDTO.setId(outId);
-        EquipmentOut equipmentOut = BeanExtUtils.bean2Bean(equipmentOutDTO, EquipmentOut.class);
-        equipmentOut.setInventoryUpdateTime(new Date());
-        this.baseMapper.insert(equipmentOut);
-       // CountDownLatch countDownLatch = new CountDownLatch(equipmentOutDTO.getEquipmentOutChildList().size());
-        for (EquipmentOutChild equipmentOutChild : equipmentOutDTO.getEquipmentOutChildList()) {
-            equipmentOutChild.setId(UniqIdUtils.getInstance().getUniqID());
-            equipmentOutChild.setOutId(outId);
-            //   taskExecutor.execute(() -> {
+        try{
+            if (equipmentOutDTO.getEquipmentOutChildList() == null || equipmentOutDTO.getEquipmentOutChildList().isEmpty()) {
+                errMsg = "请选择出库备件";
+                return errMsg;
+            }
+            // 出库单号
+            if (StringUtils.isEmpty(equipmentOutDTO.getOutOrder())) {
+                String outOrder = "CK-" + DateUtils.format(new Date(), "YYYYMMdd" + "-" + System.currentTimeMillis());
+                equipmentOutDTO.setOutOrder(outOrder);
+            }
+            // 出库表主键
+            String outId = UUID.randomUUID().toString().replaceAll("-", "");
+            equipmentOutDTO.setId(outId);
+            EquipmentOut equipmentOut = BeanExtUtils.bean2Bean(equipmentOutDTO, EquipmentOut.class);
+            equipmentOut.setInventoryUpdateTime(new Date());
+            this.baseMapper.insert(equipmentOut);
+            // CountDownLatch countDownLatch = new CountDownLatch(equipmentOutDTO.getEquipmentOutChildList().size());
+            for (EquipmentOutChild equipmentOutChild : equipmentOutDTO.getEquipmentOutChildList()) {
+                equipmentOutChild.setId(UniqIdUtils.getInstance().getUniqID());
+                equipmentOutChild.setOutId(outId);
+                //   taskExecutor.execute(() -> {
                 String sparepartId = equipmentOutChild.getSparepartId();
                 String suppliesWarehouseId = equipmentOutDTO.getSuppliesWarehouseId();
 
@@ -92,7 +93,10 @@ public class EquipmentOutServiceImpl extends ServiceImpl<EquipmentOutMapper, Equ
                     //物料信息
                     EquipmentSparepartSupplies supplies = sparepartSuppliesService.getById(sparepartId);
                     equipmentSparepart = new EquipmentSparepart();
-                    BeanUtils.copyProperties(supplies, equipmentSparepart);
+                    if(supplies != null ){
+                        BeanUtils.copyProperties(supplies, equipmentSparepart);
+                    }
+
                     equipmentSparepart.setId(null);
                     equipmentSparepart.setStorageNum(BigDecimal.ZERO);
                     equipmentSparepart.setSuppliesId(sparepartId);
@@ -118,9 +122,14 @@ public class EquipmentOutServiceImpl extends ServiceImpl<EquipmentOutMapper, Equ
                         return 0;
                     }
                 });
-            //  });
+                //  });
+            }
+            // countDownLatch.await();
+        }catch (Exception e){
+            e.printStackTrace();
+            throw new Exception("出库失败："+e.getMessage());
         }
-       // countDownLatch.await();
+
         return errMsg ;
     }
 }

+package com.skua.modules.equipment.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther kangwei
+ * @create 2024-10-25-9:30
+ */
+@Data
+@ApiModel
+public class DrugConsumptionVO {
+
+    @ApiModelProperty(value = "总药耗")
+    private String zyh;
+
+    @ApiModelProperty(value = "同比去年总药耗")
+    private String tbqnzyh;
+
+    @ApiModelProperty(value = "同比去年总药耗")
+    private String tbqnzyhsl;
+
+    @ApiModelProperty(value = "同比去年总药耗")
+    private String tbqnzyhbl;
+
+    @ApiModelProperty(value = "环比上月总药耗")
+    private String hbsyzyh;
+
+    @ApiModelProperty(value = "环比上月总药耗")
+    private String hbsyzyhsl;
+
+    @ApiModelProperty(value = "环比上月总药耗")
+    private String hbsyzyhbl;
+
+    @ApiModelProperty(value = "目标吨水药耗")
+    private String dsyh;
+
+
+
+    @ApiModelProperty(value = "tbqndsyhsl")
+    private String tbqndsyhsl;
+
+    @ApiModelProperty(value = "tbqndsyhbl")
+    private String tbqndsyhbl;
+
+}

@@ -94,7 +94,8 @@ public class MybatisInterceptor implements Interceptor {
         add("erp_distribut_material");
         //共享风险库
         add("danger_level_manage_share");
-
+        // 库存表
+        add("equipment_sparepart");
     }};
 
     //过滤不需要走部门ID查询的URL
@@ -154,6 +155,8 @@ public class MybatisInterceptor implements Interceptor {
                     || "com.skua.modules.erp.mapper.DistributContractMapper.selectList".equals(sqlId)  //分销合同列表
                     ||  "com.skua.modules.erp.mapper.ERPPurchaseContractMapper.getListByDistributId".equals(sqlId)
                     || "com.skua.modules.system.datestandard.mapper.SysMonitorMetricInfoMapper.selectList".equals(sqlId) //点表
+                    || "com.skua.modules.equipment.mapper.EquipmentSparepartMapper.selectOne".equals(sqlId)
+                    || "com.skua.modules.supplies.mapper.EquipmentSparepartSuppliesMapper.selectById".equals(sqlId)
             ) {
                 log.debug("************************------sqlId------**************************" + sqlId);
                 return invocation.proceed();