报表问题修改

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.skua.modules.common.vo.DepartVO;
 import com.skua.tool.annotation.Anonymous;
 import org.apache.ibatis.annotations.Param;
 
@@ -59,4 +60,6 @@ public interface CommonSqlMapper {
     String getChildDeparts(@Param(value="departId") String departId);
 
     String getChildDepartByUserId(@Param(value="userId") String userId);
+
+    List<DepartVO> getChildDepartList(@Param(value="departId") String departId);
 }

@@ -121,4 +121,28 @@
         from sys_user_depart
         where user_id = #{userId}
     </select>
+
+    <select id="getChildDepartList" resultType="com.skua.modules.common.vo.DepartVO">
+        SELECT
+            id as depart_id,
+            depart_name
+        FROM
+            sys_depart
+        WHERE
+            depart_type = '1'
+            AND (
+            parent_id IN
+            <foreach item="item" index="index" collection="departId.split(',')"  open="(" separator="," close=")">
+                '${item}'
+            </foreach>
+            OR id IN
+            <foreach item="item" index="index" collection="departId.split(',')"  open="(" separator="," close=")">
+                '${item}'
+            </foreach>
+            OR parent_id IN ( SELECT id FROM sys_depart WHERE parent_id IN
+            <foreach item="item" index="index" collection="departId.split(',')"  open="(" separator="," close=")">
+                '${item}'
+            </foreach>
+            ))
+    </select>
 </mapper>

@@ -3,6 +3,8 @@ package com.skua.modules.common.service;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.skua.modules.common.vo.DepartVO;
+
 import java.util.List;
 import java.util.Map;
 
@@ -47,4 +49,6 @@ public interface ICommonSqlService {
     String getChildDepartId( String departId);
 
     String getChildFactorys(String departId);
+
+    List<DepartVO> getChildDepartList(String departId);
 }

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.skua.modules.common.mapper.CommonSqlMapper;
 import com.skua.modules.common.service.ICommonSqlService;
+import com.skua.modules.common.vo.DepartVO;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -96,4 +97,10 @@ public class CommonSqlServiceImpl implements ICommonSqlService {
         return commonSqlMapper.getChildFactorys(departId);
     }
 
+    @Override
+    public List<DepartVO> getChildDepartList(String departId) {
+        List<DepartVO> list = commonSqlMapper.getChildDepartList(departId);
+        return list;
+    }
+
 }

+package com.skua.modules.common.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class DepartVO {
+
+    @ApiModelProperty(value = "机构编码")
+    private String departId;
+    @ApiModelProperty(value = "机构名称")
+    private String departName;
+
+}
+

@@ -115,24 +115,26 @@ public class AjhMeetingSendController {
 		LocalDateTime nowTime = LocalDateTime.now();
 		List<AjhMeetingSend> list = ajhMeetingSendService.list();
 		List<AjhMeetingSend> newList = new ArrayList<>();
-		for (AjhMeetingSend ajhMeetingSend : list) {
-			if(ConvertUtils.isNotEmpty(ajhMeetingSend.getMeetStartTime())&&
-					ConvertUtils.isNotEmpty(ajhMeetingSend.getMeetEndTime())){
-				String start = ajhMeetingSend.getMeetStartTime();
-				String end = ajhMeetingSend.getMeetEndTime();
-				LocalDateTime startTime = LocalDateTime.parse(start, formatter);
-				LocalDateTime endTime = LocalDateTime.parse(end, formatter);
-				if (nowTime.isBefore(startTime)) {
-					ajhMeetingSend.setMeetStatus(0);
-				} else if (nowTime.isAfter(endTime)) {
-					ajhMeetingSend.setMeetStatus(2);
-				} else {
-					ajhMeetingSend.setMeetStatus(1);
+		if(list.size() > 0){
+			for (AjhMeetingSend ajhMeetingSend : list) {
+				if(ConvertUtils.isNotEmpty(ajhMeetingSend.getMeetStartTime())&&
+						ConvertUtils.isNotEmpty(ajhMeetingSend.getMeetEndTime())){
+					String start = ajhMeetingSend.getMeetStartTime();
+					String end = ajhMeetingSend.getMeetEndTime();
+					LocalDateTime startTime = LocalDateTime.parse(start, formatter);
+					LocalDateTime endTime = LocalDateTime.parse(end, formatter);
+					if (nowTime.isBefore(startTime)) {
+						ajhMeetingSend.setMeetStatus(0);
+					} else if (nowTime.isAfter(endTime)) {
+						ajhMeetingSend.setMeetStatus(2);
+					} else {
+						ajhMeetingSend.setMeetStatus(1);
+					}
+					newList.add(ajhMeetingSend);
 				}
-				newList.add(ajhMeetingSend);
 			}
+			ajhMeetingSendService.updateBatchById(newList);
 		}
-		ajhMeetingSendService.updateBatchById(newList);
 	}
 
 	@AutoLog(value = "会议记录-数量统计")

@@ -94,7 +94,7 @@ public class AjhMeetingSend {
 	@Dict(dicCode = "accept_flag")
 	private String acceptFlag;
 	/**发布状态（0未发布，1已发布，2已撤销）*/
-	@Excel(name = "发布状态（0未发布，1已发布，2已撤销）", width = 15 ,dicCode = "meet_status" ,orderNum = "10")
+	@Excel(name = "发布状态", width = 15 ,dicCode = "meet_status" ,orderNum = "10")
 	@ApiModelProperty(value = "发布状态（0未发布，1已发布，2已撤销）")
 	@Dict(dicCode = "meet_status")
 	private String sendStatus;

@@ -136,4 +136,12 @@ public interface FCustomReportDatasetMapper extends BaseMapper<FCustomReportData
 	List<Map<String, Object>> queryNhYyybReport(@Param(value="dataViewName3a24") String dataViewName3a24,
 												@Param(value="startTime") String startTime, @Param(value="endTime") String endTime,
 												@Param(value="departId") String departId);
+
+    List<Map<String, Object>> querySzYyrbReport(@Param(value="dataViewName2119") String dataViewName2119,
+												@Param(value="startTime")String startTime, @Param(value="endTime")String endTime,
+												@Param(value="departId") String departId);
+
+	List<Map<String, Object>> queryNhYyrbReport(@Param(value="dataViewName3a24") String dataViewName3a24,
+												@Param(value="startTime") String startTime, @Param(value="endTime") String endTime,
+												@Param(value="departId") String departId);
 }

@@ -677,4 +677,90 @@
 		AND v3.time <= #{endTime}
 		GROUP BY v3.time
 	</select>
+
+	<select id="querySzYyrbReport" resultType="java.util.HashMap">
+		SELECT
+			ROUND( SUM( v.JSL )/10000, 2 ) AS `JSL`,
+			ROUND( SUM( v.CSL )/10000, 2 ) AS `CSL`,
+			ROUND( AVG( v.JSPH ), 2 ) AS `JSPH`,
+			ROUND( AVG( v.CSPH ), 2 ) AS `CSPH`,
+			ROUND( AVG( v.JSCOD ), 2 ) AS `JSCOD`,
+			ROUND( AVG( v.CSCOD ), 2 ) AS `CSCOD`,
+			ROUND( AVG( v.CSTN ), 2 ) AS `CSTN`,
+			ROUND( AVG( v.JSZD ), 2 ) AS `JSZD`,
+			ROUND( AVG( v.JSZL ), 2 ) AS `JSZL`,
+			ROUND( AVG( v.CSZL ), 2 ) AS `CSZL`,
+			ROUND( AVG( v.JSAD ), 2 ) AS `JSAD`,
+			ROUND( AVG( v.CSAD ), 2 ) AS `CSAD`,
+			ROUND( AVG( v.JSSS ), 2 ) AS `JSSS`,
+			ROUND( AVG( v.CSSS ), 2 ) AS `CSSS`,
+			v.BZ,
+			v.depart_id,
+			d.depart_name as depart_name,
+			v.time
+		FROM
+			${dataViewName2119} v
+		LEFT JOIN sys_depart d ON v.depart_id = d.id
+		WHERE
+			v.depart_id IN
+			<foreach item="item" index="index" collection="departId.split(',')"  open="(" separator="," close=")">
+				'${item}'
+			</foreach>
+			AND v.time &gt;= #{startTime}
+			AND v.time &lt;= #{endTime}
+		GROUP BY v.depart_id
+	</select>
+
+	<select id="queryNhYyrbReport" resultType="java.util.HashMap">
+		SELECT
+			ROUND(SUM(v3.PFS),2) AS PFS,
+			ROUND(SUM(v3.FHTY),2) AS FHTY,
+			ROUND(SUM(v3.RYXNJ),2) AS RYXNJ,
+			ROUND(SUM(v3.YWL),2) AS YWL,
+			ROUND(SUM(v3.GXCLJ),2) AS GXCLJ,
+			ROUND(SUM(v3.CH3COONA),2) AS CH3COONA,
+			ROUND(SUM(v3.HXT),2) AS HXT,
+			ROUND(SUM(v3.FECL3),2) AS FECL3,
+			ROUND(SUM(v3.SH),2) AS SH,
+			ROUND(SUM(v3.CH3COOH),2) AS CH3COOH,
+			ROUND(SUM(v3.FESO4G),2) AS FESO4G,
+			ROUND(SUM(v3.FESO4Y),2) AS FESO4Y,
+			ROUND(SUM(v3.H2O2),2) AS H2O2,
+			ROUND(SUM(v3.GFFDL),2) AS GFFDL,
+			ROUND(SUM(v3.QY),2) AS QY,
+			ROUND(SUM(v3.GFCZL),2) AS GFCZL,
+			ROUND(SUM(v3.WNHSL),2) AS WNHSL,
+			ROUND(SUM(v3.WFCSL),2) AS WFCSL,
+			ROUND(SUM(v3.WFCZL),2) AS WFCZL,
+			ROUND(SUM(v3.DLJZ),2) AS DLJZ,
+			ROUND(SUM(v3.GFSYL),2) AS GFSYL,
+			ROUND(SUM(v3.WNL),2) AS WNL,
+			ROUND(SUM(v3.DLFZ),2) AS DLFZ,
+			ROUND(SUM(v3.DLPZ),2) AS DLPZ,
+			ROUND(SUM(v3.DLGZ),2) AS DLGZ,
+			ROUND(SUM(v3.DLHJ)/10000,2) AS DLHJ,
+			ROUND(SUM(v3.YSL),2) AS YSL,
+			ROUND(SUM(v3.PAMZ),2) AS PAMZ,
+			ROUND(SUM(v3.PAMF),2) AS PAMF,
+			ROUND(SUM(v3.PAMRJ),2) AS PAMRJ,
+			ROUND(SUM(v3.SCLPAMZ),2) AS SCLPAMZ,
+			ROUND(SUM(v3.SCLPAMF),2) AS SCLPAMF,
+			ROUND(SUM(v3.NACLO),2) AS NACLO,
+			ROUND(SUM(v3.PACGT),2) AS PACGT,
+			ROUND(SUM(v3.PACYT),2) AS PACYT,
+			v3.BZ AS BZ,
+			v3.depart_id AS depart_id,
+			d.depart_name as depart_name,
+			v3.time
+		FROM ${dataViewName3a24} v3
+		LEFT JOIN sys_depart d ON v3.depart_id = d.id
+		WHERE
+			v3.depart_id IN
+			<foreach item="item" index="index" collection="departId.split(',')"  open="(" separator="," close=")">
+				'${item}'
+			</foreach>
+			AND v3.time &gt;= #{startTime}
+			AND v3.time &lt;= #{endTime}
+		GROUP BY v3.depart_id
+	</select>
 </mapper>

@@ -136,4 +136,8 @@ public interface IFCustomReportDatasetService extends IService<FCustomReportData
 	List<Map<String, Object>> querySzYyybReport(String dataViewName2119, String startTime, String endTime, String departId);
 
 	List<Map<String, Object>> queryNhYyybReport(String dataViewName3a24, String startTime, String endTime, String departId);
+
+    List<Map<String, Object>> querySzYyrbReport(String dataViewName2119, String startTime, String endTime, String departId);
+
+	List<Map<String, Object>> queryNhYyrbReport(String dataViewName3a24, String startTime, String endTime, String departId);
 }

@@ -454,6 +454,18 @@ public class FCustomReportDatasetServiceImpl extends ServiceImpl<FCustomReportDa
 		return list;
 	}
 
+	@Override
+	public List<Map<String, Object>> querySzYyrbReport(String dataViewName2119, String startTime, String endTime, String departId) {
+		List<Map<String, Object>> list = mapper.querySzYyrbReport(dataViewName2119, startTime, endTime, departId);
+		return list;
+	}
+
+	@Override
+	public List<Map<String, Object>> queryNhYyrbReport(String dataViewName3a24, String startTime, String endTime, String departId) {
+		List<Map<String, Object>> list = mapper.queryNhYyrbReport(dataViewName3a24, startTime, endTime, departId);
+		return list;
+	}
+
 	/**转换为Map<部门编号,JnhbReportData>  */
 	private Map<String,JnhbReportData> convertJnhbReportDataMap(List<JnhbReportData>  dataList){// Map<部门编号,JnhbReportData>
 		Map<String,JnhbReportData> dataMap = new HashMap<>();

@@ -728,10 +728,13 @@ public class FactoryCenterServiceImpl implements IFactoryCenterService {
         Map<String, Object> maptb =  factoryCenterMapper.getDhData(startDateTb, endDateTb, statisticsParam.getDepartId(), dataView3a24tb, dataView2119tb);
         if(maptb!=null){
             zdhTb = Double.parseDouble(maptb.get("zdh").toString());
+            if(zdhTb > 0.0){
+                zdhTb = Double.parseDouble(df.format(100*(zdh - zdhTb)/zdhTb));
+            }
             rjdhTb = Double.parseDouble(maptb.get("rjdh").toString());
-
-            zdhTb = Double.parseDouble(df.format(100*(zdh - zdhTb)/zdhTb));
-            rjdhTb = Double.parseDouble(df.format(100*(rjdh - rjdhTb)/rjdhTb));
+            if(rjdhTb > 0.0){
+                rjdhTb = Double.parseDouble(df.format(100*(rjdh - rjdhTb)/rjdhTb));
+            }
             if(maptb.get("dsdh")!=null){
                 dsdhTb = Double.parseDouble(maptb.get("dsdh").toString());
                 dsdhTb = Double.parseDouble(df.format(100*(dsdh - dsdhTb)/dsdhTb));
@@ -743,9 +746,13 @@ public class FactoryCenterServiceImpl implements IFactoryCenterService {
         Map<String, Object> maphb =  factoryCenterMapper.getDhData(startDateHb, endDateHb, statisticsParam.getDepartId(), dataView3a24hb, dataView2119hb);
         if(maphb!=null){
             zdhHb = Double.parseDouble(maphb.get("zdh").toString());
+            if(zdhHb > 0.0){
+                zdhHb = Double.parseDouble(df.format(100*(zdh - zdhHb)/zdhHb));
+            }
             rjdhHb = Double.parseDouble(maphb.get("rjdh").toString());
-            zdhHb = Double.parseDouble(df.format(100*(zdh - zdhHb)/zdhHb));
-            rjdhHb = Double.parseDouble(df.format(100*(rjdh - rjdhHb)/rjdhHb));
+            if(rjdhHb > 0.0){
+                rjdhHb = Double.parseDouble(df.format(100*(rjdh - rjdhHb)/rjdhHb));
+            }
             if(maphb.get("dsdh")!=null){
                 dsdhHb = Double.parseDouble(maphb.get("dsdh").toString());
                 dsdhHb = Double.parseDouble(df.format(100*(dsdh - dsdhHb)/dsdhHb));