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

日计划量跟踪修改

Browse Source
master
xiaoning 2 weeks ago
parent b59d6f82e1
commit 0ebcadcedc
3 changed files with 44 additions and 43 deletions
Show Stats Download Patch File Download Diff File

29
src/main/java/com/dsic/gj_erp/controller/jhgk/RjhgzController.java
Unescape View File

@ -60,20 +60,13 @@ public class RjhgzController {
*/
@PostMapping("getRjhList")
public ResultBean<?> getRjhList(@RequestParam String yf){
//当前月份日期 查询月份 默认当前月
//维修时间
//当前日期
DateTime date= new DateTime();
DateTime lastMonth=DateUtil.lastMonth();
int days=Integer.parseInt(date.toString("dd"));
//如果是本月 那就是今天
//如果是其他月 就全月天数
if (StrUtil.isNotEmpty(yf)){
date= DateUtil.parseDate(yf);
lastMonth=DateUtil.offsetMonth(date,-1);
}
DateTime date= DateUtil.parseDate(yf);
DateTime lastMonth=DateUtil.offsetMonth(date,-1);
//本月天数
Double days=Double.parseDouble(date.toString("dd"));
//上月天数
int lastMonthDays=Integer.parseInt(DateUtil.endOfMonth(lastMonth).toString("dd"));
Double lastMonthDays=Double.parseDouble(DateUtil.endOfMonth(lastMonth).toString("dd"));
//本月日期list
List<DateTime> dateTimes=DateUtil.rangeToList(DateUtil.beginOfMonth(date)
, DateUtil.endOfMonth(date)
@ -92,11 +85,19 @@ public class RjhgzController {
list.add(map);
}
for (DateTime dateTime : dateTimes) {
if (!dateTime.isAfter(new Date())){
if (!dateTime.isAfter(date)){
RjhDto dtos=dmYdjhMapper.getRjh(dateTime.toString("yyyy/MM/dd"));
list.forEach(l->{
if (ObjectUtil.isEmpty(dtos)){
l.put("field_"+dateTime.toString("dd"),0);
for (EmGcrl emGcrl : dateList) {
if (dateTime.toString("yyyy/MM/dd").equals(emGcrl.getGl())){
l.put("field_"+dateTime.toString("dd"),"休息");
break;
}else {
l.put("field_"+dateTime.toString("dd"),0);
}
}
}else {
if (l.get("gw").equals("抛丸")){
l.put("field_"+dateTime.toString("dd"), ObjectUtil.isEmpty(dtos.getPwnum())?0:dtos.getPwnum());

4
src/main/java/com/dsic/gj_erp/mapper/jhgk/DmYdjhMapper.java
Unescape View File

@ -89,6 +89,6 @@ public interface DmYdjhMapper extends BaseMapper<DmYdjh> {
Map<String,Object> getMPSYCLJLJBP(String dcCh,String tzbh);
List<Ydjhzz> getYdjhzz(String ch);
RjhDto getRjh(String date);
RjhDto getSyRwc(String yf,int num);
RjhDto getByRjh(String yf,int num);
RjhDto getSyRwc(String yf,Double num);
RjhDto getByRjh(String yf,Double num);
}

54
src/main/resources/mappers/jhgk/DmYdjhMapper.xml
Unescape View File

@ -1584,45 +1584,45 @@ where dm_ydjh.DC_CH=#{dcch} and dm_ydjh.dc_pl=#{dcpl}
</select>
<select id="getRjh" resultType="com.dsic.gj_erp.bean.jhgk.dto.RjhDto">
SELECT
SUM(CASE WHEN ISNULL(dm_ydjh.pwfkrq, '') != '' THEN 1 ELSE 0 END) AS pwnum,
SUM(CASE WHEN ISNULL(dm_ydjh.qgfkrq, '') != '' and kw='8' THEN 1 ELSE 0 END) AS sk1num,
SUM(CASE WHEN ISNULL(dm_ydjh.qgfkrq, '') != '' and kw='7' THEN 1 ELSE 0 END) AS lm1num,
SUM(CASE WHEN ISNULL(dm_ydjh.qgfkrq, '') != '' and kw='12' THEN 1 ELSE 0 END) AS sk2num,
SUM(CASE WHEN ISNULL(dm_ydjh.qgfkrq, '') != '' and (kw='9' or kw='10') THEN 1 ELSE 0 END) AS lm2num,
SUM(CASE WHEN ISNULL(dm_ydjh.qgfkrq, '') != '' and kw='14' THEN 1 ELSE 0 END) AS sk3num,
SUM(CASE WHEN ISNULL(dm_ydjh.qgfkrq, '') != '' and kw='13' THEN 1 ELSE 0 END) AS lm3num,
SUM(CASE WHEN ISNULL(dm_ydjh.qgfkrq, '') != '' and (kw='15' or kw='11') THEN 1 ELSE 0 END) AS sk4num,
SUM(CASE WHEN ISNULL(dm_ydjh.qgfkrq, '') != '' and kw='16' THEN 1 ELSE 0 END) AS xcnum
SUM(CASE WHEN ISNULL(dm_ydjh.pwfkrq, '') != '' and substring(pwfkrq,0,11)=#{date} THEN 1 ELSE 0 END) AS pwnum,
SUM(CASE WHEN ISNULL(dm_ydjh.qgfkrq, '') != '' and substring(qgfkrq,0,11)=#{date} and kw='8' THEN 1 ELSE 0 END) AS sk1num,
SUM(CASE WHEN ISNULL(dm_ydjh.qgfkrq, '') != '' and substring(qgfkrq,0,11)=#{date} and kw='7' THEN 1 ELSE 0 END) AS lm1num,
SUM(CASE WHEN ISNULL(dm_ydjh.qgfkrq, '') != '' and substring(qgfkrq,0,11)=#{date} and kw='12' THEN 1 ELSE 0 END) AS sk2num,
SUM(CASE WHEN ISNULL(dm_ydjh.qgfkrq, '') != '' and substring(qgfkrq,0,11)=#{date} and (kw='9' or kw='10') THEN 1 ELSE 0 END) AS lm2num,
SUM(CASE WHEN ISNULL(dm_ydjh.qgfkrq, '') != '' and substring(qgfkrq,0,11)=#{date} and kw='14' THEN 1 ELSE 0 END) AS sk3num,
SUM(CASE WHEN ISNULL(dm_ydjh.qgfkrq, '') != '' and substring(qgfkrq,0,11)=#{date} and kw='13' THEN 1 ELSE 0 END) AS lm3num,
SUM(CASE WHEN ISNULL(dm_ydjh.qgfkrq, '') != '' and substring(qgfkrq,0,11)=#{date} and (kw='15' or kw='11') THEN 1 ELSE 0 END) AS sk4num,
SUM(CASE WHEN ISNULL(dm_ydjh.qgfkrq, '') != '' and substring(qgfkrq,0,11)=#{date} and kw='16' THEN 1 ELSE 0 END) AS xcnum
from dm_ydjh WHERE
1=1
and (substring(qgfkrq,0,11)=#{date} or substring(pwfkrq,0,11)=#{date} )
</select>
<select id="getSyRwc" resultType="com.dsic.gj_erp.bean.jhgk.dto.RjhDto">
SELECT
SUM(CASE WHEN ISNULL(dm_ydjh.pwfkrq, '') != '' THEN 1 ELSE 0 END)/#{num} AS pwnum,
SUM(CASE WHEN ISNULL(dm_ydjh.qgfkrq, '') != '' and kw='8' THEN 1 ELSE 0 END)/#{num} AS sk1num,
SUM(CASE WHEN ISNULL(dm_ydjh.qgfkrq, '') != '' and kw='7' THEN 1 ELSE 0 END)/#{num} AS lm1num,
SUM(CASE WHEN ISNULL(dm_ydjh.qgfkrq, '') != '' and kw='12' THEN 1 ELSE 0 END)/#{num} AS sk2num,
SUM(CASE WHEN ISNULL(dm_ydjh.qgfkrq, '') != '' and (kw='9' or kw='10') THEN 1 ELSE 0 END)/#{num} AS lm2num,
SUM(CASE WHEN ISNULL(dm_ydjh.qgfkrq, '') != '' and kw='14' THEN 1 ELSE 0 END)/#{num} AS sk3num,
SUM(CASE WHEN ISNULL(dm_ydjh.qgfkrq, '') != '' and kw='13' THEN 1 ELSE 0 END)/#{num} AS lm3num,
SUM(CASE WHEN ISNULL(dm_ydjh.qgfkrq, '') != '' and (kw='15' or kw='11') THEN 1 ELSE 0 END)/#{num} AS sk4num,
SUM(CASE WHEN ISNULL(dm_ydjh.qgfkrq, '') != '' and kw='16' THEN 1 ELSE 0 END)/#{num} AS xcnum
CONVERT(decimal(10,1),SUM(CASE WHEN ISNULL(dm_ydjh.pwfkrq, '') != '' and substring(qgfkrq,0,8)=#{yf} THEN 1 ELSE 0 END)/#{num}) AS pwnum,
CONVERT(decimal(10,1),SUM(CASE WHEN ISNULL(dm_ydjh.qgfkrq, '') != '' and substring(qgfkrq,0,8)=#{yf} and kw='8' THEN 1 ELSE 0 END)/#{num}) AS sk1num,
CONVERT(decimal(10,1),SUM(CASE WHEN ISNULL(dm_ydjh.qgfkrq, '') != '' and substring(qgfkrq,0,8)=#{yf} and kw='7' THEN 1 ELSE 0 END)/#{num}) AS lm1num,
CONVERT(decimal(10,1),SUM(CASE WHEN ISNULL(dm_ydjh.qgfkrq, '') != '' and substring(qgfkrq,0,8)=#{yf} and kw='12' THEN 1 ELSE 0 END)/#{num}) AS sk2num,
CONVERT(decimal(10,1),SUM(CASE WHEN ISNULL(dm_ydjh.qgfkrq, '') != '' and substring(qgfkrq,0,8)=#{yf} and (kw='9' or kw='10') THEN 1 ELSE 0 END)/#{num}) AS lm2num,
CONVERT(decimal(10,1),SUM(CASE WHEN ISNULL(dm_ydjh.qgfkrq, '') != '' and substring(qgfkrq,0,8)=#{yf} and kw='14' THEN 1 ELSE 0 END)/#{num}) AS sk3num,
CONVERT(decimal(10,1),SUM(CASE WHEN ISNULL(dm_ydjh.qgfkrq, '') != '' and substring(qgfkrq,0,8)=#{yf} and kw='13' THEN 1 ELSE 0 END)/#{num}) AS lm3num,
CONVERT(decimal(10,1),SUM(CASE WHEN ISNULL(dm_ydjh.qgfkrq, '') != '' and substring(qgfkrq,0,8)=#{yf} and (kw='15' or kw='11') THEN 1 ELSE 0 END)/#{num}) AS sk4num,
CONVERT(decimal(10,1),SUM(CASE WHEN ISNULL(dm_ydjh.qgfkrq, '') != '' and substring(qgfkrq,0,8)=#{yf} and kw='16' THEN 1 ELSE 0 END)/#{num}) AS xcnum
from dm_ydjh WHERE
1=1
and (substring(qgfkrq,0,8)=#{yf} or substring(pwfkrq,0,8)=#{yf} )
</select>
<select id="getByRjh" resultType="com.dsic.gj_erp.bean.jhgk.dto.RjhDto">
SELECT
SUM(CASE WHEN ISNULL(dm_ydjh.pwjhrq, '') != '' THEN 1 ELSE 0 END)/#{num} AS pwnum,
SUM(CASE WHEN ISNULL(dm_ydjh.qgjhrq, '') != '' and kw='8' THEN 1 ELSE 0 END)/#{num} AS sk1num,
SUM(CASE WHEN ISNULL(dm_ydjh.qgjhrq, '') != '' and kw='7' THEN 1 ELSE 0 END)/#{num} AS lm1num,
SUM(CASE WHEN ISNULL(dm_ydjh.qgjhrq, '') != '' and kw='12' THEN 1 ELSE 0 END)/#{num} AS sk2num,
SUM(CASE WHEN ISNULL(dm_ydjh.qgjhrq, '') != '' and (kw='9' or kw='10') THEN 1 ELSE 0 END)/#{num} AS lm2num,
SUM(CASE WHEN ISNULL(dm_ydjh.qgjhrq, '') != '' and kw='14' THEN 1 ELSE 0 END)/#{num} AS sk3num,
SUM(CASE WHEN ISNULL(dm_ydjh.qgjhrq, '') != '' and kw='13' THEN 1 ELSE 0 END)/#{num} AS lm3num,
SUM(CASE WHEN ISNULL(dm_ydjh.qgjhrq, '') != '' and (kw='15' or kw='11') THEN 1 ELSE 0 END)/#{num} AS sk4num,
SUM(CASE WHEN ISNULL(dm_ydjh.qgjhrq, '') != '' and kw='16' THEN 1 ELSE 0 END)/#{num} AS xcnum
CONVERT(decimal(10,1),SUM(CASE WHEN ISNULL(dm_ydjh.pwjhrq, '') != '' and substring(pwjhrq,0,11)>#{yf} THEN 1 ELSE 0 END)/#{num}) AS pwnum,
CONVERT(decimal(10,1),SUM(CASE WHEN ISNULL(dm_ydjh.qgjhrq, '') != '' and substring(qgjhrq,0,8)=#{yf} and kw='8' THEN 1 ELSE 0 END)/#{num}) AS sk1num,
CONVERT(decimal(10,1),SUM(CASE WHEN ISNULL(dm_ydjh.qgjhrq, '') != '' and substring(qgjhrq,0,8)=#{yf} and kw='7' THEN 1 ELSE 0 END)/#{num}) AS lm1num,
CONVERT(decimal(10,1),SUM(CASE WHEN ISNULL(dm_ydjh.qgjhrq, '') != '' and substring(qgjhrq,0,8)=#{yf} and kw='12' THEN 1 ELSE 0 END)/#{num}) AS sk2num,
CONVERT(decimal(10,1),SUM(CASE WHEN ISNULL(dm_ydjh.qgjhrq, '') != '' and substring(qgjhrq,0,8)=#{yf} and (kw='9' or kw='10') THEN 1 ELSE 0 END)/#{num}) AS lm2num,
CONVERT(decimal(10,1),SUM(CASE WHEN ISNULL(dm_ydjh.qgjhrq, '') != '' and substring(qgjhrq,0,8)=#{yf} and kw='14' THEN 1 ELSE 0 END)/#{num}) AS sk3num,
CONVERT(decimal(10,1),SUM(CASE WHEN ISNULL(dm_ydjh.qgjhrq, '') != '' and substring(qgjhrq,0,8)=#{yf} and kw='13' THEN 1 ELSE 0 END)/#{num}) AS lm3num,
CONVERT(decimal(10,1),SUM(CASE WHEN ISNULL(dm_ydjh.qgjhrq, '') != '' and substring(qgjhrq,0,8)=#{yf} and (kw='15' or kw='11') THEN 1 ELSE 0 END)/#{num}) AS sk4num,
CONVERT(decimal(10,1),SUM(CASE WHEN ISNULL(dm_ydjh.qgjhrq, '') != '' and substring(qgjhrq,0,8)=#{yf} and kw='16' THEN 1 ELSE 0 END)/#{num}) AS xcnum
from dm_ydjh WHERE
1=1
and (substring(qgjhrq,0,8)=#{yf} or substring(pwjhrq,0,8)=#{yf} )

Write Preview
Loading…
Cancel
Save