zgty/zt-qms
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: zgty:9ffc32d9647d159a2a7ca89ea46e26041358b1eb
Branches Tags
zgty:test zgty:lims_dev
...
compare: zgty:da9db180ca4efa85a847e6792bd2adad2ecaf5b8
Branches Tags
zgty:test zgty:lims_dev

2 Commits
9ffc32d964 ... da9db180ca

Author SHA1 Message Date
wxr
da9db180ca Merge branch 'test' of https://git.will-way.cn/zgty/zt-qms into test 2025-11-07 14:27:12 +08:00
wxr
182a1fb4a6 委托单报告数据查询 2025-11-07 14:02:38 +08:00
6 changed files with 74 additions and 19 deletions
Expand all files Collapse all files

9
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/SampleEntrustController.java
View File

@@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import com.alibaba.fastjson2.JSONObject;
import com.yomahub.liteflow.core.FlowExecutor;
import com.yomahub.liteflow.flow.LiteflowResponse;
@@ -58,6 +59,14 @@ public class SampleEntrustController {
BusinessSampleEntrustRegistrationExtendRespVO sampleEntrustRegistration = sampleEntrustService.detail(id);
return success(sampleEntrustRegistration);
}
@GetMapping("/reportDetail")
@Operation(summary = "委托单详情数据")
public CommonResult<?> reportDetail(@RequestParam("id") Long id) {
JSONObject jsonObject = sampleEntrustService.reportDetail(id);
return success(jsonObject);
}
@PostMapping("/update")
@Operation(summary = "修改委托登记")

7
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSampleEntrustDetailMapper.java
View File

@@ -6,9 +6,6 @@ import com.zt.plat.framework.common.pojo.PageResult;
import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
import com.zt.plat.framework.mybatis.core.query.MPJLambdaWrapperX;
import com.zt.plat.module.qms.business.bus.controller.vo.*;
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessSampleEntrustDetailExtendRespVO;
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessSampleEntrustDetailPageReqVO;
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessSampleEntrustDetailReqVO;
import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSampleEntrustDetailDO;
import com.zt.plat.module.qms.business.config.dal.dataobject.BaseSampleDO;
import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
@@ -71,6 +68,10 @@ public interface BusinessSampleEntrustDetailMapper extends BaseMapperX<BusinessS
.eqIfPresent(BusinessSampleEntrustDetailDO::getRemark, reqVO.getRemark())
.orderByDesc(BusinessSampleEntrustDetailDO::getId));
}
default List<BusinessSampleEntrustDetailDO> selectByBusinessSampleEntrustRegistrationId(Long businessSampleEntrustRegistrationId) {
return selectList(new LambdaQueryWrapperX<BusinessSampleEntrustDetailDO>().eq(BusinessSampleEntrustDetailDO::getBusinessSampleEntrustRegistrationId, businessSampleEntrustRegistrationId));
}
/**
* 物理批量删除删除

14
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSampleEntrustProjectMapper.java
View File

@@ -4,8 +4,11 @@ import java.util.*;
import com.zt.plat.framework.common.pojo.PageResult;
import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
import com.zt.plat.framework.mybatis.core.query.MPJLambdaWrapperX;
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessSampleEntrustProjectExtendRespVO;
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessSampleEntrustProjectPageReqVO;
import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSampleEntrustProjectDO;
import com.zt.plat.module.qms.business.dic.dal.dataobject.DictionaryProjectDO;
import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
import org.apache.ibatis.annotations.Mapper;
@@ -31,6 +34,17 @@ public interface BusinessSampleEntrustProjectMapper extends BaseMapperX<Business
.eqIfPresent(BusinessSampleEntrustProjectDO::getRemark, reqVO.getRemark())
.orderByDesc(BusinessSampleEntrustProjectDO::getId));
}
default List<BusinessSampleEntrustProjectExtendRespVO> selectByBusinessSampleEntrustDetailId(Long businessSampleEntrustDetailId) {
return selectJoinList(BusinessSampleEntrustProjectExtendRespVO.class, new MPJLambdaWrapperX<BusinessSampleEntrustProjectDO>()
.selectAll(BusinessSampleEntrustProjectDO.class)
.selectAs(DictionaryProjectDO::getCode, BusinessSampleEntrustProjectExtendRespVO::getProjectCode)
.selectAs(DictionaryProjectDO::getName, BusinessSampleEntrustProjectExtendRespVO::getProjectName)
.selectAs(DictionaryProjectDO::getSimpleName, BusinessSampleEntrustProjectExtendRespVO::getProjectSimpleName)
.selectAs(DictionaryProjectDO::getShowName, BusinessSampleEntrustProjectExtendRespVO::getProjectShowName)
.leftJoin(DictionaryProjectDO.class, DictionaryProjectDO::getId, BusinessSampleEntrustProjectDO::getDictionaryProjectId)
.eq(BusinessSampleEntrustProjectDO::getBusinessSampleEntrustDetailId, businessSampleEntrustDetailId));
}
/**
* 物理批量删除删除

4
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleEntrustService.java
View File

@@ -2,6 +2,7 @@ package com.zt.plat.module.qms.business.bus.service;
import java.util.List;
import com.alibaba.fastjson2.JSONObject;
import com.yomahub.liteflow.flow.LiteflowResponse;
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessSampleEntrustRegistrationExtendRespVO;
@@ -18,8 +19,11 @@ public interface SampleEntrustService {
BusinessSampleEntrustRegistrationExtendRespVO detail(Long id);
void delete(Long id);
JSONObject reportDetail(Long id);
void deleteList(List<Long> ids);
void submit(@Valid BusinessSampleEntrustRegistrationSubmitReqVO req);
}

53
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleEntrustServiceImpl.java
View File

@@ -7,6 +7,9 @@ import java.util.stream.Collectors;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
import com.yomahub.liteflow.core.FlowExecutor;
import com.yomahub.liteflow.flow.LiteflowResponse;
@@ -73,27 +76,16 @@ public class SampleEntrustServiceImpl implements SampleEntrustService {
@Override
public BusinessSampleEntrustRegistrationExtendRespVO detail(Long id) {
BusinessSampleEntrustRegistrationDO businessSampleEntrustRegistrationDO = businessSampleEntrustRegistrationMapper.selectById(id);
//BusinessSampleEntrustRegistrationExtendRespVO businessSampleEntrustRegistrationExtendRespVO = BeanUtils.toBean(businessSampleEntrustRegistrationDO, BusinessSampleEntrustRegistrationExtendRespVO.class);
BusinessSampleEntrustRegistrationExtendRespVO businessSampleEntrustRegistrationExtendRespVO = BeanUtil.copyProperties(businessSampleEntrustRegistrationDO, BusinessSampleEntrustRegistrationExtendRespVO.class);
List<BusinessSampleEntrustDetailExtendRespVO> sampleEntrustDetailExtendRespVOList = new ArrayList<>();
List<BusinessSampleEntrustDetailDO> sampleEntrustDetailList = businessSampleEntrustDetailMapper.selectList(new LambdaQueryWrapperX<BusinessSampleEntrustDetailDO>().eq(BusinessSampleEntrustDetailDO::getBusinessSampleEntrustRegistrationId, id));
List<BusinessSampleEntrustDetailDO> sampleEntrustDetailList = businessSampleEntrustDetailMapper.selectByBusinessSampleEntrustRegistrationId(id);
BusinessSampleEntrustDetailExtendRespVO businessSampleEntrustDetailExtendRespVO = null;
for (BusinessSampleEntrustDetailDO businessSampleEntrustDetailDO : sampleEntrustDetailList) {
businessSampleEntrustDetailExtendRespVO = BeanUtils.toBean(businessSampleEntrustDetailDO, BusinessSampleEntrustDetailExtendRespVO.class);
List<BusinessSampleEntrustProjectExtendRespVO> businessSampleEntrustProjectExtendRespVOList = businessSampleEntrustProjectMapper.selectJoinList(BusinessSampleEntrustProjectExtendRespVO.class, new MPJLambdaWrapperX<BusinessSampleEntrustProjectDO>()
.selectAll(BusinessSampleEntrustProjectDO.class)
.selectAs(DictionaryProjectDO::getCode, BusinessSampleEntrustProjectExtendRespVO::getProjectCode)
.selectAs(DictionaryProjectDO::getName, BusinessSampleEntrustProjectExtendRespVO::getProjectName)
.selectAs(DictionaryProjectDO::getSimpleName, BusinessSampleEntrustProjectExtendRespVO::getProjectSimpleName)
.selectAs(DictionaryProjectDO::getShowName, BusinessSampleEntrustProjectExtendRespVO::getProjectShowName)
.leftJoin(DictionaryProjectDO.class, DictionaryProjectDO::getId, BusinessSampleEntrustProjectDO::getDictionaryProjectId)
.eq(BusinessSampleEntrustProjectDO::getBusinessSampleEntrustDetailId, businessSampleEntrustDetailDO.getId()));
// List<BusinessSampleEntrustProjectDO> sampleEntrustProjectList = businessSampleEntrustProjectMapper.selectList(new LambdaQueryWrapperX<BusinessSampleEntrustProjectDO>().eq(BusinessSampleEntrustProjectDO::getBusinessSampleEntrustDetailId, businessSampleEntrustDetailDO.getId()));
// List<BusinessSampleEntrustProjectExtendRespVO> businessSampleEntrustProjectExtendRespVOList = BeanUtils.toBean(sampleEntrustProjectList, BusinessSampleEntrustProjectExtendRespVO.class);
List<BusinessSampleEntrustProjectExtendRespVO> businessSampleEntrustProjectExtendRespVOList = businessSampleEntrustProjectMapper.selectByBusinessSampleEntrustDetailId(businessSampleEntrustDetailDO.getId());
businessSampleEntrustDetailExtendRespVO.setSampleEntrustDetailProjectList(businessSampleEntrustProjectExtendRespVOList);
@@ -103,7 +95,40 @@ public class SampleEntrustServiceImpl implements SampleEntrustService {
return businessSampleEntrustRegistrationExtendRespVO;
}
@Override
public JSONObject reportDetail(Long id) {
JSONObject result = new JSONObject();
BusinessSampleEntrustRegistrationDO businessSampleEntrustRegistrationDO = businessSampleEntrustRegistrationMapper.selectById(id);
String externalInfomation = businessSampleEntrustRegistrationDO.getExternalInfomation();
JSONObject extInfJsonObject = JSON.parseObject(externalInfomation);
JSONObject sampleEntrustRegistration = (JSONObject) JSON.toJSON(businessSampleEntrustRegistrationDO);
extInfJsonObject.forEach((key, value) -> {
sampleEntrustRegistration.put(key, value);
});
JSONArray jsonArray = new JSONArray();
jsonArray.add(sampleEntrustRegistration);
List<BusinessSampleEntrustDetailExtendRespVO> sampleEntrustDetailExtendRespVOList = new ArrayList<>();
List<BusinessSampleEntrustDetailDO> sampleEntrustDetailList = businessSampleEntrustDetailMapper.selectByBusinessSampleEntrustRegistrationId(id);
BusinessSampleEntrustDetailExtendRespVO businessSampleEntrustDetailExtendRespVO = null;
for (BusinessSampleEntrustDetailDO businessSampleEntrustDetailDO : sampleEntrustDetailList) {
businessSampleEntrustDetailExtendRespVO = BeanUtils.toBean(businessSampleEntrustDetailDO, BusinessSampleEntrustDetailExtendRespVO.class);
List<BusinessSampleEntrustProjectExtendRespVO> businessSampleEntrustProjectExtendRespVOList = businessSampleEntrustProjectMapper.selectByBusinessSampleEntrustDetailId(businessSampleEntrustDetailDO.getId());
businessSampleEntrustDetailExtendRespVO.setSampleEntrustDetailProjectList(businessSampleEntrustProjectExtendRespVOList);
sampleEntrustDetailExtendRespVOList.add(businessSampleEntrustDetailExtendRespVO);
}
result.put("sampleEntrustRegistration", jsonArray);
result.put("sampleEntrustDetail", businessSampleEntrustDetailExtendRespVO);
return result;
}
@Override
@Transactional(rollbackFor = Exception.class)
public LiteflowResponse update(@Valid SampleEntrustParam sampleEntrustParam) {
@@ -221,4 +246,6 @@ public class SampleEntrustServiceImpl implements SampleEntrustService {
}
}
}

6
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigReportTemplateController.java
View File

@@ -239,7 +239,7 @@ public class ConfigReportTemplateController implements BusinessControllerMarker
}
String body = res.body();
CommonResult<?> dataR = JSON.parseObject(body, CommonResult.class);
if (dataR != null && dataR.getCode() == 200) {
if (dataR != null && dataR.getCode() == 0) {
if (ArrayUtil.isArray(dataR.getData()) || dataR.getData() instanceof Collection) {
reportData = JSON.toJSONString(dataR);
} else {
@@ -327,7 +327,7 @@ public class ConfigReportTemplateController implements BusinessControllerMarker
}
String body = res.body();
CommonResult<?> dataR = JSON.parseObject(body, CommonResult.class);
if (dataR != null && dataR.getCode() == 200) {
if (dataR != null && dataR.getCode() == 0) {
if (ArrayUtil.isArray(dataR.getData()) || dataR.getData() instanceof Collection) {
reportData = JSON.toJSONString(dataR);
} else {
@@ -435,7 +435,7 @@ public class ConfigReportTemplateController implements BusinessControllerMarker
}
String body = res.body();
CommonResult<?> dataR = JSON.parseObject(body, CommonResult.class);
if (dataR != null && dataR.getCode() == 200) {
if (dataR != null && dataR.getCode() == 0) {
if (ArrayUtil.isArray(dataR.getData()) || dataR.getData() instanceof Collection) {
reportData = JSON.toJSONString(dataR);
} else {