java/xizang.git

			@@ -6,6 +6,7 @@
			import com.ruoyi.common.constant.DictConstants;
			import com.ruoyi.common.core.domain.R;
			import com.ruoyi.common.exception.ServiceException;
			import com.ruoyi.common.utils.CodeGenerateUtils;
			import com.ruoyi.common.utils.DictUtils;
			import com.ruoyi.common.utils.StringUtils;
			import com.ruoyi.framework.web.service.TokenService;
			@@ -53,6 +54,8 @@
			TInvoiceToBillService invoiceToBillService;
			@Autowired
			TokenService tokenService;
			@Autowired
			TTenantService tenantService;

			@ApiOperation(value = "缴费账单查询分页列表")
			@PostMapping("list")
			@@ -111,6 +114,13 @@
			@ApiOperation(value = "缴费账单开票")
			@PostMapping(value = "/invoice")
			public R<String> invoice(@RequestBody TInvoiceDTO dto) {
			String userId = tokenService.getLoginUserApplet().getUserId();
			dto.setApplyName(tenantService.getById(userId).getResidentName());
			String code;
			do {
			code = CodeGenerateUtils.generateVolumeSn();
			} while (invoiceService.count(Wrappers.lambdaQuery(TInvoice.class).eq(TInvoice::getInvoiceNumber, code)) > 0);
			dto.setInvoiceNumber(CodeGenerateUtils.generateVolumeSn());
			// 添加开票信息
			invoiceService.save(dto);

			@@ -63,7 +63,7 @@
			List<TItemTypeVO> itemTypes = itemTypeService.getItemList(itemName);
			List<TItem> items = itemService.list();
			itemTypes.forEach(itemType -> {
			itemType.setItemList(items.stream().filter(item -> itemType.getId().equals(item.getTypeId())).collect(Collectors.toList()));
			itemType.setItemList(items.stream().filter(item -> itemType.getId().equals(item.getTypeId()) && item.getItemName().contains(itemName)).collect(Collectors.toList()));
			});
			return R.ok(itemTypes);
			}

			@@ -3,6 +3,8 @@
			import java.math.BigDecimal;
			import java.text.SimpleDateFormat;
			import java.util.Calendar;
			import java.util.Date;
			import java.util.concurrent.atomic.AtomicInteger;

			/**
			* @Description
			@@ -67,7 +69,7 @@
			dateTime = dateTime.substring(2);
			String timestampPart = "" + (Math.random() * 10000) * (System.currentTimeMillis() / 10000);
			timestampPart = timestampPart.replace(".", "").replace("E", "");
			timestampPart = timestampPart.substring(0, 5);
			timestampPart = timestampPart.substring(0, 0);
			return dateTime + timestampPart;
			}

			@@ -103,6 +103,7 @@
			t.create_by,
			t.update_by,
			t.disabled,
			t.code,
			i.item_name AS itemName,
			it.type_name AS itemTypeName,
			tnt.resident_name AS residentName

	ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TBillController.java	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TFaultRepairMessageController.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-common/src/main/java/com/ruoyi/common/utils/CodeGenerateUtils.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-system/src/main/resources/mapper/system/TFaultRepairMessageMapper.xml	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史