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

修改查询请购物料数据重复的问题

This commit is contained in:
yangjun 2025-11-25 13:34:39 +08:00
parent 91984ff0ba
commit 4363a64b15
2 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,6 +29,7 @@ import com.nu.modules.qgd.mapper.QgdInfoMapper;
import com.nu.modules.sysconfig.ISysConfigApi;
import com.nu.modules.warehouseMaterialInfo.entity.BlWarehouseMaterialInfo;
import com.nu.modules.warehouseMaterialInfo.mapper.BlWarehouseMaterialInfoMapper;
import com.nu.utils.DictUtils;
import io.swagger.models.auth.In;
import org.apache.commons.lang.StringUtils;
import org.apache.shiro.SecurityUtils;
@ -99,6 +100,8 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
private ISysConfigApi sysConfigApi;
private String serverNetUrl;
@Autowired
private DictUtils dictUtils;
@Override
public void rukuInfo(NuInvoicingCgdMain nuInvoicingCgdMain) {
@ -1057,7 +1060,32 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
}
result.put("status","1");
result.put("cgdInfo",cgdMain);
Map<String,String> map = new HashMap<>();
map.put("id",cgdMain.getId());
map.put("cgdNo",cgdMain.getCgdNo());
map.put("status",cgdMain.getStatus());
map.put("cgdType",cgdMain.getCgdType());
map.put("qgBy",cgdMain.getQgBy());
map.put("qgDate",DateUtils.formatDate(cgdMain.getQgDate(),"yyyy-MM-dd"));
map.put("jhBy",cgdMain.getJhBy());
if(cgdMain.getJhTime()!=null){
map.put("jhTime",DateUtils.formatDate(cgdMain.getJhTime(),"yyyy-MM-dd HH:mm:ss"));
}else{
map.put("jhTime",null);
}
map.put("wjBy",cgdMain.getWjBy());
if(cgdMain.getWjTime()!=null){
map.put("wjTime",DateUtils.formatDate(cgdMain.getWjTime(),"yyyy-MM-dd HH:mm:ss"));
}else{
map.put("wjTime",null);
}
map.put("gysName",cgdMain.getGysName());
map.put("gysId_dictText",cgdMain.getGysName());
map.put("totalPrice",cgdMain.getTotalPrice().toString());
map.put("status_dictText", dictUtils.translateDictValue("cgd_status",cgdMain.getStatus()));
map.put("cgdType_dictText", dictUtils.translateDictValue("cgd_type",cgdMain.getCgdType()));
map.put("izNew", cgdMain.getIzNew());
result.put("cgdInfo",map);
return result;
}

4
nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/mapper/xml/BlWarehouseMaterialInfoMapper.xml
View File

@ -30,10 +30,10 @@
b.reference_unit_price,
b.material_img,
c.item_text as tagName,
if(d.id is null, '0', '1') as isAdd
if(d.wl_id is null, '0', '1') as isAdd
from nu_warehouse_material_info a
left join nu_config_material_info b on a.wl_id = b.id
left join nu_invoicing_qgd_info d on a.wl_id = d.wl_id
left join (select nu_id,wl_id from nu_invoicing_qgd_info GROUP BY nu_id,wl_id) d on a.wl_id = d.wl_id
left join sys_dict_item c on b.tag_type = c.item_value and c.dict_id = '1978662656563613698'
) a
${ew.customSqlSegment}