申请开票明细基础数据列表添加分页

src/main/java/org/springblade/modules/business/contraller/InvoiceApplyController.java

@@ -40,8 +40,8 @@ public class InvoiceApplyController extends BladeController {
 
 	@GetMapping("/finish-work-list")
 	@Operation(summary = "列表", description = "列表")
-	public R finishWorkList() {
+	public R finishWorkList(Query query) {
-		return R.data(applyService.finishWorkList());
+		return R.data(applyService.finishWorkList(query));
 	}
 
 	@GetMapping("/page")
@@ -56,7 +56,7 @@ public class InvoiceApplyController extends BladeController {
 	@Operation(summary = "明细", description = "明细")
 	public R detail(Long id) {
 		InvoiceApply apply = applyService.getById(id);
-		List<InvoiceApplyDetail> applyDetails = applyDetailService.list();
+		List<InvoiceApplyDetail> applyDetails = applyDetailService.list(Wrappers.lambdaQuery(InvoiceApplyDetail.class).eq(InvoiceApplyDetail::getApplyId, id));
 
 		InvoiceApplyDto dto = InvoiceApplyDto.builder().apply(apply).detailList(applyDetails).build();
 		return R.data(dto);

src/main/java/org/springblade/modules/business/mapper/InvoiceApplyMapper.java

@@ -2,6 +2,7 @@
 package org.springblade.modules.business.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 import org.springblade.modules.business.pojo.entity.InvoiceApply;
 
 import java.util.List;
@@ -21,5 +22,6 @@ public interface InvoiceApplyMapper extends BaseMapper<InvoiceApply> {
 	 *
 	 * @return
 	 */
-	List<Map<String, Object>> finishWorkList();
+	List<Map<String, Object>> finishWorkList(@Param("offset") int offset, @Param("size") int size);
+	int finishWorkListCount();
 }

src/main/java/org/springblade/modules/business/mapper/InvoiceApplyMapper.xml

@@ -18,7 +18,26 @@ from (
          WHERE mt.is_deleted= 0 and mt.repair_status = 7
          group by mt.id, mt.task_code
      ) t
-     left join lab_invoice_apply_detail d on t.buseness_id = d.business_id
+     left join lab_invoice_apply_detail d on t.business_id = d.business_id
+where d.id is NULL
+limit ${offset}, ${size}
+    </select>
+    <select id="finishWorkListCount" resultType="int">
+SELECT count(1)
+from (
+         SELECT 1 as business_type, wo.id as business_id, wo.requirement_code as business_code, u.`name` as serviceman, IFNULL(wo.discount_price,0) as price
+         from lab_work_order wo
+              left join blade_user u on wo.repair_person = u.id
+         WHERE wo.is_deleted= 0 AND wo.`status` = 8
+         UNION ALL
+         SELECT 2 as business_type, mt.id as buseness_id, mt.task_code as buseness_code, u.`name` as serviceman, COUNT(mtd.price) as price
+         from lab_maintenance_task mt
+              left join blade_user u on mt.serviceman_id = u.id
+              left join lab_maintenance_task_detail mtd on mt.id = mtd.task_id
+         WHERE mt.is_deleted= 0 and mt.repair_status = 7
+         group by mt.id, mt.task_code
+     ) t
+     left join lab_invoice_apply_detail d on t.business_id = d.business_id
 where d.id is NULL
     </select>
 

src/main/java/org/springblade/modules/business/pojo/entity/InvoiceApply.java

@@ -41,6 +41,11 @@ public class InvoiceApply extends BaseEntity {
 	 */
 	private Long applyUser;
 
+	/**
+	 * 申请人账号
+	 */
+	private String applyUserAccount;
+
 	/**
 	 * 申请人名称
 	 */
@@ -59,7 +64,12 @@ public class InvoiceApply extends BaseEntity {
 	private Long confirmUser;
 
 	/**
-	 * 开票人
+	 * 开票人账号
+	 */
+	private String confirmUserAccount;
+
+	/**
+	 * 开票人名称
 	 */
 	private String confirmUserName;
 

src/main/java/org/springblade/modules/business/service/IInvoiceApplyService.java

@@ -1,12 +1,11 @@
 package org.springblade.modules.business.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
+import org.springblade.core.mp.support.Query;
 import org.springblade.modules.business.pojo.dto.InvoiceApplyDto;
 import org.springblade.modules.business.pojo.entity.InvoiceApply;
 
-import java.util.List;
-import java.util.Map;
-
 /**
  * 发票申请表 服务类
  *
@@ -20,7 +19,7 @@ public interface IInvoiceApplyService extends BaseService<InvoiceApply> {
 	 *
 	 * @return
 	 */
-	List<Map<String, Object>> finishWorkList();
+	IPage finishWorkList(Query query);
 
 	/**
 	 * 保存并提交

src/main/java/org/springblade/modules/business/service/impl/InvoiceApplyServiceImpl.java

@@ -1,9 +1,12 @@
 
 package org.springblade.modules.business.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.AllArgsConstructor;
 import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.Func;
@@ -41,8 +44,17 @@ public class InvoiceApplyServiceImpl extends BaseServiceImpl<InvoiceApplyMapper,
 
 
 	@Override
-	public List<Map<String, Object>> finishWorkList() {
+	public IPage finishWorkList(Query query) {
-		return baseMapper.finishWorkList();
+		int startPage = query == null || query.getCurrent() == null ? 1 : query.getCurrent();
+		int size = query == null || query.getSize() == null ? 10 : query.getSize();
+
+		List<Map<String, Object>> data = baseMapper.finishWorkList((startPage - 1) * size, size);
+		int total = baseMapper.finishWorkListCount();
+
+		IPage page = new Page(startPage, size);
+		page.setRecords(data);
+		page.setTotal(total);
+		return page;
 	}
 
 	@Override
@@ -56,7 +68,8 @@ public class InvoiceApplyServiceImpl extends BaseServiceImpl<InvoiceApplyMapper,
 		}
 
 		applyOld.setApplyUser(AuthUtil.getUserId());
-		applyOld.setApplyUserName(AuthUtil.getUserName());
+		applyOld.setApplyUserAccount(AuthUtil.getUserName());
+		applyOld.setApplyUserName(AuthUtil.getNickName());
 		applyOld.setApplyTime(DateUtil.now());
 
 		applyOld.setUpdateUser(AuthUtil.getUserId());
@@ -75,7 +88,8 @@ public class InvoiceApplyServiceImpl extends BaseServiceImpl<InvoiceApplyMapper,
 		InvoiceApply applyOld = getById(id);
 		applyOld.setUpdateUser(AuthUtil.getUserId());
 		applyOld.setConfirmUser(AuthUtil.getUserId());
-		applyOld.setConfirmUserName(AuthUtil.getUserName());
+		applyOld.setConfirmUserAccount(AuthUtil.getUserName());
+		applyOld.setConfirmUserName(AuthUtil.getNickName());
 		applyOld.setConfirmTime(DateUtil.now());
 		applyOld.setStatus(InvoiceEnum.INVOICE_STATUS_CONFIRM.getValue());
 		updateById(applyOld);

src/main/resources/application-dev.yml

@@ -11,8 +11,8 @@ spring:
         enabled: false
   datasource:
     # MySql
-    url: jdbc:mysql://192.168.1.12:3306/lab-ops?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+#    url: jdbc:mysql://192.168.1.12:3306/lab-ops?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
-#    url: jdbc:mysql://127.0.0.1:3306/lab-ops?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+    url: jdbc:mysql://127.0.0.1:3306/lab-ops?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
     username: root
     password: 123456
 

src/main/resources/application.yml

@@ -217,6 +217,7 @@ blade:
     skip-url:
       - /blade-test/**
       - /blade-system/user/register/**
+      - /lab-ops/invoice-apply/**
     #授权认证配置
     auth:
       - method: ALL