diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/YysDayPackageService.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/YysDayPackageService.java index 4c2998c..181a659 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/YysDayPackageService.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/YysDayPackageService.java @@ -39,10 +39,10 @@ public interface YysDayPackageService extends IService { /** * 报工确认列表-app * - * @param groupName + * @param yysGroupEntity * @param request * @param requisitonMap * @return */ - List queryList(String groupName, ConfirmRequest request, Map> requisitonMap); + List queryList(YysGroupEntity yysGroupEntity, ConfirmRequest request, Map> requisitonMap); } diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysDayPackageServiceImpl.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysDayPackageServiceImpl.java index 255584d..7804983 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysDayPackageServiceImpl.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysDayPackageServiceImpl.java @@ -39,13 +39,17 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; + import java.text.SimpleDateFormat; + import jnpf.util.*; + import java.util.*; + import jnpf.base.UserInfo; import jnpf.permission.entity.UserEntity; + /** - * * yysDayPackage * 版本： V3.5 * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） @@ -53,7 +57,7 @@ import jnpf.permission.entity.UserEntity; * 日期： 2024-08-19 */ @Service -public class YysDayPackageServiceImpl extends ServiceImpl implements YysDayPackageService{ +public class YysDayPackageServiceImpl extends ServiceImpl implements YysDayPackageService { @Autowired private GeneraterSwapUtil generaterSwapUtil; @@ -67,169 +71,172 @@ public class YysDayPackageServiceImpl extends ServiceImpl getList(YysDayPackagePagination yysDayPackagePagination){ - return getTypeList(yysDayPackagePagination,yysDayPackagePagination.getDataType()); + public List getList(YysDayPackagePagination yysDayPackagePagination) { + return getTypeList(yysDayPackagePagination, yysDayPackagePagination.getDataType()); } - /** 列表查询 */ + + /** + * 列表查询 + */ @Override - public List getTypeList(YysDayPackagePagination yysDayPackagePagination,String dataType){ - String userId=userProvider.get().getUserId(); - List AllIdList =new ArrayList(); - List> intersectionList =new ArrayList<>(); + public List getTypeList(YysDayPackagePagination yysDayPackagePagination, String dataType) { + String userId = userProvider.get().getUserId(); + List AllIdList = new ArrayList(); + List> intersectionList = new ArrayList<>(); boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); String columnData = !isPc ? YysDayPackageConstant.getAppColumnData() : YysDayPackageConstant.getColumnData(); ColumnDataModel columnDataModel = JsonUtil.getJsonToBean(columnData, ColumnDataModel.class); String ruleJson = !isPc ? JsonUtil.getObjectToString(columnDataModel.getRuleListApp()) : JsonUtil.getObjectToString(columnDataModel.getRuleList()); - int total=0; - int yysDayPackageNum =0; - QueryWrapper yysDayPackageQueryWrapper=new QueryWrapper<>(); + int total = 0; + int yysDayPackageNum = 0; + QueryWrapper yysDayPackageQueryWrapper = new QueryWrapper<>(); List allSuperIDlist = new ArrayList<>(); - String superOp =""; - if (ObjectUtil.isNotEmpty(yysDayPackagePagination.getSuperQueryJson())){ + String superOp = ""; + if (ObjectUtil.isNotEmpty(yysDayPackagePagination.getSuperQueryJson())) { List allSuperList = new ArrayList<>(); - List> intersectionSuperList = new ArrayList<>(); + List> intersectionSuperList = new ArrayList<>(); String queryJson = yysDayPackagePagination.getSuperQueryJson(); SuperJsonModel superJsonModel = JsonUtil.getJsonToBean(queryJson, SuperJsonModel.class); int superNum = 0; QueryWrapper yysDayPackageSuperWrapper = new QueryWrapper<>(); - yysDayPackageSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(yysDayPackageSuperWrapper,YysDayPackageEntity.class,queryJson,"0")); + yysDayPackageSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(yysDayPackageSuperWrapper, YysDayPackageEntity.class, queryJson, "0")); int yysDayPackageNum1 = yysDayPackageSuperWrapper.getExpression().getNormal().size(); - if (yysDayPackageNum1>0){ - List yysDayPackageList =this.list(yysDayPackageSuperWrapper).stream().map(YysDayPackageEntity::getId).collect(Collectors.toList()); + if (yysDayPackageNum1 > 0) { + List yysDayPackageList = this.list(yysDayPackageSuperWrapper).stream().map(YysDayPackageEntity::getId).collect(Collectors.toList()); allSuperList.addAll(yysDayPackageList); intersectionSuperList.add(yysDayPackageList); superNum++; } superOp = superNum > 0 ? superJsonModel.getMatchLogic() : ""; //and or - if(superOp.equalsIgnoreCase("and")){ + if (superOp.equalsIgnoreCase("and")) { allSuperIDlist = generaterSwapUtil.getIntersection(intersectionSuperList); - }else{ + } else { allSuperIDlist = allSuperList; } } List allRuleIDlist = new ArrayList<>(); - String ruleOp =""; - if (ObjectUtil.isNotEmpty(ruleJson)){ + String ruleOp = ""; + if (ObjectUtil.isNotEmpty(ruleJson)) { List allRuleList = new ArrayList<>(); - List> intersectionRuleList = new ArrayList<>(); + List> intersectionRuleList = new ArrayList<>(); SuperJsonModel ruleJsonModel = JsonUtil.getJsonToBean(ruleJson, SuperJsonModel.class); int ruleNum = 0; QueryWrapper yysDayPackageSuperWrapper = new QueryWrapper<>(); - yysDayPackageSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(yysDayPackageSuperWrapper,YysDayPackageEntity.class,ruleJson,"0")); + yysDayPackageSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(yysDayPackageSuperWrapper, YysDayPackageEntity.class, ruleJson, "0")); int yysDayPackageNum1 = yysDayPackageSuperWrapper.getExpression().getNormal().size(); - if (yysDayPackageNum1>0){ - List yysDayPackageList =this.list(yysDayPackageSuperWrapper).stream().map(YysDayPackageEntity::getId).collect(Collectors.toList()); + if (yysDayPackageNum1 > 0) { + List yysDayPackageList = this.list(yysDayPackageSuperWrapper).stream().map(YysDayPackageEntity::getId).collect(Collectors.toList()); allRuleList.addAll(yysDayPackageList); intersectionRuleList.add(yysDayPackageList); ruleNum++; } ruleOp = ruleNum > 0 ? ruleJsonModel.getMatchLogic() : ""; //and or - if(ruleOp.equalsIgnoreCase("and")){ + if (ruleOp.equalsIgnoreCase("and")) { allRuleIDlist = generaterSwapUtil.getIntersection(intersectionRuleList); - }else{ + } else { allRuleIDlist = allRuleList; } } - boolean pcPermission = false; - boolean appPermission = false; - if(isPc && pcPermission){ - if (!userProvider.get().getIsAdministrator()){ - Object yysDayPackageObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysDayPackageQueryWrapper,YysDayPackageEntity.class,yysDayPackagePagination.getMenuId(),"0")); - if (ObjectUtil.isEmpty(yysDayPackageObj)){ - return new ArrayList<>(); - } else { - yysDayPackageQueryWrapper = (QueryWrapper)yysDayPackageObj; - if( yysDayPackageQueryWrapper.getExpression().getNormal().size()>0){ - yysDayPackageNum++; - } - } - } - } - if(!isPc && appPermission){ - if (!userProvider.get().getIsAdministrator()){ - Object yysDayPackageObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysDayPackageQueryWrapper,YysDayPackageEntity.class,yysDayPackagePagination.getMenuId(),"0")); - if (ObjectUtil.isEmpty(yysDayPackageObj)){ - return new ArrayList<>(); - } else { - yysDayPackageQueryWrapper = (QueryWrapper)yysDayPackageObj; - if( yysDayPackageQueryWrapper.getExpression().getNormal().size()>0){ - yysDayPackageNum++; - } + boolean pcPermission = false; + boolean appPermission = false; + if (isPc && pcPermission) { + if (!userProvider.get().getIsAdministrator()) { + Object yysDayPackageObj = generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysDayPackageQueryWrapper, YysDayPackageEntity.class, yysDayPackagePagination.getMenuId(), "0")); + if (ObjectUtil.isEmpty(yysDayPackageObj)) { + return new ArrayList<>(); + } else { + yysDayPackageQueryWrapper = (QueryWrapper) yysDayPackageObj; + if (yysDayPackageQueryWrapper.getExpression().getNormal().size() > 0) { + yysDayPackageNum++; + } + } + } } + if (!isPc && appPermission) { + if (!userProvider.get().getIsAdministrator()) { + Object yysDayPackageObj = generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysDayPackageQueryWrapper, YysDayPackageEntity.class, yysDayPackagePagination.getMenuId(), "0")); + if (ObjectUtil.isEmpty(yysDayPackageObj)) { + return new ArrayList<>(); + } else { + yysDayPackageQueryWrapper = (QueryWrapper) yysDayPackageObj; + if (yysDayPackageQueryWrapper.getExpression().getNormal().size() > 0) { + yysDayPackageNum++; + } + } - } - } - if(isPc){ - if(ObjectUtil.isNotEmpty(yysDayPackagePagination.getManufactureTime())){ - yysDayPackageNum++; + } + } + if (isPc) { + if (ObjectUtil.isNotEmpty(yysDayPackagePagination.getManufactureTime())) { + yysDayPackageNum++; - List ManufactureTimeList = JsonUtil.getJsonToList(yysDayPackagePagination.getManufactureTime(),String.class); - Long fir = Long.valueOf(String.valueOf(ManufactureTimeList.get(0))); - Long sec = Long.valueOf(String.valueOf(ManufactureTimeList.get(1))); + List ManufactureTimeList = JsonUtil.getJsonToList(yysDayPackagePagination.getManufactureTime(), String.class); + Long fir = Long.valueOf(String.valueOf(ManufactureTimeList.get(0))); + Long sec = Long.valueOf(String.valueOf(ManufactureTimeList.get(1))); - yysDayPackageQueryWrapper.lambda().ge(YysDayPackageEntity::getManufactureTime, new Date(fir)) - .le(YysDayPackageEntity::getManufactureTime, DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59")); + yysDayPackageQueryWrapper.lambda().ge(YysDayPackageEntity::getManufactureTime, new Date(fir)) + .le(YysDayPackageEntity::getManufactureTime, DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59")); } - if(ObjectUtil.isNotEmpty(yysDayPackagePagination.getProductCode())){ - yysDayPackageNum++; + if (ObjectUtil.isNotEmpty(yysDayPackagePagination.getProductCode())) { + yysDayPackageNum++; String value = yysDayPackagePagination.getProductCode() instanceof List ? - JsonUtil.getObjectToString(yysDayPackagePagination.getProductCode()) : - String.valueOf(yysDayPackagePagination.getProductCode()); - yysDayPackageQueryWrapper.lambda().like(YysDayPackageEntity::getProductCode,value); + JsonUtil.getObjectToString(yysDayPackagePagination.getProductCode()) : + String.valueOf(yysDayPackagePagination.getProductCode()); + yysDayPackageQueryWrapper.lambda().like(YysDayPackageEntity::getProductCode, value); } - if(ObjectUtil.isNotEmpty(yysDayPackagePagination.getProductName())){ - yysDayPackageNum++; + if (ObjectUtil.isNotEmpty(yysDayPackagePagination.getProductName())) { + yysDayPackageNum++; String value = yysDayPackagePagination.getProductName() instanceof List ? - JsonUtil.getObjectToString(yysDayPackagePagination.getProductName()) : - String.valueOf(yysDayPackagePagination.getProductName()); - yysDayPackageQueryWrapper.lambda().like(YysDayPackageEntity::getProductName,value); + JsonUtil.getObjectToString(yysDayPackagePagination.getProductName()) : + String.valueOf(yysDayPackagePagination.getProductName()); + yysDayPackageQueryWrapper.lambda().like(YysDayPackageEntity::getProductName, value); } - if(ObjectUtil.isNotEmpty(yysDayPackagePagination.getDeviceName())){ - yysDayPackageNum++; + if (ObjectUtil.isNotEmpty(yysDayPackagePagination.getDeviceName())) { + yysDayPackageNum++; String value = yysDayPackagePagination.getDeviceName() instanceof List ? - JsonUtil.getObjectToString(yysDayPackagePagination.getDeviceName()) : - String.valueOf(yysDayPackagePagination.getDeviceName()); - yysDayPackageQueryWrapper.lambda().like(YysDayPackageEntity::getDeviceName,value); + JsonUtil.getObjectToString(yysDayPackagePagination.getDeviceName()) : + String.valueOf(yysDayPackagePagination.getDeviceName()); + yysDayPackageQueryWrapper.lambda().like(YysDayPackageEntity::getDeviceName, value); } } List intersection = generaterSwapUtil.getIntersection(intersectionList); - if (total>0){ - if (intersection.size()==0){ + if (total > 0) { + if (intersection.size() == 0) { intersection.add("jnpfNullList"); } yysDayPackageQueryWrapper.lambda().in(YysDayPackageEntity::getId, intersection); } - //是否有高级查询 - if (StringUtil.isNotEmpty(superOp)){ - if (allSuperIDlist.size()==0){ + //是否有高级查询 + if (StringUtil.isNotEmpty(superOp)) { + if (allSuperIDlist.size() == 0) { allSuperIDlist.add("jnpfNullList"); } List finalAllSuperIDlist = allSuperIDlist; - yysDayPackageQueryWrapper.lambda().and(t->t.in(YysDayPackageEntity::getId, finalAllSuperIDlist)); + yysDayPackageQueryWrapper.lambda().and(t -> t.in(YysDayPackageEntity::getId, finalAllSuperIDlist)); } - //是否有数据过滤查询 - if (StringUtil.isNotEmpty(ruleOp)){ - if (allRuleIDlist.size()==0){ + //是否有数据过滤查询 + if (StringUtil.isNotEmpty(ruleOp)) { + if (allRuleIDlist.size() == 0) { allRuleIDlist.add("jnpfNullList"); } List finalAllRuleIDlist = allRuleIDlist; - yysDayPackageQueryWrapper.lambda().and(t->t.in(YysDayPackageEntity::getId, finalAllRuleIDlist)); + yysDayPackageQueryWrapper.lambda().and(t -> t.in(YysDayPackageEntity::getId, finalAllRuleIDlist)); } //假删除标志 yysDayPackageQueryWrapper.lambda().isNull(YysDayPackageEntity::getDeleteMark); @@ -252,100 +259,109 @@ public class YysDayPackageServiceImpl extends ServiceImpl0 && AllIdList.size()>0) || total==0){ - Page page=new Page<>(yysDayPackagePagination.getCurrentPage(), yysDayPackagePagination.getPageSize()); - IPage userIPage=this.page(page, yysDayPackageQueryWrapper); - return yysDayPackagePagination.setData(userIPage.getRecords(),userIPage.getTotal()); - }else{ + if ("0".equals(dataType)) { + if ((total > 0 && AllIdList.size() > 0) || total == 0) { + Page page = new Page<>(yysDayPackagePagination.getCurrentPage(), yysDayPackagePagination.getPageSize()); + IPage userIPage = this.page(page, yysDayPackageQueryWrapper); + return yysDayPackagePagination.setData(userIPage.getRecords(), userIPage.getTotal()); + } else { List list = new ArrayList(); return yysDayPackagePagination.setData(list, list.size()); } - }else{ + } else { return this.list(yysDayPackageQueryWrapper); } } + @Override - public YysDayPackageEntity getInfo(String id){ - QueryWrapper queryWrapper=new QueryWrapper<>(); - queryWrapper.lambda().eq(YysDayPackageEntity::getId,id); + public YysDayPackageEntity getInfo(String id) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(YysDayPackageEntity::getId, id); return this.getOne(queryWrapper); } + @Override - public void create(YysDayPackageEntity entity){ + public void create(YysDayPackageEntity entity) { this.save(entity); } + @Override - public boolean update(String id, YysDayPackageEntity entity){ + public boolean update(String id, YysDayPackageEntity entity) { return this.updateById(entity); } + @Override - public void delete(YysDayPackageEntity entity){ - if(entity!=null){ + public void delete(YysDayPackageEntity entity) { + if (entity != null) { this.removeById(entity.getId()); } } - /** 验证表单唯一字段，正则，非空 i-0新增-1修改*/ + + /** + * 验证表单唯一字段，正则，非空 i-0新增-1修改 + */ @Override - public String checkForm(YysDayPackageForm form,int i) { - boolean isUp =StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0"); - String id=""; + public String checkForm(YysDayPackageForm form, int i) { + boolean isUp = StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0"); + String id = ""; String countRecover = ""; - if (isUp){ + if (isUp) { id = form.getId(); } //主表字段验证 - if(StringUtil.isEmpty(form.getDeviceName())){ - return "设备名称不能为空"; - } - if(StringUtil.isNotEmpty(form.getProductName())){ - form.setProductName(form.getProductName().trim()); - QueryWrapper productNameWrapper=new QueryWrapper<>(); - productNameWrapper.lambda().eq(YysDayPackageEntity::getProductName,form.getProductName()); - //假删除标志 - productNameWrapper.lambda().isNull(YysDayPackageEntity::getDeleteMark); - if (isUp){ - productNameWrapper.lambda().ne(YysDayPackageEntity::getId, id); - } - if((int) this.count(productNameWrapper)>0){ - countRecover = "产品名称不能重复"; - } - } - if(StringUtil.isEmpty(form.getModels())){ - return "规格型号不能为空"; - } - if(StringUtil.isEmpty(form.getMeasurementUnit())){ - return "计量单位不能为空"; - } + if (StringUtil.isEmpty(form.getDeviceName())) { + return "设备名称不能为空"; + } + if (StringUtil.isNotEmpty(form.getProductName())) { + form.setProductName(form.getProductName().trim()); + QueryWrapper productNameWrapper = new QueryWrapper<>(); + productNameWrapper.lambda().eq(YysDayPackageEntity::getProductName, form.getProductName()); + //假删除标志 + productNameWrapper.lambda().isNull(YysDayPackageEntity::getDeleteMark); + if (isUp) { + productNameWrapper.lambda().ne(YysDayPackageEntity::getId, id); + } + if ((int) this.count(productNameWrapper) > 0) { + countRecover = "产品名称不能重复"; + } + } + if (StringUtil.isEmpty(form.getModels())) { + return "规格型号不能为空"; + } + if (StringUtil.isEmpty(form.getMeasurementUnit())) { + return "计量单位不能为空"; + } return countRecover; } + /** - * 新增修改数据(事务回滚) - * @param id - * @param yysDayPackageForm - * @return - */ + * 新增修改数据(事务回滚) + * + * @param id + * @param yysDayPackageForm + * @return + */ @Override @Transactional - public void saveOrUpdate(YysDayPackageForm yysDayPackageForm,String id, boolean isSave) throws Exception{ - UserInfo userInfo=userProvider.get(); + public void saveOrUpdate(YysDayPackageForm yysDayPackageForm, String id, boolean isSave) throws Exception { + UserInfo userInfo = userProvider.get(); UserEntity userEntity = generaterSwapUtil.getUser(userInfo.getUserId()); yysDayPackageForm = JsonUtil.getJsonToBean( - generaterSwapUtil.swapDatetime(YysDayPackageConstant.getFormData(),yysDayPackageForm),YysDayPackageForm.class); + generaterSwapUtil.swapDatetime(YysDayPackageConstant.getFormData(), yysDayPackageForm), YysDayPackageForm.class); YysDayPackageEntity entity = JsonUtil.getJsonToBean(yysDayPackageForm, YysDayPackageEntity.class); - if(isSave){ - String mainId = RandomUtil.uuId() ; + if (isSave) { + String mainId = RandomUtil.uuId(); entity.setId(mainId); entity.setVersion(0); - }else{ + } else { } this.saveOrUpdate(entity); } @Override - public List queryList(String groupName, ConfirmRequest request, Map> requisitonMap) { + public List queryList(YysGroupEntity yysGroupEntity, ConfirmRequest request, Map> requisitonMap) { //查询所有待确认的数据 LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(YysDayPackageEntity::getIsConfirm, request.getFlag()); @@ -387,7 +403,8 @@ public class YysDayPackageServiceImpl extends ServiceImpl collected = entry.getValue().stream().sorted(Comparator.comparing(YysDayPackageEntity::getSort)).collect(Collectors.toList()); for (YysDayPackageEntity packageEntity : collected) { ConfirmResponse confirmResponse = BeanUtil.copyProperties(packageEntity, ConfirmResponse.class); - confirmResponse.setGroupName(groupName); + confirmResponse.setGroupName(yysGroupEntity.getGroupName()); + confirmResponse.setGroupType(yysGroupEntity.getGroupType()); if (packMap.containsKey(packageEntity.getId())) { confirmResponse.setPackageReportList(packMap.get(packageEntity.getId())); } diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysDayWorkServiceImpl.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysDayWorkServiceImpl.java index 41a3b13..b0db4d4 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysDayWorkServiceImpl.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysDayWorkServiceImpl.java @@ -406,7 +406,7 @@ public class YysDayWorkServiceImpl extends ServiceImpl list = yysRequisitionReportService.list(); Map> requisitonMap = list.stream().collect(Collectors.groupingBy(YysRequisitionReportEntity::getWorkId)); if ("2".equals(yysGroupEntity.getGroupType())) { - return yysDayPackageService.queryList(yysGroupEntity.getGroupName(), request, requisitonMap); + return yysDayPackageService.queryList(yysGroupEntity, request, requisitonMap); } //查询所有待确认的数据 LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); @@ -455,6 +455,7 @@ public class YysDayWorkServiceImpl extends ServiceImpl