yangjun
/
nursing_unit_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: yangjun:109774f1a0f31d2eaa908f6f8e548dac2510d72d
Branches Tags
yangjun:master
..
compare: yangjun:c96145a77c214e277d5713a400fefae55165501a
Branches Tags
yangjun:master

No commits in common. "109774f1a0f31d2eaa908f6f8e548dac2510d72d" and "c96145a77c214e277d5713a400fefae55165501a" have entirely different histories.
109774f1a0 ... c96145a77c

3 changed files with 2 additions and 7 deletions
Show Stats Expand all files Collapse all files

2
nursing-unit-common/src/main/java/com/nu/entity/CgdMainEntity.java
View File

@ -105,6 +105,6 @@ public class CgdMainEntity implements Serializable {
@ApiModelProperty(value = "审核时间")
private Date wjTime;
private String nuId;
private String izNew;
}

1
nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/entity/NuInvoicingCgdMain.java
View File

@ -153,7 +153,6 @@ public class NuInvoicingCgdMain implements Serializable {
private String izNew;
private String shareBy;
private String shareTel;
private String nuId;
/**是否已生成有效付款单 Y是 N否*/
private String izFkd;

6
nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java
View File

@ -245,8 +245,6 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
List<NuInvoicingCgdMain> mapList = new ArrayList<>();
// 创建一个临时Map来按suppliersId分组
Map<String, List<QgdInfo>> tempMap = new HashMap<>();
String nuId = infoEntityList.get(0).getNuId();
for (QgdInfoEntity qgdInfoEntity : infoEntityList) {
String suppliersId = qgdInfoEntity.getSuppliersId();
@ -276,7 +274,7 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
ConfigSuppliersInfo ConfigSuppliersInfo = gysMapper.selectById(suppliersId);
String cgdNo = new SimpleDateFormat("yyyyMMdd").format(new Date()) + String.format("%03d", qgdXlhInt);
cgdNo = "C"+sysUser.getOrgCode() + cgdNo;
cgdNo = sysUser.getOrgCode() + cgdNo;
//生产采购单主表
NuInvoicingCgdMain cgdMain = new NuInvoicingCgdMain();
@ -290,7 +288,6 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
cgdMain.setStatus("0");//待入库
cgdMain.setCgdType("0");//待入库
cgdMain.setGysName(ConfigSuppliersInfo.getSuppliersName());
cgdMain.setNuId(nuId);
List<NuInvoicingCgdInfo> cgdInfoList = new ArrayList<>();
BigDecimal totalPrice = new BigDecimal(0);
String qgdId = "";
@ -399,7 +396,6 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
queryWrapper.eq(StringUtils.isNotBlank(cgdMainEntityDto.getCgBy()),"qg_by",cgdMainEntityDto.getCgBy());
queryWrapper.gt(StringUtils.isNotBlank(cgdMainEntityDto.getStartTime()),"qg_date",cgdMainEntityDto.getStartTime());
queryWrapper.lt(StringUtils.isNotBlank(cgdMainEntityDto.getEndTime()),"qg_date",cgdMainEntityDto.getEndTime());
queryWrapper.eq(StringUtils.isNotBlank(cgdMainEntityDto.getNuId()),"nu_id",cgdMainEntityDto.getNuId());
// queryWrapper.in(StringUtils.isNotBlank(cgdMainEntityDto.getStatus()),"status",cgdMainEntityDto.getStatus());
if(StringUtils.isNotBlank(cgdMainEntityDto.getCgdType())){
if (cgdMainEntityDto.getCgdType().indexOf(",")>-1){