xiaoning
/
gj_erp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

看板

Browse Source
master
董哲奇 6 months ago
parent dab452d1d9
commit 9dfebc9cb7
7 changed files with 354 additions and 41 deletions
Show Stats Download Patch File Download Diff File

2
.gitignore vendored
Unescape View File

@ -32,3 +32,5 @@ build/
### VS Code ###
.vscode/
/.idea/
src/main/resources/application-localdb.properties
src/main/resources/application-gs.properties

195
src/main/java/com/dsic/gj_erp/controller/kban/KbanController.java
Unescape View File

@ -1,14 +1,21 @@
package com.dsic.gj_erp.controller.kban;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjUtil;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.dsic.gj_erp.annotation.AuthFunction;
import com.dsic.gj_erp.bean.ResultBean;
import com.dsic.gj_erp.bean.jcsj.DmBzry;
import com.dsic.gj_erp.bean.jhgk.DmSygdMx;
import com.dsic.gj_erp.bean.jhgk.DmYdjh;
import com.dsic.gj_erp.bean.jhgk.DmYdjhxf;
import com.dsic.gj_erp.exception.ServiceException;
@ -17,15 +24,11 @@ import com.dsic.gj_erp.service.jcsj.DmBzryService;
import com.dsic.gj_erp.service.jhgk.DmSygdMxService;
import com.dsic.gj_erp.service.sy.impl.SyMsgService;
import com.dsic.gj_erp.service.zyjh.ZyjhService;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.*;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjUtil;
import lombok.AllArgsConstructor;
/**
* 各作业区划分规则
@ -48,12 +51,170 @@ public class KbanController {
private final SyMsgService msgService;
private final DmSygdMxService service;
/**
* 30天作业区完成情况折线图
*/
@GetMapping("/today_zyjhzx")
public ResultBean<?> todayXZyjhzx() {
return new ResultBean<>(this.kbanService.todayZyjhzx());
}
/**
* 30天作业区完成情况折线图
*/
@GetMapping("/zyjhzx")
public ResultBean<?> zyjhzx() {
return new ResultBean<>(this.kbanService.zyjhzx());
}
/**
* 前方需求汇总表
*/
@GetMapping("/zyjhzxTable")
public ResultBean<?> zyjhzxTable() {
Map<String, Object> map=this.kbanService.zyjhzxTable();
DateTime date = DateUtil.date();
String from = DateUtil.beginOfMonth(date).toString("yyyy/MM/dd");
String to = DateUtil.endOfMonth(date).toString("yyyy/MM/dd");
List<DmYdjh> list = zyjhService
.list(Wrappers.<DmYdjh>lambdaQuery().ge(DmYdjh::getZt, 2).between(DmYdjh::getJssj, from, to));
AtomicInteger 上料计划 = new AtomicInteger(0);
AtomicInteger 上料完成 = new AtomicInteger(0);
HashMap<String, Object> 上料 = new HashMap<>();
AtomicInteger 二区计划1k = new AtomicInteger(0);
AtomicInteger 二区完成1k = new AtomicInteger(0);
AtomicInteger 二区计划3k = new AtomicInteger(0);
AtomicInteger 二区完成3k = new AtomicInteger(0);
HashMap<String, Object> 二区1k = new HashMap<>();
HashMap<String, Object> 二区3k = new HashMap<>();
AtomicInteger 三区计划 = new AtomicInteger(0);
AtomicInteger 三区完成 = new AtomicInteger(0);
HashMap<String, Object> 三区 = new HashMap<>();
AtomicInteger 四区计划 = new AtomicInteger(0);
AtomicInteger 四区完成 = new AtomicInteger(0);
HashMap<String, Object> 四区 = new HashMap<>();
list.forEach(item -> {
String subStr = item.getTzbh().substring(5, 6);
int zt = 0;
try {
zt = Integer.parseInt(item.getZt());
} catch (Exception e) {
e.printStackTrace();
}
if (zt == 11) {
上料计划.incrementAndGet();
}
if (zt > 11) {
上料完成.incrementAndGet();
}
// 二区
if ("1".equals(subStr)) {
if (zt >= 2) {
二区计划1k.incrementAndGet();
}
if (zt >= 62) {
二区完成1k.incrementAndGet();
}
}
if ("3".equals(subStr)) {
if (zt >= 2) {
二区计划3k.incrementAndGet();
}
if (zt >= 62) {
二区完成3k.incrementAndGet();
}
}
// 三区
if ("2".equals(subStr)) {
if (zt >= 2) {
三区计划.incrementAndGet();
}
if (zt >= 62) {
三区完成.incrementAndGet();
}
}
// 四区
if ("4".equals(subStr)) {
if (zt >= 2) {
四区计划.incrementAndGet();
}
if (zt >= 62) {
四区完成.incrementAndGet();
}
}
});
ArrayList<Object> result = new ArrayList<>();
// 上料.put("zyq", "一区");
// 上料.put("sl", 上料计划.get());
// 上料.put("wc", 上料完成.get());
// result.add(上料);
二区1k.put("zyq", "二区");
二区1k.put("kw", "一垮");
二区1k.put("sl", 二区计划1k.get());
二区1k.put("wc", 二区完成1k.get());
result.add(二区1k);
二区3k.put("zyq", "二区");
二区3k.put("kw", "三垮");
二区3k.put("sl", 二区计划3k.get());
二区3k.put("wc", 二区完成3k.get());
result.add(二区3k);
三区.put("zyq", "三区");
三区.put("kw", "二垮");
三区.put("sl", 三区计划.get());
三区.put("wc", 三区完成.get());
result.add(三区);
四区.put("zyq", "四区");
四区.put("kw", "四五六垮");
四区.put("sl", 四区计划.get());
四区.put("wc", 四区完成.get());
result.add(四区);
map.put("detail", result);
return new ResultBean<>(map);
}
/**
* 前方需求柱状图
*/
@GetMapping("/qfxqWc")
public ResultBean<?> qfxqWcqk() {
return new ResultBean<>(this.kbanService.qfxqWcqk());
}
/**
* 前方需求汇总表
*/
@GetMapping("/qfxqTable")
public ResultBean<?> qfxqTable() {
return new ResultBean<>(this.kbanService.qfxqTable());
}
/**
* 作业区完成情况饼图
*/
@GetMapping("/zxqwcqk")
public ResultBean<?> getZxqwcqk(){
List<DmYdjh> list=zyjhService.list(Wrappers.<DmYdjh>lambdaQuery().ge(DmYdjh::getZt,2));
DateTime date = DateUtil.date();
String from = DateUtil.beginOfMonth(date).toString("yyyy/MM/dd");
String to = DateUtil.endOfMonth(date).toString("yyyy/MM/dd");
List<DmYdjh> list=zyjhService.list(Wrappers.<DmYdjh>lambdaQuery().ge(DmYdjh::getZt,2).between(DmYdjh::getJssj,from,to));
AtomicInteger 上料计划 = new AtomicInteger(0);
AtomicInteger 上料完成 = new AtomicInteger(0);
@ -72,11 +233,11 @@ public class KbanController {
HashMap<String, Object> 四区 = new HashMap<>();
list.forEach(item->{
String subStr=item.getTzbh().substring(6,7);
String subStr=item.getTzbh().substring(5,6);
int zt=0;
try {
zt = Integer.parseInt(subStr);
zt = Integer.parseInt(item.getZt());
}catch (Exception e){
e.printStackTrace();
}
@ -141,7 +302,7 @@ public class KbanController {
四区.put("wc",四区完成.get());
result.add(四区);
return new ResultBean<>(list);
return new ResultBean<>(result);
}
/**

22
src/main/java/com/dsic/gj_erp/mapper/KbanMapper.java
Unescape View File

@ -1,12 +1,12 @@
package com.dsic.gj_erp.mapper;
import com.dsic.gj_erp.bean.jhgk.DmYdjh;
import com.dsic.gj_erp.pc.Constant;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
import java.util.Map;
import org.apache.ibatis.annotations.Mapper;
import com.dsic.gj_erp.bean.jhgk.DmYdjh;
@Mapper
public interface KbanMapper {
@ -28,7 +28,19 @@ public interface KbanMapper {
List<Map<String,Object>> getZyjhtj(String from, String to,String zyq);
List<Map<String,Object>> zxqZxDetail();
List<Map<String,Object>> zxqZxDetail(String today);
List<Map<String,Object>> getZxqwcqk();
String qfxq(String from, String to);
List<Map<String, Object>> qfxqDetail(String from, String to);
List<Map<String, Object>> qfxqWcqk(String from, String to);
Map<String, Object> zyjh(String from, String to);
List<Map<String, Object>> zyjhzx(String from, String to);
Map<String, Object> todayZyjhzx(String from, String to);
}

4
src/main/java/com/dsic/gj_erp/mapper/fd/DmCzjbbMapper.xml
Unescape View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.dsic.xzerp.dao.fd.DmCzjbbMapper">
<mapper namespace="com.dsic.gj_erp.mapper.fd.DmCzjbbMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.dsic.xzerp.bean.fd.DmCzjbb">
<resultMap id="BaseResultMap" type="com.dsic.gj_erp.bean.fd.DmCzjbb">
<id column="czbh" property="czbh" />
<result column="fjqzcjs" property="fjqzcjs" />
<result column="cjs" property="cjs" />

4
src/main/java/com/dsic/gj_erp/mapper/fd/DmXqdwcjcdMapper.xml
Unescape View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.dsic.xzerp.dao.fd.DmXqdwcjcdMapper">
<mapper namespace="com.dsic.gj_erp.mapper.fd.DmXqdwcjcdMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.dsic.xzerp.bean.fd.DmXqdwcjcd">
<resultMap id="BaseResultMap" type="com.dsic.gj_erp.bean.fd.DmXqdwcjcd">
<id column="cdid" property="cdid" />
<result column="cdmc" property="cdmc" />
<result column="dwbm" property="dwbm" />

71
src/main/java/com/dsic/gj_erp/service/KbanService.java
Unescape View File

@ -1,18 +1,19 @@
package com.dsic.gj_erp.service;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.dsic.gj_erp.bean.ResultBean;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
import org.springframework.stereotype.Service;
import com.dsic.gj_erp.bean.jhgk.DmYdjh;
import com.dsic.gj_erp.mapper.KbanMapper;
import com.dsic.gj_erp.pc.Constant;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
import java.util.*;
import java.util.concurrent.atomic.AtomicInteger;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import lombok.AllArgsConstructor;
@Service
@AllArgsConstructor
@ -20,12 +21,60 @@ public class KbanService {
private final KbanMapper kbanMapper;
public Map<String, Object> todayZyjhzx() {
DateTime date = DateUtil.date();
String from = DateUtil.beginOfMonth(date).toString("yyyy/MM/dd");
String to = DateUtil.endOfMonth(date).toString("yyyy/MM/dd");
Map<String,Object> map=kbanMapper.todayZyjhzx(from, to);
List<Map<String,Object>> detail=kbanMapper.zxqZxDetail(date.toString("yyyy/MM/dd"));
map.put("detail", detail);
return map;
}
public List<Map<String, Object>> zyjhzx() {
DateTime date = DateUtil.date();
String from = DateUtil.beginOfMonth(date).toString("yyyy/MM/dd");
String to = DateUtil.endOfMonth(date).toString("yyyy/MM/dd");
return kbanMapper.zyjhzx(from, to);
}
public Map<String, Object> zyjhzxTable() {
DateTime date = DateUtil.date();
String from = DateUtil.beginOfMonth(date).toString("yyyy/MM/dd");
String to = DateUtil.endOfMonth(date).toString("yyyy/MM/dd");
return kbanMapper.zyjh(from, to);
}
public List<Map<String, Object>> qfxqWcqk() {
DateTime date = DateUtil.date();
String from = DateUtil.beginOfMonth(date).toString("yyyy/MM/dd");
String to = DateUtil.endOfMonth(date).toString("yyyy/MM/dd");
return kbanMapper.qfxqWcqk(from,to);
}
public Map<String, Object> qfxqTable() {
DateTime date = DateUtil.date();
String from = DateUtil.beginOfMonth(date).toString("yyyy/MM/dd");
String to = DateUtil.endOfMonth(date).toString("yyyy/MM/dd");
String xq=kbanMapper.qfxq(from,to);
List<Map<String,Object>> list=kbanMapper.qfxqDetail(from,to);
Map<String,Object> map=new HashMap<>();
map.put("xq", xq);
map.put("detail", list);
return map;
}
public List<Map<String,Object>> getZxqwcqk(){
return kbanMapper.getZxqwcqk();
}
public List<Map<String,Object>> zxqZxDetail(){
return kbanMapper.zxqZxDetail();
String today=DateUtil.date().toString("yyyy/MM/dd");
return kbanMapper.zxqZxDetail(today);
}
public List<Map<String,Object>> getZyjhtj(String zyq){

97
src/main/resources/mappers/kban/KbanMapper.xml
Unescape View File

@ -7,7 +7,14 @@
</select>
<select id="getEveryCompZlByNf" resultType="map">
SELECT MONTH(CAST(qgfkrq AS DATE)) mon,sum(bcshzl)/1000 zl from dm_ydjh WHERE qgfkrq BETWEEN #{from} and #{to} group by MONTH(CAST(qgfkrq AS DATE))
SELECT
MONTH(CAST(jssj AS DATE)) mon,sum(bcshzl)/1000 zl
from
dm_ydjh
WHERE
jssj BETWEEN #{from} and #{to} group by MONTH(CAST(jssj AS DATE))
order by
MONTH(CAST(jssj AS DATE))
</select>
<select id="getEveryKw" resultType="java.util.Map">
@ -69,10 +76,13 @@
from
dm_ydjh
WHERE
zt>=2 and jssj BETWEEN #{form} and #{to}
zt>=2 and jssj BETWEEN #{from} and #{to}
<choose>
<when test="zyq!=null and zyq!='' and zyq='2'">
<when test="zyq==2">
and (SUBSTRING(tzbh,6,1)=1 or SUBSTRING(tzbh,6,1)=3)
</when>
<when test="zyq==1">
</when>
<when test="zyq=null or zyq=''">
@ -100,7 +110,86 @@
slfkrq = #{today} or hxfkrq = #{today} or qgfkrq = #{today}
</select>
<select id="getZxqwcqk" resultType="java.util.Map">
<select id="qfxq" resultType="java.lang.String">
SELECT sum(dzjz) from dm_qfxq where xzglxq BETWEEN #{from} and #{to}
</select>
<select id="qfxqDetail" resultType="java.util.Map">
SELECT
DISTINCT dc_ch dcCh,
sum(case when isnull(dc_pl,'')!='' then 1 else 0 end) OVER(PARTITION by dc_ch) pcsl ,
sum(dzjz) OVER(PARTITION by dc_ch) zl
from
dm_qfxq
where
xzglxq BETWEEN #{from} and #{to}
</select>
<select id="qfxqWcqk" resultType="java.util.Map">
SELECT
DISTINCT xq.dc_ch ,
sum(xq.dzjz) over(PARTITION by xq.dc_ch) xqzl ,
SUM(CONVERT( decimal, isnull(ydjh.zl,'0'))) over(PARTITION by xq.dc_ch) jhzl ,
SUM(CONVERT( decimal, case when ydjh.zt>=62 then ydjh.zl else '0' end)) over(PARTITION by xq.dc_ch) wczl
from
dm_qfxq xq left join dm_ydjh ydjh on xq.dc_ch =ydjh.dc_ch and xq.dc_pl =ydjh.dc_pl
where
xq.xzglxq BETWEEN #{from} and #{to}
</select>
<select id="zyjh" resultType="java.util.Map">
SELECT
sum(CONVERT( decimal, isnull(zl,'0'))/1000) jh,
count(1) zs,
sum(case when zt>11 then 1 else 0 end) sl
from
dm_ydjh
WHERE jssj BETWEEN #{from} and #{to}
</select>
<select id="zyjhzx" resultType="java.util.Map">
SELECT
DISTINCT zyq,day,count(1) over(PARTITION by zyq,day) sl
from (
SELECT
'一区' as zyq,tzbh,zt,slfkrq as day
from
dm_ydjh
WHERE
zt >=21 and jssj BETWEEN #{from} and #{to}
UNION ALL
SELECT
'二区' as zyq,tzbh,zt,qgfkrq as day
from
dm_ydjh
WHERE
zt >=62 and jssj BETWEEN '#{from} and #{to} and (SUBSTRING(tzbh,6,1)='1' or
SUBSTRING(tzbh,6,1)='3')
UNION ALL
SELECT
'三区',tzbh,zt,qgfkrq as day
from
dm_ydjh
WHERE
zt >=62 and jssj BETWEEN #{from} and #{to} and SUBSTRING(tzbh,6,1)='2'
UNION ALL
SELECT
'四区',tzbh,zt,qgfkrq as day
from
dm_ydjh
WHERE
zt >=62 and jssj BETWEEN #{from} and #{to} and SUBSTRING(tzbh,6,1)='4'
) a
</select>
<select id="todayZyjhzx" resultType="java.util.Map">
SELECT
sum(case when zt>=2 then 1 else 0 end) jh ,
sum(case when zt>=11 then 1 else 0 end) jc,
sum(case when zt>=21 then 1 else 0 end) sl
from
dm_ydjh
WHERE
jssj BETWEEN #{from} and #{to}
</select>
</mapper>

Write Preview
Loading…
Cancel
Save