Browse Source

2026-11-16

报表优化
master
fengyuan_yang 1 day ago
parent
commit
427ada4f92
  1. 16
      src/main/java/com/gaotao/modules/shopOrder/controller/ProductionReportController.java
  2. 3
      src/main/java/com/gaotao/modules/shopOrder/dao/ProductionReportMapper.java
  3. 89
      src/main/java/com/gaotao/modules/shopOrder/service/Impl/ProductionReportServiceImpl.java
  4. 2
      src/main/java/com/gaotao/modules/shopOrder/service/ProductionReportService.java
  5. 4
      src/main/resources/mapper/shopOrder/ProductionReportMapper.xml

16
src/main/java/com/gaotao/modules/shopOrder/controller/ProductionReportController.java

@ -1,13 +1,17 @@
package com.gaotao.modules.shopOrder.controller;
import com.gaotao.common.utils.R;
import com.gaotao.modules.base.entity.WorkCenterData;
import com.gaotao.modules.pda.utils.ResponseData;
import com.gaotao.modules.rollNoReview.data.SFDCRollsOutData;
import com.gaotao.modules.shopOrder.entity.*;
import com.gaotao.modules.shopOrder.entity.SfdcRollsReportExecuteData;
import com.gaotao.modules.shopOrder.service.ProductionReportService;
import com.gaotao.modules.sys.entity.SysUserEntity;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
@ -292,6 +296,18 @@ public class ProductionReportController {
return responseData;
}
/**
* 当前登录人在 AccessSite 中的工厂权限。
*/
@GetMapping("/getSiteList")
@ResponseBody
public R getSiteList() {
Object principal = SecurityUtils.getSubject().getPrincipal();
String userName = principal instanceof SysUserEntity ? ((SysUserEntity) principal).getUsername() : "";
List<String> siteList = productionReportService.getAccessSiteList(userName);
return R.ok().put("siteList", siteList);
}
/**
* 面损明细。返回列名顺序与存储过程一致。
*/

3
src/main/java/com/gaotao/modules/shopOrder/dao/ProductionReportMapper.java

@ -4,6 +4,7 @@ import com.gaotao.modules.base.entity.WorkCenterData;
import com.gaotao.modules.rollNoReview.data.SFDCRollsOutData;
import com.gaotao.modules.shopOrder.entity.*;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@ -157,4 +158,6 @@ public interface ProductionReportMapper {
java.util.List<java.util.LinkedHashMap<String, Object>> getOrderRollDefectReport(OrderRollDefectReportQuery query);
java.util.List<java.util.LinkedHashMap<String, Object>> getOrderDowntimeReport(OrderRollDefectReportQuery query);
List<String> getAccessSiteList(@Param("userName") String userName);
}

89
src/main/java/com/gaotao/modules/shopOrder/service/Impl/ProductionReportServiceImpl.java

@ -215,25 +215,15 @@ public class ProductionReportServiceImpl implements ProductionReportService {
@Override
public Map<String, Object> getOrderRollDefectReport(OrderRollDefectReportQuery query) {
if (query == null || query.getSite() == null || query.getSite().trim().isEmpty()) {
throw new XJException("工厂编码不能为空");
}
if (query.getStartDate() == null || query.getStartDate().trim().isEmpty()
|| query.getEndDate() == null || query.getEndDate().trim().isEmpty()) {
throw new XJException("请选择报告日期");
}
query.setSite(query.getSite().trim());
query.setOrderNo(blankToEmpty(query.getOrderNo()));
query.setSeqNo(blankToEmpty(query.getSeqNo()));
query.setWorkCenter(blankToEmpty(query.getWorkCenter()));
query.setResource(blankToEmpty(query.getResource()));
query.setStartDate(normalizeReportDate(query.getStartDate(), false));
query.setEndDate(normalizeReportDate(query.getEndDate(), true));
prepareReportQuery(query);
List<LinkedHashMap<String, Object>> rows = productionReportMapper.getOrderRollDefectReport(query);
if (rows == null) {
rows = new ArrayList<>();
}
String procedureMessage = procedureRejectMessage(rows);
if (procedureMessage != null) {
throw new XJException(procedureMessage);
}
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
List<String> columns = new ArrayList<>(ORDER_ROLL_DEFECT_FIXED_COLUMNS);
if (!rows.isEmpty()) {
@ -262,25 +252,15 @@ public class ProductionReportServiceImpl implements ProductionReportService {
@Override
public Map<String, Object> getOrderDowntimeReport(OrderRollDefectReportQuery query) {
if (query == null || query.getSite() == null || query.getSite().trim().isEmpty()) {
throw new XJException("工厂编码不能为空");
}
if (query.getStartDate() == null || query.getStartDate().trim().isEmpty()
|| query.getEndDate() == null || query.getEndDate().trim().isEmpty()) {
throw new XJException("请选择创建日期");
}
query.setSite(query.getSite().trim());
query.setOrderNo(blankToEmpty(query.getOrderNo()));
query.setSeqNo(blankToEmpty(query.getSeqNo()));
query.setWorkCenter(blankToEmpty(query.getWorkCenter()));
query.setResource(blankToEmpty(query.getResource()));
query.setStartDate(normalizeReportDate(query.getStartDate(), false));
query.setEndDate(normalizeReportDate(query.getEndDate(), true));
prepareReportQuery(query);
List<LinkedHashMap<String, Object>> rows = productionReportMapper.getOrderDowntimeReport(query);
if (rows == null) {
rows = new ArrayList<>();
}
String procedureMessage = procedureRejectMessage(rows);
if (procedureMessage != null) {
throw new XJException(procedureMessage);
}
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
List<LinkedHashMap<String, Object>> normalizedRows = new ArrayList<>();
for (LinkedHashMap<String, Object> row : rows) {
@ -332,11 +312,60 @@ public class ProductionReportServiceImpl implements ProductionReportService {
}
}
@Override
public List<String> getAccessSiteList(String userName) {
if (userName == null || userName.trim().isEmpty()) {
return new ArrayList<>();
}
List<String> siteList = productionReportMapper.getAccessSiteList(userName.trim());
return siteList == null ? new ArrayList<>() : siteList;
}
private void prepareReportQuery(OrderRollDefectReportQuery query) {
if (query == null) {
throw new XJException("查询条件不能为空");
}
query.setSite(blankToEmpty(query.getSite()));
query.setOrderNo(blankToEmpty(query.getOrderNo()));
query.setSeqNo(blankToEmpty(query.getSeqNo()));
query.setWorkCenter(blankToEmpty(query.getWorkCenter()));
query.setResource(blankToEmpty(query.getResource()));
query.setStartDate(normalizeReportDate(query.getStartDate(), false));
query.setEndDate(normalizeReportDate(query.getEndDate(), true));
}
private String procedureRejectMessage(List<LinkedHashMap<String, Object>> rows) {
if (rows == null || rows.isEmpty()) {
return null;
}
Object code = mapValue(rows.get(0), "resultCode");
if (code == null || !"400".equals(String.valueOf(code).trim())) {
return null;
}
Object message = mapValue(rows.get(0), "resultMsg");
return message == null || String.valueOf(message).trim().isEmpty() ? "请输入筛选条件后再试!" : String.valueOf(message);
}
private Object mapValue(Map<String, Object> row, String name) {
if (row.containsKey(name)) {
return row.get(name);
}
for (Map.Entry<String, Object> entry : row.entrySet()) {
if (entry.getKey() != null && entry.getKey().equalsIgnoreCase(name)) {
return entry.getValue();
}
}
return null;
}
private String blankToEmpty(String value) {
return value == null ? "" : value.trim();
}
private String normalizeReportDate(String value, boolean endOfDay) {
if (value == null || value.trim().isEmpty()) {
return "";
}
String text = value.trim();
if (text.length() == 10) {
return text + (endOfDay ? " 23:59:59" : " 00:00:00");

2
src/main/java/com/gaotao/modules/shopOrder/service/ProductionReportService.java

@ -140,4 +140,6 @@ public interface ProductionReportService {
* 停机明细。前六列固定,其后为动态停机类型列。
*/
java.util.Map<String, Object> getOrderDowntimeReport(OrderRollDefectReportQuery query);
List<String> getAccessSiteList(String userName);
}

4
src/main/resources/mapper/shopOrder/ProductionReportMapper.xml

@ -670,6 +670,10 @@
</where>
</select>
<select id="getAccessSiteList" resultType="java.lang.String">
SELECT site FROM AccessSite WHERE UPPER(userID) = UPPER(#{userName}) ORDER BY site
</select>
<select id="getOrderDowntimeReport" statementType="CALLABLE" resultType="java.util.LinkedHashMap">
{call dbo.GetOrderDowntimeReport(
#{site, mode=IN, jdbcType=VARCHAR},

Loading…
Cancel
Save