wangpeng/casic-metering

Fork: 0

wangpeng / casic-metering

History for casic-metering / casic-metering-api / src / main / java

2023-03-29	f13a863 Browse files » Merge remote-tracking branch 'origin/dev' into dev ... # Conflicts: # casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentServiceImpl.java xiezhuangz committed on 29 Mar 2023
	d2aa183 Browse files » 标准装置关联子表相关逻辑修改,测量设备bug修改 xiezhuangz committed on 29 Mar 2023
	b4156e9 Browse files » word模板填充支持doc文件修改 casic_zt committed on 29 Mar 2023
	6fac08a Browse files » Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/wangpeng/casic-metering into dev chaizhuang committed on 29 Mar 2023
	7eaed0d Browse files » 打印合成文件注册 chaizhuang committed on 29 Mar 2023
2023-03-28	02a96ca Browse files » 分包方项目申请模块优化 wangpeng committed on 28 Mar 2023
	91f4f07 Browse files » listeners包变更位置，挪移到service模块 chaizhuang committed on 28 Mar 2023
	cd56154 Browse files » 分包方项目申请模块 wangpeng committed on 28 Mar 2023
	dd5962f Browse files » 1、设备收发列表新增不是自检标志 ... 2、设备交接单列表 chaizhuang committed on 28 Mar 2023
2023-03-27	07ca797 Browse files » 合同管理、业务结算、分包管理、现场检测代码生成，分包方资格审批、现场检测审批列表功能 wangpeng committed on 27 Mar 2023
2023-03-21	27386e0 Browse files » 读写器功能 wangpeng committed on 21 Mar 2023
2023-03-18	4de33f3 Browse files » 读写器接入 wangpeng committed on 18 Mar 2023
2023-03-16	9bbc9a7 Browse files » 证书报告审批通过，完成证书打印流程设计，定制化证书参数待开发 chaizhuang committed on 16 Mar 2023
2023-03-14	747322f Browse files » 由于证书打印从证书报告拆分出新的表格，现对以下接口进行了变更 ... 1、证书打印列表 2、证书打印相关审批 3、证书打印详情页面 4、证书报告审批通过，生成证书打印 chaizhuang committed on 14 Mar 2023
2023-03-13	bc231c2 Browse files » Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/wangpeng/casic-metering into dev chaizhuang committed on 13 Mar 2023
	70c5c2b Browse files » 1、实验室状态bug ... 2、委托书新增样品，缺少委托方编号 3、证书打印证书工具通用性修改 chaizhuang committed on 13 Mar 2023
	fa8b07d Browse files » 任务分发-部门负责人分配功能 wangpeng committed on 13 Mar 2023
	7bdf86f Browse files » Merge remote-tracking branch 'origin/dev' into dev xiezhuangz committed on 13 Mar 2023
	a199d78 Browse files » 通过名字/编号查询设备与样品,测试bug修改 xiezhuangz committed on 13 Mar 2023
2023-03-10	dd140a0 Browse files » Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/wangpeng/casic-metering into dev chaizhuang committed on 10 Mar 2023
	204470b Browse files » 1、设备收发新增状态完成状态后置实验室处理 ... 2、新增编号前缀查询功能 3、新增设备收发消息催办 4、其他bug修复 chaizhuang committed on 10 Mar 2023
	d1aaf9f Browse files » 联调 wangpeng committed on 10 Mar 2023
	f352220 Browse files » 证书接口联调问题修改提交 casic_zt committed on 10 Mar 2023
	d9fde1e Browse files » Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/wangpeng/casic-metering into dev ... Conflicts: casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessCertificateReportService.java casic_zt committed on 10 Mar 2023
	ae560ef Browse files » 证书接口提交 casic_zt committed on 10 Mar 2023
	33adc7a Browse files » 测试bug修改 xiezhuangz committed on 10 Mar 2023
	d7fefc4 Browse files » 测试bug修改 xiezhuangz committed on 10 Mar 2023
	f177e70 Browse files » 1、根据客户id、样品id查询证书列表修改未知 ... 2、变更 chaizhuang committed on 10 Mar 2023
	0690d4a Browse files » Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/wangpeng/casic-metering into dev chaizhuang committed on 10 Mar 2023
	2f1b1a7 Browse files » 修改常量类引用，样品列表检定记录列表 chaizhuang committed on 10 Mar 2023