diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/YysDayLogsService.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/YysDayLogsService.java index 3e22354..3d7fb2e 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/YysDayLogsService.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/YysDayLogsService.java @@ -2,7 +2,9 @@ package jnpf.service; import jnpf.model.yysdaylogs.*; import jnpf.entity.*; + import java.util.*; + import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -16,7 +18,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; public interface YysDayLogsService extends IService { List getList(YysDayLogsPagination yysDayLogsPagination); - List getTypeList(YysDayLogsPagination yysDayLogsPagination,String dataType); + List getTypeList(YysDayLogsPagination yysDayLogsPagination, String dataType); YysDayLogsEntity getInfo(String id); @@ -28,12 +30,13 @@ public interface YysDayLogsService extends IService { //子表方法 //副表数据方法 - String checkForm(YysDayLogsForm form,int i); + String checkForm(YysDayLogsForm form, int i); - void saveOrUpdate(YysDayLogsForm yysDayLogsForm,String id, boolean isSave) throws Exception; + void saveOrUpdate(YysDayLogsForm yysDayLogsForm, String id, boolean isSave) throws Exception; /** * 同步报工记录表 + * * @param entity * @param productType */ @@ -41,8 +44,17 @@ public interface YysDayLogsService extends IService { /** * 同步报工记录表 + * * @param entity * @param productType */ void syncPackage(YysPackageReportEntity entity, String productType); + + /** + * 获取月度报工统计列表 + * + * @param yysDayLogsPagination + * @return + */ + List getListByMonth(YysDayLogsPagination yysDayLogsPagination); } diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysDayLogsServiceImpl.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysDayLogsServiceImpl.java index 371d1c8..ecc6c91 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysDayLogsServiceImpl.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysDayLogsServiceImpl.java @@ -176,7 +176,6 @@ public class YysDayLogsServiceImpl extends ServiceImpl getListByMonth(YysDayLogsPagination yysDayLogsPagination) { + String userId = userProvider.get().getUserId(); + List AllIdList = new ArrayList(); + List> intersectionList = new ArrayList<>(); + boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); + String columnData = !isPc ? YysDayLogsConstant.getAppColumnData() : YysDayLogsConstant.getColumnData(); + ColumnDataModel columnDataModel = JsonUtil.getJsonToBean(columnData, ColumnDataModel.class); + String ruleJson = !isPc ? JsonUtil.getObjectToString(columnDataModel.getRuleListApp()) : JsonUtil.getObjectToString(columnDataModel.getRuleList()); + + int total = 0; + int yysDayLogsNum = 0; + QueryWrapper yysDayLogsQueryWrapper = new QueryWrapper<>(); + List allSuperIDlist = new ArrayList<>(); + String superOp = ""; + if (ObjectUtil.isNotEmpty(yysDayLogsPagination.getSuperQueryJson())) { + List allSuperList = new ArrayList<>(); + List> intersectionSuperList = new ArrayList<>(); + String queryJson = yysDayLogsPagination.getSuperQueryJson(); + SuperJsonModel superJsonModel = JsonUtil.getJsonToBean(queryJson, SuperJsonModel.class); + int superNum = 0; + QueryWrapper yysDayLogsSuperWrapper = new QueryWrapper<>(); + yysDayLogsSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(yysDayLogsSuperWrapper, YysDayLogsEntity.class, queryJson, "0")); + int yysDayLogsNum1 = yysDayLogsSuperWrapper.getExpression().getNormal().size(); + if (yysDayLogsNum1 > 0) { + List yysDayLogsList = this.list(yysDayLogsSuperWrapper).stream().map(YysDayLogsEntity::getId).collect(Collectors.toList()); + allSuperList.addAll(yysDayLogsList); + intersectionSuperList.add(yysDayLogsList); + superNum++; + } + superOp = superNum > 0 ? superJsonModel.getMatchLogic() : ""; + //and or + if (superOp.equalsIgnoreCase("and")) { + allSuperIDlist = generaterSwapUtil.getIntersection(intersectionSuperList); + } else { + allSuperIDlist = allSuperList; + } + } + List allRuleIDlist = new ArrayList<>(); + String ruleOp = ""; + if (ObjectUtil.isNotEmpty(ruleJson)) { + List allRuleList = new ArrayList<>(); + List> intersectionRuleList = new ArrayList<>(); + SuperJsonModel ruleJsonModel = JsonUtil.getJsonToBean(ruleJson, SuperJsonModel.class); + int ruleNum = 0; + QueryWrapper yysDayLogsSuperWrapper = new QueryWrapper<>(); + yysDayLogsSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(yysDayLogsSuperWrapper, YysDayLogsEntity.class, ruleJson, "0")); + int yysDayLogsNum1 = yysDayLogsSuperWrapper.getExpression().getNormal().size(); + if (yysDayLogsNum1 > 0) { + List yysDayLogsList = this.list(yysDayLogsSuperWrapper).stream().map(YysDayLogsEntity::getId).collect(Collectors.toList()); + allRuleList.addAll(yysDayLogsList); + intersectionRuleList.add(yysDayLogsList); + ruleNum++; + } + ruleOp = ruleNum > 0 ? ruleJsonModel.getMatchLogic() : ""; + //and or + if (ruleOp.equalsIgnoreCase("and")) { + allRuleIDlist = generaterSwapUtil.getIntersection(intersectionRuleList); + } else { + allRuleIDlist = allRuleList; + } + } + boolean pcPermission = false; + boolean appPermission = false; + if (isPc && pcPermission) { + if (!userProvider.get().getIsAdministrator()) { + Object yysDayLogsObj = generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysDayLogsQueryWrapper, YysDayLogsEntity.class, yysDayLogsPagination.getMenuId(), "0")); + if (ObjectUtil.isEmpty(yysDayLogsObj)) { + return new ArrayList<>(); + } else { + yysDayLogsQueryWrapper = (QueryWrapper) yysDayLogsObj; + if (yysDayLogsQueryWrapper.getExpression().getNormal().size() > 0) { + yysDayLogsNum++; + } + } + } + } + if (!isPc && appPermission) { + if (!userProvider.get().getIsAdministrator()) { + Object yysDayLogsObj = generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysDayLogsQueryWrapper, YysDayLogsEntity.class, yysDayLogsPagination.getMenuId(), "0")); + if (ObjectUtil.isEmpty(yysDayLogsObj)) { + return new ArrayList<>(); + } else { + yysDayLogsQueryWrapper = (QueryWrapper) yysDayLogsObj; + if (yysDayLogsQueryWrapper.getExpression().getNormal().size() > 0) { + yysDayLogsNum++; + } + } + + + } + } + if (isPc) { + if (ObjectUtil.isNotEmpty(yysDayLogsPagination.getManufactureTime())) { + yysDayLogsNum++; + + List ManufactureTimeList = JsonUtil.getJsonToList(yysDayLogsPagination.getManufactureTime(), String.class); + Long fir = Long.valueOf(String.valueOf(ManufactureTimeList.get(0))); + Long sec = Long.valueOf(String.valueOf(ManufactureTimeList.get(1))); + + yysDayLogsQueryWrapper.lambda().ge(YysDayLogsEntity::getManufactureTime, new Date(fir)) + .le(YysDayLogsEntity::getManufactureTime, DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59")); + + + } + + if (ObjectUtil.isNotEmpty(yysDayLogsPagination.getYears())) { + yysDayLogsNum++; + long firstDayOfMonthTimestamp = Long.parseLong(yysDayLogsPagination.getYears().toString()); + Date firstDayOfMonth = new Date(firstDayOfMonthTimestamp); + Calendar cal = Calendar.getInstance(); + cal.setTime(firstDayOfMonth); + cal.set(Calendar.DAY_OF_MONTH, cal.getActualMaximum(Calendar.DAY_OF_MONTH)); + cal.set(Calendar.HOUR_OF_DAY, 23); + cal.set(Calendar.MINUTE, 59); + cal.set(Calendar.SECOND, 59); + Date lastDayOfMonth = cal.getTime(); + + yysDayLogsQueryWrapper.lambda() + .ge(YysDayLogsEntity::getManufactureTime, firstDayOfMonth) + .le(YysDayLogsEntity::getManufactureTime, lastDayOfMonth); + } + + if (ObjectUtil.isNotEmpty(yysDayLogsPagination.getProductCode())) { + yysDayLogsNum++; + + String value = yysDayLogsPagination.getProductCode() instanceof List ? + JsonUtil.getObjectToString(yysDayLogsPagination.getProductCode()) : + String.valueOf(yysDayLogsPagination.getProductCode()); + yysDayLogsQueryWrapper.lambda().like(YysDayLogsEntity::getProductCode, value); + + } + + if (ObjectUtil.isNotEmpty(yysDayLogsPagination.getProductName())) { + yysDayLogsNum++; + + String value = yysDayLogsPagination.getProductName() instanceof List ? + JsonUtil.getObjectToString(yysDayLogsPagination.getProductName()) : + String.valueOf(yysDayLogsPagination.getProductName()); + yysDayLogsQueryWrapper.lambda().like(YysDayLogsEntity::getProductName, value); + + } + + if (ObjectUtil.isNotEmpty(yysDayLogsPagination.getDeviceName())) { + yysDayLogsNum++; + + String value = yysDayLogsPagination.getDeviceName() instanceof List ? + JsonUtil.getObjectToString(yysDayLogsPagination.getDeviceName()) : + String.valueOf(yysDayLogsPagination.getDeviceName()); + yysDayLogsQueryWrapper.lambda().like(YysDayLogsEntity::getDeviceName, value); + + } + + if (ObjectUtil.isNotEmpty(yysDayLogsPagination.getReportMember())) { + yysDayLogsNum++; + + List idList = new ArrayList<>(); + try { + String[][] reportMember = JsonUtil.getJsonToBean(yysDayLogsPagination.getReportMember(), String[][].class); + for (int i = 0; i < reportMember.length; i++) { + if (reportMember[i].length > 0) { + idList.add(JsonUtil.getObjectToString(Arrays.asList(reportMember[i]))); + } + } + } catch (Exception e1) { + try { + List reportMember = JsonUtil.getJsonToList(yysDayLogsPagination.getReportMember(), String.class); + if (reportMember.size() > 0) { + idList.addAll(reportMember); + } + } catch (Exception e2) { + idList.add(String.valueOf(yysDayLogsPagination.getReportMember())); + } + } + yysDayLogsQueryWrapper.lambda().and(t -> { + idList.forEach(tt -> { + t.like(YysDayLogsEntity::getReportMember, tt).or(); + }); + }); + + } + + } + List intersection = generaterSwapUtil.getIntersection(intersectionList); + if (total > 0) { + if (intersection.size() == 0) { + intersection.add("jnpfNullList"); + } + yysDayLogsQueryWrapper.lambda().in(YysDayLogsEntity::getId, intersection); + } + //是否有高级查询 + if (StringUtil.isNotEmpty(superOp)) { + if (allSuperIDlist.size() == 0) { + allSuperIDlist.add("jnpfNullList"); + } + List finalAllSuperIDlist = allSuperIDlist; + yysDayLogsQueryWrapper.lambda().and(t -> t.in(YysDayLogsEntity::getId, finalAllSuperIDlist)); + } + //是否有数据过滤查询 + if (StringUtil.isNotEmpty(ruleOp)) { + if (allRuleIDlist.size() == 0) { + allRuleIDlist.add("jnpfNullList"); + } + List finalAllRuleIDlist = allRuleIDlist; + yysDayLogsQueryWrapper.lambda().and(t -> t.in(YysDayLogsEntity::getId, finalAllRuleIDlist)); + } + if (ObjectUtil.isNotNull(yysDayLogsPagination.getProductType())) { + yysDayLogsQueryWrapper.lambda().eq(YysDayLogsEntity::getProductType, yysDayLogsPagination.getProductType()); + } + //假删除标志 + yysDayLogsQueryWrapper.lambda().isNull(YysDayLogsEntity::getDeleteMark); + + if ("0".equals(yysDayLogsPagination.getDataType())) { + if ((total > 0 && AllIdList.size() > 0) || total == 0) { + Page page = new Page<>(yysDayLogsPagination.getCurrentPage(), yysDayLogsPagination.getPageSize()); + IPage userIPage = this.page(page, yysDayLogsQueryWrapper); + return yysDayLogsPagination.setData(userIPage.getRecords(), userIPage.getTotal()); + } else { + List list = new ArrayList(); + return yysDayLogsPagination.setData(list, list.size()); + } + } else { + return this.list(yysDayLogsQueryWrapper); + } + } + } diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/YysDayLogsController.java b/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/YysDayLogsController.java index e2cb7bd..8cb3482 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/YysDayLogsController.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/YysDayLogsController.java @@ -1,5 +1,6 @@ package jnpf.controller; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import io.swagger.v3.oas.annotations.Operation; @@ -13,18 +14,27 @@ import jnpf.entity.*; import jnpf.util.*; import jnpf.model.yysdaylogs.*; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.compress.utils.Lists; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; + import javax.validation.Valid; +import java.time.LocalDate; +import java.time.ZoneId; import java.util.*; + import jnpf.annotation.JnpfField; import jnpf.base.vo.PageListVO; import jnpf.base.vo.PaginationVO; import jnpf.base.vo.DownloadVO; import jnpf.config.ConfigValueUtil; import jnpf.base.entity.ProvinceEntity; + import java.io.IOException; +import java.util.concurrent.ConcurrentHashMap; import java.util.stream.Collectors; + import jnpf.engine.entity.FlowTaskEntity; import jnpf.exception.WorkFlowException; import org.springframework.web.multipart.MultipartFile; @@ -36,7 +46,9 @@ import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity; import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.ss.usermodel.Workbook; + import java.io.File; + import jnpf.onlinedev.model.ExcelImFieldModel; import jnpf.onlinedev.model.OnlineImport.ImportDataModel; import jnpf.onlinedev.model.OnlineImport.ImportFormCheckUniqueModel; @@ -51,6 +63,7 @@ import org.springframework.transaction.annotation.Transactional; /** * yysDayLogs + * * @版本： V3.5 * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） * @作者： JNPF开发平台组 @@ -58,7 +71,7 @@ import org.springframework.transaction.annotation.Transactional; */ @Slf4j @RestController -@Tag(name = "yysDayLogs" , description = "example") +@Tag(name = "yysDayLogs", description = "example") @RequestMapping("/api/example/YysDayLogs") public class YysDayLogsController { @@ -72,30 +85,29 @@ public class YysDayLogsController { private YysDayLogsService yysDayLogsService; - @Autowired private ConfigValueUtil configValueUtil; /** - * 列表 - * - * @param yysDayLogsPagination - * @return - */ + * 列表 + * + * @param yysDayLogsPagination + * @return + */ @Operation(summary = "获取列表") @PostMapping("/getList") - public ActionResult list(@RequestBody YysDayLogsPagination yysDayLogsPagination)throws IOException{ - List list= yysDayLogsService.getList(yysDayLogsPagination); - List> realList=new ArrayList<>(); + public ActionResult list(@RequestBody YysDayLogsPagination yysDayLogsPagination) throws IOException { + List list = yysDayLogsService.getList(yysDayLogsPagination); + List> realList = new ArrayList<>(); for (YysDayLogsEntity entity : list) { - Map yysDayLogsMap=JsonUtil.entityToMap(entity); - yysDayLogsMap.put("id", yysDayLogsMap.get("id")); - //副表数据 - //子表数据 + Map yysDayLogsMap = JsonUtil.entityToMap(entity); + yysDayLogsMap.put("id", yysDayLogsMap.get("id")); + //副表数据 + //子表数据 realList.add(yysDayLogsMap); } //数据转换 - realList = generaterSwapUtil.swapDataList(realList, YysDayLogsConstant.getFormData(), YysDayLogsConstant.getColumnData(), yysDayLogsPagination.getModuleId(),false); + realList = generaterSwapUtil.swapDataList(realList, YysDayLogsConstant.getFormData(), YysDayLogsConstant.getColumnData(), yysDayLogsPagination.getModuleId(), false); //返回对象 PageListVO vo = new PageListVO(); @@ -104,97 +116,231 @@ public class YysDayLogsController { vo.setPagination(page); return ActionResult.success(vo); } + + /** + * 列表 + * + * @param yysDayLogsPagination + * @return + */ + @Operation(summary = "获取月度报工统计列表") + @PostMapping("/getListByMonth") + public ActionResult getListByMonth(@RequestBody YysDayLogsPagination yysDayLogsPagination) { + List list = yysDayLogsService.getListByMonth(yysDayLogsPagination); + List> realList = new ArrayList<>(); + PageListVO vo = new PageListVO(); + PaginationVO page = JsonUtil.getJsonToBean(yysDayLogsPagination, PaginationVO.class); + vo.setPagination(page); + if (CollectionUtils.isEmpty(list)) { + vo.setList(realList); + return ActionResult.success(vo); + } + Map mergedLogs = new ConcurrentHashMap<>(); + for (YysDayLogsEntity logs : list) { + YysDayLogsDTO dto = BeanUtil.copyProperties(logs, YysDayLogsDTO.class); + LocalDate date = logs.getManufactureTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDate(); + String yearMonth = date.getYear() + "-" + (date.getMonthValue() < 10 ? "0" : "") + date.getMonthValue(); + String key = yearMonth + "_" + logs.getReportMember() + "_" + logs.getProductCode() + "_" + logs.getProductType(); + dto.setYears(yearMonth); + if (mergedLogs.containsKey(key)) { + YysDayLogsDTO mergedLog = mergedLogs.getOrDefault(key, new YysDayLogsDTO()); + int qualifiedNum = Integer.parseInt(mergedLog.getQualifiedNum()) + Integer.parseInt(logs.getQualifiedNum()); + dto.setQualifiedNum(String.valueOf(qualifiedNum)); + dto.setCompensatoryHour(mergedLog.getCompensatoryHour().add(logs.getCompensatoryHour())); + mergedLogs.put(key, mergedLog); + } + mergedLogs.put(key, dto); + } + List resultList = new ArrayList<>(mergedLogs.values()); + + + for (YysDayLogsDTO entity : resultList) { + Map yysDayLogsMap = JsonUtil.entityToMap(entity); + yysDayLogsMap.put("id", yysDayLogsMap.get("id")); + //副表数据 + //子表数据 + realList.add(yysDayLogsMap); + } + //数据转换 + realList = generaterSwapUtil.swapDataList(realList, YysDayLogsConstant.getFormData(), YysDayLogsConstant.getColumnData(), yysDayLogsPagination.getModuleId(), false); + //返回对象 + vo.setList(realList); + return ActionResult.success(vo); + } + /** - * 导出Excel - * - * @return - */ + * 导出Excel + * + * @return + */ @Operation(summary = "导出Excel") @PostMapping("/Actions/Export") public ActionResult Export(@RequestBody YysDayLogsPagination yysDayLogsPagination) throws IOException { - if (StringUtil.isEmpty(yysDayLogsPagination.getSelectKey())){ + if (StringUtil.isEmpty(yysDayLogsPagination.getSelectKey())) { return ActionResult.fail("请选择导出字段"); } - List list= yysDayLogsService.getList(yysDayLogsPagination); - List> realList=new ArrayList<>(); - for (YysDayLogsEntity entity : list) { - Map yysDayLogsMap=JsonUtil.entityToMap(entity); - yysDayLogsMap.put("id", yysDayLogsMap.get("id")); - //副表数据 - //子表数据 - realList.add(yysDayLogsMap); + String name; + List list = yysDayLogsService.getList(yysDayLogsPagination); + List> realList = new ArrayList<>(); + if ("1".equals(yysDayLogsPagination.getExportType())) { + name = "年月"; + Map mergedLogs = new ConcurrentHashMap<>(); + for (YysDayLogsEntity logs : list) { + YysDayLogsDTO dto = BeanUtil.copyProperties(logs, YysDayLogsDTO.class); + LocalDate date = logs.getManufactureTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDate(); + String yearMonth = date.getYear() + "-" + (date.getMonthValue() < 10 ? "0" : "") + date.getMonthValue(); + String key = yearMonth + "_" + logs.getReportMember() + "_" + logs.getProductCode() + "_" + logs.getProductType(); + dto.setYears(yearMonth); + if (mergedLogs.containsKey(key)) { + YysDayLogsDTO mergedLog = mergedLogs.getOrDefault(key, new YysDayLogsDTO()); + int qualifiedNum = Integer.parseInt(mergedLog.getQualifiedNum()) + Integer.parseInt(logs.getQualifiedNum()); + dto.setQualifiedNum(String.valueOf(qualifiedNum)); + dto.setCompensatoryHour(mergedLog.getCompensatoryHour().add(logs.getCompensatoryHour())); + mergedLogs.put(key, mergedLog); + } + mergedLogs.put(key, dto); + } + List resultList = new ArrayList<>(mergedLogs.values()); + for (YysDayLogsDTO entity : resultList) { + Map yysDayLogsMap = JsonUtil.entityToMap(entity); + yysDayLogsMap.put("id", yysDayLogsMap.get("id")); + //副表数据 + //子表数据 + realList.add(yysDayLogsMap); + } + } else { + name = "生产日期"; + for (YysDayLogsEntity entity : list) { + Map yysDayLogsMap = JsonUtil.entityToMap(entity); + yysDayLogsMap.put("id", yysDayLogsMap.get("id")); + //副表数据 + //子表数据 + realList.add(yysDayLogsMap); + } } //数据转换 - realList = generaterSwapUtil.swapDataList(realList, YysDayLogsConstant.getFormData(), YysDayLogsConstant.getColumnData(), yysDayLogsPagination.getModuleId(),false); - String[]keys=!StringUtil.isEmpty(yysDayLogsPagination.getSelectKey())?yysDayLogsPagination.getSelectKey():new String[0]; - UserInfo userInfo=userProvider.get(); - DownloadVO vo=this.creatModelExcel(configValueUtil.getTemporaryFilePath(),realList,keys,userInfo); + realList = generaterSwapUtil.swapDataList(realList, YysDayLogsConstant.getFormData(), YysDayLogsConstant.getColumnData(), yysDayLogsPagination.getModuleId(), false); + String[] keys = !StringUtil.isEmpty(yysDayLogsPagination.getSelectKey()) ? yysDayLogsPagination.getSelectKey() : new String[0]; + UserInfo userInfo = userProvider.get(); + DownloadVO vo = this.creatModelExcel(configValueUtil.getTemporaryFilePath(), realList, keys, userInfo, name); return ActionResult.success(vo); } /** - * 导出表格方法 - */ - public DownloadVO creatModelExcel(String path,List>list,String[]keys,UserInfo userInfo){ - DownloadVO vo=DownloadVO.builder().build(); - List entitys=new ArrayList<>(); - if(keys.length>0){ - for(String key:keys){ - switch(key){ - case "manufactureTime" : - entitys.add(new ExcelExportEntity("生产日期" ,"manufactureTime")); - break; - case "deviceCode" : - entitys.add(new ExcelExportEntity("设备编码" ,"deviceCode")); - break; - case "deviceName" : - entitys.add(new ExcelExportEntity("设备名称" ,"deviceName")); - break; - case "sort" : - entitys.add(new ExcelExportEntity("顺序号" ,"sort")); - break; - case "post" : - entitys.add(new ExcelExportEntity("班次" ,"post")); - break; - case "startTime" : - entitys.add(new ExcelExportEntity("开始时间" ,"startTime")); - break; - case "endTime" : - entitys.add(new ExcelExportEntity("结束时间" ,"endTime")); - break; - case "productCode" : - entitys.add(new ExcelExportEntity("产品编码" ,"productCode")); - break; - case "productName" : - entitys.add(new ExcelExportEntity("产品名称" ,"productName")); - break; - case "models" : - entitys.add(new ExcelExportEntity("规格型号" ,"models")); - break; - case "measurementUnit" : - entitys.add(new ExcelExportEntity("计量单位" ,"measurementUnit")); - break; - case "reportMember" : - entitys.add(new ExcelExportEntity("报工成员" ,"reportMember")); - break; - case "qualifiedNum" : - entitys.add(new ExcelExportEntity("报工数量" ,"qualifiedNum")); - break; - case "compensatoryHour" : - entitys.add(new ExcelExportEntity("补偿工时" ,"compensatoryHour")); - break; - default: - break; + * 导出表格方法 + */ + public DownloadVO creatModelExcel(String path, List> list, String[] keys, UserInfo userInfo, String name) { + DownloadVO vo = DownloadVO.builder().build(); + List entitys = new ArrayList<>(); + if (keys.length > 0) { + if ("年月".equals(name)){ + for (String key : keys) { + switch (key) { + case "years": + entitys.add(new ExcelExportEntity(name, "years")); + break; + case "deviceCode": + entitys.add(new ExcelExportEntity("设备编码", "deviceCode")); + break; + case "deviceName": + entitys.add(new ExcelExportEntity("设备名称", "deviceName")); + break; + case "sort": + entitys.add(new ExcelExportEntity("顺序号", "sort")); + break; + case "post": + entitys.add(new ExcelExportEntity("班次", "post")); + break; + case "startTime": + entitys.add(new ExcelExportEntity("开始时间", "startTime")); + break; + case "endTime": + entitys.add(new ExcelExportEntity("结束时间", "endTime")); + break; + case "productCode": + entitys.add(new ExcelExportEntity("产品编码", "productCode")); + break; + case "productName": + entitys.add(new ExcelExportEntity("产品名称", "productName")); + break; + case "models": + entitys.add(new ExcelExportEntity("规格型号", "models")); + break; + case "measurementUnit": + entitys.add(new ExcelExportEntity("计量单位", "measurementUnit")); + break; + case "reportMember": + entitys.add(new ExcelExportEntity("报工成员", "reportMember")); + break; + case "qualifiedNum": + entitys.add(new ExcelExportEntity("报工数量", "qualifiedNum")); + break; + case "compensatoryHour": + entitys.add(new ExcelExportEntity("补偿工时", "compensatoryHour")); + break; + default: + break; + } + } + }else { + for (String key : keys) { + switch (key) { + case "manufactureTime": + entitys.add(new ExcelExportEntity(name, "manufactureTime")); + break; + case "deviceCode": + entitys.add(new ExcelExportEntity("设备编码", "deviceCode")); + break; + case "deviceName": + entitys.add(new ExcelExportEntity("设备名称", "deviceName")); + break; + case "sort": + entitys.add(new ExcelExportEntity("顺序号", "sort")); + break; + case "post": + entitys.add(new ExcelExportEntity("班次", "post")); + break; + case "startTime": + entitys.add(new ExcelExportEntity("开始时间", "startTime")); + break; + case "endTime": + entitys.add(new ExcelExportEntity("结束时间", "endTime")); + break; + case "productCode": + entitys.add(new ExcelExportEntity("产品编码", "productCode")); + break; + case "productName": + entitys.add(new ExcelExportEntity("产品名称", "productName")); + break; + case "models": + entitys.add(new ExcelExportEntity("规格型号", "models")); + break; + case "measurementUnit": + entitys.add(new ExcelExportEntity("计量单位", "measurementUnit")); + break; + case "reportMember": + entitys.add(new ExcelExportEntity("报工成员", "reportMember")); + break; + case "qualifiedNum": + entitys.add(new ExcelExportEntity("报工数量", "qualifiedNum")); + break; + case "compensatoryHour": + entitys.add(new ExcelExportEntity("补偿工时", "compensatoryHour")); + break; + default: + break; + } } } + } ExportParams exportParams = new ExportParams(null, "表单信息"); exportParams.setType(ExcelType.XSSF); - try{ + try { @Cleanup Workbook workbook = new HSSFWorkbook(); - if (entitys.size()>0){ - if (list.size()==0){ + if (entitys.size() > 0) { + if (list.size() == 0) { list.add(new HashMap<>()); } //去除空数据 @@ -204,8 +350,8 @@ public class YysDayLogsController { for (String key : keys) { //子表 if (key.toLowerCase().startsWith("tablefield")) { - String tableField = key.substring(0, key.indexOf("-" )); - String field = key.substring(key.indexOf("-" ) + 1); + String tableField = key.substring(0, key.indexOf("-")); + String field = key.substring(key.indexOf("-") + 1); Object o = map.get(tableField); if (o != null) { List> childList = (List>) o; @@ -231,7 +377,7 @@ public class YysDayLogsController { List complexHeaderList = columnDataModel.getComplexHeaderList(); if (!Objects.equals(columnDataModel.getType(), 3) && !Objects.equals(columnDataModel.getType(), 5)) { entitys = VisualUtils.complexHeaderHandel(entitys, complexHeaderList); - dataList = VisualUtils.complexHeaderDataHandel(dataList, complexHeaderList); + dataList = VisualUtils.complexHeaderDataHandel(dataList, complexHeaderList); } workbook = ExcelExportUtil.exportExcel(exportParams, entitys, dataList); @@ -248,111 +394,119 @@ public class YysDayLogsController { } return vo; } + /** - * 创建 - * - * @param yysDayLogsForm - * @return - */ + * 创建 + * + * @param yysDayLogsForm + * @return + */ @PostMapping() @Operation(summary = "创建") public ActionResult create(@RequestBody @Valid YysDayLogsForm yysDayLogsForm) { - String b = yysDayLogsService.checkForm(yysDayLogsForm,0); - if (StringUtil.isNotEmpty(b)){ - return ActionResult.fail(b ); + String b = yysDayLogsService.checkForm(yysDayLogsForm, 0); + if (StringUtil.isNotEmpty(b)) { + return ActionResult.fail(b); } - try{ - yysDayLogsService.saveOrUpdate(yysDayLogsForm, null ,true); - }catch(Exception e){ + try { + yysDayLogsService.saveOrUpdate(yysDayLogsForm, null, true); + } catch (Exception e) { return ActionResult.fail("新增数据失败"); } return ActionResult.success("创建成功"); } + /** - * 编辑 - * @param id - * @param yysDayLogsForm - * @return - */ + * 编辑 + * + * @param id + * @param yysDayLogsForm + * @return + */ @PutMapping("/{id}") @Operation(summary = "更新") - public ActionResult update(@PathVariable("id") String id,@RequestBody @Valid YysDayLogsForm yysDayLogsForm, - @RequestParam(value = "isImport", required = false) boolean isImport){ + public ActionResult update(@PathVariable("id") String id, @RequestBody @Valid YysDayLogsForm yysDayLogsForm, + @RequestParam(value = "isImport", required = false) boolean isImport) { yysDayLogsForm.setId(id); if (!isImport) { - String b = yysDayLogsService.checkForm(yysDayLogsForm,1); - if (StringUtil.isNotEmpty(b)){ - return ActionResult.fail(b ); + String b = yysDayLogsService.checkForm(yysDayLogsForm, 1); + if (StringUtil.isNotEmpty(b)) { + return ActionResult.fail(b); } } - YysDayLogsEntity entity= yysDayLogsService.getInfo(id); - if(entity!=null){ - try{ - yysDayLogsService.saveOrUpdate(yysDayLogsForm,id,false); - }catch(Exception e){ + YysDayLogsEntity entity = yysDayLogsService.getInfo(id); + if (entity != null) { + try { + yysDayLogsService.saveOrUpdate(yysDayLogsForm, id, false); + } catch (Exception e) { return ActionResult.fail("修改数据失败"); } return ActionResult.success("更新成功"); - }else{ + } else { return ActionResult.fail("更新失败，数据不存在"); } } + /** - * 删除 - * @param id - * @return - */ + * 删除 + * + * @param id + * @return + */ @Operation(summary = "删除") @DeleteMapping("/{id}") @Transactional - public ActionResult delete(@PathVariable("id") String id){ - YysDayLogsEntity entity= yysDayLogsService.getInfo(id); - if(entity!=null){ + public ActionResult delete(@PathVariable("id") String id) { + YysDayLogsEntity entity = yysDayLogsService.getInfo(id); + if (entity != null) { //假删除 entity.setDeleteMark(1); - yysDayLogsService.update(id,entity); + yysDayLogsService.update(id, entity); } return ActionResult.success("删除成功"); } + /** - * 表单信息(详情页) - * 详情页面使用-转换数据 - * @param id - * @return - */ + * 表单信息(详情页) + * 详情页面使用-转换数据 + * + * @param id + * @return + */ @Operation(summary = "表单信息(详情页)") @GetMapping("/detail/{id}") - public ActionResult detailInfo(@PathVariable("id") String id){ - YysDayLogsEntity entity= yysDayLogsService.getInfo(id); - if(entity==null){ + public ActionResult detailInfo(@PathVariable("id") String id) { + YysDayLogsEntity entity = yysDayLogsService.getInfo(id); + if (entity == null) { return ActionResult.fail("表单数据不存在！"); } - Map yysDayLogsMap=JsonUtil.entityToMap(entity); + Map yysDayLogsMap = JsonUtil.entityToMap(entity); yysDayLogsMap.put("id", yysDayLogsMap.get("id")); //副表数据 //子表数据 - yysDayLogsMap = generaterSwapUtil.swapDataDetail(yysDayLogsMap,YysDayLogsConstant.getFormData(),"591260101755544965",false); + yysDayLogsMap = generaterSwapUtil.swapDataDetail(yysDayLogsMap, YysDayLogsConstant.getFormData(), "591260101755544965", false); return ActionResult.success(yysDayLogsMap); } + /** - * 获取详情(编辑页) - * 编辑页面使用-不转换数据 - * @param id - * @return - */ + * 获取详情(编辑页) + * 编辑页面使用-不转换数据 + * + * @param id + * @return + */ @Operation(summary = "信息") @GetMapping("/{id}") - public ActionResult info(@PathVariable("id") String id){ - YysDayLogsEntity entity= yysDayLogsService.getInfo(id); - if(entity==null){ + public ActionResult info(@PathVariable("id") String id) { + YysDayLogsEntity entity = yysDayLogsService.getInfo(id); + if (entity == null) { return ActionResult.fail("表单数据不存在！"); } - Map yysDayLogsMap=JsonUtil.entityToMap(entity); + Map yysDayLogsMap = JsonUtil.entityToMap(entity); yysDayLogsMap.put("id", yysDayLogsMap.get("id")); //副表数据 //子表数据 - yysDayLogsMap = generaterSwapUtil.swapDataForm(yysDayLogsMap,YysDayLogsConstant.getFormData(),YysDayLogsConstant.TABLEFIELDKEY,YysDayLogsConstant.TABLERENAMES); + yysDayLogsMap = generaterSwapUtil.swapDataForm(yysDayLogsMap, YysDayLogsConstant.getFormData(), YysDayLogsConstant.TABLEFIELDKEY, YysDayLogsConstant.TABLERENAMES); return ActionResult.success(yysDayLogsMap); } - } diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysdaylogs/YysDayLogsDTO.java b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysdaylogs/YysDayLogsDTO.java new file mode 100644 index 0000000..4dfb38a --- /dev/null +++ b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysdaylogs/YysDayLogsDTO.java @@ -0,0 +1,28 @@ +package jnpf.model.yysdaylogs; + +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +@Data +public class YysDayLogsDTO implements Serializable { + private String id; + private Date manufactureTime; + private String deviceCode; + private String deviceName; + private Integer sort; + private String post; + private String startTime; + private String endTime; + private String productCode; + private String productName; + private String models; + private String measurementUnit; + private String qualifiedNum; + private BigDecimal compensatoryHour; + private String reportMember; + private String productType; + private String years; +} diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysdaylogs/YysDayLogsPagination.java b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysdaylogs/YysDayLogsPagination.java index 32ecb49..f7cb317 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysdaylogs/YysDayLogsPagination.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysdaylogs/YysDayLogsPagination.java @@ -47,4 +47,10 @@ public class YysDayLogsPagination extends Pagination { */ @JsonProperty("productType") private Object productType; + /** 年月 */ + @JsonProperty("years") + private Object years; + /** 导出类型 */ + @JsonProperty("exportType") + private Object exportType; } diff --git a/jnpf-java-boot/jnpf-web/src/views/yys/yysmonthcount/Detail.vue b/jnpf-java-boot/jnpf-web/src/views/yys/yysmonthcount/Detail.vue new file mode 100644 index 0000000..9b811fd --- /dev/null +++ b/jnpf-java-boot/jnpf-web/src/views/yys/yysmonthcount/Detail.vue @@ -0,0 +1,190 @@ + + diff --git a/jnpf-java-boot/jnpf-web/src/views/yys/yysmonthcount/columnList.js b/jnpf-java-boot/jnpf-web/src/views/yys/yysmonthcount/columnList.js new file mode 100644 index 0000000..89fd766 --- /dev/null +++ b/jnpf-java-boot/jnpf-web/src/views/yys/yysmonthcount/columnList.js @@ -0,0 +1,2 @@ +const columnList = [{ "clearable": true, "jnpfKey": "datePicker", "format": "yyyy-MM-dd", "fullName": "年月", "label": "年月", "sortable": false, "align": "left", "type": "date", "__config__": { "endRelationField": "", "defaultValue": null, "dragDisabled": false, "className": [], "showLabel": true, "required": false, "tableName": "yys_day_logs", "renderKey": 1723103548110, "tagIcon": "icon-ym icon-ym-generator-date", "startRelationField": "", "defaultCurrent": false, "tag": "JnpfDatePicker", "formId": 101, "visibility": ["pc", "app"], "jnpfKey": "datePicker", "noShow": false, "endTimeTarget": 1, "tipLabel": "", "startTimeType": 1, "endTimeRule": false, "label": "年月", "startTimeRule": false, "startTimeValue": "", "trigger": "change", "endTimeValue": "", "endTimeType": 1, "layout": "colFormItem", "startTimeTarget": 1, "regList": [], "span": 8 }, "readonly": false, "prop": "years", "width": 0, "__vModel__": "years", "fixed": "none", "style": { "width": "100%" }, "disabled": false, "startTime": null, "id": "years", "placeholder": "请选择", "endTime": null, "on": { "change": "({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}", "blur": "({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}" } }, { "clearable": true, "maxlength": null, "jnpfKey": "input", "suffixIcon": "", "fullName": "产品编码", "label": "产品编码", "sortable": false, "align": "left", "addonAfter": "", "__config__": { "formId": 108, "visibility": ["pc", "app"], "jnpfKey": "input", "noShow": false, "tipLabel": "", "dragDisabled": false, "className": [], "label": "产品编码", "trigger": "blur", "showLabel": true, "required": false, "tableName": "yys_day_logs", "renderKey": 1723103650569, "layout": "colFormItem", "tagIcon": "icon-ym icon-ym-generator-input", "unique": false, "tag": "JnpfInput", "regList": [], "span": 8 }, "readonly": false, "prop": "productCode", "showWordLimit": false, "width": 0, "__vModel__": "productCode", "showPassword": false, "fixed": "none", "style": { "width": "100%" }, "disabled": false, "id": "productCode", "placeholder": "请输入", "prefixIcon": "", "addonBefore": "", "on": { "change": "({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}", "blur": "({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}" } }, { "clearable": true, "maxlength": null, "jnpfKey": "input", "suffixIcon": "", "fullName": "产品名称", "label": "产品名称", "sortable": false, "align": "left", "addonAfter": "", "__config__": { "formId": 109, "visibility": ["pc", "app"], "jnpfKey": "input", "noShow": false, "tipLabel": "", "dragDisabled": false, "className": [], "label": "产品名称", "trigger": "blur", "showLabel": true, "required": false, "tableName": "yys_day_logs", "renderKey": 1723103658647, "layout": "colFormItem", "tagIcon": "icon-ym icon-ym-generator-input", "unique": false, "tag": "JnpfInput", "regList": [], "span": 8 }, "readonly": false, "prop": "productName", "showWordLimit": false, "width": 0, "__vModel__": "productName", "showPassword": false, "fixed": "none", "style": { "width": "100%" }, "disabled": false, "id": "productName", "placeholder": "请输入", "prefixIcon": "", "addonBefore": "", "on": { "change": "({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}", "blur": "({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}" } }, { "clearable": true, "maxlength": null, "jnpfKey": "input", "suffixIcon": "", "fullName": "规格型号", "label": "规格型号", "sortable": false, "align": "left", "addonAfter": "", "__config__": { "formId": 110, "visibility": ["pc", "app"], "jnpfKey": "input", "noShow": false, "tipLabel": "", "dragDisabled": false, "className": [], "label": "规格型号", "trigger": "blur", "showLabel": true, "required": false, "tableName": "yys_day_logs", "renderKey": 1723103670388, "layout": "colFormItem", "tagIcon": "icon-ym icon-ym-generator-input", "unique": false, "tag": "JnpfInput", "regList": [], "span": 8 }, "readonly": false, "prop": "models", "showWordLimit": false, "width": 0, "__vModel__": "models", "showPassword": false, "fixed": "none", "style": { "width": "100%" }, "disabled": false, "id": "models", "placeholder": "请输入", "prefixIcon": "", "addonBefore": "", "on": { "change": "({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}", "blur": "({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}" } }, { "clearable": true, "maxlength": null, "jnpfKey": "input", "suffixIcon": "", "fullName": "计量单位", "label": "计量单位", "sortable": false, "align": "left", "addonAfter": "", "__config__": { "formId": 111, "visibility": ["pc", "app"], "jnpfKey": "input", "noShow": false, "tipLabel": "", "dragDisabled": false, "className": [], "label": "计量单位", "trigger": "blur", "showLabel": true, "required": false, "tableName": "yys_day_logs", "renderKey": 1723103677314, "layout": "colFormItem", "tagIcon": "icon-ym icon-ym-generator-input", "unique": false, "tag": "JnpfInput", "regList": [], "span": 8 }, "readonly": false, "prop": "measurementUnit", "showWordLimit": false, "width": 0, "__vModel__": "measurementUnit", "showPassword": false, "fixed": "none", "style": { "width": "100%" }, "disabled": false, "id": "measurementUnit", "placeholder": "请输入", "prefixIcon": "", "addonBefore": "", "on": { "change": "({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}", "blur": "({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}" } }, { "clearable": true, "jnpfKey": "userSelect", "ableIds": [], "multiple": false, "fullName": "报工成员", "label": "报工成员", "sortable": false, "align": "left", "relationField": "", "__config__": { "formId": 112, "visibility": ["pc", "app"], "jnpfKey": "userSelect", "defaultValue": null, "noShow": false, "tipLabel": "", "dragDisabled": false, "className": [], "label": "报工成员", "trigger": "change", "showLabel": true, "required": false, "relationField": "", "tableName": "yys_day_logs", "renderKey": 1723103685227, "layout": "colFormItem", "tagIcon": "icon-ym icon-ym-generator-user", "defaultCurrent": false, "tag": "JnpfUserSelect", "regList": [], "span": 8 }, "prop": "reportMember", "width": 0, "__vModel__": "reportMember", "fixed": "none", "style": { "width": "100%" }, "selectType": "all", "disabled": false, "id": "reportMember", "placeholder": "请选择", "on": { "change": "({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}" } }, { "clearable": true, "maxlength": null, "jnpfKey": "input", "suffixIcon": "", "fullName": "报工数量", "label": "报工数量", "sortable": false, "align": "left", "addonAfter": "", "__config__": { "formId": 113, "visibility": ["pc", "app"], "jnpfKey": "input", "noShow": false, "tipLabel": "", "dragDisabled": false, "className": [], "label": "报工数量", "trigger": "blur", "showLabel": true, "required": false, "tableName": "yys_day_logs", "renderKey": 1723103701974, "layout": "colFormItem", "tagIcon": "icon-ym icon-ym-generator-input", "unique": false, "tag": "JnpfInput", "regList": [], "span": 8 }, "readonly": false, "prop": "qualifiedNum", "showWordLimit": false, "width": 0, "__vModel__": "qualifiedNum", "showPassword": false, "fixed": "none", "style": { "width": "100%" }, "disabled": false, "id": "qualifiedNum", "placeholder": "请输入", "prefixIcon": "", "addonBefore": "", "on": { "change": "({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}", "blur": "({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}" } }, { "step-strictly": false, "controls": false, "jnpfKey": "inputNumber", "precision": 1, "fullName": "补偿工时", "label": "补偿工时", "sortable": false, "align": "left", "thousands": false, "isAmountChinese": false, "addonAfter": null, "__config__": { "formId": 114, "visibility": ["pc", "app"], "jnpfKey": "inputNumber", "noShow": false, "tipLabel": "", "dragDisabled": false, "className": [], "label": "补偿工时", "trigger": ["blur", "change"], "showLabel": true, "required": false, "tableName": "yys_day_logs", "renderKey": 1723103720627, "layout": "colFormItem", "tagIcon": "icon-ym icon-ym-generator-number", "tag": "JnpfInputNumber", "regList": [], "span": 8 }, "prop": "compensatoryHour", "width": 0, "__vModel__": "compensatoryHour", "fixed": "none", "style": { "width": null }, "step": 1, "disabled": false, "id": "compensatoryHour", "placeholder": "数字文本", "controlsPosition": "", "addonBefore": null, "on": { "change": "({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}", "blur": "({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}" } }] +export default columnList diff --git a/jnpf-java-boot/jnpf-web/src/views/yys/yysmonthcount/form.vue b/jnpf-java-boot/jnpf-web/src/views/yys/yysmonthcount/form.vue new file mode 100644 index 0000000..8e4b534 --- /dev/null +++ b/jnpf-java-boot/jnpf-web/src/views/yys/yysmonthcount/form.vue @@ -0,0 +1,525 @@ + + + + + + + diff --git a/jnpf-java-boot/jnpf-web/src/views/yys/yysmonthcount/index.vue b/jnpf-java-boot/jnpf-web/src/views/yys/yysmonthcount/index.vue new file mode 100644 index 0000000..d845a2d --- /dev/null +++ b/jnpf-java-boot/jnpf-web/src/views/yys/yysmonthcount/index.vue @@ -0,0 +1,467 @@ + + + diff --git a/jnpf-java-boot/jnpf-web/src/views/yys/yysmonthcount/superQueryJson.js b/jnpf-java-boot/jnpf-web/src/views/yys/yysmonthcount/superQueryJson.js new file mode 100644 index 0000000..b017aef --- /dev/null +++ b/jnpf-java-boot/jnpf-web/src/views/yys/yysmonthcount/superQueryJson.js @@ -0,0 +1,2 @@ +const superQueryJson = [{"clearable":true,"format":"yyyy-MM-dd","fullName":"生产日期","type":"date","__config__":{"endRelationField":"","defaultValue":null,"dragDisabled":false,"className":[],"showLabel":true,"required":false,"tableName":"yys_day_logs","renderKey":1723103548110,"tagIcon":"icon-ym icon-ym-generator-date","startRelationField":"","defaultCurrent":false,"tag":"JnpfDatePicker","formId":101,"visibility":["pc","app"],"jnpfKey":"datePicker","noShow":false,"endTimeTarget":1,"tipLabel":"","startTimeType":1,"endTimeRule":false,"label":"生产日期","startTimeRule":false,"startTimeValue":"","trigger":"change","endTimeValue":"","endTimeType":1,"layout":"colFormItem","startTimeTarget":1,"regList":[],"span":8},"readonly":false,"__vModel__":"manufactureTime","style":{"width":"100%"},"disabled":false,"startTime":null,"id":"manufactureTime","placeholder":"请选择","endTime":null,"on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"maxlength":null,"suffixIcon":"","fullName":"设备编码","addonAfter":"","__config__":{"formId":102,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"设备编码","trigger":"blur","showLabel":true,"required":false,"tableName":"yys_day_logs","renderKey":1723103580681,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":8},"readonly":false,"showWordLimit":false,"__vModel__":"deviceCode","showPassword":false,"style":{"width":"100%"},"disabled":false,"id":"deviceCode","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"maxlength":null,"suffixIcon":"","fullName":"设备名称","addonAfter":"","__config__":{"formId":103,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"设备名称","trigger":"blur","showLabel":true,"required":false,"tableName":"yys_day_logs","renderKey":1723103588738,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":8},"readonly":false,"showWordLimit":false,"__vModel__":"deviceName","showPassword":false,"style":{"width":"100%"},"disabled":false,"id":"deviceName","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"step-strictly":false,"controls":true,"fullName":"顺序号","thousands":false,"isAmountChinese":false,"addonAfter":"","__config__":{"formId":104,"visibility":["pc","app"],"jnpfKey":"inputNumber","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"顺序号","trigger":["blur","change"],"showLabel":true,"required":false,"tableName":"yys_day_logs","renderKey":1723103595358,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-number","tag":"JnpfInputNumber","regList":[],"span":8},"__vModel__":"sort","style":{"width":null},"step":1,"disabled":false,"id":"sort","placeholder":"数字文本","controlsPosition":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"filterable":false,"clearable":true,"multiple":false,"fullName":"班次","props":{"label":"fullName","value":"id"},"__config__":{"formId":105,"visibility":["pc","app"],"jnpfKey":"select","defaultValue":"","noShow":false,"dataType":"static","dictionaryType":"","tipLabel":"","dragDisabled":false,"className":[],"label":"班次","trigger":"change","propsUrl":"","templateJson":[],"showLabel":true,"required":false,"tableName":"yys_day_logs","renderKey":1723103609393,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-select","propsName":"","tag":"JnpfSelect","regList":[],"span":8},"options":[{"fullName":"旺季白班","id":"1"},{"fullName":"旺季夜班","id":"2"}],"__vModel__":"post","style":{"width":"100%"},"disabled":false,"interfaceHasPage":false,"id":"post","placeholder":"请选择","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"format":"HH:mm","fullName":"开始时间","__config__":{"endRelationField":"","defaultValue":null,"dragDisabled":false,"className":[],"showLabel":true,"required":false,"tableName":"yys_day_logs","renderKey":1723103631841,"tagIcon":"icon-ym icon-ym-generator-time","startRelationField":"","defaultCurrent":false,"tag":"JnpfTimePicker","formId":106,"visibility":["pc","app"],"jnpfKey":"timePicker","noShow":false,"endTimeTarget":1,"tipLabel":"","startTimeType":1,"endTimeRule":false,"label":"开始时间","startTimeRule":false,"startTimeValue":"","trigger":"change","endTimeValue":"","endTimeType":1,"layout":"colFormItem","startTimeTarget":1,"regList":[],"span":8},"readonly":false,"__vModel__":"startTime","style":{"width":"100%"},"disabled":false,"startTime":null,"id":"startTime","placeholder":"请选择","endTime":null,"on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"format":"HH:mm","fullName":"结束时间","__config__":{"endRelationField":"","defaultValue":null,"dragDisabled":false,"className":[],"showLabel":true,"required":false,"tableName":"yys_day_logs","renderKey":1723103642811,"tagIcon":"icon-ym icon-ym-generator-time","startRelationField":"","defaultCurrent":false,"tag":"JnpfTimePicker","formId":107,"visibility":["pc","app"],"jnpfKey":"timePicker","noShow":false,"endTimeTarget":1,"tipLabel":"","startTimeType":1,"endTimeRule":false,"label":"结束时间","startTimeRule":false,"startTimeValue":"","trigger":"change","endTimeValue":"","endTimeType":1,"layout":"colFormItem","startTimeTarget":1,"regList":[],"span":8},"readonly":false,"__vModel__":"endTime","style":{"width":"100%"},"disabled":false,"startTime":null,"id":"endTime","placeholder":"请选择","endTime":null,"on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"maxlength":null,"suffixIcon":"","fullName":"产品编码","addonAfter":"","__config__":{"formId":108,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"产品编码","trigger":"blur","showLabel":true,"required":false,"tableName":"yys_day_logs","renderKey":1723103650569,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":8},"readonly":false,"showWordLimit":false,"__vModel__":"productCode","showPassword":false,"style":{"width":"100%"},"disabled":false,"id":"productCode","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"maxlength":null,"suffixIcon":"","fullName":"产品名称","addonAfter":"","__config__":{"formId":109,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"产品名称","trigger":"blur","showLabel":true,"required":false,"tableName":"yys_day_logs","renderKey":1723103658647,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":8},"readonly":false,"showWordLimit":false,"__vModel__":"productName","showPassword":false,"style":{"width":"100%"},"disabled":false,"id":"productName","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"maxlength":null,"suffixIcon":"","fullName":"规格型号","addonAfter":"","__config__":{"formId":110,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"规格型号","trigger":"blur","showLabel":true,"required":false,"tableName":"yys_day_logs","renderKey":1723103670388,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":8},"readonly":false,"showWordLimit":false,"__vModel__":"models","showPassword":false,"style":{"width":"100%"},"disabled":false,"id":"models","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"maxlength":null,"suffixIcon":"","fullName":"计量单位","addonAfter":"","__config__":{"formId":111,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"计量单位","trigger":"blur","showLabel":true,"required":false,"tableName":"yys_day_logs","renderKey":1723103677314,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":8},"readonly":false,"showWordLimit":false,"__vModel__":"measurementUnit","showPassword":false,"style":{"width":"100%"},"disabled":false,"id":"measurementUnit","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"ableIds":[],"multiple":false,"fullName":"报工成员","relationField":"","__config__":{"formId":112,"visibility":["pc","app"],"jnpfKey":"userSelect","defaultValue":null,"noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"报工成员","trigger":"change","showLabel":true,"required":false,"relationField":"","tableName":"yys_day_logs","renderKey":1723103685227,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-user","defaultCurrent":false,"tag":"JnpfUserSelect","regList":[],"span":8},"__vModel__":"reportMember","style":{"width":"100%"},"selectType":"all","disabled":false,"id":"reportMember","placeholder":"请选择","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"maxlength":null,"suffixIcon":"","fullName":"报工数量","addonAfter":"","__config__":{"formId":113,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"报工数量","trigger":"blur","showLabel":true,"required":false,"tableName":"yys_day_logs","renderKey":1723103701974,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":8},"readonly":false,"showWordLimit":false,"__vModel__":"qualifiedNum","showPassword":false,"style":{"width":"100%"},"disabled":false,"id":"qualifiedNum","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"step-strictly":false,"controls":false,"precision":1,"fullName":"补偿工时","thousands":false,"isAmountChinese":false,"addonAfter":null,"__config__":{"formId":114,"visibility":["pc","app"],"jnpfKey":"inputNumber","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"补偿工时","trigger":["blur","change"],"showLabel":true,"required":false,"tableName":"yys_day_logs","renderKey":1723103720627,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-number","tag":"JnpfInputNumber","regList":[],"span":8},"__vModel__":"compensatoryHour","style":{"width":null},"step":1,"disabled":false,"id":"compensatoryHour","placeholder":"数字文本","controlsPosition":"","addonBefore":null,"on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}}] +export default superQueryJson