geg-gas/geg-gas-pcitc
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
shunyi.kuang
2026-03-18 16:43:53 +08:00
parent 20435d8885
commit fda4f5d85c
7 changed files with 21 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/PngMeasureSalesPurController.java
View File

@ -127,7 +127,7 @@ public class PngMeasureSalesPurController {
if(temp != null && "JLZ".equals(temp.getStatusCode()) && temp.getCfmCuUserId() == null && temp.getDataSource() == null ) {
}else {
throw new BusinessException(BusinessCode.of(10500, "只有状态为计量中、且客户未确认且来源不为空的数据才能进行确认！"));
throw new BusinessException(BusinessCode.of(10500, "只有状态为计量中、且客户未确认且来源不为空的数据才能进行保存！"));
}
}
return R.ok(dataService.insertBatch(dtoList,new DataOperationListener<UpdateLngPngMeasureSalesPurDto>() {

2
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngMeasurePurMapper.java
View File

@ -29,7 +29,7 @@ public interface LngPngMeasurePurMapper extends BaseMapper<LngPngMeasurePur> {
" ORDER BY date_plan, status_code, cu_code, su_code ")
//LngPngMeasurePur> queryLngPngMeasurePurById(@Param("id")Long id);
List<LngPngMeasurePur> queryLngPngMeasurePurListByIds(List<Long> ids,@Param("ew") QueryWrapper<LngContract> queryWrapper);
List<LngPngMeasurePur> queryLngPngMeasurePurListByIds(List<Long> ids,@Param("ew") QueryWrapper<LngPngMeasurePur> queryWrapper);

2
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngMeasureSalesPurMapper.java
View File

@ -28,6 +28,6 @@ public interface LngPngMeasureSalesPurMapper extends BaseMapper<LngPngMeasureSal
" ${ew.customSqlSegment} " +
" ORDER BY date_plan, status_code, cu_code, su_code ")
List<LngPngMeasureSalesPur> queryLngPngMeasureSalesPurListByIds(List<Long> ids,
@Param("ew") QueryWrapper<LngContract> queryWrapper);
@Param("ew") QueryWrapper<LngPngMeasureSalesPur> queryWrapper);
}

9
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/PngMeasurePurServiceImpl.java
View File

@ -2,17 +2,12 @@ package com.xjrsoft.module.dayPlan.service.impl;
import java.util.List;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.pictc.enums.BusinessCode;
import com.xjrsoft.common.exception.BusinessException;
import com.xjrsoft.common.page.ConventPage;
import com.xjrsoft.module.contract.entity.LngContract;
import com.xjrsoft.module.contract.vo.LngContractPageVo;
import com.xjrsoft.module.dayPlan.entity.LngPngMeasurePur;
import com.xjrsoft.module.dayPlan.mapper.LngPngMeasurePurMapper;
import com.xjrsoft.module.dayPlan.service.IPngMeasurePurService;
@ -33,7 +28,7 @@ import lombok.AllArgsConstructor;
@AllArgsConstructor
public class PngMeasurePurServiceImpl extends ServiceImpl<LngPngMeasurePurMapper, LngPngMeasurePur> implements IPngMeasurePurService {
private final IFileClient fileClient;
private final IFileClient fileClient;
@Override
public LngPngMeasurePurVo getInfoById(Long id) {
@ -49,7 +44,7 @@ private final IFileClient fileClient;
@Override
public List<LngPngMeasurePur> getListByIds(List<Long> ids) {
QueryWrapper<LngContract> queryWrapper = new QueryWrapper<>();
QueryWrapper<LngPngMeasurePur> queryWrapper = new QueryWrapper<>();
queryWrapper.in("msp.id", ids);
return this.baseMapper.queryLngPngMeasurePurListByIds(ids, queryWrapper);

7
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/PngMeasureSalesPurServiceImpl.java
View File

@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.pictc.enums.BusinessCode;
import com.xjrsoft.common.exception.BusinessException;
import com.xjrsoft.module.contract.entity.LngContract;
import com.xjrsoft.module.dayPlan.entity.LngPngMeasureSalesPur;
import com.xjrsoft.module.dayPlan.mapper.LngPngMeasureSalesPurMapper;
import com.xjrsoft.module.dayPlan.service.IPngMeasureSalesPurService;
@ -39,15 +38,15 @@ public class PngMeasureSalesPurServiceImpl extends ServiceImpl<LngPngMeasureSale
throw new BusinessException(BusinessCode.of(10500, "找不到此数据！"));
}
LngPngMeasureSalesPurVo vo = BeanUtil.toBean(lngPngMeasureSalesPur, LngPngMeasureSalesPurVo.class);
List<LngFileUploadVo> fileList = fileClient.getTableFiles("lng_png_measure_sales_pur", "fileList", vo.getId());
vo.setFileList(fileList);
List<LngFileUploadVo> fileList = fileClient.getTableFiles("lng_png_measure_sales_pur", "lngFileUploadList", vo.getId());
vo.setLngFileUploadList(fileList);
return vo;
}
@Override
public List<LngPngMeasureSalesPur> getListByIds(List<Long> ids) {
QueryWrapper<LngContract> queryWrapper = new QueryWrapper<>();
QueryWrapper<LngPngMeasureSalesPur> queryWrapper = new QueryWrapper<>();
queryWrapper.in("msp.id", ids);
return this.baseMapper.queryLngPngMeasureSalesPurListByIds(ids, queryWrapper);
}