init

pom.xml

@@ -18,7 +18,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-        <flowable.version>6.4.2</flowable.version>
+<!--        <flowable.version>6.4.2</flowable.version>-->
 
         <spring.boot.version>2.2.13.RELEASE</spring.boot.version>
         <spring.platform.version>Cairo-SR8</spring.platform.version>
@@ -127,7 +127,7 @@
             <artifactId>easy-captcha</artifactId>
         </dependency>
         <!-- 工作流 -->
-        <dependency>
+        <!--<dependency>
             <groupId>org.flowable</groupId>
             <artifactId>flowable-spring-boot-starter</artifactId>
             <version>${flowable.version}</version>
@@ -136,7 +136,7 @@
             <groupId>org.flowable</groupId>
             <artifactId>flowable-json-converter</artifactId>
             <version>${flowable.version}</version>
-        </dependency>
+        </dependency>-->
         <!-- Mybatis-Plus -->
         <dependency>
             <groupId>com.baomidou</groupId>

src/main/java/org/springblade/bank/cardswallow/controller/CardSwallowController.java

@@ -0,0 +1,129 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.bank.cardswallow.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.bank.cardswallow.entity.CardSwallow;
+import org.springblade.bank.cardswallow.vo.CardSwallowVO;
+import org.springblade.bank.cardswallow.wrapper.CardSwallowWrapper;
+import org.springblade.bank.cardswallow.service.ICardSwallowService;
+import org.springblade.core.boot.ctrl.BladeController;
+
+/**
+ * 自助設備吞沒卡處理 控制器
+ *
+ * @author BladeX
+ * @since 2021-08-12
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("bank/cardswallow")
+@Api(value = "自助設備吞沒卡處理", tags = "自助設備吞沒卡處理接口")
+public class CardSwallowController extends BladeController {
+
+	private final ICardSwallowService cardSwallowService;
+
+	/**
+	 * 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入cardSwallow")
+	public R<CardSwallowVO> detail(CardSwallow cardSwallow) {
+		CardSwallow detail = cardSwallowService.getOne(Condition.getQueryWrapper(cardSwallow));
+		return R.data(CardSwallowWrapper.build().entityVO(detail));
+	}
+
+	/**
+	 * 分页 自助設備吞沒卡處理
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入cardSwallow")
+	public R<IPage<CardSwallowVO>> list(CardSwallow cardSwallow, Query query) {
+		IPage<CardSwallow> pages = cardSwallowService.page(Condition.getPage(query), Condition.getQueryWrapper(cardSwallow));
+		return R.data(CardSwallowWrapper.build().pageVO(pages));
+	}
+
+
+	/**
+	 * 自定义分页 自助設備吞沒卡處理
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入cardSwallow")
+	public R<IPage<CardSwallowVO>> page(CardSwallowVO cardSwallow, Query query) {
+		IPage<CardSwallowVO> pages = cardSwallowService.selectCardSwallowPage(Condition.getPage(query), cardSwallow);
+		return R.data(pages);
+	}
+
+	/**
+	 * 新增 自助設備吞沒卡處理
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入cardSwallow")
+	public R save(@Valid @RequestBody CardSwallow cardSwallow) {
+		return R.status(cardSwallowService.save(cardSwallow));
+	}
+
+	/**
+	 * 修改 自助設備吞沒卡處理
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入cardSwallow")
+	public R update(@Valid @RequestBody CardSwallow cardSwallow) {
+		return R.status(cardSwallowService.updateById(cardSwallow));
+	}
+
+	/**
+	 * 新增或修改 自助設備吞沒卡處理
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入cardSwallow")
+	public R submit(@Valid @RequestBody CardSwallow cardSwallow) {
+		return R.status(cardSwallowService.saveOrUpdate(cardSwallow));
+	}
+
+	
+	/**
+	 * 删除 自助設備吞沒卡處理
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(cardSwallowService.deleteLogic(Func.toLongList(ids)));
+	}
+
+	
+}

src/main/java/org/springblade/flow/core/entity/FlowEntity.java → src/main/java/org/springblade/bank/cardswallow/dto/CardSwallowDTO.java

@@ -14,30 +14,21 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package org.springblade.flow.core.entity;
+package org.springblade.bank.cardswallow.dto;
 
-import com.baomidou.mybatisplus.annotation.TableField;
+import org.springblade.bank.cardswallow.entity.CardSwallow;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.core.mp.base.BaseEntity;
 
 /**
- * FlowEntity
+ * 自助設備吞沒卡處理数据传输对象实体类
  *
- * @author Chill
+ * @author BladeX
+ * @since 2021-08-12
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class FlowEntity extends BaseEntity {
-
-	@TableField(exist = false)
-	private BladeFlow flow;
-
-	public BladeFlow getFlow() {
-		if (flow == null) {
-			flow = new BladeFlow();
-		}
-		return flow;
-	}
+public class CardSwallowDTO extends CardSwallow {
+	private static final long serialVersionUID = 1L;
 
 }

src/main/java/org/springblade/bank/cardswallow/entity/CardSwallow.java

@@ -0,0 +1,145 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.bank.cardswallow.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springblade.core.mp.base.BaseEntity;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * 自助設備吞沒卡處理实体类
+ *
+ * @author BladeX
+ * @since 2021-08-12
+ */
+@Data
+@TableName("zh_input_card_swallow")
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "CardSwallow对象", description = "自助設備吞沒卡處理")
+public class CardSwallow extends BaseEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	* 銀行號
+	*/
+		@ApiModelProperty(value = "銀行號")
+		private String bankNo;
+	/**
+	* 機構號
+	*/
+		@ApiModelProperty(value = "機構號")
+		private String orgNo;
+	/**
+	* 序號
+	*/
+		@ApiModelProperty(value = "序號")
+		private String serialNo;
+	/**
+	* 發送時間
+	*/
+		@ApiModelProperty(value = "發送時間")
+		@DateTimeFormat(
+			pattern = "yyyy-MM-dd HH:mm"
+		)
+		@JsonFormat(
+			pattern = "yyyy-MM-dd HH:mm"
+		)
+		private Date sendDate;
+	/**
+	* 發送支行
+	*/
+		@ApiModelProperty(value = "發送支行")
+		private String sendBank;
+	/**
+	* 卡號
+	*/
+		@ApiModelProperty(value = "卡號")
+		private String cardNo;
+	/**
+	* 卡序號
+	*/
+		@ApiModelProperty(value = "卡序號")
+		private String cardSerialNo;
+	/**
+	* 本行機/他行機
+	*/
+		@ApiModelProperty(value = "本行機/他行機")
+		private String machine;
+	/**
+	* 機號
+	*/
+		@ApiModelProperty(value = "機號")
+		private String machineNo;
+	/**
+	* 沒收卡日期
+	*/
+		@ApiModelProperty(value = "沒收卡日期")
+		@DateTimeFormat(
+			pattern = "yyyy-MM-dd HH:mm"
+		)
+		@JsonFormat(
+			pattern = "yyyy-MM-dd HH:mm"
+		)
+		private Date swallowDate;
+	/**
+	* 卡狀態
+	*/
+		@ApiModelProperty(value = "卡狀態")
+		private String cardStatus;
+	/**
+	* 發送狀態
+	*/
+		@ApiModelProperty(value = "發送狀態")
+		private String sendStatus;
+	/**
+	* 備註
+	*/
+		@ApiModelProperty(value = "備註")
+		private String remark;
+	/**
+	* 支行確認人員工號
+	*/
+		@ApiModelProperty(value = "支行確認人員工號")
+		private String bankConfirmNo;
+	/**
+	* 支行確認人姓名
+	*/
+		@ApiModelProperty(value = "支行確認人姓名")
+		private String bankConfirmName;
+	/**
+	* 確認日期
+	*/
+		@ApiModelProperty(value = "確認日期")
+		@DateTimeFormat(
+			pattern = "yyyy-MM-dd HH:mm"
+		)
+		@JsonFormat(
+			pattern = "yyyy-MM-dd HH:mm"
+		)
+		private Date bankConfirmTime;
+
+
+}

src/main/java/org/springblade/bank/cardswallow/mapper/CardSwallowMapper.java

@@ -0,0 +1,42 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.bank.cardswallow.mapper;
+
+import org.springblade.bank.cardswallow.entity.CardSwallow;
+import org.springblade.bank.cardswallow.vo.CardSwallowVO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import java.util.List;
+
+/**
+ * 自助設備吞沒卡處理 Mapper 接口
+ *
+ * @author BladeX
+ * @since 2021-08-12
+ */
+public interface CardSwallowMapper extends BaseMapper<CardSwallow> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param cardSwallow
+	 * @return
+	 */
+	List<CardSwallowVO> selectCardSwallowPage(IPage page, CardSwallowVO cardSwallow);
+
+}

src/main/java/org/springblade/bank/cardswallow/mapper/CardSwallowMapper.xml

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.springblade.bank.cardswallow.mapper.CardSwallowMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="cardSwallowResultMap" type="org.springblade.bank.cardswallow.entity.CardSwallow">
+        <result column="id" property="id"/>
+        <result column="create_user" property="createUser"/>
+        <result column="create_dept" property="createDept"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="status" property="status"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="bank_no" property="bankNo"/>
+        <result column="org_no" property="orgNo"/>
+        <result column="serial_no" property="serialNo"/>
+        <result column="send_date" property="sendDate"/>
+        <result column="send_bank" property="sendBank"/>
+        <result column="card_no" property="cardNo"/>
+        <result column="card_serial_no" property="cardSerialNo"/>
+        <result column="machine" property="machine"/>
+        <result column="machine_no" property="machineNo"/>
+        <result column="swallow_date" property="swallowDate"/>
+        <result column="card_status" property="cardStatus"/>
+        <result column="send_status" property="sendStatus"/>
+        <result column="remark" property="remark"/>
+        <result column="bank_confirm_no" property="bankConfirmNo"/>
+        <result column="bank_confirm_name" property="bankConfirmName"/>
+        <result column="bank_confirm_time" property="bankConfirmTime"/>
+    </resultMap>
+
+
+    <select id="selectCardSwallowPage" resultMap="cardSwallowResultMap">
+        select * from zh_input_card_swallow where is_deleted = 0
+    </select>
+
+</mapper>

src/main/java/org/springblade/bank/cardswallow/service/ICardSwallowService.java

@@ -0,0 +1,41 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.bank.cardswallow.service;
+
+import org.springblade.bank.cardswallow.entity.CardSwallow;
+import org.springblade.bank.cardswallow.vo.CardSwallowVO;
+import org.springblade.core.mp.base.BaseService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ * 自助設備吞沒卡處理 服务类
+ *
+ * @author BladeX
+ * @since 2021-08-12
+ */
+public interface ICardSwallowService extends BaseService<CardSwallow> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param cardSwallow
+	 * @return
+	 */
+	IPage<CardSwallowVO> selectCardSwallowPage(IPage<CardSwallowVO> page, CardSwallowVO cardSwallow);
+
+}

src/main/java/org/springblade/bank/cardswallow/service/impl/CardSwallowServiceImpl.java

@@ -0,0 +1,41 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.bank.cardswallow.service.impl;
+
+import org.springblade.bank.cardswallow.entity.CardSwallow;
+import org.springblade.bank.cardswallow.vo.CardSwallowVO;
+import org.springblade.bank.cardswallow.mapper.CardSwallowMapper;
+import org.springblade.bank.cardswallow.service.ICardSwallowService;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ * 自助設備吞沒卡處理 服务实现类
+ *
+ * @author BladeX
+ * @since 2021-08-12
+ */
+@Service
+public class CardSwallowServiceImpl extends BaseServiceImpl<CardSwallowMapper, CardSwallow> implements ICardSwallowService {
+
+	@Override
+	public IPage<CardSwallowVO> selectCardSwallowPage(IPage<CardSwallowVO> page, CardSwallowVO cardSwallow) {
+		return page.setRecords(baseMapper.selectCardSwallowPage(page, cardSwallow));
+	}
+
+}

src/main/java/org/springblade/bank/cardswallow/vo/CardSwallowVO.java

@@ -0,0 +1,36 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.bank.cardswallow.vo;
+
+import org.springblade.bank.cardswallow.entity.CardSwallow;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+
+/**
+ * 自助設備吞沒卡處理视图实体类
+ *
+ * @author BladeX
+ * @since 2021-08-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "CardSwallowVO对象", description = "自助設備吞沒卡處理")
+public class CardSwallowVO extends CardSwallow {
+	private static final long serialVersionUID = 1L;
+
+}

src/main/java/org/springblade/bank/cardswallow/wrapper/CardSwallowWrapper.java

@@ -0,0 +1,49 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.bank.cardswallow.wrapper;
+
+import org.springblade.core.mp.support.BaseEntityWrapper;
+import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.bank.cardswallow.entity.CardSwallow;
+import org.springblade.bank.cardswallow.vo.CardSwallowVO;
+import java.util.Objects;
+
+/**
+ * 自助設備吞沒卡處理包装类,返回视图层所需的字段
+ *
+ * @author BladeX
+ * @since 2021-08-12
+ */
+public class CardSwallowWrapper extends BaseEntityWrapper<CardSwallow, CardSwallowVO>  {
+
+	public static CardSwallowWrapper build() {
+		return new CardSwallowWrapper();
+ 	}
+
+	@Override
+	public CardSwallowVO entityVO(CardSwallow cardSwallow) {
+		CardSwallowVO cardSwallowVO = Objects.requireNonNull(BeanUtil.copy(cardSwallow, CardSwallowVO.class));
+
+		//User createUser = UserCache.getUser(cardSwallow.getCreateUser());
+		//User updateUser = UserCache.getUser(cardSwallow.getUpdateUser());
+		//cardSwallowVO.setCreateUserName(createUser.getName());
+		//cardSwallowVO.setUpdateUserName(updateUser.getName());
+
+		return cardSwallowVO;
+	}
+
+}

src/main/java/org/springblade/bank/checklist/controller/ChecklistController.java

@@ -0,0 +1,137 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.bank.checklist.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.BladeUser;
+import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.DateUtil;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.bank.checklist.entity.Checklist;
+import org.springblade.bank.checklist.vo.ChecklistVO;
+import org.springblade.bank.checklist.wrapper.ChecklistWrapper;
+import org.springblade.bank.checklist.service.IChecklistService;
+import org.springblade.core.boot.ctrl.BladeController;
+
+import java.util.Date;
+
+/**
+ * 每日/週/月核對記錄表 控制器
+ *
+ * @author BladeX
+ * @since 2021-08-13
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("bank/checklist")
+@Api(value = "每日/週/月核對記錄表", tags = "每日/週/月核對記錄表接口")
+public class ChecklistController extends BladeController {
+
+	private final IChecklistService checklistService;
+
+	/**
+	 * 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入checklist")
+	public R<ChecklistVO> detail(Checklist checklist) {
+		Checklist detail = checklistService.getOne(Condition.getQueryWrapper(checklist));
+		return R.data(ChecklistWrapper.build().entityVO(detail));
+	}
+
+	/**
+	 * 分页 每日/週/月核對記錄表
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入checklist")
+	public R<IPage<ChecklistVO>> list(Checklist checklist, Query query) {
+		IPage<Checklist> pages = checklistService.page(Condition.getPage(query), Condition.getQueryWrapper(checklist));
+		return R.data(ChecklistWrapper.build().pageVO(pages));
+	}
+
+
+	/**
+	 * 自定义分页 每日/週/月核對記錄表
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入checklist")
+	public R<IPage<ChecklistVO>> page(ChecklistVO checklist, Query query) {
+		IPage<ChecklistVO> pages = checklistService.selectChecklistPage(Condition.getPage(query), checklist);
+		return R.data(pages);
+	}
+
+	/**
+	 * 新增 每日/週/月核對記錄表
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入checklist")
+	public R save(@Valid @RequestBody Checklist checklist) {
+		return R.status(checklistService.save(checklist));
+	}
+
+	/**
+	 * 修改 每日/週/月核對記錄表
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入checklist")
+	public R update(@Valid @RequestBody Checklist checklist) {
+		return R.status(checklistService.updateById(checklist));
+	}
+
+	/**
+	 * 新增或修改 每日/週/月核對記錄表
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入checklist")
+	public R submit(@Valid @RequestBody Checklist checklist) {
+		if (checklist.getId() == null){
+			checklist.setFillingDate(DateUtil.now());
+		}
+		return R.status(checklistService.saveOrUpdate(checklist));
+	}
+
+
+	/**
+	 * 删除 每日/週/月核對記錄表
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(checklistService.deleteLogic(Func.toLongList(ids)));
+	}
+
+
+}

src/main/java/org/springblade/bank/checklist/dto/ChecklistDTO.java

@@ -0,0 +1,34 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.bank.checklist.dto;
+
+import org.springblade.bank.checklist.entity.Checklist;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 每日/週/月核對記錄表数据传输对象实体类
+ *
+ * @author BladeX
+ * @since 2021-08-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ChecklistDTO extends Checklist {
+	private static final long serialVersionUID = 1L;
+
+}

src/main/java/org/springblade/bank/checklist/entity/Checklist.java

@@ -0,0 +1,114 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.bank.checklist.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springblade.core.mp.base.BaseEntity;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * 每日/週/月核對記錄表实体类
+ *
+ * @author BladeX
+ * @since 2021-08-13
+ */
+@Data
+@TableName("zh_record_checklist")
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "Checklist对象", description = "每日/週/月核對記錄表")
+public class Checklist extends BaseEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	* 銀行號
+	*/
+		@ApiModelProperty(value = "銀行號")
+		private String bankNo;
+	/**
+	* 機構號
+	*/
+		@ApiModelProperty(value = "機構號")
+		private String orgNo;
+	/**
+	* 核對日期
+	*/
+		@ApiModelProperty(value = "核對日期")
+		@DateTimeFormat(
+			pattern = "yyyy-MM-dd HH:mm"
+		)
+		@JsonFormat(
+			pattern = "yyyy-MM-dd HH:mm"
+		)
+		private Date checkDate;
+	/**
+	* 分類
+	*/
+		@ApiModelProperty(value = "分類")
+		private String type;
+	/**
+	* 核對項目
+	*/
+		@ApiModelProperty(value = "核對項目")
+		private String item;
+	/**
+	* 核對內容/標準
+	*/
+		@ApiModelProperty(value = "核對內容/標準")
+		private String content;
+	/**
+	* 已核對
+	*/
+		@ApiModelProperty(value = "已核對")
+		private Integer isChecked;
+	/**
+	* 核對人員工號
+	*/
+		@ApiModelProperty(value = "核對人員工號")
+		private String checkNo;
+	/**
+	* 核對人姓名
+	*/
+		@ApiModelProperty(value = "核對人姓名")
+		private String checkName;
+	/**
+	* 備註
+	*/
+		@ApiModelProperty(value = "備註")
+		private String remark;
+	/**
+	* 填報時間
+	*/
+		@ApiModelProperty(value = "填報時間")
+		@DateTimeFormat(
+			pattern = "yyyy-MM-dd HH:mm"
+		)
+		@JsonFormat(
+			pattern = "yyyy-MM-dd HH:mm"
+		)
+		private Date fillingDate;
+
+
+}

src/main/java/org/springblade/bank/checklist/mapper/ChecklistMapper.java

@@ -0,0 +1,42 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.bank.checklist.mapper;
+
+import org.springblade.bank.checklist.entity.Checklist;
+import org.springblade.bank.checklist.vo.ChecklistVO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import java.util.List;
+
+/**
+ * 每日/週/月核對記錄表 Mapper 接口
+ *
+ * @author BladeX
+ * @since 2021-08-13
+ */
+public interface ChecklistMapper extends BaseMapper<Checklist> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param checklist
+	 * @return
+	 */
+	List<ChecklistVO> selectChecklistPage(IPage page, ChecklistVO checklist);
+
+}

src/main/java/org/springblade/bank/checklist/mapper/ChecklistMapper.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.springblade.bank.checklist.mapper.ChecklistMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="checklistResultMap" type="org.springblade.bank.checklist.entity.Checklist">
+        <result column="id" property="id"/>
+        <result column="create_user" property="createUser"/>
+        <result column="create_dept" property="createDept"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="status" property="status"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="bank_no" property="bankNo"/>
+        <result column="org_no" property="orgNo"/>
+        <result column="check_date" property="checkDate"/>
+        <result column="type" property="type"/>
+        <result column="item" property="item"/>
+        <result column="content" property="content"/>
+        <result column="is_checked" property="isChecked"/>
+        <result column="check_no" property="checkNo"/>
+        <result column="check_name" property="checkName"/>
+        <result column="remark" property="remark"/>
+        <result column="filling_date" property="fillingDate"/>
+    </resultMap>
+
+
+    <select id="selectChecklistPage" resultMap="checklistResultMap">
+        select * from zh_record_checklist where is_deleted = 0
+    </select>
+
+</mapper>

src/main/java/org/springblade/flow/core/constant/ProcessConstant.java → src/main/java/org/springblade/bank/checklist/service/IChecklistService.java

@@ -14,48 +14,28 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package org.springblade.flow.core.constant;
+package org.springblade.bank.checklist.service;
+
+import org.springblade.bank.checklist.entity.Checklist;
+import org.springblade.bank.checklist.vo.ChecklistVO;
+import org.springblade.core.mp.base.BaseService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 
 /**
- * 流程常量.
+ * 每日/週/月核對記錄表 服务类
  *
- * @author Chill
+ * @author BladeX
+ * @since 2021-08-13
  */
-public interface ProcessConstant {
-
-	/**
-	 * 请假流程标识
-	 */
-	String LEAVE_KEY = "Leave";
-
-	/**
-	 * 报销流程标识
-	 */
-	String EXPENSE_KEY = "Expense";
-
-	/**
-	 * 同意标识
-	 */
-	String PASS_KEY = "pass";
-
-	/**
-	 * 同意代号
-	 */
-	String PASS_ALIAS = "ok";
-
-	/**
-	 * 同意默认批复
-	 */
-	String PASS_COMMENT = "同意";
-
-	/**
-	 * 驳回默认批复
-	 */
-	String NOT_PASS_COMMENT = "驳回";
+public interface IChecklistService extends BaseService<Checklist> {
 
 	/**
-	 * 创建人变量名
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param checklist
+	 * @return
 	 */
-	String TASK_VARIABLE_CREATE_USER = "createUser";
+	IPage<ChecklistVO> selectChecklistPage(IPage<ChecklistVO> page, ChecklistVO checklist);
 
 }

src/main/java/org/springblade/flow/engine/constant/FlowEngineConstant.java → src/main/java/org/springblade/bank/checklist/service/impl/ChecklistServiceImpl.java

@@ -14,39 +14,28 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package org.springblade.flow.engine.constant;
+package org.springblade.bank.checklist.service.impl;
+
+import org.springblade.bank.checklist.entity.Checklist;
+import org.springblade.bank.checklist.vo.ChecklistVO;
+import org.springblade.bank.checklist.mapper.ChecklistMapper;
+import org.springblade.bank.checklist.service.IChecklistService;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 
 /**
- * 流程常量.
+ * 每日/週/月核對記錄表 服务实现类
  *
- * @author zhuangqian
+ * @author BladeX
+ * @since 2021-08-13
  */
-public interface FlowEngineConstant {
-
-	String FLOWABLE_BASE_PACKAGES = "org.flowable.ui";
-
-	String SUFFIX = ".bpmn20.xml";
-
-	String ACTIVE = "active";
-
-	String SUSPEND = "suspend";
-
-	String STATUS_TODO = "todo";
-
-	String STATUS_CLAIM = "claim";
-
-	String STATUS_SEND = "send";
-
-	String STATUS_DONE = "done";
-
-	String STATUS_FINISHED = "finished";
-
-	String STATUS_UNFINISHED = "unfinished";
-
-	String STATUS_FINISH = "finish";
-
-	String START_EVENT = "startEvent";
+@Service
+public class ChecklistServiceImpl extends BaseServiceImpl<ChecklistMapper, Checklist> implements IChecklistService {
 
-	String END_EVENT = "endEvent";
+	@Override
+	public IPage<ChecklistVO> selectChecklistPage(IPage<ChecklistVO> page, ChecklistVO checklist) {
+		return page.setRecords(baseMapper.selectChecklistPage(page, checklist));
+	}
 
 }

src/main/java/org/springblade/bank/checklist/vo/ChecklistVO.java

@@ -0,0 +1,36 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.bank.checklist.vo;
+
+import org.springblade.bank.checklist.entity.Checklist;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+
+/**
+ * 每日/週/月核對記錄表视图实体类
+ *
+ * @author BladeX
+ * @since 2021-08-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "ChecklistVO对象", description = "每日/週/月核對記錄表")
+public class ChecklistVO extends Checklist {
+	private static final long serialVersionUID = 1L;
+
+}

src/main/java/org/springblade/bank/checklist/wrapper/ChecklistWrapper.java

@@ -0,0 +1,49 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.bank.checklist.wrapper;
+
+import org.springblade.core.mp.support.BaseEntityWrapper;
+import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.bank.checklist.entity.Checklist;
+import org.springblade.bank.checklist.vo.ChecklistVO;
+import java.util.Objects;
+
+/**
+ * 每日/週/月核對記錄表包装类,返回视图层所需的字段
+ *
+ * @author BladeX
+ * @since 2021-08-13
+ */
+public class ChecklistWrapper extends BaseEntityWrapper<Checklist, ChecklistVO>  {
+
+	public static ChecklistWrapper build() {
+		return new ChecklistWrapper();
+ 	}
+
+	@Override
+	public ChecklistVO entityVO(Checklist checklist) {
+		ChecklistVO checklistVO = Objects.requireNonNull(BeanUtil.copy(checklist, ChecklistVO.class));
+
+		//User createUser = UserCache.getUser(checklist.getCreateUser());
+		//User updateUser = UserCache.getUser(checklist.getUpdateUser());
+		//checklistVO.setCreateUserName(createUser.getName());
+		//checklistVO.setUpdateUserName(updateUser.getName());
+
+		return checklistVO;
+	}
+
+}

src/main/java/org/springblade/bank/goodsuse/controller/GoodsUseController.java

@@ -0,0 +1,129 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.bank.goodsuse.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.bank.goodsuse.entity.GoodsUse;
+import org.springblade.bank.goodsuse.vo.GoodsUseVO;
+import org.springblade.bank.goodsuse.wrapper.GoodsUseWrapper;
+import org.springblade.bank.goodsuse.service.IGoodsUseService;
+import org.springblade.core.boot.ctrl.BladeController;
+
+/**
+ * 網點各項憑證/實物使用及出入庫登記表 控制器
+ *
+ * @author BladeX
+ * @since 2021-08-13
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("bank/goodsuse")
+@Api(value = "網點各項憑證/實物使用及出入庫登記表", tags = "網點各項憑證/實物使用及出入庫登記表接口")
+public class GoodsUseController extends BladeController {
+
+	private final IGoodsUseService goodsUseService;
+
+	/**
+	 * 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入goodsUse")
+	public R<GoodsUseVO> detail(GoodsUse goodsUse) {
+		GoodsUse detail = goodsUseService.getOne(Condition.getQueryWrapper(goodsUse));
+		return R.data(GoodsUseWrapper.build().entityVO(detail));
+	}
+
+	/**
+	 * 分页 網點各項憑證/實物使用及出入庫登記表
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入goodsUse")
+	public R<IPage<GoodsUseVO>> list(GoodsUse goodsUse, Query query) {
+		IPage<GoodsUse> pages = goodsUseService.page(Condition.getPage(query), Condition.getQueryWrapper(goodsUse));
+		return R.data(GoodsUseWrapper.build().pageVO(pages));
+	}
+
+
+	/**
+	 * 自定义分页 網點各項憑證/實物使用及出入庫登記表
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入goodsUse")
+	public R<IPage<GoodsUseVO>> page(GoodsUseVO goodsUse, Query query) {
+		IPage<GoodsUseVO> pages = goodsUseService.selectGoodsUsePage(Condition.getPage(query), goodsUse);
+		return R.data(pages);
+	}
+
+	/**
+	 * 新增 網點各項憑證/實物使用及出入庫登記表
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入goodsUse")
+	public R save(@Valid @RequestBody GoodsUse goodsUse) {
+		return R.status(goodsUseService.save(goodsUse));
+	}
+
+	/**
+	 * 修改 網點各項憑證/實物使用及出入庫登記表
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入goodsUse")
+	public R update(@Valid @RequestBody GoodsUse goodsUse) {
+		return R.status(goodsUseService.updateById(goodsUse));
+	}
+
+	/**
+	 * 新增或修改 網點各項憑證/實物使用及出入庫登記表
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入goodsUse")
+	public R submit(@Valid @RequestBody GoodsUse goodsUse) {
+		return R.status(goodsUseService.saveOrUpdate(goodsUse));
+	}
+
+	
+	/**
+	 * 删除 網點各項憑證/實物使用及出入庫登記表
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(goodsUseService.deleteLogic(Func.toLongList(ids)));
+	}
+
+	
+}

src/main/java/org/springblade/bank/goodsuse/dto/GoodsUseDTO.java

@@ -0,0 +1,34 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.bank.goodsuse.dto;
+
+import org.springblade.bank.goodsuse.entity.GoodsUse;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 網點各項憑證/實物使用及出入庫登記表数据传输对象实体类
+ *
+ * @author BladeX
+ * @since 2021-08-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class GoodsUseDTO extends GoodsUse {
+	private static final long serialVersionUID = 1L;
+
+}

src/main/java/org/springblade/bank/goodsuse/entity/GoodsUse.java

@@ -0,0 +1,166 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.bank.goodsuse.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springblade.core.mp.base.BaseEntity;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * 網點各項憑證/實物使用及出入庫登記表实体类
+ *
+ * @author BladeX
+ * @since 2021-08-13
+ */
+@Data
+@TableName("zh_record_goods_use")
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "GoodsUse对象", description = "網點各項憑證/實物使用及出入庫登記表")
+public class GoodsUse extends BaseEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	* 銀行號
+	*/
+		@ApiModelProperty(value = "銀行號")
+		private String bankNo;
+	/**
+	* 機構號
+	*/
+		@ApiModelProperty(value = "機構號")
+		private String orgNo;
+	/**
+	* 日期
+	*/
+		@ApiModelProperty(value = "日期")
+		@DateTimeFormat(
+			pattern = "yyyy-MM-dd HH:mm"
+		)
+		@JsonFormat(
+			pattern = "yyyy-MM-dd HH:mm"
+		)
+		private Date date;
+	/**
+	* 憑證/實物種類
+	*/
+		@ApiModelProperty(value = "憑證/實物種類")
+		private String type;
+	/**
+	* 使用數量
+	*/
+		@ApiModelProperty(value = "使用數量")
+		private Integer useNumber;
+	/**
+	* 領入數量
+	*/
+		@ApiModelProperty(value = "領入數量")
+		private Integer receiptNumber;
+	/**
+	* 註銷數量
+	*/
+		@ApiModelProperty(value = "註銷數量")
+		private Integer writeOffNumber;
+	/**
+	* 開始編號
+	*/
+		@ApiModelProperty(value = "開始編號")
+		private String beginNo;
+	/**
+	* 結束編號
+	*/
+		@ApiModelProperty(value = "結束編號")
+		private String endNo;
+	/**
+	* 餘額
+	*/
+		@ApiModelProperty(value = "餘額")
+		private Integer balance;
+	/**
+	* 備註
+	*/
+		@ApiModelProperty(value = "備註")
+		private String remark;
+	/**
+	* 填報人員工號
+	*/
+		@ApiModelProperty(value = "填報人員工號")
+		private String fillingNo;
+	/**
+	* 填報人姓名
+	*/
+		@ApiModelProperty(value = "填報人姓名")
+		private String fillingName;
+	/**
+	* 確認人員工號
+	*/
+		@ApiModelProperty(value = "確認人員工號")
+		private String confirmNo;
+	/**
+	* 確認人姓名
+	*/
+		@ApiModelProperty(value = "確認人姓名")
+		private String confirmName;
+	/**
+	* 填報日期及時間
+	*/
+		@ApiModelProperty(value = "填報日期及時間")
+		@DateTimeFormat(
+			pattern = "yyyy-MM-dd HH:mm:ss"
+		)
+		@JsonFormat(
+			pattern = "yyyy-MM-dd HH:mm:ss"
+		)
+		private Date fillingDate;
+	private Long personId;
+	/**
+	* 審批人
+	*/
+		@ApiModelProperty(value = "審批人")
+		private String personName;
+	/**
+	* 審批時間
+	*/
+		@ApiModelProperty(value = "審批時間")
+		@DateTimeFormat(
+			pattern = "yyyy-MM-dd HH:mm:ss"
+		)
+		@JsonFormat(
+			pattern = "yyyy-MM-dd HH:mm:ss"
+		)
+		private Date approveTime;
+	/**
+	* 節點
+	*/
+		@ApiModelProperty(value = "節點")
+		private Integer process;
+	/**
+	* 是否已完成
+	*/
+		@ApiModelProperty(value = "是否已完成")
+		private Integer isCompleted;
+
+
+}

src/main/java/org/springblade/bank/goodsuse/mapper/GoodsUseMapper.java

@@ -0,0 +1,42 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.bank.goodsuse.mapper;
+
+import org.springblade.bank.goodsuse.entity.GoodsUse;
+import org.springblade.bank.goodsuse.vo.GoodsUseVO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import java.util.List;
+
+/**
+ * 網點各項憑證/實物使用及出入庫登記表 Mapper 接口
+ *
+ * @author BladeX
+ * @since 2021-08-13
+ */
+public interface GoodsUseMapper extends BaseMapper<GoodsUse> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param goodsUse
+	 * @return
+	 */
+	List<GoodsUseVO> selectGoodsUsePage(IPage page, GoodsUseVO goodsUse);
+
+}

src/main/java/org/springblade/bank/goodsuse/mapper/GoodsUseMapper.xml

@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.springblade.bank.goodsuse.mapper.GoodsUseMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="goodsUseResultMap" type="org.springblade.bank.goodsuse.entity.GoodsUse">
+        <result column="id" property="id"/>
+        <result column="create_user" property="createUser"/>
+        <result column="create_dept" property="createDept"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="status" property="status"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="bank_no" property="bankNo"/>
+        <result column="org_no" property="orgNo"/>
+        <result column="date" property="date"/>
+        <result column="type" property="type"/>
+        <result column="use_number" property="useNumber"/>
+        <result column="receipt_number" property="receiptNumber"/>
+        <result column="write_off_number" property="writeOffNumber"/>
+        <result column="begin_no" property="beginNo"/>
+        <result column="end_no" property="endNo"/>
+        <result column="balance" property="balance"/>
+        <result column="remark" property="remark"/>
+        <result column="filling_no" property="fillingNo"/>
+        <result column="filling_name" property="fillingName"/>
+        <result column="confirm_no" property="confirmNo"/>
+        <result column="confirm_name" property="confirmName"/>
+        <result column="filling_date" property="fillingDate"/>
+        <result column="person_id" property="personId"/>
+        <result column="person_name" property="personName"/>
+        <result column="approve_time" property="approveTime"/>
+        <result column="process" property="process"/>
+        <result column="is_completed" property="isCompleted"/>
+    </resultMap>
+
+
+    <select id="selectGoodsUsePage" resultMap="goodsUseResultMap">
+        select * from zh_record_goods_use where is_deleted = 0
+    </select>
+
+</mapper>

src/main/java/org/springblade/bank/goodsuse/service/IGoodsUseService.java

@@ -0,0 +1,41 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.bank.goodsuse.service;
+
+import org.springblade.bank.goodsuse.entity.GoodsUse;
+import org.springblade.bank.goodsuse.vo.GoodsUseVO;
+import org.springblade.core.mp.base.BaseService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ * 網點各項憑證/實物使用及出入庫登記表 服务类
+ *
+ * @author BladeX
+ * @since 2021-08-13
+ */
+public interface IGoodsUseService extends BaseService<GoodsUse> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param goodsUse
+	 * @return
+	 */
+	IPage<GoodsUseVO> selectGoodsUsePage(IPage<GoodsUseVO> page, GoodsUseVO goodsUse);
+
+}

src/main/java/org/springblade/bank/goodsuse/service/impl/GoodsUseServiceImpl.java

@@ -0,0 +1,41 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.bank.goodsuse.service.impl;
+
+import org.springblade.bank.goodsuse.entity.GoodsUse;
+import org.springblade.bank.goodsuse.vo.GoodsUseVO;
+import org.springblade.bank.goodsuse.mapper.GoodsUseMapper;
+import org.springblade.bank.goodsuse.service.IGoodsUseService;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ * 網點各項憑證/實物使用及出入庫登記表 服务实现类
+ *
+ * @author BladeX
+ * @since 2021-08-13
+ */
+@Service
+public class GoodsUseServiceImpl extends BaseServiceImpl<GoodsUseMapper, GoodsUse> implements IGoodsUseService {
+
+	@Override
+	public IPage<GoodsUseVO> selectGoodsUsePage(IPage<GoodsUseVO> page, GoodsUseVO goodsUse) {
+		return page.setRecords(baseMapper.selectGoodsUsePage(page, goodsUse));
+	}
+
+}

src/main/java/org/springblade/bank/goodsuse/vo/GoodsUseVO.java

@@ -0,0 +1,36 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.bank.goodsuse.vo;
+
+import org.springblade.bank.goodsuse.entity.GoodsUse;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+
+/**
+ * 網點各項憑證/實物使用及出入庫登記表视图实体类
+ *
+ * @author BladeX
+ * @since 2021-08-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "GoodsUseVO对象", description = "網點各項憑證/實物使用及出入庫登記表")
+public class GoodsUseVO extends GoodsUse {
+	private static final long serialVersionUID = 1L;
+
+}

src/main/java/org/springblade/bank/goodsuse/wrapper/GoodsUseWrapper.java

@@ -0,0 +1,49 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.bank.goodsuse.wrapper;
+
+import org.springblade.core.mp.support.BaseEntityWrapper;
+import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.bank.goodsuse.entity.GoodsUse;
+import org.springblade.bank.goodsuse.vo.GoodsUseVO;
+import java.util.Objects;
+
+/**
+ * 網點各項憑證/實物使用及出入庫登記表包装类,返回视图层所需的字段
+ *
+ * @author BladeX
+ * @since 2021-08-13
+ */
+public class GoodsUseWrapper extends BaseEntityWrapper<GoodsUse, GoodsUseVO>  {
+
+	public static GoodsUseWrapper build() {
+		return new GoodsUseWrapper();
+ 	}
+
+	@Override
+	public GoodsUseVO entityVO(GoodsUse goodsUse) {
+		GoodsUseVO goodsUseVO = Objects.requireNonNull(BeanUtil.copy(goodsUse, GoodsUseVO.class));
+
+		//User createUser = UserCache.getUser(goodsUse.getCreateUser());
+		//User updateUser = UserCache.getUser(goodsUse.getUpdateUser());
+		//goodsUseVO.setCreateUserName(createUser.getName());
+		//goodsUseVO.setUpdateUserName(updateUser.getName());
+
+		return goodsUseVO;
+	}
+
+}

src/main/java/org/springblade/bank/keypwd/controller/KeyPwdController.java

@@ -0,0 +1,158 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.bank.keypwd.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+
+import org.springblade.core.datascope.annotation.DataAuth;
+import org.springblade.core.datascope.enums.DataScopeEnum;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.BladeUser;
+import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.DateUtil;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.bank.keypwd.entity.KeyPwd;
+import org.springblade.bank.keypwd.vo.KeyPwdVO;
+import org.springblade.bank.keypwd.wrapper.KeyPwdWrapper;
+import org.springblade.bank.keypwd.service.IKeyPwdService;
+import org.springblade.core.boot.ctrl.BladeController;
+
+import java.time.ZoneId;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 網點鎖匙/密碼登記表 控制器
+ *
+ * @author BladeX
+ * @since 2021-08-13
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("bank/keypwd")
+@Api(value = "網點鎖匙/密碼登記表", tags = "網點鎖匙/密碼登記表接口")
+public class KeyPwdController extends BladeController {
+
+	private final IKeyPwdService keyPwdService;
+
+	/**
+	 * 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入keyPwd")
+	public R<KeyPwdVO> detail(KeyPwd keyPwd) {
+		KeyPwd detail = keyPwdService.getOne(Condition.getQueryWrapper(keyPwd));
+		return R.data(KeyPwdWrapper.build().entityVO(detail));
+	}
+
+	/**
+	 * 分页 網點鎖匙/密碼登記表
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入keyPwd")
+	public R<IPage<KeyPwdVO>> list(KeyPwd keyPwd, Query query) {
+		IPage<KeyPwd> pages = keyPwdService.page(Condition.getPage(query), Condition.getQueryWrapper(keyPwd));
+		return R.data(KeyPwdWrapper.build().pageVO(pages));
+	}
+
+
+	/**
+	 * 自定义分页 網點鎖匙/密碼登記表
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入keyPwd")
+	@DataAuth(column = "create_dept", type = DataScopeEnum.OWN)
+	public R<IPage<KeyPwdVO>> page(KeyPwdVO keyPwd, Query query) {
+		IPage<KeyPwdVO> pages = keyPwdService.selectKeyPwdPage(Condition.getPage(query), keyPwd);
+		return R.data(pages);
+	}
+
+	/**
+	 * 新增 網點鎖匙/密碼登記表
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入keyPwd")
+	public R save(@Valid @RequestBody KeyPwd keyPwd) {
+		return R.status(keyPwdService.save(keyPwd));
+	}
+
+	/**
+	 * 修改 網點鎖匙/密碼登記表
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入keyPwd")
+	public R update(@Valid @RequestBody KeyPwd keyPwd) {
+		return R.status(keyPwdService.updateById(keyPwd));
+	}
+
+	/**
+	 * 新增或修改 網點鎖匙/密碼登記表
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入keyPwd")
+	public R submit(@Valid @RequestBody KeyPwd keyPwd) {
+		if (keyPwd.getId() == null){
+			BladeUser currentUser = AuthUtil.getUser();
+			keyPwd.setFillingPerson(currentUser.getUserName());
+			keyPwd.setFillingDate(DateUtil.now());
+		}
+		return R.status(keyPwdService.saveOrUpdate(keyPwd));
+	}
+
+
+	/**
+	 * 删除 網點鎖匙/密碼登記表
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(keyPwdService.deleteLogic(Func.toLongList(ids)));
+	}
+
+	@GetMapping("/getByCategoryAndType")
+	@ApiOperationSupport(order = 8)
+	@ApiOperation(value = "获取最新一条记录", notes = "传入category,type")
+	public R getByCategoryAndType(@ApiParam(required = true) @RequestParam String category, @ApiParam(required = true) @RequestParam String type, @ApiParam(required = true) @RequestParam String orgNo){
+		LambdaQueryWrapper<KeyPwd> eq = new QueryWrapper<>(new KeyPwd()).lambda().eq(KeyPwd::getCategory, category)
+			.eq(KeyPwd::getType, type).eq(KeyPwd::getOrgNo, orgNo).orderByDesc(KeyPwd::getFillingDate);
+		List<KeyPwd> list = keyPwdService.list(eq);
+		if (list != null && list.size() > 0){
+			return R.data(list.get(0));
+		}
+		return R.data(null);
+	}
+
+}

src/main/java/org/springblade/flow/core/enums/FlowModeEnum.java → src/main/java/org/springblade/bank/keypwd/dto/KeyPwdDTO.java

@@ -14,32 +14,21 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package org.springblade.flow.core.enums;
+package org.springblade.bank.keypwd.dto;
 
-import lombok.AllArgsConstructor;
-import lombok.Getter;
+import org.springblade.bank.keypwd.entity.KeyPwd;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 /**
- * 流程类型枚举
+ * 網點鎖匙/密碼登記表数据传输对象实体类
  *
- * @author Chill
+ * @author BladeX
+ * @since 2021-08-13
  */
-@Getter
-@AllArgsConstructor
-public enum FlowModeEnum {
-
-	/**
-	 * 通用流程
-	 */
-	COMMON("common", 1),
-
-	/**
-	 * 定制流程
-	 */
-	CUSTOM("custom", 2),
-	;
-
-	final String name;
-	final int mode;
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class KeyPwdDTO extends KeyPwd {
+	private static final long serialVersionUID = 1L;
 
 }

src/main/java/org/springblade/bank/keypwd/entity/KeyPwd.java

@@ -0,0 +1,125 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.bank.keypwd.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springblade.core.mp.base.BaseEntity;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.springblade.core.tenant.mp.TenantEntity;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * 網點鎖匙/密碼登記表实体类
+ *
+ * @author BladeX
+ * @since 2021-08-13
+ */
+@Data
+@TableName("zh_input_key_pwd")
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "KeyPwd对象", description = "網點鎖匙/密碼登記表")
+public class KeyPwd extends BaseEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	* 銀行號
+	*/
+		@ApiModelProperty(value = "銀行號")
+		private String bankNo;
+	/**
+	* 機構號
+	*/
+		@ApiModelProperty(value = "機構號")
+		private String orgNo;
+	/**
+	* 分類
+	*/
+		@ApiModelProperty(value = "分類")
+		private String category;
+	/**
+	* 種類
+	*/
+		@ApiModelProperty(value = "種類")
+		private String type;
+	/**
+	* 數量
+	*/
+		@ApiModelProperty(value = "數量")
+		private Integer number;
+	/**
+	* 交出人員工號
+	*/
+		@ApiModelProperty(value = "交出人員工號")
+		private String handoverPersonNo;
+	/**
+	* 交出人姓名
+	*/
+		@ApiModelProperty(value = "交出人姓名")
+		private String handoverPersonName;
+	/**
+	* 交接日期
+	*/
+		@ApiModelProperty(value = "交接日期")
+		@DateTimeFormat(
+			pattern = "yyyy-MM-dd HH:mm"
+		)
+		@JsonFormat(
+			pattern = "yyyy-MM-dd HH:mm"
+		)
+		private Date handoverDate;
+	/**
+	* 接收人員工號
+	*/
+		@ApiModelProperty(value = "接收人員工號")
+		private String receiverNo;
+	/**
+	* 接收人姓名
+	*/
+		@ApiModelProperty(value = "接收人姓名")
+		private String receiverName;
+	/**
+	* 備註
+	*/
+		@ApiModelProperty(value = "備註")
+		private String remark;
+	/**
+	* 填報時間
+	*/
+		@ApiModelProperty(value = "填報時間")
+		@DateTimeFormat(
+			pattern = "yyyy-MM-dd HH:mm:ss"
+		)
+		@JsonFormat(
+			pattern = "yyyy-MM-dd HH:mm:ss"
+		)
+		private Date fillingDate;
+	/**
+	* 填報人
+	*/
+		@ApiModelProperty(value = "填報人")
+		private String fillingPerson;
+
+
+}

src/main/java/org/springblade/bank/keypwd/mapper/KeyPwdMapper.java

@@ -0,0 +1,46 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.bank.keypwd.mapper;
+
+import org.springblade.bank.keypwd.entity.KeyPwd;
+import org.springblade.bank.keypwd.vo.KeyPwdVO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.datascope.annotation.DataAuth;
+import org.springblade.core.datascope.enums.DataScopeEnum;
+
+import java.util.List;
+
+/**
+ * 網點鎖匙/密碼登記表 Mapper 接口
+ *
+ * @author BladeX
+ * @since 2021-08-13
+ */
+public interface KeyPwdMapper extends BaseMapper<KeyPwd> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param keyPwd
+	 * @return
+	 */
+	@DataAuth(type = DataScopeEnum.OWN_DEPT_CHILD)
+	List<KeyPwdVO> selectKeyPwdPage(IPage page, KeyPwdVO keyPwd);
+
+}

src/main/java/org/springblade/bank/keypwd/mapper/KeyPwdMapper.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.springblade.bank.keypwd.mapper.KeyPwdMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="keyPwdResultMap" type="org.springblade.bank.keypwd.entity.KeyPwd">
+        <result column="id" property="id"/>
+        <result column="create_user" property="createUser"/>
+        <result column="create_dept" property="createDept"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="status" property="status"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="bank_no" property="bankNo"/>
+        <result column="org_no" property="orgNo"/>
+        <result column="category" property="category"/>
+        <result column="type" property="type"/>
+        <result column="number" property="number"/>
+        <result column="handover_person_no" property="handoverPersonNo"/>
+        <result column="handover_person_name" property="handoverPersonName"/>
+        <result column="handover_date" property="handoverDate"/>
+        <result column="receiver_no" property="receiverNo"/>
+        <result column="receiver_name" property="receiverName"/>
+        <result column="remark" property="remark"/>
+        <result column="filling_date" property="fillingDate"/>
+        <result column="filling_person" property="fillingPerson"/>
+    </resultMap>
+
+
+    <select id="selectKeyPwdPage" resultMap="keyPwdResultMap">
+        select * from zh_input_key_pwd where is_deleted = 0
+    </select>
+
+</mapper>

src/main/java/org/springblade/bank/keypwd/service/IKeyPwdService.java

@@ -0,0 +1,43 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.bank.keypwd.service;
+
+import org.springblade.bank.keypwd.entity.KeyPwd;
+import org.springblade.bank.keypwd.vo.KeyPwdVO;
+import org.springblade.core.datascope.annotation.DataAuth;
+import org.springblade.core.datascope.enums.DataScopeEnum;
+import org.springblade.core.mp.base.BaseService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ * 網點鎖匙/密碼登記表 服务类
+ *
+ * @author BladeX
+ * @since 2021-08-13
+ */
+public interface IKeyPwdService extends BaseService<KeyPwd> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param keyPwd
+	 * @return
+	 */
+	IPage<KeyPwdVO> selectKeyPwdPage(IPage<KeyPwdVO> page, KeyPwdVO keyPwd);
+
+}

src/main/java/org/springblade/bank/keypwd/service/impl/KeyPwdServiceImpl.java

@@ -0,0 +1,44 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.bank.keypwd.service.impl;
+
+import org.springblade.bank.keypwd.entity.KeyPwd;
+import org.springblade.bank.keypwd.vo.KeyPwdVO;
+import org.springblade.bank.keypwd.mapper.KeyPwdMapper;
+import org.springblade.bank.keypwd.service.IKeyPwdService;
+import org.springblade.core.datascope.annotation.DataAuth;
+import org.springblade.core.datascope.enums.DataScopeEnum;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ * 網點鎖匙/密碼登記表 服务实现类
+ *
+ * @author BladeX
+ * @since 2021-08-13
+ */
+@Service
+public class KeyPwdServiceImpl extends BaseServiceImpl<KeyPwdMapper, KeyPwd> implements IKeyPwdService {
+
+	@Override
+	@DataAuth(column = "create_dept", type = DataScopeEnum.OWN)
+	public IPage<KeyPwdVO> selectKeyPwdPage(IPage<KeyPwdVO> page, KeyPwdVO keyPwd) {
+		return page.setRecords(baseMapper.selectKeyPwdPage(page, keyPwd));
+	}
+
+}

src/main/java/org/springblade/bank/keypwd/vo/KeyPwdVO.java

@@ -0,0 +1,36 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.bank.keypwd.vo;
+
+import org.springblade.bank.keypwd.entity.KeyPwd;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+
+/**
+ * 網點鎖匙/密碼登記表视图实体类
+ *
+ * @author BladeX
+ * @since 2021-08-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "KeyPwdVO对象", description = "網點鎖匙/密碼登記表")
+public class KeyPwdVO extends KeyPwd {
+	private static final long serialVersionUID = 1L;
+
+}

src/main/java/org/springblade/bank/keypwd/wrapper/KeyPwdWrapper.java

@@ -0,0 +1,49 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.bank.keypwd.wrapper;
+
+import org.springblade.core.mp.support.BaseEntityWrapper;
+import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.bank.keypwd.entity.KeyPwd;
+import org.springblade.bank.keypwd.vo.KeyPwdVO;
+import java.util.Objects;
+
+/**
+ * 網點鎖匙/密碼登記表包装类,返回视图层所需的字段
+ *
+ * @author BladeX
+ * @since 2021-08-13
+ */
+public class KeyPwdWrapper extends BaseEntityWrapper<KeyPwd, KeyPwdVO>  {
+
+	public static KeyPwdWrapper build() {
+		return new KeyPwdWrapper();
+ 	}
+
+	@Override
+	public KeyPwdVO entityVO(KeyPwd keyPwd) {
+		KeyPwdVO keyPwdVO = Objects.requireNonNull(BeanUtil.copy(keyPwd, KeyPwdVO.class));
+
+		//User createUser = UserCache.getUser(keyPwd.getCreateUser());
+		//User updateUser = UserCache.getUser(keyPwd.getUpdateUser());
+		//keyPwdVO.setCreateUserName(createUser.getName());
+		//keyPwdVO.setUpdateUserName(updateUser.getName());
+
+		return keyPwdVO;
+	}
+
+}

src/main/java/org/springblade/bank/message/controller/MessageController.java

@@ -0,0 +1,129 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.bank.message.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.bank.message.entity.Message;
+import org.springblade.bank.message.vo.MessageVO;
+import org.springblade.bank.message.wrapper.MessageWrapper;
+import org.springblade.bank.message.service.IMessageService;
+import org.springblade.core.boot.ctrl.BladeController;
+
+/**
+ * 信息發佈 控制器
+ *
+ * @author BladeX
+ * @since 2021-08-13
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("bank/message")
+@Api(value = "信息發佈", tags = "信息發佈接口")
+public class MessageController extends BladeController {
+
+	private final IMessageService messageService;
+
+	/**
+	 * 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入message")
+	public R<MessageVO> detail(Message message) {
+		Message detail = messageService.getOne(Condition.getQueryWrapper(message));
+		return R.data(MessageWrapper.build().entityVO(detail));
+	}
+
+	/**
+	 * 分页 信息發佈
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入message")
+	public R<IPage<MessageVO>> list(Message message, Query query) {
+		IPage<Message> pages = messageService.page(Condition.getPage(query), Condition.getQueryWrapper(message));
+		return R.data(MessageWrapper.build().pageVO(pages));
+	}
+
+
+	/**
+	 * 自定义分页 信息發佈
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入message")
+	public R<IPage<MessageVO>> page(MessageVO message, Query query) {
+		IPage<MessageVO> pages = messageService.selectMessagePage(Condition.getPage(query), message);
+		return R.data(pages);
+	}
+
+	/**
+	 * 新增 信息發佈
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入message")
+	public R save(@Valid @RequestBody Message message) {
+		return R.status(messageService.save(message));
+	}
+
+	/**
+	 * 修改 信息發佈
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入message")
+	public R update(@Valid @RequestBody Message message) {
+		return R.status(messageService.updateById(message));
+	}
+
+	/**
+	 * 新增或修改 信息發佈
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入message")
+	public R submit(@Valid @RequestBody Message message) {
+		return R.status(messageService.saveOrUpdate(message));
+	}
+
+	
+	/**
+	 * 删除 信息發佈
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(messageService.deleteLogic(Func.toLongList(ids)));
+	}
+
+	
+}

src/main/java/org/springblade/flow/demo/leave/mapper/LeaveMapper.java → src/main/java/org/springblade/bank/message/dto/MessageDTO.java

@@ -14,16 +14,21 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package org.springblade.flow.demo.leave.mapper;
+package org.springblade.bank.message.dto;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.springblade.flow.demo.leave.entity.ProcessLeave;
+import org.springblade.bank.message.entity.Message;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 /**
- * Mapper 接口
+ * 信息發佈数据传输对象实体类
  *
- * @author Chill
+ * @author BladeX
+ * @since 2021-08-13
  */
-public interface LeaveMapper extends BaseMapper<ProcessLeave> {
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class MessageDTO extends Message {
+	private static final long serialVersionUID = 1L;
 
 }

src/main/java/org/springblade/bank/message/entity/Message.java

@@ -0,0 +1,89 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.bank.message.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springblade.core.mp.base.BaseEntity;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * 信息發佈实体类
+ *
+ * @author BladeX
+ * @since 2021-08-13
+ */
+@Data
+@TableName("zh_message")
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "Message对象", description = "信息發佈")
+public class Message extends BaseEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	* 標題
+	*/
+		@ApiModelProperty(value = "標題")
+		private String title;
+	/**
+	* 內文
+	*/
+		@ApiModelProperty(value = "內文")
+		private String name;
+	/**
+	* 附件
+	*/
+		@ApiModelProperty(value = "附件")
+		private String file;
+	private Long personId;
+	/**
+	* 審批人
+	*/
+		@ApiModelProperty(value = "審批人")
+		private String personName;
+	/**
+	* 審批時間
+	*/
+		@ApiModelProperty(value = "審批時間")
+		@DateTimeFormat(
+			pattern = "yyyy-MM-dd HH:mm:ss"
+		)
+		@JsonFormat(
+			pattern = "yyyy-MM-dd HH:mm:ss"
+		)
+		private Date approveTime;
+	/**
+	* 節點
+	*/
+		@ApiModelProperty(value = "節點")
+		private Integer process;
+	/**
+	* 是否已完成
+	*/
+		@ApiModelProperty(value = "是否已完成")
+		private Integer isCompleted;
+
+
+}

src/main/java/org/springblade/flow/engine/mapper/FlowMapper.java → src/main/java/org/springblade/bank/message/mapper/MessageMapper.java

@@ -14,33 +14,29 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package org.springblade.flow.engine.mapper;
+package org.springblade.bank.message.mapper;
 
+import org.springblade.bank.message.entity.Message;
+import org.springblade.bank.message.vo.MessageVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.flow.engine.entity.FlowModel;
-
 import java.util.List;
 
 /**
- * FlowMapper.
+ * 信息發佈 Mapper 接口
  *
- * @author Chill
+ * @author BladeX
+ * @since 2021-08-13
  */
-public interface FlowMapper extends BaseMapper<FlowModel> {
+public interface MessageMapper extends BaseMapper<Message> {
 
 	/**
 	 * 自定义分页
+	 *
 	 * @param page
-	 * @param flowModel
+	 * @param message
 	 * @return
 	 */
-	List<FlowModel> selectFlowPage(IPage page, FlowModel flowModel);
+	List<MessageVO> selectMessagePage(IPage page, MessageVO message);
 
-	/**
-	 * 获取模型
-	 * @param parentModelId
-	 * @return
-	 */
-	List<FlowModel> findByParentModelId(String parentModelId);
 }

src/main/java/org/springblade/bank/message/mapper/MessageMapper.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.springblade.bank.message.mapper.MessageMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="messageResultMap" type="org.springblade.bank.message.entity.Message">
+        <result column="id" property="id"/>
+        <result column="create_user" property="createUser"/>
+        <result column="create_dept" property="createDept"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="status" property="status"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="title" property="title"/>
+        <result column="name" property="name"/>
+        <result column="file" property="file"/>
+        <result column="person_id" property="personId"/>
+        <result column="person_name" property="personName"/>
+        <result column="approve_time" property="approveTime"/>
+        <result column="process" property="process"/>
+        <result column="is_completed" property="isCompleted"/>
+    </resultMap>
+
+
+    <select id="selectMessagePage" resultMap="messageResultMap">
+        select * from zh_message where is_deleted = 0
+    </select>
+
+</mapper>

src/main/java/org/springblade/bank/message/service/IMessageService.java

@@ -0,0 +1,41 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.bank.message.service;
+
+import org.springblade.bank.message.entity.Message;
+import org.springblade.bank.message.vo.MessageVO;
+import org.springblade.core.mp.base.BaseService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ * 信息發佈 服务类
+ *
+ * @author BladeX
+ * @since 2021-08-13
+ */
+public interface IMessageService extends BaseService<Message> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param message
+	 * @return
+	 */
+	IPage<MessageVO> selectMessagePage(IPage<MessageVO> page, MessageVO message);
+
+}

src/main/java/org/springblade/bank/message/service/impl/MessageServiceImpl.java

@@ -0,0 +1,41 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.bank.message.service.impl;
+
+import org.springblade.bank.message.entity.Message;
+import org.springblade.bank.message.vo.MessageVO;
+import org.springblade.bank.message.mapper.MessageMapper;
+import org.springblade.bank.message.service.IMessageService;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ * 信息發佈 服务实现类
+ *
+ * @author BladeX
+ * @since 2021-08-13
+ */
+@Service
+public class MessageServiceImpl extends BaseServiceImpl<MessageMapper, Message> implements IMessageService {
+
+	@Override
+	public IPage<MessageVO> selectMessagePage(IPage<MessageVO> page, MessageVO message) {
+		return page.setRecords(baseMapper.selectMessagePage(page, message));
+	}
+
+}

src/main/java/org/springblade/bank/message/vo/MessageVO.java

@@ -0,0 +1,36 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.bank.message.vo;
+
+import org.springblade.bank.message.entity.Message;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+
+/**
+ * 信息發佈视图实体类
+ *
+ * @author BladeX
+ * @since 2021-08-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "MessageVO对象", description = "信息發佈")
+public class MessageVO extends Message {
+	private static final long serialVersionUID = 1L;
+
+}

src/main/java/org/springblade/bank/message/wrapper/MessageWrapper.java

@@ -0,0 +1,49 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.bank.message.wrapper;
+
+import org.springblade.core.mp.support.BaseEntityWrapper;
+import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.bank.message.entity.Message;
+import org.springblade.bank.message.vo.MessageVO;
+import java.util.Objects;
+
+/**
+ * 信息發佈包装类,返回视图层所需的字段
+ *
+ * @author BladeX
+ * @since 2021-08-13
+ */
+public class MessageWrapper extends BaseEntityWrapper<Message, MessageVO>  {
+
+	public static MessageWrapper build() {
+		return new MessageWrapper();
+ 	}
+
+	@Override
+	public MessageVO entityVO(Message message) {
+		MessageVO messageVO = Objects.requireNonNull(BeanUtil.copy(message, MessageVO.class));
+
+		//User createUser = UserCache.getUser(message.getCreateUser());
+		//User updateUser = UserCache.getUser(message.getUpdateUser());
+		//messageVO.setCreateUserName(createUser.getName());
+		//messageVO.setUpdateUserName(updateUser.getName());
+
+		return messageVO;
+	}
+
+}

src/main/java/org/springblade/bank/postchange/controller/PostChangeController.java

@@ -0,0 +1,145 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.bank.postchange.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.bank.postchange.entity.PostChange;
+import org.springblade.bank.postchange.vo.PostChangeVO;
+import org.springblade.bank.postchange.wrapper.PostChangeWrapper;
+import org.springblade.bank.postchange.service.IPostChangeService;
+import org.springblade.core.boot.ctrl.BladeController;
+
+/**
+ * 網點出納主管及專管員崗位表更記錄表 控制器
+ *
+ * @author BladeX
+ * @since 2021-08-13
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("bank/postchange")
+@Api(value = "網點出納主管及專管員崗位表更記錄表", tags = "網點出納主管及專管員崗位表更記錄表接口")
+public class PostChangeController extends BladeController {
+
+	private final IPostChangeService postChangeService;
+
+	/**
+	 * 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入postChange")
+	public R<PostChangeVO> detail(PostChange postChange) {
+		PostChange detail = postChangeService.getOne(Condition.getQueryWrapper(postChange));
+		return R.data(PostChangeWrapper.build().entityVO(detail));
+	}
+
+	/**
+	 * 分页 網點出納主管及專管員崗位表更記錄表
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入postChange")
+	public R<IPage<PostChangeVO>> list(PostChange postChange, Query query) {
+		IPage<PostChange> pages = postChangeService.page(Condition.getPage(query), Condition.getQueryWrapper(postChange));
+		return R.data(PostChangeWrapper.build().pageVO(pages));
+	}
+
+
+	/**
+	 * 自定义分页 網點出納主管及專管員崗位表更記錄表
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入postChange")
+	public R<IPage<PostChangeVO>> page(PostChangeVO postChange, Query query) {
+		IPage<PostChangeVO> pages = postChangeService.selectPostChangePage(Condition.getPage(query), postChange);
+		return R.data(pages);
+	}
+
+	/**
+	 * 新增 網點出納主管及專管員崗位表更記錄表
+	 */
+	@PostMapping("/settingSave")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入postChange")
+	public R save(@Valid @RequestBody PostChange postChange) {
+		postChange.setId(1L);
+		if (postChange.getPersonId() == null){
+			return R.status(postChangeService.save(postChange));
+		}
+		return R.status(postChangeService.updateById(postChange));
+	}
+
+	/**
+	 * 修改 網點出納主管及專管員崗位表更記錄表
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入postChange")
+	public R update(@Valid @RequestBody PostChange postChange) {
+		return R.status(postChangeService.updateById(postChange));
+	}
+
+	/**
+	 * 新增或修改 網點出納主管及專管員崗位表更記錄表
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入postChange")
+	public R submit(@Valid @RequestBody PostChange postChange) {
+		return R.status(postChangeService.saveOrUpdate(postChange));
+	}
+
+
+	/**
+	 * 删除 網點出納主管及專管員崗位表更記錄表
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(postChangeService.deleteLogic(Func.toLongList(ids)));
+	}
+
+	/**
+	 * 获取审批人设置
+	 */
+	@GetMapping("/getSetting")
+	@ApiOperationSupport(order = 8)
+	@ApiOperation(value = "获取审批人设置", notes = "")
+	public R getSetting() {
+		PostChange one = postChangeService.getOne(new QueryWrapper<>(new PostChange()).lambda().eq(PostChange::getId, 1L));
+		return R.data(one);
+	}
+
+
+}

src/main/java/org/springblade/bank/postchange/dto/PostChangeDTO.java

@@ -0,0 +1,34 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.bank.postchange.dto;
+
+import org.springblade.bank.postchange.entity.PostChange;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 網點出納主管及專管員崗位表更記錄表数据传输对象实体类
+ *
+ * @author BladeX
+ * @since 2021-08-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class PostChangeDTO extends PostChange {
+	private static final long serialVersionUID = 1L;
+
+}

src/main/java/org/springblade/bank/postchange/entity/PostChange.java

@@ -0,0 +1,142 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.bank.postchange.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springblade.core.mp.base.BaseEntity;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * 網點出納主管及專管員崗位表更記錄表实体类
+ *
+ * @author BladeX
+ * @since 2021-08-13
+ */
+@Data
+@TableName("zh_record_post_change")
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "PostChange对象", description = "網點出納主管及專管員崗位表更記錄表")
+public class PostChange extends BaseEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	* 銀行號
+	*/
+		@ApiModelProperty(value = "銀行號")
+		private String bankNo;
+	/**
+	* 機構號
+	*/
+		@ApiModelProperty(value = "機構號")
+		private String orgNo;
+	/**
+	* 網點出納主管
+	*/
+		@ApiModelProperty(value = "網點出納主管")
+		private String director;
+	/**
+	* 網點出納專管員
+	*/
+		@ApiModelProperty(value = "網點出納專管員")
+		private String manager;
+	/**
+	* 種類
+	*/
+		@ApiModelProperty(value = "種類")
+		private String type;
+	/**
+	* 鎖匙/密碼
+	*/
+		@ApiModelProperty(value = "鎖匙/密碼")
+		private String keyPwd;
+	/**
+	* 持有人
+	*/
+		@ApiModelProperty(value = "持有人")
+		private String holder;
+	/**
+	* 後備人員
+	*/
+		@ApiModelProperty(value = "後備人員")
+		private String backupPerson;
+	/**
+	* 申請日期
+	*/
+		@ApiModelProperty(value = "申請日期")
+		@DateTimeFormat(
+			pattern = "yyyy-MM-dd HH:mm:ss"
+		)
+		@JsonFormat(
+			pattern = "yyyy-MM-dd HH:mm:ss"
+		)
+		private Date applyDate;
+	/**
+	* 生效日期
+	*/
+		@ApiModelProperty(value = "生效日期")
+		@DateTimeFormat(
+			pattern = "yyyy-MM-dd HH:mm:ss"
+		)
+		@JsonFormat(
+			pattern = "yyyy-MM-dd HH:mm:ss"
+		)
+		private Date effectiveDate;
+	/**
+	* 備註
+	*/
+		@ApiModelProperty(value = "備註")
+		private String remark;
+	/**
+	* 審批人
+	*/
+		private Long personId;
+		private String personNo;
+		@ApiModelProperty(value = "審批人")
+		private String personName;
+	/**
+	* 審批時間
+	*/
+		@ApiModelProperty(value = "審批時間")
+		@DateTimeFormat(
+			pattern = "yyyy-MM-dd HH:mm:ss"
+		)
+		@JsonFormat(
+			pattern = "yyyy-MM-dd HH:mm:ss"
+		)
+		private Date approveTime;
+	/**
+	* 節點
+	*/
+		@ApiModelProperty(value = "節點")
+		private Integer process;
+	/**
+	* 是否已完成
+	*/
+		@ApiModelProperty(value = "是否已完成")
+		private Integer isCompleted;
+
+
+}

src/main/java/org/springblade/bank/postchange/mapper/PostChangeMapper.java

@@ -0,0 +1,42 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.bank.postchange.mapper;
+
+import org.springblade.bank.postchange.entity.PostChange;
+import org.springblade.bank.postchange.vo.PostChangeVO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import java.util.List;
+
+/**
+ * 網點出納主管及專管員崗位表更記錄表 Mapper 接口
+ *
+ * @author BladeX
+ * @since 2021-08-13
+ */
+public interface PostChangeMapper extends BaseMapper<PostChange> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param postChange
+	 * @return
+	 */
+	List<PostChangeVO> selectPostChangePage(IPage page, PostChangeVO postChange);
+
+}

src/main/java/org/springblade/bank/postchange/mapper/PostChangeMapper.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.springblade.bank.postchange.mapper.PostChangeMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="postChangeResultMap" type="org.springblade.bank.postchange.entity.PostChange">
+        <result column="id" property="id"/>
+        <result column="create_user" property="createUser"/>
+        <result column="create_dept" property="createDept"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="status" property="status"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="bank_no" property="bankNo"/>
+        <result column="org_no" property="orgNo"/>
+        <result column="director" property="director"/>
+        <result column="manager" property="manager"/>
+        <result column="type" property="type"/>
+        <result column="key_pwd" property="keyPwd"/>
+        <result column="holder" property="holder"/>
+        <result column="backup_person" property="backupPerson"/>
+        <result column="apply_date" property="applyDate"/>
+        <result column="effective_date" property="effectiveDate"/>
+        <result column="remark" property="remark"/>
+        <result column="person_id" property="personId"/>
+        <result column="person_no" property="personNo"/>
+        <result column="person_name" property="personName"/>
+        <result column="approve_time" property="approveTime"/>
+        <result column="process" property="process"/>
+        <result column="is_completed" property="isCompleted"/>
+    </resultMap>
+
+
+    <select id="selectPostChangePage" resultMap="postChangeResultMap">
+        select * from zh_record_post_change where is_deleted = 0 and id != 1
+    </select>
+
+</mapper>

src/main/java/org/springblade/bank/postchange/service/IPostChangeService.java

@@ -0,0 +1,41 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.bank.postchange.service;
+
+import org.springblade.bank.postchange.entity.PostChange;
+import org.springblade.bank.postchange.vo.PostChangeVO;
+import org.springblade.core.mp.base.BaseService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ * 網點出納主管及專管員崗位表更記錄表 服务类
+ *
+ * @author BladeX
+ * @since 2021-08-13
+ */
+public interface IPostChangeService extends BaseService<PostChange> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param postChange
+	 * @return
+	 */
+	IPage<PostChangeVO> selectPostChangePage(IPage<PostChangeVO> page, PostChangeVO postChange);
+
+}

src/main/java/org/springblade/bank/postchange/service/impl/PostChangeServiceImpl.java

@@ -0,0 +1,41 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.bank.postchange.service.impl;
+
+import org.springblade.bank.postchange.entity.PostChange;
+import org.springblade.bank.postchange.vo.PostChangeVO;
+import org.springblade.bank.postchange.mapper.PostChangeMapper;
+import org.springblade.bank.postchange.service.IPostChangeService;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ * 網點出納主管及專管員崗位表更記錄表 服务实现类
+ *
+ * @author BladeX
+ * @since 2021-08-13
+ */
+@Service
+public class PostChangeServiceImpl extends BaseServiceImpl<PostChangeMapper, PostChange> implements IPostChangeService {
+
+	@Override
+	public IPage<PostChangeVO> selectPostChangePage(IPage<PostChangeVO> page, PostChangeVO postChange) {
+		return page.setRecords(baseMapper.selectPostChangePage(page, postChange));
+	}
+
+}

src/main/java/org/springblade/bank/postchange/vo/PostChangeVO.java

@@ -0,0 +1,36 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.bank.postchange.vo;
+
+import org.springblade.bank.postchange.entity.PostChange;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+
+/**
+ * 網點出納主管及專管員崗位表更記錄表视图实体类
+ *
+ * @author BladeX
+ * @since 2021-08-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "PostChangeVO对象", description = "網點出納主管及專管員崗位表更記錄表")
+public class PostChangeVO extends PostChange {
+	private static final long serialVersionUID = 1L;
+
+}

src/main/java/org/springblade/bank/postchange/wrapper/PostChangeWrapper.java

@@ -0,0 +1,49 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.bank.postchange.wrapper;
+
+import org.springblade.core.mp.support.BaseEntityWrapper;
+import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.bank.postchange.entity.PostChange;
+import org.springblade.bank.postchange.vo.PostChangeVO;
+import java.util.Objects;
+
+/**
+ * 網點出納主管及專管員崗位表更記錄表包装类,返回视图层所需的字段
+ *
+ * @author BladeX
+ * @since 2021-08-13
+ */
+public class PostChangeWrapper extends BaseEntityWrapper<PostChange, PostChangeVO>  {
+
+	public static PostChangeWrapper build() {
+		return new PostChangeWrapper();
+ 	}
+
+	@Override
+	public PostChangeVO entityVO(PostChange postChange) {
+		PostChangeVO postChangeVO = Objects.requireNonNull(BeanUtil.copy(postChange, PostChangeVO.class));
+
+		//User createUser = UserCache.getUser(postChange.getCreateUser());
+		//User updateUser = UserCache.getUser(postChange.getUpdateUser());
+		//postChangeVO.setCreateUserName(createUser.getName());
+		//postChangeVO.setUpdateUserName(updateUser.getName());
+
+		return postChangeVO;
+	}
+
+}

src/main/java/org/springblade/bank/returns/controller/ReturnsController.java

@@ -0,0 +1,129 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.bank.returns.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.bank.returns.entity.Returns;
+import org.springblade.bank.returns.vo.ReturnsVO;
+import org.springblade.bank.returns.wrapper.ReturnsWrapper;
+import org.springblade.bank.returns.service.IReturnsService;
+import org.springblade.core.boot.ctrl.BladeController;
+
+/**
+ * 新開戶退件登記表 控制器
+ *
+ * @author BladeX
+ * @since 2021-08-13
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("bank/returns")
+@Api(value = "新開戶退件登記表", tags = "新開戶退件登記表接口")
+public class ReturnsController extends BladeController {
+
+	private final IReturnsService returnsService;
+
+	/**
+	 * 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入returns")
+	public R<ReturnsVO> detail(Returns returns) {
+		Returns detail = returnsService.getOne(Condition.getQueryWrapper(returns));
+		return R.data(ReturnsWrapper.build().entityVO(detail));
+	}
+
+	/**
+	 * 分页 新開戶退件登記表
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入returns")
+	public R<IPage<ReturnsVO>> list(Returns returns, Query query) {
+		IPage<Returns> pages = returnsService.page(Condition.getPage(query), Condition.getQueryWrapper(returns));
+		return R.data(ReturnsWrapper.build().pageVO(pages));
+	}
+
+
+	/**
+	 * 自定义分页 新開戶退件登記表
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入returns")
+	public R<IPage<ReturnsVO>> page(ReturnsVO returns, Query query) {
+		IPage<ReturnsVO> pages = returnsService.selectReturnsPage(Condition.getPage(query), returns);
+		return R.data(pages);
+	}
+
+	/**
+	 * 新增 新開戶退件登記表
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入returns")
+	public R save(@Valid @RequestBody Returns returns) {
+		return R.status(returnsService.save(returns));
+	}
+
+	/**
+	 * 修改 新開戶退件登記表
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入returns")
+	public R update(@Valid @RequestBody Returns returns) {
+		return R.status(returnsService.updateById(returns));
+	}
+
+	/**
+	 * 新增或修改 新開戶退件登記表
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入returns")
+	public R submit(@Valid @RequestBody Returns returns) {
+		return R.status(returnsService.saveOrUpdate(returns));
+	}
+
+	
+	/**
+	 * 删除 新開戶退件登記表
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(returnsService.deleteLogic(Func.toLongList(ids)));
+	}
+
+	
+}

src/main/java/org/springblade/flow/demo/leave/service/ILeaveService.java → src/main/java/org/springblade/bank/returns/dto/ReturnsDTO.java

@@ -14,24 +14,21 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package org.springblade.flow.demo.leave.service;
+package org.springblade.bank.returns.dto;
 
-import org.springblade.core.mp.base.BaseService;
-import org.springblade.flow.demo.leave.entity.ProcessLeave;
+import org.springblade.bank.returns.entity.Returns;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 /**
- * 服务类
+ * 新開戶退件登記表数据传输对象实体类
  *
- * @author Chill
+ * @author BladeX
+ * @since 2021-08-13
  */
-public interface ILeaveService extends BaseService<ProcessLeave> {
-
-	/**
-	 * 开启流程
-	 *
-	 * @param leave 请假实体
-	 * @return boolean
-	 */
-	boolean startProcess(ProcessLeave leave);
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ReturnsDTO extends Returns {
+	private static final long serialVersionUID = 1L;
 
 }

src/main/java/org/springblade/bank/returns/entity/Returns.java

@@ -0,0 +1,176 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.bank.returns.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.mp.base.BaseEntity;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * 新開戶退件登記表实体类
+ *
+ * @author BladeX
+ * @since 2021-08-13
+ */
+@Data
+@TableName("zh_input_returns")
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "Returns对象", description = "新開戶退件登記表")
+public class Returns extends BaseEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	* 銀行號
+	*/
+		@ApiModelProperty(value = "銀行號")
+		private String bankNo;
+	/**
+	* 機構號
+	*/
+		@ApiModelProperty(value = "機構號")
+		private String orgNo;
+	/**
+	* 序號
+	*/
+		@ApiModelProperty(value = "序號")
+		private Integer serialNo;
+	/**
+	* 支行
+	*/
+		@ApiModelProperty(value = "支行")
+		private String bank;
+	/**
+	* 客戶名稱
+	*/
+		@ApiModelProperty(value = "客戶名稱")
+		private String customerName;
+	/**
+	* 退件原因
+	*/
+		@ApiModelProperty(value = "退件原因")
+		private String reason;
+	/**
+	* 備註
+	*/
+		@ApiModelProperty(value = "備註")
+		private String remark;
+	/**
+	* 條碼
+	*/
+		@ApiModelProperty(value = "條碼")
+		private String barCode;
+	/**
+	* 接辦行經辦
+	*/
+		@ApiModelProperty(value = "接辦行經辦")
+		private String handlingBank;
+	/**
+	* 接辦行覆核
+	*/
+		@ApiModelProperty(value = "接辦行覆核")
+		private String handlingBankReview;
+	/**
+	* 處理日期
+	*/
+		@ApiModelProperty(value = "處理日期")
+		@DateTimeFormat(
+			pattern = "yyyy-MM-dd HH:mm:ss"
+		)
+		@JsonFormat(
+			pattern = "yyyy-MM-dd HH:mm:ss"
+		)
+		private Date handlingDate;
+	/**
+	* 經辦
+	*/
+		@ApiModelProperty(value = "經辦")
+		private String handler;
+	/**
+	* 處理狀態
+	*/
+		@ApiModelProperty(value = "處理狀態")
+		private String handlingStatus;
+	/**
+	* 支行備註
+	*/
+		@ApiModelProperty(value = "支行備註")
+		private String bankRemark;
+	/**
+	* 支行確認人員工號
+	*/
+		@ApiModelProperty(value = "支行確認人員工號")
+		private String bankConfirmNo;
+	/**
+	* 支行確認人姓名
+	*/
+		@ApiModelProperty(value = "支行確認人姓名")
+		private String bankConfirmName;
+	/**
+	* 確認日期
+	*/
+		@ApiModelProperty(value = "確認日期")
+		@DateTimeFormat(
+			pattern = "yyyy-MM-dd HH:mm:ss"
+		)
+		@JsonFormat(
+			pattern = "yyyy-MM-dd HH:mm:ss"
+		)
+		private Date bankConfirmTime;
+	private Long personId;
+	/**
+	* 審批人
+	*/
+		@ApiModelProperty(value = "審批人")
+		private String personName;
+	/**
+	* 審批時間
+	*/
+		@ApiModelProperty(value = "審批時間")
+		@DateTimeFormat(
+			pattern = "yyyy-MM-dd HH:mm:ss"
+		)
+		@JsonFormat(
+			pattern = "yyyy-MM-dd HH:mm:ss"
+		)
+		private Date approveTime;
+	/**
+	* 節點
+	*/
+		@ApiModelProperty(value = "節點")
+		@DateTimeFormat(
+			pattern = "yyyy-MM-dd HH:mm:ss"
+		)
+		@JsonFormat(
+			pattern = "yyyy-MM-dd HH:mm:ss"
+		)
+		private Integer process;
+	/**
+	* 是否已完成
+	*/
+		@ApiModelProperty(value = "是否已完成")
+		private Integer isCompleted;
+
+
+}

src/main/java/org/springblade/bank/returns/mapper/ReturnsMapper.java

@@ -0,0 +1,42 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.bank.returns.mapper;
+
+import org.springblade.bank.returns.entity.Returns;
+import org.springblade.bank.returns.vo.ReturnsVO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import java.util.List;
+
+/**
+ * 新開戶退件登記表 Mapper 接口
+ *
+ * @author BladeX
+ * @since 2021-08-13
+ */
+public interface ReturnsMapper extends BaseMapper<Returns> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param returns
+	 * @return
+	 */
+	List<ReturnsVO> selectReturnsPage(IPage page, ReturnsVO returns);
+
+}

src/main/java/org/springblade/bank/returns/mapper/ReturnsMapper.xml

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.springblade.bank.returns.mapper.ReturnsMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="returnsResultMap" type="org.springblade.bank.returns.entity.Returns">
+        <result column="id" property="id"/>
+        <result column="status" property="status"/>
+        <result column="create_user" property="createUser"/>
+        <result column="create_dept" property="createDept"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="bank_no" property="bankNo"/>
+        <result column="org_no" property="orgNo"/>
+        <result column="serial_no" property="serialNo"/>
+        <result column="bank" property="bank"/>
+        <result column="customer_name" property="customerName"/>
+        <result column="reason" property="reason"/>
+        <result column="remark" property="remark"/>
+        <result column="bar_code" property="barCode"/>
+        <result column="handling_bank" property="handlingBank"/>
+        <result column="handling_bank_review" property="handlingBankReview"/>
+        <result column="handling_date" property="handlingDate"/>
+        <result column="handler" property="handler"/>
+        <result column="handling_status" property="handlingStatus"/>
+        <result column="bank_remark" property="bankRemark"/>
+        <result column="bank_confirm_no" property="bankConfirmNo"/>
+        <result column="bank_confirm_name" property="bankConfirmName"/>
+        <result column="bank_confirm_time" property="bankConfirmTime"/>
+        <result column="person_id" property="personId"/>
+        <result column="person_name" property="personName"/>
+        <result column="approve_time" property="approveTime"/>
+        <result column="process" property="process"/>
+        <result column="is_completed" property="isCompleted"/>
+    </resultMap>
+
+
+    <select id="selectReturnsPage" resultMap="returnsResultMap">
+        select * from zh_input_returns where is_deleted = 0
+    </select>
+
+</mapper>

src/main/java/org/springblade/bank/returns/service/IReturnsService.java

@@ -0,0 +1,41 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.bank.returns.service;
+
+import org.springblade.bank.returns.entity.Returns;
+import org.springblade.bank.returns.vo.ReturnsVO;
+import org.springblade.core.mp.base.BaseService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ * 新開戶退件登記表 服务类
+ *
+ * @author BladeX
+ * @since 2021-08-13
+ */
+public interface IReturnsService extends BaseService<Returns> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param returns
+	 * @return
+	 */
+	IPage<ReturnsVO> selectReturnsPage(IPage<ReturnsVO> page, ReturnsVO returns);
+
+}

src/main/java/org/springblade/bank/returns/service/impl/ReturnsServiceImpl.java

@@ -0,0 +1,41 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.bank.returns.service.impl;
+
+import org.springblade.bank.returns.entity.Returns;
+import org.springblade.bank.returns.vo.ReturnsVO;
+import org.springblade.bank.returns.mapper.ReturnsMapper;
+import org.springblade.bank.returns.service.IReturnsService;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ * 新開戶退件登記表 服务实现类
+ *
+ * @author BladeX
+ * @since 2021-08-13
+ */
+@Service
+public class ReturnsServiceImpl extends BaseServiceImpl<ReturnsMapper, Returns> implements IReturnsService {
+
+	@Override
+	public IPage<ReturnsVO> selectReturnsPage(IPage<ReturnsVO> page, ReturnsVO returns) {
+		return page.setRecords(baseMapper.selectReturnsPage(page, returns));
+	}
+
+}

src/main/java/org/springblade/bank/returns/vo/ReturnsVO.java

@@ -0,0 +1,36 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.bank.returns.vo;
+
+import org.springblade.bank.returns.entity.Returns;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+
+/**
+ * 新開戶退件登記表视图实体类
+ *
+ * @author BladeX
+ * @since 2021-08-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "ReturnsVO对象", description = "新開戶退件登記表")
+public class ReturnsVO extends Returns {
+	private static final long serialVersionUID = 1L;
+
+}

src/main/java/org/springblade/bank/returns/wrapper/ReturnsWrapper.java

@@ -0,0 +1,49 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.bank.returns.wrapper;
+
+import org.springblade.core.mp.support.BaseEntityWrapper;
+import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.bank.returns.entity.Returns;
+import org.springblade.bank.returns.vo.ReturnsVO;
+import java.util.Objects;
+
+/**
+ * 新開戶退件登記表包装类,返回视图层所需的字段
+ *
+ * @author BladeX
+ * @since 2021-08-13
+ */
+public class ReturnsWrapper extends BaseEntityWrapper<Returns, ReturnsVO>  {
+
+	public static ReturnsWrapper build() {
+		return new ReturnsWrapper();
+ 	}
+
+	@Override
+	public ReturnsVO entityVO(Returns returns) {
+		ReturnsVO returnsVO = Objects.requireNonNull(BeanUtil.copy(returns, ReturnsVO.class));
+
+		//User createUser = UserCache.getUser(returns.getCreateUser());
+		//User updateUser = UserCache.getUser(returns.getUpdateUser());
+		//returnsVO.setCreateUserName(createUser.getName());
+		//returnsVO.setUpdateUserName(updateUser.getName());
+
+		return returnsVO;
+	}
+
+}

src/main/java/org/springblade/bank/sealhandover/controller/SealHandoverController.java

@@ -0,0 +1,154 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.bank.sealhandover.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+
+import org.springblade.bank.keypwd.entity.KeyPwd;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.BladeUser;
+import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.DateUtil;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.bank.sealhandover.entity.SealHandover;
+import org.springblade.bank.sealhandover.vo.SealHandoverVO;
+import org.springblade.bank.sealhandover.wrapper.SealHandoverWrapper;
+import org.springblade.bank.sealhandover.service.ISealHandoverService;
+import org.springblade.core.boot.ctrl.BladeController;
+
+import java.util.List;
+
+/**
+ * 業務印章交接登記表 控制器
+ *
+ * @author BladeX
+ * @since 2021-08-13
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("bank/sealhandover")
+@Api(value = "業務印章交接登記表", tags = "業務印章交接登記表接口")
+public class SealHandoverController extends BladeController {
+
+	private final ISealHandoverService sealHandoverService;
+
+	/**
+	 * 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入sealHandover")
+	public R<SealHandoverVO> detail(SealHandover sealHandover) {
+		SealHandover detail = sealHandoverService.getOne(Condition.getQueryWrapper(sealHandover));
+		return R.data(SealHandoverWrapper.build().entityVO(detail));
+	}
+
+	/**
+	 * 分页 業務印章交接登記表
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入sealHandover")
+	public R<IPage<SealHandoverVO>> list(SealHandover sealHandover, Query query) {
+		IPage<SealHandover> pages = sealHandoverService.page(Condition.getPage(query), Condition.getQueryWrapper(sealHandover));
+		return R.data(SealHandoverWrapper.build().pageVO(pages));
+	}
+
+
+	/**
+	 * 自定义分页 業務印章交接登記表
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入sealHandover")
+	public R<IPage<SealHandoverVO>> page(SealHandoverVO sealHandover, Query query) {
+		IPage<SealHandoverVO> pages = sealHandoverService.selectSealHandoverPage(Condition.getPage(query), sealHandover);
+		return R.data(pages);
+	}
+
+	/**
+	 * 新增 業務印章交接登記表
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入sealHandover")
+	public R save(@Valid @RequestBody SealHandover sealHandover) {
+		return R.status(sealHandoverService.save(sealHandover));
+	}
+
+	/**
+	 * 修改 業務印章交接登記表
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入sealHandover")
+	public R update(@Valid @RequestBody SealHandover sealHandover) {
+		return R.status(sealHandoverService.updateById(sealHandover));
+	}
+
+	/**
+	 * 新增或修改 業務印章交接登記表
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入sealHandover")
+	public R submit(@Valid @RequestBody SealHandover sealHandover) {
+		if (sealHandover.getId() == null){
+			BladeUser currentUser = AuthUtil.getUser();
+			sealHandover.setFillingPerson(currentUser.getUserName());
+			sealHandover.setFillingDate(DateUtil.now());
+		}
+		return R.status(sealHandoverService.saveOrUpdate(sealHandover));
+	}
+
+
+	/**
+	 * 删除 業務印章交接登記表
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(sealHandoverService.deleteLogic(Func.toLongList(ids)));
+	}
+
+	@GetMapping("/getByNoAndType")
+	@ApiOperationSupport(order = 8)
+	@ApiOperation(value = "获取最新一条记录", notes = "传入category,type")
+	public R getByNoAndType(@ApiParam(required = true) @RequestParam String sealNo, @ApiParam(required = true) @RequestParam String sealType, @ApiParam(required = true) @RequestParam String orgNo){
+		LambdaQueryWrapper<SealHandover> eq = new QueryWrapper<>(new SealHandover()).lambda().eq(SealHandover::getSealNo, sealNo)
+			.eq(SealHandover::getSealType, sealType).eq(SealHandover::getOrgNo, orgNo).orderByDesc(SealHandover::getFillingDate);
+		List<SealHandover> list = sealHandoverService.list(eq);
+		if (list != null && list.size() > 0){
+			return R.data(list.get(0));
+		}
+		return R.data(null);
+	}
+
+}

src/main/java/org/springblade/bank/sealhandover/dto/SealHandoverDTO.java

@@ -0,0 +1,34 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.bank.sealhandover.dto;
+
+import org.springblade.bank.sealhandover.entity.SealHandover;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 業務印章交接登記表数据传输对象实体类
+ *
+ * @author BladeX
+ * @since 2021-08-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class SealHandoverDTO extends SealHandover {
+	private static final long serialVersionUID = 1L;
+
+}

src/main/java/org/springblade/bank/sealhandover/entity/SealHandover.java

@@ -0,0 +1,119 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.bank.sealhandover.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springblade.core.mp.base.BaseEntity;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * 業務印章交接登記表实体类
+ *
+ * @author BladeX
+ * @since 2021-08-13
+ */
+@Data
+@TableName("zh_input_seal_handover")
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "SealHandover对象", description = "業務印章交接登記表")
+public class SealHandover extends BaseEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	* 銀行號
+	*/
+		@ApiModelProperty(value = "銀行號")
+		private String bankNo;
+	/**
+	* 機構號
+	*/
+		@ApiModelProperty(value = "機構號")
+		private String orgNo;
+	/**
+	* 印章類型
+	*/
+		@ApiModelProperty(value = "印章類型")
+		private String sealType;
+	/**
+	* 印章編號
+	*/
+		@ApiModelProperty(value = "印章編號")
+		private String sealNo;
+	/**
+	* 交出人員工號
+	*/
+		@ApiModelProperty(value = "交出人員工號")
+		private String handoverPersonNo;
+	/**
+	* 交出人姓名
+	*/
+		@ApiModelProperty(value = "交出人姓名")
+		private String handoverPersonName;
+	/**
+	* 交接日期
+	*/
+		@ApiModelProperty(value = "交接日期")
+		@DateTimeFormat(
+			pattern = "yyyy-MM-dd HH:mm"
+		)
+		@JsonFormat(
+			pattern = "yyyy-MM-dd HH:mm"
+		)
+		private Date handoverDate;
+	/**
+	* 接收人員工號
+	*/
+		@ApiModelProperty(value = "接收人員工號")
+		private String receiverNo;
+	/**
+	* 接收人姓名
+	*/
+		@ApiModelProperty(value = "接收人姓名")
+		private String receiverName;
+	/**
+	* 備註
+	*/
+		@ApiModelProperty(value = "備註")
+		private String remark;
+	/**
+	* 填報時間
+	*/
+		@ApiModelProperty(value = "填報時間")
+		@DateTimeFormat(
+			pattern = "yyyy-MM-dd HH:mm:ss"
+		)
+		@JsonFormat(
+			pattern = "yyyy-MM-dd HH:mm:ss"
+		)
+		private Date fillingDate;
+	/**
+	* 填報人
+	*/
+		@ApiModelProperty(value = "填報人")
+		private String fillingPerson;
+
+
+}

src/main/java/org/springblade/bank/sealhandover/mapper/SealHandoverMapper.java

@@ -0,0 +1,42 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.bank.sealhandover.mapper;
+
+import org.springblade.bank.sealhandover.entity.SealHandover;
+import org.springblade.bank.sealhandover.vo.SealHandoverVO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import java.util.List;
+
+/**
+ * 業務印章交接登記表 Mapper 接口
+ *
+ * @author BladeX
+ * @since 2021-08-13
+ */
+public interface SealHandoverMapper extends BaseMapper<SealHandover> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param sealHandover
+	 * @return
+	 */
+	List<SealHandoverVO> selectSealHandoverPage(IPage page, SealHandoverVO sealHandover);
+
+}

src/main/java/org/springblade/bank/sealhandover/mapper/SealHandoverMapper.xml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.springblade.bank.sealhandover.mapper.SealHandoverMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="sealHandoverResultMap" type="org.springblade.bank.sealhandover.entity.SealHandover">
+        <result column="id" property="id"/>
+        <result column="create_user" property="createUser"/>
+        <result column="create_dept" property="createDept"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="status" property="status"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="bank_no" property="bankNo"/>
+        <result column="org_no" property="orgNo"/>
+        <result column="seal_type" property="sealType"/>
+        <result column="seal_no" property="sealNo"/>
+        <result column="handover_person_no" property="handoverPersonNo"/>
+        <result column="handover_person_name" property="handoverPersonName"/>
+        <result column="handover_date" property="handoverDate"/>
+        <result column="receiver_no" property="receiverNo"/>
+        <result column="receiver_name" property="receiverName"/>
+        <result column="remark" property="remark"/>
+        <result column="filling_date" property="fillingDate"/>
+        <result column="filling_person" property="fillingPerson"/>
+    </resultMap>
+
+
+    <select id="selectSealHandoverPage" resultMap="sealHandoverResultMap">
+        select * from zh_input_seal_handover where is_deleted = 0
+    </select>
+
+</mapper>

src/main/java/org/springblade/bank/sealhandover/service/ISealHandoverService.java

@@ -0,0 +1,41 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.bank.sealhandover.service;
+
+import org.springblade.bank.sealhandover.entity.SealHandover;
+import org.springblade.bank.sealhandover.vo.SealHandoverVO;
+import org.springblade.core.mp.base.BaseService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ * 業務印章交接登記表 服务类
+ *
+ * @author BladeX
+ * @since 2021-08-13
+ */
+public interface ISealHandoverService extends BaseService<SealHandover> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param sealHandover
+	 * @return
+	 */
+	IPage<SealHandoverVO> selectSealHandoverPage(IPage<SealHandoverVO> page, SealHandoverVO sealHandover);
+
+}

src/main/java/org/springblade/bank/sealhandover/service/impl/SealHandoverServiceImpl.java

@@ -0,0 +1,41 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.bank.sealhandover.service.impl;
+
+import org.springblade.bank.sealhandover.entity.SealHandover;
+import org.springblade.bank.sealhandover.vo.SealHandoverVO;
+import org.springblade.bank.sealhandover.mapper.SealHandoverMapper;
+import org.springblade.bank.sealhandover.service.ISealHandoverService;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ * 業務印章交接登記表 服务实现类
+ *
+ * @author BladeX
+ * @since 2021-08-13
+ */
+@Service
+public class SealHandoverServiceImpl extends BaseServiceImpl<SealHandoverMapper, SealHandover> implements ISealHandoverService {
+
+	@Override
+	public IPage<SealHandoverVO> selectSealHandoverPage(IPage<SealHandoverVO> page, SealHandoverVO sealHandover) {
+		return page.setRecords(baseMapper.selectSealHandoverPage(page, sealHandover));
+	}
+
+}

src/main/java/org/springblade/bank/sealhandover/vo/SealHandoverVO.java

@@ -0,0 +1,36 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.bank.sealhandover.vo;
+
+import org.springblade.bank.sealhandover.entity.SealHandover;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+
+/**
+ * 業務印章交接登記表视图实体类
+ *
+ * @author BladeX
+ * @since 2021-08-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "SealHandoverVO对象", description = "業務印章交接登記表")
+public class SealHandoverVO extends SealHandover {
+	private static final long serialVersionUID = 1L;
+
+}

src/main/java/org/springblade/bank/sealhandover/wrapper/SealHandoverWrapper.java

@@ -0,0 +1,49 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.bank.sealhandover.wrapper;
+
+import org.springblade.core.mp.support.BaseEntityWrapper;
+import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.bank.sealhandover.entity.SealHandover;
+import org.springblade.bank.sealhandover.vo.SealHandoverVO;
+import java.util.Objects;
+
+/**
+ * 業務印章交接登記表包装类,返回视图层所需的字段
+ *
+ * @author BladeX
+ * @since 2021-08-13
+ */
+public class SealHandoverWrapper extends BaseEntityWrapper<SealHandover, SealHandoverVO>  {
+
+	public static SealHandoverWrapper build() {
+		return new SealHandoverWrapper();
+ 	}
+
+	@Override
+	public SealHandoverVO entityVO(SealHandover sealHandover) {
+		SealHandoverVO sealHandoverVO = Objects.requireNonNull(BeanUtil.copy(sealHandover, SealHandoverVO.class));
+
+		//User createUser = UserCache.getUser(sealHandover.getCreateUser());
+		//User updateUser = UserCache.getUser(sealHandover.getUpdateUser());
+		//sealHandoverVO.setCreateUserName(createUser.getName());
+		//sealHandoverVO.setUpdateUserName(updateUser.getName());
+
+		return sealHandoverVO;
+	}
+
+}

src/main/java/org/springblade/bank/tellertrunk/controller/TellerTrunkController.java

@@ -0,0 +1,137 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.bank.tellertrunk.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.BladeUser;
+import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.DateUtil;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.bank.tellertrunk.entity.TellerTrunk;
+import org.springblade.bank.tellertrunk.vo.TellerTrunkVO;
+import org.springblade.bank.tellertrunk.wrapper.TellerTrunkWrapper;
+import org.springblade.bank.tellertrunk.service.ITellerTrunkService;
+import org.springblade.core.boot.ctrl.BladeController;
+
+/**
+ * 櫃員尾箱檢查流水賬記錄表 控制器
+ *
+ * @author BladeX
+ * @since 2021-08-13
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("bank/tellertrunk")
+@Api(value = "櫃員尾箱檢查流水賬記錄表", tags = "櫃員尾箱檢查流水賬記錄表接口")
+public class TellerTrunkController extends BladeController {
+
+	private final ITellerTrunkService tellerTrunkService;
+
+	/**
+	 * 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入tellerTrunk")
+	public R<TellerTrunkVO> detail(TellerTrunk tellerTrunk) {
+		TellerTrunk detail = tellerTrunkService.getOne(Condition.getQueryWrapper(tellerTrunk));
+		return R.data(TellerTrunkWrapper.build().entityVO(detail));
+	}
+
+	/**
+	 * 分页 櫃員尾箱檢查流水賬記錄表
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入tellerTrunk")
+	public R<IPage<TellerTrunkVO>> list(TellerTrunk tellerTrunk, Query query) {
+		IPage<TellerTrunk> pages = tellerTrunkService.page(Condition.getPage(query), Condition.getQueryWrapper(tellerTrunk));
+		return R.data(TellerTrunkWrapper.build().pageVO(pages));
+	}
+
+
+	/**
+	 * 自定义分页 櫃員尾箱檢查流水賬記錄表
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入tellerTrunk")
+	public R<IPage<TellerTrunkVO>> page(TellerTrunkVO tellerTrunk, Query query) {
+		IPage<TellerTrunkVO> pages = tellerTrunkService.selectTellerTrunkPage(Condition.getPage(query), tellerTrunk);
+		return R.data(pages);
+	}
+
+	/**
+	 * 新增 櫃員尾箱檢查流水賬記錄表
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入tellerTrunk")
+	public R save(@Valid @RequestBody TellerTrunk tellerTrunk) {
+		return R.status(tellerTrunkService.save(tellerTrunk));
+	}
+
+	/**
+	 * 修改 櫃員尾箱檢查流水賬記錄表
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入tellerTrunk")
+	public R update(@Valid @RequestBody TellerTrunk tellerTrunk) {
+		return R.status(tellerTrunkService.updateById(tellerTrunk));
+	}
+
+	/**
+	 * 新增或修改 櫃員尾箱檢查流水賬記錄表
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入tellerTrunk")
+	public R submit(@Valid @RequestBody TellerTrunk tellerTrunk) {
+		if (tellerTrunk.getId() == null){
+			BladeUser currentUser = AuthUtil.getUser();
+			tellerTrunk.setFillingPerson(currentUser.getUserName());
+			tellerTrunk.setFillingDate(DateUtil.now());
+		}
+		return R.status(tellerTrunkService.saveOrUpdate(tellerTrunk));
+	}
+
+
+	/**
+	 * 删除 櫃員尾箱檢查流水賬記錄表
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(tellerTrunkService.deleteLogic(Func.toLongList(ids)));
+	}
+
+
+}

src/main/java/org/springblade/bank/tellertrunk/dto/TellerTrunkDTO.java

@@ -0,0 +1,34 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.bank.tellertrunk.dto;
+
+import org.springblade.bank.tellertrunk.entity.TellerTrunk;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 櫃員尾箱檢查流水賬記錄表数据传输对象实体类
+ *
+ * @author BladeX
+ * @since 2021-08-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class TellerTrunkDTO extends TellerTrunk {
+	private static final long serialVersionUID = 1L;
+
+}

src/main/java/org/springblade/bank/tellertrunk/entity/TellerTrunk.java

@@ -0,0 +1,145 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.bank.tellertrunk.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springblade.core.mp.base.BaseEntity;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * 櫃員尾箱檢查流水賬記錄表实体类
+ *
+ * @author BladeX
+ * @since 2021-08-13
+ */
+@Data
+@TableName("zh_record_teller_trunk")
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "TellerTrunk对象", description = "櫃員尾箱檢查流水賬記錄表")
+public class TellerTrunk extends BaseEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	* 銀行號
+	*/
+		@ApiModelProperty(value = "銀行號")
+		private String bankNo;
+	/**
+	* 機構號
+	*/
+		@ApiModelProperty(value = "機構號")
+		private String orgNo;
+	/**
+	* 檢查內容
+	*/
+		@ApiModelProperty(value = "檢查內容")
+		private String checkContent;
+	/**
+	* 檢查時間開始
+	*/
+		@ApiModelProperty(value = "檢查時間開始")
+		@DateTimeFormat(
+			pattern = "yyyy-MM-dd HH:mm"
+		)
+		@JsonFormat(
+			pattern = "yyyy-MM-dd HH:mm"
+		)
+		private Date checkTimeBegin;
+	/**
+	* 檢查時間結束
+	*/
+		@ApiModelProperty(value = "檢查時間結束")
+		@DateTimeFormat(
+			pattern = "yyyy-MM-dd HH:mm"
+		)
+		@JsonFormat(
+			pattern = "yyyy-MM-dd HH:mm"
+		)
+		private Date checkTimeEnd;
+	/**
+	* 檢查單位
+	*/
+		@ApiModelProperty(value = "檢查單位")
+		private String checkUnit;
+	/**
+	* 本單位持有現金/重空櫃員數量
+	*/
+		@ApiModelProperty(value = "本單位持有現金/重空櫃員數量")
+		private Integer holdingNumberUnit;
+	/**
+	* 本次檢查持有現金/重空櫃員數量
+	*/
+		@ApiModelProperty(value = "本次檢查持有現金/重空櫃員數量")
+		private Integer holdingNumberCheck;
+	/**
+	* 檢查類型
+	*/
+		@ApiModelProperty(value = "檢查類型")
+		private String checkType;
+	/**
+	* 核對結果
+	*/
+		@ApiModelProperty(value = "核對結果")
+		private String checkResult;
+	/**
+	* 查庫人員(員工號/身份證號後四位)
+	*/
+		@ApiModelProperty(value = "查庫人員(員工號/身份證號後四位)")
+		private String checkPersonNo;
+	/**
+	* 查庫人員姓名
+	*/
+		@ApiModelProperty(value = "查庫人員姓名")
+		private String checkPersonName;
+	/**
+	* 備註(可簡要補充檢查發現情況)
+	*/
+		@ApiModelProperty(value = "備註(可簡要補充檢查發現情況)")
+		private String remark;
+	/**
+	* 填報日期及時間
+	*/
+		@ApiModelProperty(value = "填報日期及時間")
+		@DateTimeFormat(
+			pattern = "yyyy-MM-dd HH:mm:ss"
+		)
+		@JsonFormat(
+			pattern = "yyyy-MM-dd HH:mm:ss"
+		)
+		private Date fillingDate;
+	/**
+	* 填報人
+	*/
+		@ApiModelProperty(value = "填報人")
+		private String fillingPerson;
+	/**
+	* 附件
+	*/
+		@ApiModelProperty(value = "附件")
+		private String enclosure;
+
+
+}

src/main/java/org/springblade/bank/tellertrunk/mapper/TellerTrunkMapper.java

@@ -0,0 +1,42 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.bank.tellertrunk.mapper;
+
+import org.springblade.bank.tellertrunk.entity.TellerTrunk;
+import org.springblade.bank.tellertrunk.vo.TellerTrunkVO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import java.util.List;
+
+/**
+ * 櫃員尾箱檢查流水賬記錄表 Mapper 接口
+ *
+ * @author BladeX
+ * @since 2021-08-13
+ */
+public interface TellerTrunkMapper extends BaseMapper<TellerTrunk> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param tellerTrunk
+	 * @return
+	 */
+	List<TellerTrunkVO> selectTellerTrunkPage(IPage page, TellerTrunkVO tellerTrunk);
+
+}

src/main/java/org/springblade/bank/tellertrunk/mapper/TellerTrunkMapper.xml

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.springblade.bank.tellertrunk.mapper.TellerTrunkMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="tellerTrunkResultMap" type="org.springblade.bank.tellertrunk.entity.TellerTrunk">
+        <result column="id" property="id"/>
+        <result column="create_user" property="createUser"/>
+        <result column="create_dept" property="createDept"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="status" property="status"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="bank_no" property="bankNo"/>
+        <result column="org_no" property="orgNo"/>
+        <result column="check_content" property="checkContent"/>
+        <result column="check_time_begin" property="checkTimeBegin"/>
+        <result column="check_time_end" property="checkTimeEnd"/>
+        <result column="check_unit" property="checkUnit"/>
+        <result column="holding_number_unit" property="holdingNumberUnit"/>
+        <result column="holding_number_check" property="holdingNumberCheck"/>
+        <result column="check_type" property="checkType"/>
+        <result column="check_result" property="checkResult"/>
+        <result column="check_person_no" property="checkPersonNo"/>
+        <result column="check_person_name" property="checkPersonName"/>
+        <result column="remark" property="remark"/>
+        <result column="filling_date" property="fillingDate"/>
+        <result column="filling_person" property="fillingPerson"/>
+        <result column="enclosure" property="enclosure"/>
+    </resultMap>
+
+
+    <select id="selectTellerTrunkPage" resultMap="tellerTrunkResultMap">
+        select * from zh_record_teller_trunk where is_deleted = 0
+    </select>
+
+</mapper>

src/main/java/org/springblade/bank/tellertrunk/service/ITellerTrunkService.java

@@ -0,0 +1,41 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.bank.tellertrunk.service;
+
+import org.springblade.bank.tellertrunk.entity.TellerTrunk;
+import org.springblade.bank.tellertrunk.vo.TellerTrunkVO;
+import org.springblade.core.mp.base.BaseService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ * 櫃員尾箱檢查流水賬記錄表 服务类
+ *
+ * @author BladeX
+ * @since 2021-08-13
+ */
+public interface ITellerTrunkService extends BaseService<TellerTrunk> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param tellerTrunk
+	 * @return
+	 */
+	IPage<TellerTrunkVO> selectTellerTrunkPage(IPage<TellerTrunkVO> page, TellerTrunkVO tellerTrunk);
+
+}

src/main/java/org/springblade/bank/tellertrunk/service/impl/TellerTrunkServiceImpl.java

@@ -0,0 +1,41 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.bank.tellertrunk.service.impl;
+
+import org.springblade.bank.tellertrunk.entity.TellerTrunk;
+import org.springblade.bank.tellertrunk.vo.TellerTrunkVO;
+import org.springblade.bank.tellertrunk.mapper.TellerTrunkMapper;
+import org.springblade.bank.tellertrunk.service.ITellerTrunkService;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ * 櫃員尾箱檢查流水賬記錄表 服务实现类
+ *
+ * @author BladeX
+ * @since 2021-08-13
+ */
+@Service
+public class TellerTrunkServiceImpl extends BaseServiceImpl<TellerTrunkMapper, TellerTrunk> implements ITellerTrunkService {
+
+	@Override
+	public IPage<TellerTrunkVO> selectTellerTrunkPage(IPage<TellerTrunkVO> page, TellerTrunkVO tellerTrunk) {
+		return page.setRecords(baseMapper.selectTellerTrunkPage(page, tellerTrunk));
+	}
+
+}

src/main/java/org/springblade/bank/tellertrunk/vo/TellerTrunkVO.java

@@ -0,0 +1,36 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.bank.tellertrunk.vo;
+
+import org.springblade.bank.tellertrunk.entity.TellerTrunk;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+
+/**
+ * 櫃員尾箱檢查流水賬記錄表视图实体类
+ *
+ * @author BladeX
+ * @since 2021-08-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "TellerTrunkVO对象", description = "櫃員尾箱檢查流水賬記錄表")
+public class TellerTrunkVO extends TellerTrunk {
+	private static final long serialVersionUID = 1L;
+
+}

src/main/java/org/springblade/bank/tellertrunk/wrapper/TellerTrunkWrapper.java

@@ -0,0 +1,49 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.bank.tellertrunk.wrapper;
+
+import org.springblade.core.mp.support.BaseEntityWrapper;
+import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.bank.tellertrunk.entity.TellerTrunk;
+import org.springblade.bank.tellertrunk.vo.TellerTrunkVO;
+import java.util.Objects;
+
+/**
+ * 櫃員尾箱檢查流水賬記錄表包装类,返回视图层所需的字段
+ *
+ * @author BladeX
+ * @since 2021-08-13
+ */
+public class TellerTrunkWrapper extends BaseEntityWrapper<TellerTrunk, TellerTrunkVO>  {
+
+	public static TellerTrunkWrapper build() {
+		return new TellerTrunkWrapper();
+ 	}
+
+	@Override
+	public TellerTrunkVO entityVO(TellerTrunk tellerTrunk) {
+		TellerTrunkVO tellerTrunkVO = Objects.requireNonNull(BeanUtil.copy(tellerTrunk, TellerTrunkVO.class));
+
+		//User createUser = UserCache.getUser(tellerTrunk.getCreateUser());
+		//User updateUser = UserCache.getUser(tellerTrunk.getUpdateUser());
+		//tellerTrunkVO.setCreateUserName(createUser.getName());
+		//tellerTrunkVO.setUpdateUserName(updateUser.getName());
+
+		return tellerTrunkVO;
+	}
+
+}

src/main/java/org/springblade/bank/warehouse/controller/CheckWarehouseController.java

@@ -0,0 +1,137 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.bank.warehouse.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.BladeUser;
+import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.DateUtil;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.bank.warehouse.entity.CheckWarehouse;
+import org.springblade.bank.warehouse.vo.CheckWarehouseVO;
+import org.springblade.bank.warehouse.wrapper.CheckWarehouseWrapper;
+import org.springblade.bank.warehouse.service.ICheckWarehouseService;
+import org.springblade.core.boot.ctrl.BladeController;
+
+/**
+ * 查庫流水賬記錄表 控制器
+ *
+ * @author BladeX
+ * @since 2021-08-13
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("bank/checkwarehouse")
+@Api(value = "查庫流水賬記錄表", tags = "查庫流水賬記錄表接口")
+public class CheckWarehouseController extends BladeController {
+
+	private final ICheckWarehouseService checkWarehouseService;
+
+	/**
+	 * 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入checkWarehouse")
+	public R<CheckWarehouseVO> detail(CheckWarehouse checkWarehouse) {
+		CheckWarehouse detail = checkWarehouseService.getOne(Condition.getQueryWrapper(checkWarehouse));
+		return R.data(CheckWarehouseWrapper.build().entityVO(detail));
+	}
+
+	/**
+	 * 分页 查庫流水賬記錄表
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入checkWarehouse")
+	public R<IPage<CheckWarehouseVO>> list(CheckWarehouse checkWarehouse, Query query) {
+		IPage<CheckWarehouse> pages = checkWarehouseService.page(Condition.getPage(query), Condition.getQueryWrapper(checkWarehouse));
+		return R.data(CheckWarehouseWrapper.build().pageVO(pages));
+	}
+
+
+	/**
+	 * 自定义分页 查庫流水賬記錄表
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入checkWarehouse")
+	public R<IPage<CheckWarehouseVO>> page(CheckWarehouseVO checkWarehouse, Query query) {
+		IPage<CheckWarehouseVO> pages = checkWarehouseService.selectCheckWarehousePage(Condition.getPage(query), checkWarehouse);
+		return R.data(pages);
+	}
+
+	/**
+	 * 新增 查庫流水賬記錄表
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入checkWarehouse")
+	public R save(@Valid @RequestBody CheckWarehouse checkWarehouse) {
+		return R.status(checkWarehouseService.save(checkWarehouse));
+	}
+
+	/**
+	 * 修改 查庫流水賬記錄表
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入checkWarehouse")
+	public R update(@Valid @RequestBody CheckWarehouse checkWarehouse) {
+		return R.status(checkWarehouseService.updateById(checkWarehouse));
+	}
+
+	/**
+	 * 新增或修改 查庫流水賬記錄表
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入checkWarehouse")
+	public R submit(@Valid @RequestBody CheckWarehouse checkWarehouse) {
+		if (checkWarehouse.getId() == null){
+			BladeUser currentUser = AuthUtil.getUser();
+			checkWarehouse.setFillingPerson(currentUser.getUserName());
+			checkWarehouse.setFillingDate(DateUtil.now());
+		}
+		return R.status(checkWarehouseService.saveOrUpdate(checkWarehouse));
+	}
+
+
+	/**
+	 * 删除 查庫流水賬記錄表
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(checkWarehouseService.deleteLogic(Func.toLongList(ids)));
+	}
+
+
+}

src/main/java/org/springblade/bank/warehouse/dto/CheckWarehouseDTO.java

@@ -0,0 +1,34 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.bank.warehouse.dto;
+
+import org.springblade.bank.warehouse.entity.CheckWarehouse;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 查庫流水賬記錄表数据传输对象实体类
+ *
+ * @author BladeX
+ * @since 2021-08-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class CheckWarehouseDTO extends CheckWarehouse {
+	private static final long serialVersionUID = 1L;
+
+}

src/main/java/org/springblade/bank/warehouse/entity/CheckWarehouse.java

@@ -0,0 +1,135 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.bank.warehouse.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springblade.core.mp.base.BaseEntity;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * 查庫流水賬記錄表实体类
+ *
+ * @author BladeX
+ * @since 2021-08-13
+ */
+@Data
+@TableName("zh_record_check_warehouse")
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "CheckWarehouse对象", description = "查庫流水賬記錄表")
+public class CheckWarehouse extends BaseEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	* 銀行號
+	*/
+		@ApiModelProperty(value = "銀行號")
+		private String bankNo;
+	/**
+	* 機構號
+	*/
+		@ApiModelProperty(value = "機構號")
+		private String orgNo;
+	/**
+	* 檢查時間開始
+	*/
+		@ApiModelProperty(value = "檢查時間開始")
+		@DateTimeFormat(
+			pattern = "yyyy-MM-dd HH:mm"
+		)
+		@JsonFormat(
+			pattern = "yyyy-MM-dd HH:mm"
+		)
+		private Date checkTimeBegin;
+	/**
+	* 檢查時間結束
+	*/
+		@ApiModelProperty(value = "檢查時間結束")
+		@DateTimeFormat(
+			pattern = "yyyy-MM-dd HH:mm"
+		)
+		@JsonFormat(
+			pattern = "yyyy-MM-dd HH:mm"
+		)
+		private Date checkTimeEnd;
+	/**
+	* 檢查單位
+	*/
+		@ApiModelProperty(value = "檢查單位")
+		private String checkUnit;
+	/**
+	* 檢查目的
+	*/
+		@ApiModelProperty(value = "檢查目的")
+		private String checkPurpose;
+	/**
+	* 檢查內容
+	*/
+		@ApiModelProperty(value = "檢查內容")
+		private String checkContent;
+	/**
+	* 核對結果
+	*/
+		@ApiModelProperty(value = "核對結果")
+		private String checkResult;
+	/**
+	* 查庫人員(員工號/身份證號後四位)
+	*/
+		@ApiModelProperty(value = "查庫人員(員工號/身份證號後四位)")
+		private String checkPersonNo;
+	/**
+	* 查庫人員姓名
+	*/
+		@ApiModelProperty(value = "查庫人員姓名")
+		private String checkPersonName;
+	/**
+	* 備註(可簡要補充檢查發現情況)
+	*/
+		@ApiModelProperty(value = "備註(可簡要補充檢查發現情況)")
+		private String remark;
+	/**
+	* 填報日期及時間
+	*/
+		@ApiModelProperty(value = "填報日期及時間")
+		@DateTimeFormat(
+			pattern = "yyyy-MM-dd HH:mm:ss"
+		)
+		@JsonFormat(
+			pattern = "yyyy-MM-dd HH:mm:ss"
+		)
+		private Date fillingDate;
+	/**
+	* 填報人
+	*/
+		@ApiModelProperty(value = "填報人")
+		private String fillingPerson;
+	/**
+	* 附件
+	*/
+		@ApiModelProperty(value = "附件")
+		private String enclosure;
+
+
+}

src/main/java/org/springblade/bank/warehouse/mapper/CheckWarehouseMapper.java

@@ -0,0 +1,42 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.bank.warehouse.mapper;
+
+import org.springblade.bank.warehouse.entity.CheckWarehouse;
+import org.springblade.bank.warehouse.vo.CheckWarehouseVO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import java.util.List;
+
+/**
+ * 查庫流水賬記錄表 Mapper 接口
+ *
+ * @author BladeX
+ * @since 2021-08-13
+ */
+public interface CheckWarehouseMapper extends BaseMapper<CheckWarehouse> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param checkWarehouse
+	 * @return
+	 */
+	List<CheckWarehouseVO> selectCheckWarehousePage(IPage page, CheckWarehouseVO checkWarehouse);
+
+}

src/main/java/org/springblade/bank/warehouse/mapper/CheckWarehouseMapper.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.springblade.bank.warehouse.mapper.CheckWarehouseMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="checkWarehouseResultMap" type="org.springblade.bank.warehouse.entity.CheckWarehouse">
+        <result column="id" property="id"/>
+        <result column="create_user" property="createUser"/>
+        <result column="create_dept" property="createDept"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="status" property="status"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="bank_no" property="bankNo"/>
+        <result column="org_no" property="orgNo"/>
+        <result column="check_time_begin" property="checkTimeBegin"/>
+        <result column="check_time_end" property="checkTimeEnd"/>
+        <result column="check_unit" property="checkUnit"/>
+        <result column="check_purpose" property="checkPurpose"/>
+        <result column="check_content" property="checkContent"/>
+        <result column="check_result" property="checkResult"/>
+        <result column="check_person_no" property="checkPersonNo"/>
+        <result column="check_person_name" property="checkPersonName"/>
+        <result column="remark" property="remark"/>
+        <result column="filling_date" property="fillingDate"/>
+        <result column="filling_person" property="fillingPerson"/>
+        <result column="enclosure" property="enclosure"/>
+    </resultMap>
+
+
+    <select id="selectCheckWarehousePage" resultMap="checkWarehouseResultMap">
+        select * from zh_record_check_warehouse where is_deleted = 0
+    </select>
+
+</mapper>

src/main/java/org/springblade/bank/warehouse/service/ICheckWarehouseService.java

@@ -0,0 +1,41 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.bank.warehouse.service;
+
+import org.springblade.bank.warehouse.entity.CheckWarehouse;
+import org.springblade.bank.warehouse.vo.CheckWarehouseVO;
+import org.springblade.core.mp.base.BaseService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ * 查庫流水賬記錄表 服务类
+ *
+ * @author BladeX
+ * @since 2021-08-13
+ */
+public interface ICheckWarehouseService extends BaseService<CheckWarehouse> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param checkWarehouse
+	 * @return
+	 */
+	IPage<CheckWarehouseVO> selectCheckWarehousePage(IPage<CheckWarehouseVO> page, CheckWarehouseVO checkWarehouse);
+
+}

src/main/java/org/springblade/bank/warehouse/service/impl/CheckWarehouseServiceImpl.java

@@ -0,0 +1,41 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.bank.warehouse.service.impl;
+
+import org.springblade.bank.warehouse.entity.CheckWarehouse;
+import org.springblade.bank.warehouse.vo.CheckWarehouseVO;
+import org.springblade.bank.warehouse.mapper.CheckWarehouseMapper;
+import org.springblade.bank.warehouse.service.ICheckWarehouseService;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ * 查庫流水賬記錄表 服务实现类
+ *
+ * @author BladeX
+ * @since 2021-08-13
+ */
+@Service
+public class CheckWarehouseServiceImpl extends BaseServiceImpl<CheckWarehouseMapper, CheckWarehouse> implements ICheckWarehouseService {
+
+	@Override
+	public IPage<CheckWarehouseVO> selectCheckWarehousePage(IPage<CheckWarehouseVO> page, CheckWarehouseVO checkWarehouse) {
+		return page.setRecords(baseMapper.selectCheckWarehousePage(page, checkWarehouse));
+	}
+
+}

src/main/java/org/springblade/bank/warehouse/vo/CheckWarehouseVO.java

@@ -0,0 +1,36 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.bank.warehouse.vo;
+
+import org.springblade.bank.warehouse.entity.CheckWarehouse;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+
+/**
+ * 查庫流水賬記錄表视图实体类
+ *
+ * @author BladeX
+ * @since 2021-08-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "CheckWarehouseVO对象", description = "查庫流水賬記錄表")
+public class CheckWarehouseVO extends CheckWarehouse {
+	private static final long serialVersionUID = 1L;
+
+}

src/main/java/org/springblade/bank/warehouse/wrapper/CheckWarehouseWrapper.java

@@ -0,0 +1,49 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.bank.warehouse.wrapper;
+
+import org.springblade.core.mp.support.BaseEntityWrapper;
+import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.bank.warehouse.entity.CheckWarehouse;
+import org.springblade.bank.warehouse.vo.CheckWarehouseVO;
+import java.util.Objects;
+
+/**
+ * 查庫流水賬記錄表包装类,返回视图层所需的字段
+ *
+ * @author BladeX
+ * @since 2021-08-13
+ */
+public class CheckWarehouseWrapper extends BaseEntityWrapper<CheckWarehouse, CheckWarehouseVO>  {
+
+	public static CheckWarehouseWrapper build() {
+		return new CheckWarehouseWrapper();
+ 	}
+
+	@Override
+	public CheckWarehouseVO entityVO(CheckWarehouse checkWarehouse) {
+		CheckWarehouseVO checkWarehouseVO = Objects.requireNonNull(BeanUtil.copy(checkWarehouse, CheckWarehouseVO.class));
+
+		//User createUser = UserCache.getUser(checkWarehouse.getCreateUser());
+		//User updateUser = UserCache.getUser(checkWarehouse.getUpdateUser());
+		//checkWarehouseVO.setCreateUserName(createUser.getName());
+		//checkWarehouseVO.setUpdateUserName(updateUser.getName());
+
+		return checkWarehouseVO;
+	}
+
+}

src/main/java/org/springblade/flow/business/controller/WorkController.java

@@ -1,146 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.flow.business.controller;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import lombok.AllArgsConstructor;
-import org.flowable.engine.TaskService;
-import org.springblade.core.launch.constant.AppConstant;
-import org.springblade.core.mp.support.Condition;
-import org.springblade.core.mp.support.Query;
-import org.springblade.core.tool.api.R;
-import org.springblade.flow.business.service.FlowBusinessService;
-import org.springblade.flow.core.entity.BladeFlow;
-import org.springblade.flow.core.utils.TaskUtil;
-import org.springblade.flow.engine.entity.FlowProcess;
-import org.springblade.flow.engine.service.FlowEngineService;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * 流程事务通用接口
- *
- * @author Chill
- */
-@RestController
-@AllArgsConstructor
-@RequestMapping(AppConstant.APPLICATION_FLOW_NAME + "/work")
-@Api(value = "流程事务通用接口", tags = "流程事务通用接口")
-public class WorkController {
-
-	private final TaskService taskService;
-	private final FlowEngineService flowEngineService;
-	private final FlowBusinessService flowBusinessService;
-
-	/**
-	 * 发起事务列表页
-	 */
-	@GetMapping("start-list")
-	@ApiOperationSupport(order = 1)
-	@ApiOperation(value = "发起事务列表页", notes = "传入流程类型")
-	public R<IPage<FlowProcess>> startList(@ApiParam("流程类型") String category, Query query, @RequestParam(required = false, defaultValue = "1") Integer mode) {
-		IPage<FlowProcess> pages = flowEngineService.selectProcessPage(Condition.getPage(query), category, mode);
-		return R.data(pages);
-	}
-
-	/**
-	 * 待签事务列表页
-	 */
-	@GetMapping("claim-list")
-	@ApiOperationSupport(order = 2)
-	@ApiOperation(value = "待签事务列表页", notes = "传入流程信息")
-	public R<IPage<BladeFlow>> claimList(@ApiParam("流程信息") BladeFlow bladeFlow, Query query) {
-		IPage<BladeFlow> pages = flowBusinessService.selectClaimPage(Condition.getPage(query), bladeFlow);
-		return R.data(pages);
-	}
-
-	/**
-	 * 待办事务列表页
-	 */
-	@GetMapping("todo-list")
-	@ApiOperationSupport(order = 3)
-	@ApiOperation(value = "待办事务列表页", notes = "传入流程信息")
-	public R<IPage<BladeFlow>> todoList(@ApiParam("流程信息") BladeFlow bladeFlow, Query query) {
-		IPage<BladeFlow> pages = flowBusinessService.selectTodoPage(Condition.getPage(query), bladeFlow);
-		return R.data(pages);
-	}
-
-	/**
-	 * 已发事务列表页
-	 */
-	@GetMapping("send-list")
-	@ApiOperationSupport(order = 4)
-	@ApiOperation(value = "已发事务列表页", notes = "传入流程信息")
-	public R<IPage<BladeFlow>> sendList(@ApiParam("流程信息") BladeFlow bladeFlow, Query query) {
-		IPage<BladeFlow> pages = flowBusinessService.selectSendPage(Condition.getPage(query), bladeFlow);
-		return R.data(pages);
-	}
-
-	/**
-	 * 办结事务列表页
-	 */
-	@GetMapping("done-list")
-	@ApiOperationSupport(order = 5)
-	@ApiOperation(value = "办结事务列表页", notes = "传入流程信息")
-	public R<IPage<BladeFlow>> doneList(@ApiParam("流程信息") BladeFlow bladeFlow, Query query) {
-		IPage<BladeFlow> pages = flowBusinessService.selectDonePage(Condition.getPage(query), bladeFlow);
-		return R.data(pages);
-	}
-
-	/**
-	 * 签收事务
-	 *
-	 * @param taskId 任务id
-	 */
-	@PostMapping("claim-task")
-	@ApiOperationSupport(order = 6)
-	@ApiOperation(value = "签收事务", notes = "传入流程信息")
-	public R claimTask(@ApiParam("任务id") String taskId) {
-		taskService.claim(taskId, TaskUtil.getTaskUser());
-		return R.success("签收事务成功");
-	}
-
-	/**
-	 * 完成任务
-	 *
-	 * @param flow 请假信息
-	 */
-	@PostMapping("complete-task")
-	@ApiOperationSupport(order = 7)
-	@ApiOperation(value = "完成任务", notes = "传入流程信息")
-	public R completeTask(@ApiParam("任务信息") @RequestBody BladeFlow flow) {
-		return R.status(flowBusinessService.completeTask(flow));
-	}
-
-	/**
-	 * 删除任务
-	 *
-	 * @param taskId 任务id
-	 * @param reason 删除原因
-	 */
-	@PostMapping("delete-task")
-	@ApiOperationSupport(order = 8)
-	@ApiOperation(value = "删除任务", notes = "传入流程信息")
-	public R deleteTask(@ApiParam("任务id") String taskId, @ApiParam("删除原因") String reason) {
-		taskService.deleteTask(taskId, reason);
-		return R.success("删除任务成功");
-	}
-
-}

src/main/java/org/springblade/flow/business/service/FlowBusinessService.java

@@ -1,72 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.flow.business.service;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.flow.core.entity.BladeFlow;
-
-/**
- * 流程业务类
- *
- * @author Chill
- */
-public interface FlowBusinessService {
-
-	/**
-	 * 流程待签列表
-	 *
-	 * @param page      分页工具
-	 * @param bladeFlow 流程类
-	 * @return
-	 */
-	IPage<BladeFlow> selectClaimPage(IPage<BladeFlow> page, BladeFlow bladeFlow);
-
-	/**
-	 * 流程待办列表
-	 *
-	 * @param page      分页工具
-	 * @param bladeFlow 流程类
-	 * @return
-	 */
-	IPage<BladeFlow> selectTodoPage(IPage<BladeFlow> page, BladeFlow bladeFlow);
-
-	/**
-	 * 流程已发列表
-	 *
-	 * @param page      分页工具
-	 * @param bladeFlow 流程类
-	 * @return
-	 */
-	IPage<BladeFlow> selectSendPage(IPage<BladeFlow> page, BladeFlow bladeFlow);
-
-	/**
-	 * 流程办结列表
-	 *
-	 * @param page      分页工具
-	 * @param bladeFlow 流程类
-	 * @return
-	 */
-	IPage<BladeFlow> selectDonePage(IPage<BladeFlow> page, BladeFlow bladeFlow);
-
-	/**
-	 * 完成任务
-	 *
-	 * @param leave 请假信息
-	 * @return boolean
-	 */
-	boolean completeTask(BladeFlow leave);
-}

src/main/java/org/springblade/flow/business/service/IFlowService.java

@@ -1,77 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.flow.business.service;
-
-import org.springblade.flow.core.entity.BladeFlow;
-
-import java.util.Map;
-
-/**
- * 工作流调用接口.
- *
- * @author Chill
- */
-public interface IFlowService {
-
-	/**
-	 * 开启流程
-	 *
-	 * @param processDefinitionId 流程id
-	 * @param businessKey         业务key
-	 * @param variables           参数
-	 * @return BladeFlow
-	 */
-	BladeFlow startProcessInstanceById(String processDefinitionId, String businessKey, Map<String, Object> variables);
-
-	/**
-	 * 开启流程
-	 *
-	 * @param processDefinitionKey 流程标识
-	 * @param businessKey          业务key
-	 * @param variables            参数
-	 * @return BladeFlow
-	 */
-	BladeFlow startProcessInstanceByKey(String processDefinitionKey, String businessKey, Map<String, Object> variables);
-
-	/**
-	 * 完成任务
-	 *
-	 * @param taskId            任务id
-	 * @param processInstanceId 流程实例id
-	 * @param comment           评论
-	 * @param variables         参数
-	 * @return R
-	 */
-	boolean completeTask(String taskId, String processInstanceId, String comment, Map<String, Object> variables);
-
-	/**
-	 * 获取流程变量
-	 *
-	 * @param taskId       任务id
-	 * @param variableName 变量名
-	 * @return R
-	 */
-	Object taskVariable(String taskId, String variableName);
-
-	/**
-	 * 获取流程变量集合
-	 *
-	 * @param taskId 任务id
-	 * @return R
-	 */
-	Map<String, Object> taskVariables(String taskId);
-}

src/main/java/org/springblade/flow/business/service/impl/FlowBusinessServiceImpl.java

@@ -1,327 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.flow.business.service.impl;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import lombok.AllArgsConstructor;
-import org.flowable.engine.HistoryService;
-import org.flowable.engine.TaskService;
-import org.flowable.engine.history.HistoricProcessInstance;
-import org.flowable.engine.history.HistoricProcessInstanceQuery;
-import org.flowable.engine.repository.ProcessDefinition;
-import org.flowable.task.api.TaskQuery;
-import org.flowable.task.api.history.HistoricTaskInstance;
-import org.flowable.task.api.history.HistoricTaskInstanceQuery;
-import org.springblade.core.secure.utils.AuthUtil;
-import org.springblade.core.tool.support.Kv;
-import org.springblade.core.tool.utils.Func;
-import org.springblade.core.tool.utils.StringPool;
-import org.springblade.core.tool.utils.StringUtil;
-import org.springblade.flow.business.service.FlowBusinessService;
-import org.springblade.flow.core.constant.ProcessConstant;
-import org.springblade.flow.core.entity.BladeFlow;
-import org.springblade.flow.core.utils.TaskUtil;
-import org.springblade.flow.engine.constant.FlowEngineConstant;
-import org.springblade.flow.engine.utils.FlowCache;
-import org.springframework.stereotype.Service;
-
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 流程业务实现类
- *
- * @author Chill
- */
-@Service
-@AllArgsConstructor
-public class FlowBusinessServiceImpl implements FlowBusinessService {
-
-	private final TaskService taskService;
-	private final HistoryService historyService;
-
-	@Override
-	public IPage<BladeFlow> selectClaimPage(IPage<BladeFlow> page, BladeFlow bladeFlow) {
-		String taskUser = TaskUtil.getTaskUser();
-		String taskGroup = TaskUtil.getCandidateGroup();
-		List<BladeFlow> flowList = new LinkedList<>();
-
-		// 个人等待签收的任务
-		TaskQuery claimUserQuery = taskService.createTaskQuery().taskCandidateUser(taskUser)
-			.includeProcessVariables().active().orderByTaskCreateTime().desc();
-		// 定制流程等待签收的任务
-		TaskQuery claimRoleWithTenantIdQuery = taskService.createTaskQuery().taskTenantId(AuthUtil.getTenantId()).taskCandidateGroupIn(Func.toStrList(taskGroup))
-			.includeProcessVariables().active().orderByTaskCreateTime().desc();
-		// 通用流程等待签收的任务
-		TaskQuery claimRoleWithoutTenantIdQuery = taskService.createTaskQuery().taskWithoutTenantId().taskCandidateGroupIn(Func.toStrList(taskGroup))
-			.includeProcessVariables().active().orderByTaskCreateTime().desc();
-
-		// 构建列表数据
-		buildFlowTaskList(bladeFlow, flowList, claimUserQuery, FlowEngineConstant.STATUS_CLAIM);
-		buildFlowTaskList(bladeFlow, flowList, claimRoleWithTenantIdQuery, FlowEngineConstant.STATUS_CLAIM);
-		buildFlowTaskList(bladeFlow, flowList, claimRoleWithoutTenantIdQuery, FlowEngineConstant.STATUS_CLAIM);
-
-		// 计算总数
-		long count = claimUserQuery.count() + claimRoleWithTenantIdQuery.count() + claimRoleWithoutTenantIdQuery.count();
-		// 设置页数
-		page.setSize(count);
-		// 设置总数
-		page.setTotal(count);
-		// 设置数据
-		page.setRecords(flowList);
-		return page;
-	}
-
-	@Override
-	public IPage<BladeFlow> selectTodoPage(IPage<BladeFlow> page, BladeFlow bladeFlow) {
-		String taskUser = TaskUtil.getTaskUser();
-		List<BladeFlow> flowList = new LinkedList<>();
-
-		// 已签收的任务
-		TaskQuery todoQuery = taskService.createTaskQuery().taskAssignee(taskUser).active()
-			.includeProcessVariables().orderByTaskCreateTime().desc();
-
-		// 构建列表数据
-		buildFlowTaskList(bladeFlow, flowList, todoQuery, FlowEngineConstant.STATUS_TODO);
-
-		// 计算总数
-		long count = todoQuery.count();
-		// 设置页数
-		page.setSize(count);
-		// 设置总数
-		page.setTotal(count);
-		// 设置数据
-		page.setRecords(flowList);
-		return page;
-	}
-
-	@Override
-	public IPage<BladeFlow> selectSendPage(IPage<BladeFlow> page, BladeFlow bladeFlow) {
-		String taskUser = TaskUtil.getTaskUser();
-		List<BladeFlow> flowList = new LinkedList<>();
-
-		HistoricProcessInstanceQuery historyQuery = historyService.createHistoricProcessInstanceQuery().startedBy(taskUser).orderByProcessInstanceStartTime().desc();
-
-		if (bladeFlow.getCategory() != null) {
-			historyQuery.processDefinitionCategory(bladeFlow.getCategory());
-		}
-		if (bladeFlow.getBeginDate() != null) {
-			historyQuery.startedAfter(bladeFlow.getBeginDate());
-		}
-		if (bladeFlow.getEndDate() != null) {
-			historyQuery.startedBefore(bladeFlow.getEndDate());
-		}
-
-		// 查询列表
-		List<HistoricProcessInstance> historyList = historyQuery.listPage(Func.toInt((page.getCurrent() - 1) * page.getSize()), Func.toInt(page.getSize()));
-
-		historyList.forEach(historicProcessInstance -> {
-			BladeFlow flow = new BladeFlow();
-			// historicProcessInstance
-			flow.setCreateTime(historicProcessInstance.getStartTime());
-			flow.setEndTime(historicProcessInstance.getEndTime());
-			flow.setVariables(historicProcessInstance.getProcessVariables());
-			String[] businessKey = Func.toStrArray(StringPool.COLON, historicProcessInstance.getBusinessKey());
-			if (businessKey.length > 1) {
-				flow.setBusinessTable(businessKey[0]);
-				flow.setBusinessId(businessKey[1]);
-			}
-			flow.setHistoryActivityName(historicProcessInstance.getName());
-			flow.setProcessInstanceId(historicProcessInstance.getId());
-			flow.setHistoryProcessInstanceId(historicProcessInstance.getId());
-			// ProcessDefinition
-			ProcessDefinition processDefinition = FlowCache.getProcessDefinition(historicProcessInstance.getProcessDefinitionId());
-			flow.setProcessDefinitionId(processDefinition.getId());
-			flow.setProcessDefinitionName(processDefinition.getName());
-			flow.setProcessDefinitionVersion(processDefinition.getVersion());
-			flow.setProcessDefinitionKey(processDefinition.getKey());
-			flow.setCategory(processDefinition.getCategory());
-			flow.setCategoryName(FlowCache.getCategoryName(processDefinition.getCategory()));
-			flow.setProcessInstanceId(historicProcessInstance.getId());
-			// HistoricTaskInstance
-			List<HistoricTaskInstance> historyTasks = historyService.createHistoricTaskInstanceQuery().processInstanceId(historicProcessInstance.getId()).orderByHistoricTaskInstanceEndTime().desc().list();
-			if (Func.isNotEmpty(historyTasks)) {
-				HistoricTaskInstance historyTask = historyTasks.iterator().next();
-				flow.setTaskId(historyTask.getId());
-				flow.setTaskName(historyTask.getName());
-				flow.setTaskDefinitionKey(historyTask.getTaskDefinitionKey());
-			}
-			// Status
-			if (historicProcessInstance.getEndActivityId() != null) {
-				flow.setProcessIsFinished(FlowEngineConstant.STATUS_FINISHED);
-			} else {
-				flow.setProcessIsFinished(FlowEngineConstant.STATUS_UNFINISHED);
-			}
-			flow.setStatus(FlowEngineConstant.STATUS_FINISH);
-			flowList.add(flow);
-		});
-
-		// 计算总数
-		long count = historyQuery.count();
-		// 设置总数
-		page.setTotal(count);
-		page.setRecords(flowList);
-		return page;
-	}
-
-	@Override
-	public IPage<BladeFlow> selectDonePage(IPage<BladeFlow> page, BladeFlow bladeFlow) {
-		String taskUser = TaskUtil.getTaskUser();
-		List<BladeFlow> flowList = new LinkedList<>();
-
-		HistoricTaskInstanceQuery doneQuery = historyService.createHistoricTaskInstanceQuery().taskAssignee(taskUser).finished()
-			.includeProcessVariables().orderByHistoricTaskInstanceEndTime().desc();
-
-		if (bladeFlow.getCategory() != null) {
-			doneQuery.processCategoryIn(Func.toStrList(bladeFlow.getCategory()));
-		}
-		if (bladeFlow.getBeginDate() != null) {
-			doneQuery.taskCompletedAfter(bladeFlow.getBeginDate());
-		}
-		if (bladeFlow.getEndDate() != null) {
-			doneQuery.taskCompletedBefore(bladeFlow.getEndDate());
-		}
-
-		// 查询列表
-		List<HistoricTaskInstance> doneList = doneQuery.listPage(Func.toInt((page.getCurrent() - 1) * page.getSize()), Func.toInt(page.getSize()));
-		doneList.forEach(historicTaskInstance -> {
-			BladeFlow flow = new BladeFlow();
-			flow.setTaskId(historicTaskInstance.getId());
-			flow.setTaskDefinitionKey(historicTaskInstance.getTaskDefinitionKey());
-			flow.setTaskName(historicTaskInstance.getName());
-			flow.setAssignee(historicTaskInstance.getAssignee());
-			flow.setCreateTime(historicTaskInstance.getCreateTime());
-			flow.setExecutionId(historicTaskInstance.getExecutionId());
-			flow.setHistoryTaskEndTime(historicTaskInstance.getEndTime());
-			flow.setVariables(historicTaskInstance.getProcessVariables());
-
-			ProcessDefinition processDefinition = FlowCache.getProcessDefinition(historicTaskInstance.getProcessDefinitionId());
-			flow.setProcessDefinitionId(processDefinition.getId());
-			flow.setProcessDefinitionName(processDefinition.getName());
-			flow.setProcessDefinitionKey(processDefinition.getKey());
-			flow.setProcessDefinitionVersion(processDefinition.getVersion());
-			flow.setCategory(processDefinition.getCategory());
-			flow.setCategoryName(FlowCache.getCategoryName(processDefinition.getCategory()));
-
-			flow.setProcessInstanceId(historicTaskInstance.getProcessInstanceId());
-			flow.setHistoryProcessInstanceId(historicTaskInstance.getProcessInstanceId());
-			HistoricProcessInstance historicProcessInstance = getHistoricProcessInstance((historicTaskInstance.getProcessInstanceId()));
-			if (Func.isNotEmpty(historicProcessInstance)) {
-				String[] businessKey = Func.toStrArray(StringPool.COLON, historicProcessInstance.getBusinessKey());
-				flow.setBusinessTable(businessKey[0]);
-				flow.setBusinessId(businessKey[1]);
-				if (historicProcessInstance.getEndActivityId() != null) {
-					flow.setProcessIsFinished(FlowEngineConstant.STATUS_FINISHED);
-				} else {
-					flow.setProcessIsFinished(FlowEngineConstant.STATUS_UNFINISHED);
-				}
-			}
-			flow.setStatus(FlowEngineConstant.STATUS_FINISH);
-			flowList.add(flow);
-		});
-		// 计算总数
-		long count = doneQuery.count();
-		// 设置总数
-		page.setTotal(count);
-		page.setRecords(flowList);
-		return page;
-	}
-
-	@Override
-	public boolean completeTask(BladeFlow flow) {
-		String taskId = flow.getTaskId();
-		String processInstanceId = flow.getProcessInstanceId();
-		String comment = Func.toStr(flow.getComment(), ProcessConstant.PASS_COMMENT);
-		// 增加评论
-		if (StringUtil.isNoneBlank(processInstanceId, comment)) {
-			taskService.addComment(taskId, processInstanceId, comment);
-		}
-		// 创建变量
-		Map<String, Object> variables = flow.getVariables();
-		if (variables == null) {
-			variables = Kv.create();
-		}
-		variables.put(ProcessConstant.PASS_KEY, flow.isPass());
-		// 完成任务
-		taskService.complete(taskId, variables);
-		return true;
-	}
-
-	/**
-	 * 构建流程
-	 *
-	 * @param bladeFlow 流程通用类
-	 * @param flowList  流程列表
-	 * @param taskQuery 任务查询类
-	 * @param status    状态
-	 */
-	private void buildFlowTaskList(BladeFlow bladeFlow, List<BladeFlow> flowList, TaskQuery taskQuery, String status) {
-		if (bladeFlow.getCategory() != null) {
-			taskQuery.processCategoryIn(Func.toStrList(bladeFlow.getCategory()));
-		}
-		if (bladeFlow.getProcessDefinitionName() != null) {
-			taskQuery.processDefinitionName(bladeFlow.getProcessDefinitionName());
-		}
-		if (bladeFlow.getBeginDate() != null) {
-			taskQuery.taskCreatedAfter(bladeFlow.getBeginDate());
-		}
-		if (bladeFlow.getEndDate() != null) {
-			taskQuery.taskCreatedBefore(bladeFlow.getEndDate());
-		}
-		taskQuery.list().forEach(task -> {
-			BladeFlow flow = new BladeFlow();
-			flow.setTaskId(task.getId());
-			flow.setTaskDefinitionKey(task.getTaskDefinitionKey());
-			flow.setTaskName(task.getName());
-			flow.setAssignee(task.getAssignee());
-			flow.setCreateTime(task.getCreateTime());
-			flow.setClaimTime(task.getClaimTime());
-			flow.setExecutionId(task.getExecutionId());
-			flow.setVariables(task.getProcessVariables());
-
-			HistoricProcessInstance historicProcessInstance = getHistoricProcessInstance(task.getProcessInstanceId());
-			if (Func.isNotEmpty(historicProcessInstance)) {
-				String[] businessKey = Func.toStrArray(StringPool.COLON, historicProcessInstance.getBusinessKey());
-				flow.setBusinessTable(businessKey[0]);
-				flow.setBusinessId(businessKey[1]);
-			}
-
-			ProcessDefinition processDefinition = FlowCache.getProcessDefinition(task.getProcessDefinitionId());
-			flow.setCategory(processDefinition.getCategory());
-			flow.setCategoryName(FlowCache.getCategoryName(processDefinition.getCategory()));
-			flow.setProcessDefinitionId(processDefinition.getId());
-			flow.setProcessDefinitionName(processDefinition.getName());
-			flow.setProcessDefinitionKey(processDefinition.getKey());
-			flow.setProcessDefinitionVersion(processDefinition.getVersion());
-			flow.setProcessInstanceId(task.getProcessInstanceId());
-			flow.setStatus(status);
-			flowList.add(flow);
-		});
-	}
-
-	/**
-	 * 获取历史流程
-	 *
-	 * @param processInstanceId 流程实例id
-	 * @return HistoricProcessInstance
-	 */
-	private HistoricProcessInstance getHistoricProcessInstance(String processInstanceId) {
-		return historyService.createHistoricProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();
-	}
-
-}

src/main/java/org/springblade/flow/business/service/impl/FlowServiceImpl.java

@@ -1,97 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.flow.business.service.impl;
-
-import lombok.AllArgsConstructor;
-import org.flowable.engine.IdentityService;
-import org.flowable.engine.RuntimeService;
-import org.flowable.engine.TaskService;
-import org.flowable.engine.runtime.ProcessInstance;
-import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.support.Kv;
-import org.springblade.core.tool.utils.Func;
-import org.springblade.core.tool.utils.StringUtil;
-import org.springblade.flow.business.service.IFlowService;
-import org.springblade.flow.core.entity.BladeFlow;
-import org.springblade.flow.core.utils.TaskUtil;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.Map;
-
-/**
- * 流程实现类
- *
- * @author Chill
- */
-@RestController
-@AllArgsConstructor
-public class FlowServiceImpl implements IFlowService {
-
-	private final RuntimeService runtimeService;
-	private final IdentityService identityService;
-	private final TaskService taskService;
-
-	@Override
-	public BladeFlow startProcessInstanceById(String processDefinitionId, String businessKey, Map<String, Object> variables) {
-		// 设置流程启动用户
-		identityService.setAuthenticatedUserId(TaskUtil.getTaskUser());
-		// 开启流程
-		ProcessInstance processInstance = runtimeService.startProcessInstanceById(processDefinitionId, businessKey, variables);
-		// 组装流程通用类
-		BladeFlow flow = new BladeFlow();
-		flow.setProcessInstanceId(processInstance.getId());
-		return flow;
-	}
-
-	@Override
-	public BladeFlow startProcessInstanceByKey(String processDefinitionKey, String businessKey, Map<String, Object> variables) {
-		// 设置流程启动用户
-		identityService.setAuthenticatedUserId(TaskUtil.getTaskUser());
-		// 开启流程
-		ProcessInstance processInstance = runtimeService.startProcessInstanceByKey(processDefinitionKey, businessKey, variables);
-		// 组装流程通用类
-		BladeFlow flow = new BladeFlow();
-		flow.setProcessInstanceId(processInstance.getId());
-		return flow;
-	}
-
-	@Override
-	public boolean completeTask(String taskId, String processInstanceId, String comment, Map<String, Object> variables) {
-		// 增加评论
-		if (StringUtil.isNoneBlank(processInstanceId, comment)) {
-			taskService.addComment(taskId, processInstanceId, comment);
-		}
-		// 非空判断
-		if (Func.isEmpty(variables)) {
-			variables = Kv.create();
-		}
-		// 完成任务
-		taskService.complete(taskId, variables);
-		return true;
-	}
-
-	@Override
-	public Object taskVariable(String taskId, String variableName) {
-		return R.data(taskService.getVariable(taskId, variableName));
-	}
-
-	@Override
-	public Map<String, Object> taskVariables(String taskId) {
-		return taskService.getVariables(taskId);
-	}
-
-}

src/main/java/org/springblade/flow/core/entity/BladeFlow.java

@@ -1,179 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.flow.core.entity;
-
-import lombok.Data;
-import org.springblade.flow.core.constant.ProcessConstant;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.Map;
-
-/**
- * 工作流通用实体类
- *
- * @author Chill
- */
-@Data
-public class BladeFlow implements Serializable {
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * 任务编号
-	 */
-	private String taskId;
-	/**
-	 * 任务名称
-	 */
-	private String taskName;
-	/**
-	 * 任务定义Key
-	 */
-	private String taskDefinitionKey;
-	/**
-	 * 任务执行人编号
-	 */
-	private String assignee;
-	/**
-	 * 任务执行人名称
-	 */
-	private String assigneeName;
-	/**
-	 * 流程分类
-	 */
-	private String category;
-	/**
-	 * 流程分类名
-	 */
-	private String categoryName;
-	/**
-	 * 创建时间
-	 */
-	private Date createTime;
-	/**
-	 * 结束时间
-	 */
-	private Date endTime;
-	/**
-	 * 签收时间
-	 */
-	private Date claimTime;
-	/**
-	 * 历史任务结束时间
-	 */
-	private Date historyTaskEndTime;
-	/**
-	 * 执行ID
-	 */
-	private String executionId;
-	/**
-	 * 流程实例ID
-	 */
-	private String processInstanceId;
-	/**
-	 * 流程ID
-	 */
-	private String processDefinitionId;
-	/**
-	 * 流程标识
-	 */
-	private String processDefinitionKey;
-	/**
-	 * 流程名
-	 */
-	private String processDefinitionName;
-	/**
-	 * 流程版本
-	 */
-	private int processDefinitionVersion;
-	/**
-	 * 流程说明
-	 */
-	private String processDefinitionDesc;
-	/**
-	 * 流程简图名
-	 */
-	private String processDefinitionDiagramResName;
-	/**
-	 * 流程重命名
-	 */
-	private String processDefinitionResName;
-	/**
-	 * 历史任务流程实例ID 查看流程图会用到
-	 */
-	private String historyProcessInstanceId;
-	/**
-	 * 流程实例是否结束
-	 */
-	private String processIsFinished;
-	/**
-	 * 历史活动ID
-	 */
-	private String historyActivityId;
-	/**
-	 * 历史活动流程
-	 */
-	private String historyActivityName;
-	/**
-	 * 历史活动耗时
-	 */
-	private String historyActivityDurationTime;
-	/**
-	 * 业务绑定Table
-	 */
-	private String businessTable;
-	/**
-	 * 业务绑定ID
-	 */
-	private String businessId;
-	/**
-	 * 任务状态
-	 */
-	private String status;
-	/**
-	 * 任务意见
-	 */
-	private String comment;
-	/**
-	 * 是否通过
-	 */
-	private boolean isPass;
-	/**
-	 * 是否通过代号
-	 */
-	private String flag;
-	/**
-	 * 开始查询日期
-	 */
-	private Date beginDate;
-	/**
-	 * 结束查询日期
-	 */
-	private Date endDate;
-	/**
-	 * 流程参数
-	 */
-	private Map<String, Object> variables;
-
-	/**
-	 * 获取是否通过
-	 */
-	public boolean isPass() {
-		return ProcessConstant.PASS_ALIAS.equals(flag) || ProcessConstant.PASS_COMMENT.equals(comment);
-	}
-
-}

src/main/java/org/springblade/flow/core/utils/FlowUtil.java

@@ -1,66 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.flow.core.utils;
-
-import org.springblade.core.tool.utils.Func;
-import org.springblade.core.tool.utils.StringUtil;
-import org.springblade.flow.core.constant.ProcessConstant;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * 工作流工具类
- *
- * @author Chill
- */
-public class FlowUtil {
-
-	/**
-	 * 定义流程key对应的表名
-	 */
-	private final static Map<String, String> BUSINESS_TABLE = new HashMap<>();
-
-	static {
-		BUSINESS_TABLE.put(ProcessConstant.LEAVE_KEY, "blade_process_leave");
-	}
-
-	/**
-	 * 通过流程key获取业务表名
-	 *
-	 * @param key 流程key
-	 */
-	public static String getBusinessTable(String key) {
-		String businessTable = BUSINESS_TABLE.get(key);
-		if (Func.isEmpty(businessTable)) {
-			throw new RuntimeException("流程启动失败,未找到相关业务表");
-		}
-		return businessTable;
-	}
-
-	/**
-	 * 获取业务标识
-	 *
-	 * @param businessTable 业务表
-	 * @param businessId    业务表主键
-	 * @return businessKey
-	 */
-	public static String getBusinessKey(String businessTable, String businessId) {
-		return StringUtil.format("{}:{}", businessTable, businessId);
-	}
-
-}

src/main/java/org/springblade/flow/core/utils/TaskUtil.java

@@ -1,71 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.flow.core.utils;
-
-import org.springblade.core.secure.utils.AuthUtil;
-import org.springblade.core.tool.utils.Func;
-import org.springblade.core.tool.utils.StringUtil;
-
-import static org.springblade.core.launch.constant.FlowConstant.TASK_USR_PREFIX;
-
-/**
- * 工作流任务工具类
- *
- * @author Chill
- */
-public class TaskUtil {
-
-	/**
-	 * 获取任务用户格式
-	 *
-	 * @return taskUser
-	 */
-	public static String getTaskUser() {
-		return StringUtil.format("{}{}", TASK_USR_PREFIX, AuthUtil.getUserId());
-	}
-
-	/**
-	 * 获取任务用户格式
-	 *
-	 * @param userId 用户id
-	 * @return taskUser
-	 */
-	public static String getTaskUser(String userId) {
-		return StringUtil.format("{}{}", TASK_USR_PREFIX, userId);
-	}
-
-
-	/**
-	 * 获取用户主键
-	 *
-	 * @param taskUser 任务用户
-	 * @return userId
-	 */
-	public static Long getUserId(String taskUser) {
-		return Func.toLong(StringUtil.removePrefix(taskUser, TASK_USR_PREFIX));
-	}
-
-	/**
-	 * 获取用户组格式
-	 *
-	 * @return candidateGroup
-	 */
-	public static String getCandidateGroup() {
-		return AuthUtil.getUserRole();
-	}
-
-}

src/main/java/org/springblade/flow/demo/leave/controller/LeaveController.java

@@ -1,65 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.flow.demo.leave.controller;
-
-import lombok.AllArgsConstructor;
-import org.springblade.common.cache.UserCache;
-import org.springblade.core.launch.constant.AppConstant;
-import org.springblade.core.tenant.annotation.NonDS;
-import org.springblade.core.tool.api.R;
-import org.springblade.flow.demo.leave.entity.ProcessLeave;
-import org.springblade.flow.demo.leave.service.ILeaveService;
-import org.springframework.web.bind.annotation.*;
-import springfox.documentation.annotations.ApiIgnore;
-
-/**
- * 控制器
- *
- * @author Chill
- */
-@NonDS
-@ApiIgnore
-@RestController
-@RequestMapping(AppConstant.APPLICATION_DESK_NAME + "/process/leave")
-@AllArgsConstructor
-public class LeaveController {
-
-	private final ILeaveService leaveService;
-
-	/**
-	 * 详情
-	 *
-	 * @param businessId 主键
-	 */
-	@GetMapping("detail")
-	public R<ProcessLeave> detail(Long businessId) {
-		ProcessLeave detail = leaveService.getById(businessId);
-		detail.getFlow().setAssigneeName(UserCache.getUser(detail.getCreateUser()).getName());
-		return R.data(detail);
-	}
-
-	/**
-	 * 新增或修改
-	 *
-	 * @param leave 请假信息
-	 */
-	@PostMapping("start-process")
-	public R startProcess(@RequestBody ProcessLeave leave) {
-		return R.status(leaveService.startProcess(leave));
-	}
-
-}