doc:文档更新
This commit is contained in:
158
doc/中铜技术文档/Seata分布式事务集成参考.md
Normal file
158
doc/中铜技术文档/Seata分布式事务集成参考.md
Normal file
File diff suppressed because it is too large
Load Diff
212
doc/中铜技术文档/计量单位转换使用文档.md
Normal file
212
doc/中铜技术文档/计量单位转换使用文档.md
Normal file
File diff suppressed because it is too large
Load Diff
@@ -14,8 +14,10 @@ import com.zt.plat.framework.excel.core.util.ExcelUtils;
|
|||||||
import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigUserSignatureDO;
|
import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigUserSignatureDO;
|
||||||
import com.zt.plat.module.qms.business.config.service.ConfigUserSignatureService;
|
import com.zt.plat.module.qms.business.config.service.ConfigUserSignatureService;
|
||||||
import com.zt.plat.module.qms.business.reportdoc.controller.vo.*;
|
import com.zt.plat.module.qms.business.reportdoc.controller.vo.*;
|
||||||
|
import com.zt.plat.module.qms.business.reportdoc.dal.dataobject.ReportDocumentDataDO;
|
||||||
import com.zt.plat.module.qms.business.reportdoc.dal.dataobject.ReportDocumentMainDO;
|
import com.zt.plat.module.qms.business.reportdoc.dal.dataobject.ReportDocumentMainDO;
|
||||||
import com.zt.plat.module.qms.business.reportdoc.dal.dataobject.ReportDocumentTypeDO;
|
import com.zt.plat.module.qms.business.reportdoc.dal.dataobject.ReportDocumentTypeDO;
|
||||||
|
import com.zt.plat.module.qms.business.reportdoc.service.ReportDocumentDataService;
|
||||||
import com.zt.plat.module.qms.business.reportdoc.service.ReportDocumentMainService;
|
import com.zt.plat.module.qms.business.reportdoc.service.ReportDocumentMainService;
|
||||||
import com.zt.plat.module.qms.business.reportdoc.service.ReportDocumentTypeService;
|
import com.zt.plat.module.qms.business.reportdoc.service.ReportDocumentTypeService;
|
||||||
import com.zt.plat.module.qms.enums.QmsCommonConstant;
|
import com.zt.plat.module.qms.enums.QmsCommonConstant;
|
||||||
@@ -32,7 +34,9 @@ import org.springframework.web.bind.annotation.*;
|
|||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
import java.util.HashSet;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.Set;
|
||||||
|
|
||||||
import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
|
import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
|
||||||
import static com.zt.plat.framework.common.pojo.CommonResult.error;
|
import static com.zt.plat.framework.common.pojo.CommonResult.error;
|
||||||
@@ -54,6 +58,7 @@ public class ReportDocumentMainController extends AbstractFileUploadController i
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Resource private ReportDocumentMainService reportDocumentMainService;
|
@Resource private ReportDocumentMainService reportDocumentMainService;
|
||||||
|
@Resource private ReportDocumentDataService reportDocumentDataService;
|
||||||
@Resource private ReportDocumentTypeService reportDocumentTypeService;
|
@Resource private ReportDocumentTypeService reportDocumentTypeService;
|
||||||
@Resource private ConfigUserSignatureService configUserSignatureService;
|
@Resource private ConfigUserSignatureService configUserSignatureService;
|
||||||
|
|
||||||
@@ -149,7 +154,7 @@ public class ReportDocumentMainController extends AbstractFileUploadController i
|
|||||||
@Operation(summary = "获得检测报告业务")
|
@Operation(summary = "获得检测报告业务")
|
||||||
@Parameter(name = "id", description = "编号", required = true, example = "1024")
|
@Parameter(name = "id", description = "编号", required = true, example = "1024")
|
||||||
//@PreAuthorize("@ss.hasPermission('qms:report-document-main:query')")
|
//@PreAuthorize("@ss.hasPermission('qms:report-document-main:query')")
|
||||||
public CommonResult<ReportDocumentMainRespVO> getReportDocumentMain(@RequestParam("id") Long id) {
|
public CommonResult<ReportDocumentMainRespVO> getReportDocumentMain(@RequestParam("id") Long id, @RequestParam(value = "editFlag", required = false, defaultValue = "false") String editFlag) {
|
||||||
ReportDocumentMainDO reportDocumentMain = reportDocumentMainService.getReportDocumentMain(id);
|
ReportDocumentMainDO reportDocumentMain = reportDocumentMainService.getReportDocumentMain(id);
|
||||||
|
|
||||||
ReportDocumentMainRespVO vo = BeanUtils.toBean(reportDocumentMain, ReportDocumentMainRespVO.class);
|
ReportDocumentMainRespVO vo = BeanUtils.toBean(reportDocumentMain, ReportDocumentMainRespVO.class);
|
||||||
@@ -183,9 +188,58 @@ public class ReportDocumentMainController extends AbstractFileUploadController i
|
|||||||
vo.setDocumentSignature(docSigJson.toJSONString());
|
vo.setDocumentSignature(docSigJson.toJSONString());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//处理抬头数据
|
||||||
|
|
||||||
|
if("true".equals(editFlag)){
|
||||||
|
String formData = vo.getFormData();
|
||||||
|
JSONObject formDataJson = new JSONObject();
|
||||||
|
if(!ObjectUtils.isEmpty(formData))
|
||||||
|
formDataJson = JSONObject.parseObject(formData);
|
||||||
|
List<ReportDocumentDataDO> dataList = reportDocumentDataService.listByMainDataId(id).getData();
|
||||||
|
ReportDocumentTypeDO typeDO = reportDocumentTypeService.getReportDocumentType(reportDocumentMain.getReportDocumentTypeId());
|
||||||
|
String customConfig = typeDO.getCustomConfig();
|
||||||
|
String defaultConclusion = "";
|
||||||
|
if(!ObjectUtils.isEmpty(customConfig)){
|
||||||
|
JSONObject config = JSONObject.parseObject(customConfig);
|
||||||
|
defaultConclusion = config.getString("defaultConclusion");
|
||||||
|
}
|
||||||
|
formDataJson.put("conclusion", defaultConclusion);
|
||||||
|
if(!dataList.isEmpty())
|
||||||
|
formDataJson.put("sampleName", dataList.get(0).getSampleName());
|
||||||
|
//处理检测标准
|
||||||
|
String standard = assembleStandard(dataList);
|
||||||
|
formDataJson.put("standard", standard);
|
||||||
|
vo.setFormData(formDataJson.toJSONString());
|
||||||
|
// ReportDocumentMainSaveReqVO updateVO = new ReportDocumentMainSaveReqVO();
|
||||||
|
// updateVO.setId(reportDocumentMain.getId());
|
||||||
|
// updateVO.setFormData(formDataJson.toJSONString());
|
||||||
|
// reportDocumentMainService.updateReportDocumentMain(updateVO);
|
||||||
|
}
|
||||||
return success(vo);
|
return success(vo);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private String assembleStandard(List<ReportDocumentDataDO> dataList){
|
||||||
|
|
||||||
|
Set<String> standardSet = new HashSet<>();
|
||||||
|
for(ReportDocumentDataDO data : dataList){
|
||||||
|
String content = data.getDocumentContent();
|
||||||
|
if(ObjectUtils.isEmpty( content))
|
||||||
|
continue;
|
||||||
|
JSONObject json = JSONObject.parseObject(content);
|
||||||
|
for(String key : json.keySet()){
|
||||||
|
JSONObject obj = json.getJSONObject(key);
|
||||||
|
String methodName = obj.getString("methodName");
|
||||||
|
if(ObjectUtils.isEmpty(methodName))
|
||||||
|
continue;
|
||||||
|
standardSet.add(methodName);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if(standardSet.isEmpty())
|
||||||
|
return "";
|
||||||
|
return String.join(",", standardSet);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
@GetMapping("/page")
|
@GetMapping("/page")
|
||||||
@Operation(summary = "获得检测报告业务分页")
|
@Operation(summary = "获得检测报告业务分页")
|
||||||
//@PreAuthorize("@ss.hasPermission('qms:report-document-main:query')")
|
//@PreAuthorize("@ss.hasPermission('qms:report-document-main:query')")
|
||||||
|
|||||||
Reference in New Issue
Block a user