委托单报告数据查询

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

@@ -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;
 
@@ -59,6 +60,14 @@ public class SampleEntrustController {
     	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 = "修改委托登记")
     public CommonResult<?> update(@Valid @RequestBody SampleEntrustParam sampleEntrustParam) {

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

@@ -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;
@@ -72,6 +69,10 @@ public interface BusinessSampleEntrustDetailMapper extends BaseMapperX<BusinessS
                 .orderByDesc(BusinessSampleEntrustDetailDO::getId));
     }
     
+    default List<BusinessSampleEntrustDetailDO> selectByBusinessSampleEntrustRegistrationId(Long businessSampleEntrustRegistrationId) {
+    	return selectList(new LambdaQueryWrapperX<BusinessSampleEntrustDetailDO>().eq(BusinessSampleEntrustDetailDO::getBusinessSampleEntrustRegistrationId, businessSampleEntrustRegistrationId));
+    }
+
     /**
      * 物理批量删除删除
      * @param idList

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

@@ -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;
@@ -32,6 +35,17 @@ public interface BusinessSampleEntrustProjectMapper extends BaseMapperX<Business
                 .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));
+    }
+
     /**
      * 物理批量删除删除
      * @param idList

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

@@ -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;
@@ -19,7 +20,10 @@ public interface SampleEntrustService {
 
 	void delete(Long id);
 	
+	JSONObject reportDetail(Long id);
+
 	void deleteList(List<Long> ids);
 
 	void submit(@Valid BusinessSampleEntrustRegistrationSubmitReqVO req);
+
 }

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

@@ -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>()
+			List<BusinessSampleEntrustProjectExtendRespVO> businessSampleEntrustProjectExtendRespVOList = businessSampleEntrustProjectMapper.selectByBusinessSampleEntrustDetailId(businessSampleEntrustDetailDO.getId());
-					.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);
 			
 			businessSampleEntrustDetailExtendRespVO.setSampleEntrustDetailProjectList(businessSampleEntrustProjectExtendRespVOList);
 			
@@ -104,6 +96,39 @@ 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 {
 	    }
 	}
 
+	
+
 }

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

@@ -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 {