修改bug
This commit is contained in:
parent
c1cc6f8a62
commit
678b4d1ab1
|
|
@ -321,11 +321,11 @@ public class NuInvoicingPddMainServiceImpl extends ServiceImpl<NuInvoicingPddMai
|
||||||
map.put("message","盘点单状态不是盘点中,不能作废盘点单");
|
map.put("message","盘点单状态不是盘点中,不能作废盘点单");
|
||||||
return map;
|
return map;
|
||||||
}
|
}
|
||||||
List<NuInvoicingPddInfo> listCrk = pddInfoMapper.selectList(new QueryWrapper<NuInvoicingPddInfo>().eq("pdd_id",invoicingPddMainEntity.getId()));
|
// List<NuInvoicingPddInfo> listCrk = pddInfoMapper.selectList(new QueryWrapper<NuInvoicingPddInfo>().eq("pdd_id",invoicingPddMainEntity.getId()));
|
||||||
for(NuInvoicingPddInfo param : listCrk){
|
// for(NuInvoicingPddInfo param : listCrk){
|
||||||
param.setPdType("3");//作废
|
// param.setPdType("3");//作废
|
||||||
pddInfoMapper.updateById(param);
|
// pddInfoMapper.updateById(param);
|
||||||
}
|
// }
|
||||||
nuInvoicingPddMainInfo.setUpdateBy(user.getRealname());
|
nuInvoicingPddMainInfo.setUpdateBy(user.getRealname());
|
||||||
nuInvoicingPddMainInfo.setUpdateTime(new Date());
|
nuInvoicingPddMainInfo.setUpdateTime(new Date());
|
||||||
nuInvoicingPddMainInfo.setPddStatus("3");
|
nuInvoicingPddMainInfo.setPddStatus("3");
|
||||||
|
|
|
||||||
|
|
@ -24,6 +24,7 @@ import com.nu.modules.tplink.common.entity.ErrorCode;
|
||||||
import com.nu.modules.tplink.common.service.IErrorCodeService;
|
import com.nu.modules.tplink.common.service.IErrorCodeService;
|
||||||
import com.nu.modules.tplink.utils.TumsApi;
|
import com.nu.modules.tplink.utils.TumsApi;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.beans.factory.annotation.Value;
|
||||||
import org.springframework.context.annotation.Lazy;
|
import org.springframework.context.annotation.Lazy;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
|
|
@ -57,6 +58,9 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
|
||||||
@Lazy
|
@Lazy
|
||||||
@Autowired
|
@Autowired
|
||||||
private CameraInfoServiceImpl syncImpl;
|
private CameraInfoServiceImpl syncImpl;
|
||||||
|
|
||||||
|
@Value(value = "${jeecg.path.upload}")
|
||||||
|
private String uploadpath;
|
||||||
/**
|
/**
|
||||||
* 获取摄像头信息-分页
|
* 获取摄像头信息-分页
|
||||||
* @param page
|
* @param page
|
||||||
|
|
@ -3016,8 +3020,12 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
|
||||||
public String mkdirsFolder(String folderPath){
|
public String mkdirsFolder(String folderPath){
|
||||||
// 创建File对象
|
// 创建File对象
|
||||||
File folder = new File(folderPath);
|
File folder = new File(folderPath);
|
||||||
|
String ctxPath = uploadpath;
|
||||||
// 判断文件夹是否存在
|
String fileName = null;
|
||||||
|
File file = new File(ctxPath + File.separator + File.separator);
|
||||||
|
if (!file.exists()) {
|
||||||
|
file.mkdirs();// 创建文件根目录
|
||||||
|
} // 判断文件夹是否存在
|
||||||
if (!folder.exists()) {
|
if (!folder.exists()) {
|
||||||
System.out.println("文件夹不存在,开始创建...");
|
System.out.println("文件夹不存在,开始创建...");
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -38,7 +38,9 @@ public class CarePadServiceImpl extends ServiceImpl<CareOrdersMapper, CareOrders
|
||||||
public IPage<CareOrdersEntity> queryCareList(Integer pageNo, Integer pageSize, CareOrdersEntity careOrdersEntityDto, HttpServletRequest req) {
|
public IPage<CareOrdersEntity> queryCareList(Integer pageNo, Integer pageSize, CareOrdersEntity careOrdersEntityDto, HttpServletRequest req) {
|
||||||
CareOrders careOrders = new CareOrders();
|
CareOrders careOrders = new CareOrders();
|
||||||
BeanUtils.copyProperties(careOrdersEntityDto,careOrders);
|
BeanUtils.copyProperties(careOrdersEntityDto,careOrders);
|
||||||
QueryWrapper<CareOrders> queryWrapper = QueryGenerator.initQueryWrapper(careOrders, req.getParameterMap());
|
QueryWrapper<CareOrders> queryWrapper = new QueryWrapper<>();
|
||||||
|
queryWrapper.eq("nu_id",careOrdersEntityDto.getNuId());
|
||||||
|
queryWrapper.eq(StringUtils.isNotBlank(careOrdersEntityDto.getEmployeeId()),"employee_id",careOrdersEntityDto.getEmployeeId());
|
||||||
Page<CareOrders> page = new Page<>(pageNo, pageSize);
|
Page<CareOrders> page = new Page<>(pageNo, pageSize);
|
||||||
List<CareOrders> list = baseMapper.selectList(page,queryWrapper);
|
List<CareOrders> list = baseMapper.selectList(page,queryWrapper);
|
||||||
IPage<CareOrdersEntity> entityPage = new Page<>(page.getCurrent(), page.getSize(), page.getTotal());
|
IPage<CareOrdersEntity> entityPage = new Page<>(page.getCurrent(), page.getSize(), page.getTotal());
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue