看板接口

src/main/java/org/jeecg/config/ShiroConfig.java

@@ -50,6 +50,7 @@ public class ShiroConfig {
 		filterChainDefinitionMap.put("/sys/login", "anon"); //登录接口排除
 		filterChainDefinitionMap.put("/auth/2step-code", "anon");//登录验证码
 		filterChainDefinitionMap.put("/workingStatistics/fbsWorkingStatistics/**", "anon"); //工时接口
+		filterChainDefinitionMap.put("/fbs**/**/**", "anon"); //工时接口
 		filterChainDefinitionMap.put("/test/jeecgDemo/**", "anon"); //测试接口
 		filterChainDefinitionMap.put("/test/jeecgOrderMain/**", "anon"); //测试接口
 		filterChainDefinitionMap.put("/**/exportXls", "anon"); //导出接口

src/main/java/org/jeecg/modules/fbsWorkshopDispatchList/controller/FbsWorkshopDispatchListController.java

@@ -360,4 +360,60 @@ public class FbsWorkshopDispatchListController {
 		 return result;
 	 }
 
+
+	 /**
+	 * @Author chenchuang
+	 * @Description //TODO 查询当月工时产品分布率
+	 * @Date 2020/10/19 14:12
+	 * @Param []
+	 * @return org.jeecg.common.api.vo.Result<java.util.List<org.jeecg.modules.fbsWorkshopDispatchList.entity.FbsWorkshopDispatchList>>
+	 */
+	 @GetMapping(value = "/getProductHoursMonthReport")
+	 public Result<Map<String,Object>> getProductHoursMonthReport(){
+	 	Result<Map<String,Object>> result=new Result<>();
+		 try {
+			 Map<String,Object> map=fbsWorkshopDispatchListService.getProductHoursMonthReport();
+			 result.setResult(map);
+			 result.success("操作成功");
+		 } catch (Exception e) {
+			 e.printStackTrace();
+			 result.error500("操作失败："+e.getMessage());
+		 }
+		 return result;
+	 }
+
+	 /**
+	 * @Author chenchuang
+	 * @Description //TODO 查询单月按异常分类的工时
+	 * @Date 2020/10/19 16:34
+	 * @Param []
+	 * @return org.jeecg.common.api.vo.Result<java.util.Map<java.lang.String,java.lang.Object>>
+	 */
+	 @GetMapping(value = "/getAbnormalHoursMonthReport")
+	 public Result<Map<String,Object>> getAbnormalHoursMonthReport(){
+		 Result<Map<String,Object>> result=new Result<>();
+		 try {
+			 Map<String,Object> map=fbsWorkshopDispatchListService.getAbnormalHoursMonthReport();
+			 result.setResult(map);
+			 result.success("操作成功");
+		 } catch (Exception e) {
+			 e.printStackTrace();
+			 result.error500("操作失败："+e.getMessage());
+		 }
+		 return result;
+	 }
+
+	 @GetMapping(value = "/getAttendance")
+	 public Result<List<Map<String,Object>>> getAttendance(){
+		 Result<List<Map<String,Object>>> result=new Result<>();
+		 try {
+			 List<Map<String,Object>> map=fbsWorkshopDispatchListService.getAttendance();
+			 result.setResult(map);
+			 result.success("操作成功");
+		 } catch (Exception e) {
+			 e.printStackTrace();
+			 result.error500("操作失败："+e.getMessage());
+		 }
+		 return result;
+	 }
 }

src/main/java/org/jeecg/modules/fbsWorkshopDispatchList/entity/FbsWorkshopDispatchList.java

@@ -137,4 +137,8 @@ public class FbsWorkshopDispatchList implements Serializable {
 	@TableField(exist = false)
 	private List<FbsWorkshopDispatchList> fbsWorkshopDispatchListList;
 
+	//当月产品总工时
+	@TableField(exist = false)
+	private String productTotal;
+
 }

src/main/java/org/jeecg/modules/fbsWorkshopDispatchList/mapper/FbsWorkshopDispatchListMapper.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.fbsWorkshopDispatchList.mapper;
 
 import java.util.List;
+import java.util.Map;
 
 import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.fbsWorkshopDispatchList.entity.FbsWorkshopDispatchList;
@@ -24,4 +25,31 @@ public interface FbsWorkshopDispatchListMapper extends BaseMapper<FbsWorkshopDis
     * @return java.util.List<org.jeecg.modules.fbsWorkshopDispatchList.entity.FbsWorkshopDispatchList>
     */
     List<FbsWorkshopDispatchList> getSumDispatch();
+
+    /**
+    * @Author chenchuang
+    * @Description //TODO 查询当月工时产品分布率
+    * @Date 2020/10/19 14:01
+    * @Param []
+    * @return java.util.List<org.jeecg.modules.fbsWorkshopDispatchList.entity.FbsWorkshopDispatchList>
+    */
+    List<FbsWorkshopDispatchList> getProductHoursMonthReport();
+
+    /**
+    * @Author chenchuang
+    * @Description //TODO 查询单月按异常分类的工时
+    * @Date 2020/10/19 16:32
+    * @Param []
+    * @return java.util.Map<java.lang.String,java.lang.Object>
+    */
+    Map<String,Object> getAbnormalHoursMonthReport();
+
+    /**
+    * @Author chenchuang
+    * @Description //TODO 人员出勤率
+    * @Date 2020/10/19 17:54
+    * @Param []
+    * @return java.util.List<org.jeecg.modules.fbsWorkshopDispatchList.entity.FbsWorkshopDispatchList>
+    */
+    List<Map<String,Object>> getAttendance();
 }

src/main/java/org/jeecg/modules/fbsWorkshopDispatchList/mapper/xml/FbsWorkshopDispatchListMapper.xml

@@ -18,5 +18,61 @@
         ORDER BY
             production_line_name
     </select>
+
+    <select id="getProductHoursMonthReport" resultType="org.jeecg.modules.fbsWorkshopDispatchList.entity.FbsWorkshopDispatchList">
+       SELECT
+            sum( standard_working_hours ) as productTotal,product
+        FROM
+            fbs_workshop_dispatch_list
+        WHERE
+            del_flag = '0'
+            AND date_format( date, '%Y-%m' ) = DATE_FORMAT( now( ), '%Y-%m' )
+        GROUP BY
+            product
+    </select>
+
+    <select id="getAbnormalHoursMonthReport" resultType="java.util.HashMap">
+        SELECT
+            sum( quality ) AS '质量',
+            sum( design ) AS '设计',
+            sum( rework ) AS '返工',
+            sum( materiel ) AS '物料',
+            sum( energy ) AS '能源',
+            sum( other ) AS '其他',
+            sum( equipment ) AS '设备',
+            sum( plan ) AS '计划'
+        FROM
+            fbs_abnormal_working_hours
+        WHERE
+            del_flag = '0'
+            AND date_format( date, '%Y-%m' ) = DATE_FORMAT( now( ), '%Y-%m' )
+    </select>
+
+    <select id="getAttendance" resultType="java.util.HashMap">
+        SELECT
+            (
+        SELECT
+            count( personnel_code )
+        FROM
+            fbs_working_statistics
+        WHERE
+            del_flag = '0'
+            AND date_format( start_date, '%Y' ) = date_format( now( ), '%Y' )
+            AND date_format( fwdl.planned_start_time, '-%m' ) = date_format( start_date, '-%m' )
+        GROUP BY
+            date_format( start_date, '%Y-%m' )
+            ) as sum1,
+            count( personnel_id_u8 ) as sum2,
+            date_format( fwdl.planned_start_time, '%m' ) as label
+        FROM
+            fbs_workshop_dispatch_list fwdl
+        WHERE
+            del_flag = '0'
+            AND date_format( planned_start_time, '%Y' ) = date_format( now( ), '%Y' )
+        GROUP BY
+            date_format( planned_start_time, '-%m' )
+    </select>
+
+
     
 </mapper>

src/main/java/org/jeecg/modules/fbsWorkshopDispatchList/service/IFbsWorkshopDispatchListService.java

@@ -4,6 +4,7 @@ import org.jeecg.modules.fbsWorkshopDispatchList.entity.FbsWorkshopDispatchList;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description: 车间派工单
@@ -23,4 +24,31 @@ public interface IFbsWorkshopDispatchListService extends IService<FbsWorkshopDis
     */
     List<FbsWorkshopDispatchList> getSumDispatch();
 
+
+    /**
+    * @Author chenchuang
+    * @Description //TODO TODO 查询当月工时产品分布率
+    * @Date 2020/10/19 14:08
+    * @Param []
+    * @return java.util.List<org.jeecg.modules.fbsWorkshopDispatchList.entity.FbsWorkshopDispatchList>
+    */
+    Map<String,Object> getProductHoursMonthReport();
+
+    /**
+    * @Author chenchuang
+    * @Description //TODO 查询单月按异常分类的工时
+    * @Date 2020/10/19 16:33
+    * @Param []
+    * @return java.util.Map<java.lang.String,java.lang.Object>
+    */
+    Map<String,Object> getAbnormalHoursMonthReport();
+
+    /**
+    * @Author chenchuang
+    * @Description //TODO 月度人员出勤率
+    * @Date 2020/10/19 19:49
+    * @Param []
+    * @return java.util.List<java.util.Map<java.lang.String,java.lang.Object>>
+    */
+    List<Map<String,Object>> getAttendance();
 }

src/main/java/org/jeecg/modules/fbsWorkshopDispatchList/service/impl/FbsWorkshopDispatchListServiceImpl.java

@@ -12,9 +12,7 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.Date;
-import java.util.List;
 
 /**
  * @Description: 车间派工单
@@ -85,6 +83,8 @@ public class FbsWorkshopDispatchListServiceImpl extends ServiceImpl<FbsWorkshopD
         return fbsWorkshopDispatchListListSum;
     }
 
+
+
     public List<Date> startDateAndEndDate(String startDate, String endDate) {
         List<Date> list = new ArrayList<>();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
@@ -141,4 +141,35 @@ public class FbsWorkshopDispatchListServiceImpl extends ServiceImpl<FbsWorkshopD
             }
         }
     }
+
+    @Override
+    public Map<String,Object> getProductHoursMonthReport() {
+        Map<String,Object> map=new HashMap<>();
+        List<FbsWorkshopDispatchList> fbsWorkshopDispatchListList=fbsWorkshopDispatchListMapper.getProductHoursMonthReport();
+        if(fbsWorkshopDispatchListList!=null){
+            for(FbsWorkshopDispatchList fbsWorkshopDispatchList:fbsWorkshopDispatchListMapper.getProductHoursMonthReport()){
+                map.put(fbsWorkshopDispatchList.getProduct(),fbsWorkshopDispatchList.getProductTotal());
+            }
+        }
+
+        System.out.println(fbsWorkshopDispatchListMapper.getAbnormalHoursMonthReport());
+
+        return map;
+    }
+
+    @Override
+    public Map<String, Object> getAbnormalHoursMonthReport() {
+        return fbsWorkshopDispatchListMapper.getAbnormalHoursMonthReport();
+    }
+
+    @Override
+    public List<Map<String, Object>> getAttendance() {
+
+        List<String> month=new ArrayList<>();
+//        month.add();
+
+        return fbsWorkshopDispatchListMapper.getAttendance();
+    }
+
+
 }