Skip to content

张雷 / skboot-zhongye

转到一个项目
切换导航栏
切换导航栏固定状态
978f1a06 由 张雷
选项

Merge remote-tracking branch 'origin/master' into master

2 个父辈 7f4766be b95f383b
内嵌 并排
正在显示 12 个修改的文件 包含 212 行增加 和 27 行删除
sk-module-biz/src/main/java/com/skua/modules/erp/controller/DistributContractController.java
...@@ -87,7 +87,7 @@ public class DistributContractController { ...@@ -87,7 +87,7 @@ public class DistributContractController {
87 queryWrapper.le("start_time", DateUtil.formatDate(new Date(),"yyyy-MM-dd HH:mm:ss")); 87 queryWrapper.le("start_time", DateUtil.formatDate(new Date(),"yyyy-MM-dd HH:mm:ss"));
88 88
89 //启用状态：=0 89 //启用状态：=0
90 if(StringUtils.isEmpty(distributContract.getUseFlag())){ 90 if(StringUtils.isNotEmpty(distributContract.getUseFlag())){
91 use_flag = distributContract.getUseFlag(); 91 use_flag = distributContract.getUseFlag();
92 } 92 }
93 queryWrapper.eq("use_flag",use_flag); 93 queryWrapper.eq("use_flag",use_flag);
......
sk-module-biz/src/main/java/com/skua/modules/erp/controller/ErpReportController.java 0 → 100644
1 package com.skua.modules.erp.controller;
2
3 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
4 import com.baomidou.mybatisplus.core.metadata.IPage;
5 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
6 import com.skua.core.api.vo.Result;
7 import com.skua.core.aspect.annotation.AutoLog;
8 import com.skua.core.context.SpringContextUtils;
9 import com.skua.core.query.QueryGenerator;
10 import com.skua.modules.erp.entity.ErpSettlement;
11 import com.skua.modules.erp.vo.AgentiaStatisticsVO;
12 import io.swagger.annotations.Api;
13 import io.swagger.annotations.ApiOperation;
14 import lombok.extern.slf4j.Slf4j;
15 import org.springframework.jdbc.core.BeanPropertyRowMapper;
16 import org.springframework.jdbc.core.JdbcTemplate;
17 import org.springframework.web.bind.annotation.GetMapping;
18 import org.springframework.web.bind.annotation.RequestMapping;
19 import org.springframework.web.bind.annotation.RequestParam;
20 import org.springframework.web.bind.annotation.RestController;
21
22 import javax.servlet.http.HttpServletRequest;
23 import java.util.List;
24
25 @Slf4j
26 @Api(tags="赋能中心")
27 @RestController("erpReportController")
28 @RequestMapping("/web/erp/report")
29 public class ErpReportController {
30
31 @AutoLog(value = "赋能中心-药剂统购分销")
32 @ApiOperation(value="赋能中心-药剂统购分销", notes="赋能中心-药剂统购分销")
33 @GetMapping(value = "/agentiaStatistics")
34 public Result<List<AgentiaStatisticsVO>> agentiaStatistics() {
35 Result<List<AgentiaStatisticsVO>> result = new Result<List<AgentiaStatisticsVO>>();
36
37 String sql ="select d.depart_name , mi.material_num ,sm.supp_name 'supplier_name' ,aaa.* from (";
38 sql +=" select pp.depart_id , ppi.sparepart_name ,ppi.purchase_num 'plan_num' ,ppi.sparepart_id from erp_purchase_plan_item ppi ,erp_purchase_plan pp where ppi.plan_id = pp.id and pp.apply_year = year(now()) )aaa";
39 sql +=" left join sys_depart d on d.id = aaa.depart_id ";
40 sql +=" left join erp_material_in mi on (aaa.depart_id = mi.depart_id and aaa.sparepart_id = mi.sparepart_id )";
41 sql +=" left join ajh_supplier_manage sm on sm.id = aaa.sparepart_id";
42 //主库数据源
43 JdbcTemplate masterDB = (JdbcTemplate) SpringContextUtils.getBean("master");
44
45 List<AgentiaStatisticsVO> dataList = masterDB.query(sql,new BeanPropertyRowMapper<AgentiaStatisticsVO>(AgentiaStatisticsVO.class));
46 result.setSuccess(true);
47 result.setResult(dataList);
48 return result;
49 }
50 }
sk-module-biz/src/main/java/com/skua/modules/erp/controller/ErpSettlementController.java
...@@ -21,6 +21,7 @@ import com.skua.modules.erp.service.IErpSettlementService; ...@@ -21,6 +21,7 @@ import com.skua.modules.erp.service.IErpSettlementService;
21 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 21 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
22 import com.baomidou.mybatisplus.core.metadata.IPage; 22 import com.baomidou.mybatisplus.core.metadata.IPage;
23 import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 23 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
24 import com.skua.modules.erp.vo.ErpSettlementFormVO;
24 import com.skua.modules.erp.vo.ErpSettlementVO; 25 import com.skua.modules.erp.vo.ErpSettlementVO;
25 import com.skua.modules.productionduty.utils.HolidaysUtils; 26 import com.skua.modules.productionduty.utils.HolidaysUtils;
26 import com.skua.modules.quartz.util.BaseUtil; 27 import com.skua.modules.quartz.util.BaseUtil;
...@@ -265,12 +266,12 @@ public class ErpSettlementController { ...@@ -265,12 +266,12 @@ public class ErpSettlementController {
265 return result; 266 return result;
266 } 267 }
267 268
268 @AutoLog(value = "药剂结算单详情-导出：送货单以及物资验收单") 269 @AutoLog(value = "药剂结算单详情-导出：(供应商)送货单以及物资验收单")
269 @ApiOperation(value="药剂结算单详情-导出：送货单以及物资验收单", notes="药剂结算单详情-导出：送货单以及物资验收单") 270 @ApiOperation(value="药剂结算单详情-导出：（供应商）送货单以及物资验收单", notes="药剂结算单详情-导出：送货单以及物资验收单")
270 @GetMapping(value = "/exportSupplierFormPDF") 271 @GetMapping(value = "/exportSupplierSupplierFormPDF")
271 public Result<ErpSettlementVO> exportSupplierFormPDF(@RequestParam(name="id",required=true) String id) { 272 public Result<ErpSettlementFormVO> exportSupplierSupplierFormPDF(@RequestParam(name="id",required=true) String id) {
272 Result<ErpSettlementVO> result = new Result<ErpSettlementVO>(); 273 Result<ErpSettlementFormVO> result = new Result<ErpSettlementFormVO>();
273 ErpSettlementVO erpSettlement = erpSettlementService.queryById(id); 274 ErpSettlementFormVO erpSettlement = erpSettlementService.querySupplierSettlementFormById(id);
274 if(erpSettlement==null) { 275 if(erpSettlement==null) {
275 result.error500("未找到对应实体"); 276 result.error500("未找到对应实体");
276 }else { 277 }else {
...@@ -279,6 +280,20 @@ public class ErpSettlementController { ...@@ -279,6 +280,20 @@ public class ErpSettlementController {
279 } 280 }
280 return result; 281 return result;
281 } 282 }
283 @AutoLog(value = "药剂结算单详情-导出：(供应商)送货单以及物资验收单")
284 @ApiOperation(value="药剂结算单详情-导出：（供应商）送货单以及物资验收单", notes="药剂结算单详情-导出：送货单以及物资验收单")
285 @GetMapping(value = "/exportWaterDepartSupplierFormPDF")
286 public Result<ErpSettlementFormVO> exportWaterDepartSupplierFormPDF(@RequestParam(name="id",required=true) String id) {
287 Result<ErpSettlementFormVO> result = new Result<ErpSettlementFormVO>();
288 ErpSettlementFormVO erpSettlement = erpSettlementService.queryWaterDepartSettlementFormById(id);
289 if(erpSettlement==null) {
290 result.error500("未找到对应实体");
291 }else {
292 result.setResult(erpSettlement);
293 result.setSuccess(true);
294 }
295 return result;
296 }
282 297
283 @RequestMapping(value = "/exportXls") 298 @RequestMapping(value = "/exportXls")
284 public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) { 299 public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
......
sk-module-biz/src/main/java/com/skua/modules/erp/mapper/ErpSettlementMapper.java
...@@ -3,6 +3,7 @@ package com.skua.modules.erp.mapper; ...@@ -3,6 +3,7 @@ package com.skua.modules.erp.mapper;
3 import java.util.List; 3 import java.util.List;
4 4
5 import com.skua.modules.erp.entity.ErpSettlementItem; 5 import com.skua.modules.erp.entity.ErpSettlementItem;
6 import com.skua.modules.erp.vo.ErpSettlementItemVO;
6 import com.skua.modules.erp.vo.ErpSettlementVO; 7 import com.skua.modules.erp.vo.ErpSettlementVO;
7 import org.apache.ibatis.annotations.Param; 8 import org.apache.ibatis.annotations.Param;
8 import com.skua.modules.erp.entity.ErpSettlement; 9 import com.skua.modules.erp.entity.ErpSettlement;
...@@ -22,4 +23,8 @@ public interface ErpSettlementMapper extends BaseMapper<ErpSettlement> { ...@@ -22,4 +23,8 @@ public interface ErpSettlementMapper extends BaseMapper<ErpSettlement> {
22 23
23 // 根据入库单ids，获取【水厂】结算单详情 24 // 根据入库单ids，获取【水厂】结算单详情
24 List<ErpSettlementItem> queryWaterDepartSettlementByMaterialIds(@Param("ids") String materialIds); 25 List<ErpSettlementItem> queryWaterDepartSettlementByMaterialIds(@Param("ids") String materialIds);
26 //（供应商）送货单以及物资验收单
27 List<ErpSettlementItemVO> querySupplierSettlementFormById(@Param("id")String id);
28 //（水厂） 送货单以及物资验收单
29 List<ErpSettlementItemVO> queryWaterDepartSettlementFormById(@Param("id")String id);
25 } 30 }
......
sk-module-biz/src/main/java/com/skua/modules/erp/mapper/MaterialINMapper.java
...@@ -3,6 +3,7 @@ package com.skua.modules.erp.mapper; ...@@ -3,6 +3,7 @@ package com.skua.modules.erp.mapper;
3 import java.util.List; 3 import java.util.List;
4 4
5 import com.baomidou.mybatisplus.core.metadata.IPage; 5 import com.baomidou.mybatisplus.core.metadata.IPage;
6 import com.skua.modules.erp.vo.AgentiaStatisticsVO;
6 import com.skua.modules.erp.vo.ArrivalRecordExcelExportVO; 7 import com.skua.modules.erp.vo.ArrivalRecordExcelExportVO;
7 import org.apache.ibatis.annotations.Param; 8 import org.apache.ibatis.annotations.Param;
8 import com.skua.modules.erp.entity.MaterialIN; 9 import com.skua.modules.erp.entity.MaterialIN;
...@@ -26,5 +27,6 @@ public interface MaterialINMapper extends BaseMapper<MaterialIN> { ...@@ -26,5 +27,6 @@ public interface MaterialINMapper extends BaseMapper<MaterialIN> {
26 * @param materialIN 27 * @param materialIN
27 * @return 28 * @return
28 */ 29 */
29 public List<MaterialIN> selectAuditMaterialINByPage(IPage<MaterialIN> page, @Param("materialIN") MaterialIN materialIN); 30 List<MaterialIN> selectAuditMaterialINByPage(IPage<MaterialIN> page, @Param("materialIN") MaterialIN materialIN);
31
30 } 32 }
......
sk-module-biz/src/main/java/com/skua/modules/erp/mapper/xml/ErpSettlementMapper.xml
...@@ -48,4 +48,30 @@ ...@@ -48,4 +48,30 @@
48 and mi.id in (${ids}) 48 and mi.id in (${ids})
49 order by mi.arrive_time asc 49 order by mi.arrive_time asc
50 </select> 50 </select>
51
52 <select id="querySupplierSettlementFormById" resultType="com.skua.modules.erp.vo.ErpSettlementItemVO">
53 select d.depart_name,pc.project_name ,pc.contract_code,sm.supp_name as supplier_name,mi.arrive_time, maf.appearance_info ,maf.matched_info ,maf.handle_msg ,maf.sender_sign ,maf.receiver_sign ,aaa.*
54 from (
55 select si.sparepart_name,si.material_num,si.specification,si.measuring_unit,s.purchase_contract_id,s.supplier_id,si.material_in_id
56 from erp_settlement s ,erp_settlement_item si where s.id = si.settlement_id and s.id = #{id}
57 )aaa
58 left join erp_purchase_contract pc on aaa.purchase_contract_id = pc.id
59 left join ajh_supplier_manage sm on aaa.supplier_id = sm.id
60 left join erp_material_in mi on mi.id = aaa.material_in_id
61 left join erp_material_acceptance_form maf on maf.id= aaa.material_in_id
62 left join sys_depart d on d.id = mi.depart_id
63 </select>
64
65 <select id="queryWaterDepartSettlementFormById" resultType="com.skua.modules.erp.vo.ErpSettlementItemVO">
66 select d.depart_name,dc.contract_code,dc.contract_name as project_name ,mi.arrive_time, maf.appearance_info ,maf.matched_info ,maf.handle_msg ,maf.sender_sign ,maf.receiver_sign ,aaa.*
67 from (
68 select si.sparepart_name,si.material_num,si.specification,si.measuring_unit,
69 s.distribut_contract_id,s.supplier_id,si.material_in_id
70 from erp_settlement s ,erp_settlement_item si where s.id = si.settlement_id and s.id = #{id}
71 )aaa
72 left join erp_distribut_contract dc on aaa.distribut_contract_id = dc.id
73 left join erp_material_in mi on mi.id = aaa.material_in_id
74 left join erp_material_acceptance_form maf on maf.id= aaa.material_in_id
75 left join sys_depart d on d.id = mi.depart_id
76 </select>
51 </mapper> 77 </mapper>
......
sk-module-biz/src/main/java/com/skua/modules/erp/service/IErpSettlementService.java
...@@ -3,6 +3,7 @@ package com.skua.modules.erp.service; ...@@ -3,6 +3,7 @@ package com.skua.modules.erp.service;
3 import com.skua.modules.erp.entity.ErpSettlement; 3 import com.skua.modules.erp.entity.ErpSettlement;
4 import com.baomidou.mybatisplus.extension.service.IService; 4 import com.baomidou.mybatisplus.extension.service.IService;
5 import com.skua.modules.erp.entity.ErpSettlementItem; 5 import com.skua.modules.erp.entity.ErpSettlementItem;
6 import com.skua.modules.erp.vo.ErpSettlementFormVO;
6 import com.skua.modules.erp.vo.ErpSettlementVO; 7 import com.skua.modules.erp.vo.ErpSettlementVO;
7 import org.apache.ibatis.annotations.Param; 8 import org.apache.ibatis.annotations.Param;
8 9
...@@ -40,5 +41,9 @@ public interface IErpSettlementService extends IService<ErpSettlement> { ...@@ -40,5 +41,9 @@ public interface IErpSettlementService extends IService<ErpSettlement> {
40 List<ErpSettlementVO> waterDepartSettlement(String materialInIds); 41 List<ErpSettlementVO> waterDepartSettlement(String materialInIds);
41 // 根据入库单ids，获取【水厂】结算单详情 42 // 根据入库单ids，获取【水厂】结算单详情
42 List<ErpSettlementItem> queryWaterDepartSettlementByMaterialIds( String materialInIds); 43 List<ErpSettlementItem> queryWaterDepartSettlementByMaterialIds( String materialInIds);
44 // （供应商）送货单以及物资验收单
45 ErpSettlementFormVO querySupplierSettlementFormById(String id);
46 //（水厂） 送货单以及物资验收单
47 ErpSettlementFormVO queryWaterDepartSettlementFormById(String id);
43 48
44 } 49 }
......
sk-module-biz/src/main/java/com/skua/modules/erp/service/impl/ErpSettlementServiceImpl.java
...@@ -8,10 +8,13 @@ import com.skua.modules.erp.entity.ErpSettlementItem; ...@@ -8,10 +8,13 @@ import com.skua.modules.erp.entity.ErpSettlementItem;
8 import com.skua.modules.erp.mapper.ErpSettlementItemMapper; 8 import com.skua.modules.erp.mapper.ErpSettlementItemMapper;
9 import com.skua.modules.erp.mapper.ErpSettlementMapper; 9 import com.skua.modules.erp.mapper.ErpSettlementMapper;
10 import com.skua.modules.erp.service.IErpSettlementService; 10 import com.skua.modules.erp.service.IErpSettlementService;
11 import com.skua.modules.erp.vo.ErpSettlementFormVO;
12 import com.skua.modules.erp.vo.ErpSettlementItemVO;
11 import com.skua.modules.erp.vo.ErpSettlementVO; 13 import com.skua.modules.erp.vo.ErpSettlementVO;
12 import com.skua.modules.system.entity.SysDepart; 14 import com.skua.modules.system.entity.SysDepart;
13 import com.skua.modules.system.mapper.SysDepartMapper; 15 import com.skua.modules.system.mapper.SysDepartMapper;
14 import com.skua.tool.util.JSUtils; 16 import com.skua.tool.util.JSUtils;
17 import org.springframework.beans.BeanUtils;
15 import org.springframework.stereotype.Service; 18 import org.springframework.stereotype.Service;
16 19
17 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; 20 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
...@@ -68,12 +71,17 @@ public class ErpSettlementServiceImpl extends ServiceImpl<ErpSettlementMapper, E ...@@ -68,12 +71,17 @@ public class ErpSettlementServiceImpl extends ServiceImpl<ErpSettlementMapper, E
68 71
69 //根据编号查询结算单 72 //根据编号查询结算单
70 public ErpSettlementVO queryById(String id){ 73 public ErpSettlementVO queryById(String id){
71 ErpSettlementVO erpSettlementVO =(ErpSettlementVO) this.baseMapper.selectById(id); 74 ErpSettlement erpSettlement = this.baseMapper.selectById(id);
72 QueryWrapper<ErpSettlementItem> queryWrapper = new QueryWrapper<ErpSettlementItem>(); 75 QueryWrapper<ErpSettlementItem> queryWrapper = new QueryWrapper<ErpSettlementItem>();
73 queryWrapper.eq("settlement_id",id); 76 queryWrapper.eq("settlement_id",id);
74 List<ErpSettlementItem> settlementItemList = settlementItemMapper.selectList(queryWrapper); 77 List<ErpSettlementItem> settlementItemList = settlementItemMapper.selectList(queryWrapper);
78 ErpSettlementVO erpSettlementVO = new ErpSettlementVO();
75 79
76 if(erpSettlementVO != null )erpSettlementVO.setItemList( settlementItemList ); 80 if(erpSettlement != null ){
81 //BeanUtils.copyProperties(有值的对象, 要被赋值的对象);
82 BeanUtils.copyProperties(erpSettlement, erpSettlementVO);
83 erpSettlementVO.setItemList( settlementItemList );
84 }
77 return erpSettlementVO; 85 return erpSettlementVO;
78 } 86 }
79 87
...@@ -102,4 +110,40 @@ public class ErpSettlementServiceImpl extends ServiceImpl<ErpSettlementMapper, E ...@@ -102,4 +110,40 @@ public class ErpSettlementServiceImpl extends ServiceImpl<ErpSettlementMapper, E
102 public List<ErpSettlementItem> queryWaterDepartSettlementByMaterialIds( String materialInIds){ 110 public List<ErpSettlementItem> queryWaterDepartSettlementByMaterialIds( String materialInIds){
103 return this.baseMapper.queryWaterDepartSettlementByMaterialIds( materialInIds ); 111 return this.baseMapper.queryWaterDepartSettlementByMaterialIds( materialInIds );
104 } 112 }
113 // 送货单以及物资验收单
114 public ErpSettlementFormVO querySupplierSettlementFormById(String id){
115 List<ErpSettlementItemVO> itemList = this.baseMapper.querySupplierSettlementFormById( id );
116 ErpSettlementFormVO erpSettlementFormVO = new ErpSettlementFormVO();
117 if(itemList != null && !itemList.isEmpty()){
118 for(ErpSettlementItemVO settlementFormVO: itemList){
119 erpSettlementFormVO.setContractCode(settlementFormVO.getContractCode());
120 erpSettlementFormVO.setDepartName(settlementFormVO.getDepartName());
121 erpSettlementFormVO.setProjectName(settlementFormVO.getProjectName());
122 erpSettlementFormVO.setSparepartName(settlementFormVO.getSparepartName());
123 erpSettlementFormVO.setSpecification(settlementFormVO.getSpecification());
124 erpSettlementFormVO.setSupplierName(settlementFormVO.getSupplierName());
125 //erpSettlementFormVO.setSparepartTypeName(settlementFormVO.getSparepartName());
126 }
127 }
128 erpSettlementFormVO.setItemList(itemList );
129 return erpSettlementFormVO;
130 }
131 //（水厂） 送货单以及物资验收单
132 public ErpSettlementFormVO queryWaterDepartSettlementFormById(String id){
133 List<ErpSettlementItemVO> itemList = this.baseMapper.queryWaterDepartSettlementFormById( id );
134 ErpSettlementFormVO erpSettlementFormVO = new ErpSettlementFormVO();
135 if(itemList != null && !itemList.isEmpty()){
136 for(ErpSettlementItemVO settlementFormVO: itemList){
137 erpSettlementFormVO.setContractCode(settlementFormVO.getContractCode());
138 erpSettlementFormVO.setDepartName(settlementFormVO.getDepartName());
139 erpSettlementFormVO.setProjectName(settlementFormVO.getProjectName());
140 erpSettlementFormVO.setSparepartName(settlementFormVO.getSparepartName());
141 erpSettlementFormVO.setSpecification(settlementFormVO.getSpecification());
142 erpSettlementFormVO.setSupplierName(settlementFormVO.getSupplierName());
143 //erpSettlementFormVO.setSparepartTypeName(settlementFormVO.getSparepartName());
144 }
145 }
146 erpSettlementFormVO.setItemList(itemList );
147 return erpSettlementFormVO;
148 }
105 } 149 }
......
sk-module-biz/src/main/java/com/skua/modules/erp/vo/AgentiaStatisticsVO.java 0 → 100644
1 package com.skua.modules.erp.vo;
2
3 import com.baomidou.mybatisplus.annotation.TableField;
4 import com.skua.core.util.ConvertUtils;
5 import com.skua.tool.util.JSUtils;
6 import io.swagger.annotations.ApiModel;
7 import io.swagger.annotations.ApiModelProperty;
8 import lombok.Data;
9
10 /**
11 * 药剂结算单详情
12 */
13 @Data
14 @ApiModel(value="AgentiaStatistics药剂统计对象", description="药剂统计对象")
15 public class AgentiaStatisticsVO {
16 @ApiModelProperty(value = "供应商名称")
17 private String supplierName;
18
19 @ApiModelProperty(value = "部门名称")
20 private String departName;
21
22 @ApiModelProperty(value = "物料名称")
23 private String sparepartName;
24
25 @ApiModelProperty(value = "计划数量")
26 private String planNum;
27
28 @ApiModelProperty(value = "供货数量")
29 private String materialNum;
30
31 @TableField(exist=false)
32 @ApiModelProperty(value = "剩余数量")
33 private String leaveNum;
34
35 public String getLeaveNum() {
36 leaveNum = JSUtils.format(ConvertUtils.getDouble( this.planNum,0d ) - ConvertUtils.getDouble(this.materialNum,0d));
37 return leaveNum;
38 }
39 }
sk-module-biz/src/main/java/com/skua/modules/erp/vo/ErpSettlementFormVO.java
1 package com.skua.modules.erp.vo; 1 package com.skua.modules.erp.vo;
2 2
3 import com.baomidou.mybatisplus.annotation.TableField;
4 import io.swagger.annotations.ApiModel; 3 import io.swagger.annotations.ApiModel;
5 import io.swagger.annotations.ApiModelProperty; 4 import io.swagger.annotations.ApiModelProperty;
6 import lombok.Data; 5 import lombok.Data;
...@@ -43,7 +42,6 @@ public class ErpSettlementFormVO { ...@@ -43,7 +42,6 @@ public class ErpSettlementFormVO {
43 @ApiModelProperty(value = "规格型号") 42 @ApiModelProperty(value = "规格型号")
44 private String specification; 43 private String specification;
45 44
46 @TableField(exist=false)
47 @ApiModelProperty(value = "结算清单") 45 @ApiModelProperty(value = "结算清单")
48 private List<ErpSettlementItemVO> itemList ; 46 private List<ErpSettlementItemVO> itemList ;
49 47
......
sk-module-biz/src/main/java/com/skua/modules/erp/vo/ErpSettlementItemVO.java
1 package com.skua.modules.erp.vo; 1 package com.skua.modules.erp.vo;
2 2
3 import java.io.Serializable;
4 import java.util.Date;
5 import com.baomidou.mybatisplus.annotation.IdType;
6 import com.baomidou.mybatisplus.annotation.TableId;
7 import com.baomidou.mybatisplus.annotation.TableName;
8 import com.baomidou.mybatisplus.annotation.TableField;
9 import com.skua.modules.erp.entity.ErpSettlementItem; 3 import com.skua.modules.erp.entity.ErpSettlementItem;
10 import io.swagger.annotations.ApiModel; 4 import io.swagger.annotations.ApiModel;
11 import io.swagger.annotations.ApiModelProperty; 5 import io.swagger.annotations.ApiModelProperty;
12 import lombok.Data; 6 import lombok.Data;
13 import lombok.EqualsAndHashCode;
14 import lombok.experimental.Accessors;
15 import com.fasterxml.jackson.annotation.JsonFormat;
16 import org.springframework.format.annotation.DateTimeFormat;
17 import org.jeecgframework.poi.excel.annotation.Excel;
18
19 /** 7 /**
20 * 药剂结算单详情 8 * 药剂结算单详情
21 */ 9 */
22 @Data 10 @Data
23 @ApiModel(value="erp_settlement_item数据传输对象", description="药剂结算单详情") 11 @ApiModel(value="erp_settlement_item数据传输对象", description="药剂结算单详情")
24 public class ErpSettlementItemVO extends ErpSettlementItem { 12 public class ErpSettlementItemVO extends ErpSettlementItem {
13 @ApiModelProperty(value = "合同编号")
14 private String contractCode;
15 @ApiModelProperty(value = "项目名称")
16 private String projectName;
17
18 @ApiModelProperty(value = "供应商名称")
19 private String supplierName;
20
21 @ApiModelProperty(value = "部门名称")
22 private String departName;
23
24
25 /**外观情况*/ 25 /**外观情况*/
26 @ApiModelProperty(value = "外观情况") 26 @ApiModelProperty(value = "外观情况")
27 private String appearanceInfo; 27 private String appearanceInfo;
......
sk-module-datafill/src/main/java/com/skua/modules/report/vo/largeScreen/ResultNumberVO.java
1 package com.skua.modules.report.vo.largeScreen; 1 package com.skua.modules.report.vo.largeScreen;
2 2
3 import com.skua.core.util.ConvertUtils;
3 import com.skua.tool.util.DigitalUtils; 4 import com.skua.tool.util.DigitalUtils;
4 import com.skua.tool.util.JSUtils; 5 import com.skua.tool.util.JSUtils;
5 import io.swagger.annotations.ApiModel; 6 import io.swagger.annotations.ApiModel;
...@@ -102,8 +103,8 @@ public class ResultNumberVO { ...@@ -102,8 +103,8 @@ public class ResultNumberVO {
102 public ResultNumberVO(String name, String unit, String value, String valueTb, String valueHb) { 103 public ResultNumberVO(String name, String unit, String value, String valueTb, String valueHb) {
103 this.name = name; 104 this.name = name;
104 this.unit = unit; 105 this.unit = unit;
105 this.value = value; 106 this.value = ConvertUtils.getString(value,"0") ;
106 this.valueTb = valueTb; 107 this.valueTb = ConvertUtils.getString(valueTb,"0");
107 this.valueHb = valueHb; 108 this.valueHb = ConvertUtils.getString(valueHb,"0");
108 } 109 }
109 } 110 }
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!