修復

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

@@ -65,7 +65,7 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 /**
- * 自助設備吞沒卡處理 控制器
+ * 自助設備吞卡資料 控制器
  *
  * @author BladeX
  * @since 2021-08-12
@@ -73,7 +73,7 @@ import java.util.stream.Collectors;
 @RestController
 @AllArgsConstructor
 @RequestMapping("bank/cardswallow")
-@Api(value = "自助設備吞沒卡處理", tags = "自助設備吞沒卡處理接口")
+@Api(value = "自助設備吞卡資料", tags = "自助設備吞卡資料接口")
 public class CardSwallowController extends BladeController {
 
 	private final ICardSwallowService cardSwallowService;
@@ -95,7 +95,7 @@ public class CardSwallowController extends BladeController {
 	}
 
 	/**
-	 * 分页 自助設備吞沒卡處理
+	 * 分页 自助設備吞卡資料
 	 */
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
@@ -107,7 +107,7 @@ public class CardSwallowController extends BladeController {
 
 
 	/**
-	 * 自定义分页 自助設備吞沒卡處理
+	 * 自定义分页 自助設備吞卡資料
 	 */
 	@GetMapping("/page")
 	@ApiOperationSupport(order = 3)
@@ -137,7 +137,7 @@ public class CardSwallowController extends BladeController {
 	}
 
 	/**
-	 * 新增 自助設備吞沒卡處理
+	 * 新增 自助設備吞卡資料
 	 */
 	@PostMapping("/save")
 	@ApiOperationSupport(order = 4)
@@ -147,7 +147,7 @@ public class CardSwallowController extends BladeController {
 	}
 
 	/**
-	 * 修改 自助設備吞沒卡處理
+	 * 修改 自助設備吞卡資料
 	 */
 	@PostMapping("/update")
 	@ApiOperationSupport(order = 5)
@@ -157,7 +157,7 @@ public class CardSwallowController extends BladeController {
 	}
 
 	/**
-	 * 新增或修改 自助設備吞沒卡處理
+	 * 新增或修改 自助設備吞卡資料
 	 */
 	@PostMapping("/submit")
 	@ApiOperationSupport(order = 6)
@@ -168,7 +168,7 @@ public class CardSwallowController extends BladeController {
 
 
 	/**
-	 * 删除 自助設備吞沒卡處理
+	 * 删除 自助設備吞卡資料
 	 */
 	@PostMapping("/remove")
 	@ApiOperationSupport(order = 7)
@@ -254,17 +254,22 @@ public class CardSwallowController extends BladeController {
 
 		read.forEach(item -> {
 			String sendBank = item.getSendBank();
+			String orgNo = item.getOrgNo();
 			Dept one = deptService.getOne(Wrappers.<Dept>query().lambda().eq(Dept::getDeptName, sendBank));
+			Dept byOrgNo = deptService.getByOrgNo(orgNo);
 			if (one != null){
 				item.setSendBank(one.getOrgNo() + " " + one.getDeptName());
 			}
+			if (byOrgNo != null){
+				item.setOrgName(byOrgNo.getDeptName());
+			}
 		});
 
 		return R.data(read);
 	}
 
 	/**
-	 * 新增或修改 自助設備吞沒卡處理
+	 * 新增或修改 自助設備吞卡資料
 	 */
 	@PostMapping("/cardswallowSubmit")
 	@ApiOperationSupport(order = 6)
@@ -348,7 +353,7 @@ public class CardSwallowController extends BladeController {
 	}
 
 	/**
-	 * 新增或修改 自助設備吞沒卡處理
+	 * 新增或修改 自助設備吞卡資料
 	 */
 	@PostMapping("/cardswallowSubmitBatch")
 	@ApiOperationSupport(order = 6)

src/main/java/org/springblade/bank/cardswallow/dto/CardSwallowDTO.java

@@ -21,7 +21,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 /**
- * 自助設備吞沒卡處理数据传输对象实体类
+ * 自助設備吞卡資料数据传输对象实体类
  *
  * @author BladeX
  * @since 2021-08-12

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

@@ -29,7 +29,7 @@ import io.swagger.annotations.ApiModelProperty;
 import org.springframework.format.annotation.DateTimeFormat;
 
 /**
- * 自助設備吞沒卡處理实体类
+ * 自助設備吞卡資料实体类
  *
  * @author BladeX
  * @since 2021-08-12
@@ -37,7 +37,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 @Data
 @TableName("zh_input_card_swallow")
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value = "CardSwallow对象", description = "自助設備吞沒卡處理")
+@ApiModel(value = "CardSwallow对象", description = "自助設備吞卡資料")
 public class CardSwallow extends BaseEntity {
 
 	private static final long serialVersionUID = 1L;

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

@@ -28,14 +28,14 @@ import org.springframework.format.annotation.DateTimeFormat;
 import java.util.Date;
 
 /**
- * 自助設備吞沒卡處理实体类
+ * 自助設備吞卡資料实体类
  *
  * @author BladeX
  * @since 2021-08-12
  */
 @Data
 @TableName("zh_input_card_swallow")
-@ApiModel(value = "CardSwallow对象", description = "自助設備吞沒卡處理")
+@ApiModel(value = "CardSwallow对象", description = "自助設備吞卡資料")
 public class CardSwallowExcel{
 
 	/**
@@ -48,11 +48,7 @@ public class CardSwallowExcel{
 	*/
 		@ApiModelProperty(value = "機構號")
 		private String orgNo;
-	/**
-	 * 機構名稱
-	 */
-	@ApiModelProperty(value = "機構名稱")
-	private String orgName;
+
 	/**
 	* 序號
 	*/
@@ -115,5 +111,10 @@ public class CardSwallowExcel{
 	*/
 		@ApiModelProperty(value = "發送狀態")
 		private String sendStatus;
+	/**
+	 * 機構名稱
+	 */
+	@ApiModelProperty(value = "機構名稱")
+	private String orgName;
 
 }

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

@@ -27,7 +27,7 @@ import org.springblade.core.datascope.enums.DataScopeEnum;
 import java.util.List;
 
 /**
- * 自助設備吞沒卡處理 Mapper 接口
+ * 自助設備吞卡資料 Mapper 接口
  *
  * @author BladeX
  * @since 2021-08-12

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

@@ -24,7 +24,7 @@ import org.springblade.core.mp.base.BaseService;
 import java.util.List;
 
 /**
- * 自助設備吞沒卡處理 服务类
+ * 自助設備吞卡資料 服务类
  *
  * @author BladeX
  * @since 2021-08-12

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

@@ -29,7 +29,7 @@ import org.springframework.stereotype.Service;
 import java.util.List;
 
 /**
- * 自助設備吞沒卡處理 服务实现类
+ * 自助設備吞卡資料 服务实现类
  *
  * @author BladeX
  * @since 2021-08-12

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

@@ -24,14 +24,14 @@ import io.swagger.annotations.ApiModel;
 import java.util.List;
 
 /**
- * 自助設備吞沒卡處理视图实体类
+ * 自助設備吞卡資料视图实体类
  *
  * @author BladeX
  * @since 2021-08-12
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value = "CardSwallowVO对象", description = "自助設備吞沒卡處理")
+@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

@@ -23,7 +23,7 @@ import org.springblade.bank.cardswallow.vo.CardSwallowVO;
 import java.util.Objects;
 
 /**
- * 自助設備吞沒卡處理包装类,返回视图层所需的字段
+ * 自助設備吞卡資料包装类,返回视图层所需的字段
  *
  * @author BladeX
  * @since 2021-08-12

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

@@ -213,10 +213,12 @@ public class GoodsUseController extends BladeController {
 				userLog.setOperationType("add");
 
 				//發送通知
-				noticeService.sendGoodsUseNotice(goodsUse);
+				noticeService.sendGoodsUseNotice(goodsUse, false);
 			}else{
 				userLog.setOperationType("edit");
 				userLog.setOldData(JSONUtil.toJsonStr(old));
+				//發送通知
+				noticeService.sendGoodsUseNotice(goodsUse, true);
 			}
 			userLogService.save(userLog);
 		}
@@ -391,15 +393,22 @@ public class GoodsUseController extends BladeController {
 	@ApiOperation(value = "获取审批人设置", notes = "")
 	public R getBalanceList() {
 		Dept dept = deptService.getById(AuthUtil.getDeptId());
-
 		List<GoodsUse> balanceList = new ArrayList<>();
+		List<Dept> deptList = new ArrayList<>();
+		if (!dept.getOrgNo().startsWith("999") && !dept.getOrgNo().equals("51614")){
+			deptList.add(dept);
+		}
+		List<Dept> deptChild = deptService.getDeptChild(dept.getId());
+		deptList.addAll(deptChild);
 
 		List<Dict> voucherTypeList = dictService.getList("voucher_type");
-		voucherTypeList.forEach(item -> {
-			GoodsUse goo = this.getLastByOrgNoAndType(dept.getOrgNo(), item.getDictKey());
-			if (goo != null){
-				balanceList.add(goo);
-			}
+		deptList.forEach(dept1 -> {
+			voucherTypeList.forEach(item -> {
+				GoodsUse goo = this.getLastByOrgNoAndType(dept1.getOrgNo(), item.getDictKey());
+				if (goo != null){
+					balanceList.add(goo);
+				}
+			});
 		});
 
 		return R.data(balanceList);

src/main/java/org/springblade/bank/home/controller/HomeController.java

@@ -123,7 +123,7 @@ public class HomeController extends BladeController {
 		boolean goodsuse = roleMenuService.checkMenuByMenuCodeAndRoles("goodsuse", menuService);
 		//新開戶退件登記表
 		boolean returns = roleMenuService.checkMenuByMenuCodeAndRoles("returns", menuService);
-		//自助設備吞沒卡處理
+		//自助設備吞卡資料
 		boolean cardswallow = roleMenuService.checkMenuByMenuCodeAndRoles("cardswallow", menuService);
 		//信息發佈
 		boolean message = roleMenuService.checkMenuByMenuCodeAndRoles("message", menuService);
@@ -188,7 +188,7 @@ public class HomeController extends BladeController {
 		boolean goodsuse = roleMenuService.checkMenuByMenuCodeAndRoles("goodsuse", menuService);
 		//新開戶退件登記表
 		boolean returns = roleMenuService.checkMenuByMenuCodeAndRoles("returns", menuService);
-		//自助設備吞沒卡處理
+		//自助設備吞卡資料
 		boolean cardswallow = roleMenuService.checkMenuByMenuCodeAndRoles("cardswallow", menuService);
 
 		if (postchange){
@@ -226,7 +226,7 @@ public class HomeController extends BladeController {
 		boolean goodsuse = roleMenuService.checkMenuByMenuCodeAndRoles("goodsuse", menuService);
 		//新開戶退件登記表
 		boolean returns = roleMenuService.checkMenuByMenuCodeAndRoles("returns", menuService);
-		//自助設備吞沒卡處理
+		//自助設備吞卡資料
 		boolean cardswallow = roleMenuService.checkMenuByMenuCodeAndRoles("cardswallow", menuService);
 
 		if (postchange){

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

@@ -210,10 +210,12 @@ public class KeyPwdController extends BladeController {
 				userLog.setOperationType("add");
 
 				//發送通知
-				noticeService.sendKeyPwdNotice(keyPwd);
+				noticeService.sendKeyPwdNotice(keyPwd, false);
 			}else{
 				userLog.setOperationType("edit");
 				userLog.setOldData(JSONUtil.toJsonStr(old));
+				//發送通知
+				noticeService.sendKeyPwdNotice(keyPwd, true);
 			}
 			userLogService.save(userLog);
 		}

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

@@ -182,10 +182,12 @@ public class MessageController extends BladeController {
 				userLog.setOperationType("add");
 
 				// 發送通知
-				noticeService.sendMessageNotice(message);
+				noticeService.sendMessageNotice(message, false);
 			}else{
 				userLog.setOperationType("edit");
 				userLog.setOldData(JSONUtil.toJsonStr(old));
+				// 發送通知
+				noticeService.sendMessageNotice(message, true);
 			}
 			userLogService.save(userLog);
 		}

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

@@ -201,10 +201,12 @@ public class PostChangeController extends BladeController {
 				userLog.setOperationType("add");
 
 				//發送通知
-				boolean r = noticeService.sendPostChangeNotice(postChange);
+				noticeService.sendPostChangeNotice(postChange, false);
 			}else{
 				userLog.setOperationType("edit");
 				userLog.setOldData(JSONUtil.toJsonStr(old));
+				//發送通知
+				noticeService.sendPostChangeNotice(postChange, true);
 			}
 			userLogService.save(userLog);
 		}

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

@@ -315,6 +315,11 @@ public class ReturnsController extends BladeController {
 			old = returnsService.getById(returns.getId());
 		}
 
+		Dept byOrgNo = deptService.getByOrgNo(returns.getOrgNo());
+		if (byOrgNo != null){
+			returns.setOrgName(byOrgNo.getDeptName());
+		}
+
 		if (returnsService.saveOrUpdate(returns)){
 			userLog.setTableName("returns");
 			userLog.setBankNo(dept.getBankNo());

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

@@ -254,11 +254,12 @@ public class SealHandoverController extends BladeController {
 				userLog.setOperationType("add");
 
 				//發送通知
-				noticeService.sendSealNotice(sealHandover);
+				noticeService.sendSealNotice(sealHandover, false);
 			}else{
 				userLog.setOperationType("edit");
-
 				userLog.setOldData(JSONUtil.toJsonStr(old));
+				//發送通知
+				noticeService.sendSealNotice(sealHandover, true);
 			}
 			userLogService.save(userLog);
 

src/main/java/org/springblade/modules/desk/service/INoticeService.java

@@ -53,17 +53,17 @@ public interface INoticeService extends BaseService<Notice> {
 
 	boolean sendNotice(Notice notice);
 
-	boolean sendKeyPwdNotice(KeyPwd keyPwd);
+	boolean sendKeyPwdNotice(KeyPwd keyPwd, boolean isEdit);
 
-	boolean sendCardSwallowNotice(CardSwallow cardSwallow);
+	boolean sendCardSwallowNotice(CardSwallow cardSwallow, boolean isEdit);
 
-	boolean sendReturnsNotice(Returns returns);
+	boolean sendReturnsNotice(Returns returns, boolean isEdit);
 
-	boolean sendMessageNotice(Message message);
+	boolean sendMessageNotice(Message message, boolean isEdit);
 
-	boolean sendSealNotice(SealHandover sealHandover);
+	boolean sendSealNotice(SealHandover sealHandover, boolean isEdit);
 
-	boolean sendPostChangeNotice(PostChange postChange);
+	boolean sendPostChangeNotice(PostChange postChange, boolean isEdit);
 
-	boolean sendGoodsUseNotice(GoodsUse goodsUse);
+	boolean sendGoodsUseNotice(GoodsUse goodsUse, boolean isEdit);
 }

src/main/java/org/springblade/modules/desk/service/impl/NoticeServiceImpl.java

@@ -97,11 +97,15 @@ public class NoticeServiceImpl extends BaseServiceImpl<NoticeMapper, Notice> imp
 	}
 
 	@Override
-	public boolean sendKeyPwdNotice(KeyPwd keyPwd) {
+	public boolean sendKeyPwdNotice(KeyPwd keyPwd, boolean isEdit) {
 		//有關XXX(分類+種類+鎖匙/密碼)的交接登記已於X年X月X日完成；交出人﹕XXX；接收人﹕XXX
 		String categoryName = getCategoryName(keyPwd);
 		String now = DateUtil.formatDate(DateUtil.now());
-		String title = "有關[" + categoryName + "]的交接登記已於" + now + "完成；交出人：" + keyPwd.getHandoverPersonName() + "；接收人：" + keyPwd.getReceiverName();
+		String title = "";
+		if (isEdit){
+			title = "更正：";
+		}
+		title += "有關[" + categoryName + "]的交接登記已於" + now + "完成；交出人：" + keyPwd.getHandoverPersonName() + "；接收人：" + keyPwd.getReceiverName();
 		User user1 = userService.getUserByEhr(keyPwd.getHandoverPersonNo());
 		User user2 = userService.getUserByEhr(keyPwd.getReceiverNo());
 
@@ -121,12 +125,16 @@ public class NoticeServiceImpl extends BaseServiceImpl<NoticeMapper, Notice> imp
 	}
 
 	@Override
-	public boolean sendCardSwallowNotice(CardSwallow cardSwallow) {
-
+	public boolean sendCardSwallowNotice(CardSwallow cardSwallow, boolean isEdit) {
+		String title = "";
+		if (isEdit){
+			title = "更正：";
+		}
+		title += "營運部已發佈新消息，請查閱";
 		Dept dept = deptService.getByOrgNo(cardSwallow.getSendOrgNo());
 
 		Notice notice = new Notice();
-		notice.setTitle("營運部已發佈新消息，請查閱");
+		notice.setTitle(title);
 		notice.setBusinessType("cardswallow");
 		notice.setDeptId(dept.getId()+"");
 		notice.setRoleId(null);
@@ -134,12 +142,16 @@ public class NoticeServiceImpl extends BaseServiceImpl<NoticeMapper, Notice> imp
 	}
 
 	@Override
-	public boolean sendReturnsNotice(Returns returns) {
-
+	public boolean sendReturnsNotice(Returns returns, boolean isEdit) {
+		String title = "";
+		if (isEdit){
+			title = "更正：";
+		}
+		title += "營運部已發佈新消息，請查閱";
 		Dept dept = deptService.getByOrgNo(returns.getSubOrgNo());
 
 		Notice notice = new Notice();
-		notice.setTitle("營運部已發佈新消息，請查閱");
+		notice.setTitle(title);
 		notice.setBusinessType("returns");
 		notice.setDeptId(dept.getId()+"");
 		notice.setRoleId(null);
@@ -147,9 +159,14 @@ public class NoticeServiceImpl extends BaseServiceImpl<NoticeMapper, Notice> imp
 	}
 
 	@Override
-	public boolean sendMessageNotice(Message message) {
+	public boolean sendMessageNotice(Message message, boolean isEdit) {
+		String title = "";
+		if (isEdit){
+			title = "更正：";
+		}
+		title += "營運部已發佈新消息，請查閱";
 		Notice notice = new Notice();
-		notice.setTitle("營運部已發佈新消息，請查閱");
+		notice.setTitle(title);
 		notice.setBusinessType("message");
 		notice.setDeptId(message.getDeptId());
 		notice.setRoleId(message.getRoleId());
@@ -158,7 +175,7 @@ public class NoticeServiceImpl extends BaseServiceImpl<NoticeMapper, Notice> imp
 	}
 
 	@Override
-	public boolean sendSealNotice(SealHandover sealHandover) {
+	public boolean sendSealNotice(SealHandover sealHandover, boolean isEdit) {
 		//有關XXX(印章種類+印章編號)的交接登記已於X年X月X日完成；交出人﹕XXX；接收人﹕XXX
 		String seal_type = dictService.getValue("seal_type", sealHandover.getSealType());
 		String now = DateUtil.formatDate(DateUtil.now());
@@ -172,7 +189,11 @@ public class NoticeServiceImpl extends BaseServiceImpl<NoticeMapper, Notice> imp
 			userList.add(user2.getId());
 		}
 
-		String title = "有關 （" + seal_type + sealHandover.getSealNo() + "） 的交接登記已於" + now + "完成；交出人：" + sealHandover.getHandoverPersonName() + "；接收人：" + sealHandover.getReceiverName();
+		String title = "";
+		if (isEdit){
+			title = "更正：";
+		}
+		title += "有關 （" + seal_type + sealHandover.getSealNo() + "） 的交接登記已於" + now + "完成；交出人：" + sealHandover.getHandoverPersonName() + "；接收人：" + sealHandover.getReceiverName();
 		Notice notice = new Notice();
 		notice.setTitle(title);
 		notice.setBusinessType("sealhandover");
@@ -181,9 +202,13 @@ public class NoticeServiceImpl extends BaseServiceImpl<NoticeMapper, Notice> imp
 	}
 
 	@Override
-	public boolean sendPostChangeNotice(PostChange postChange) {
+	public boolean sendPostChangeNotice(PostChange postChange, boolean isEdit) {
 		Dept dept = deptService.getByOrgNo(postChange.getOrgNo());
-		String title = dept.getDeptName() + "機構已提交網點出納主管及專管員崗位變更記錄表，請登陸系統查詢";
+		String title = "";
+		if (isEdit){
+			title = "更正：";
+		}
+		title += dept.getDeptName() + "機構已提交網點出納主管及專管員崗位變更記錄表，請登陸系統查詢";
 
 		Notice notice = new Notice();
 		notice.setTitle(title);
@@ -193,9 +218,13 @@ public class NoticeServiceImpl extends BaseServiceImpl<NoticeMapper, Notice> imp
 	}
 
 	@Override
-	public boolean sendGoodsUseNotice(GoodsUse goodsUse) {
+	public boolean sendGoodsUseNotice(GoodsUse goodsUse, boolean isEdit) {
 		//用戶1指派XXX請登入系統進行確認
-		String title = goodsUse.getFillingName() + "指派" + goodsUse.getPersonName() + "請登入系統進行確認";
+		String title = "";
+		if (isEdit){
+			title = "更正：";
+		}
+		title += goodsUse.getFillingName() + "指派" + goodsUse.getPersonName() + "請登入系統進行確認";
 
 		Notice notice = new Notice();
 		notice.setTitle(title);

src/main/resources/application-dev.yml

@@ -9,7 +9,7 @@ spring:
     ssl: false
     ##redis 集群环境配置
     #cluster:
-    #  nodes: 127.0.0.1:7001,127.0.0.1:7002,127.0.0.1:7003
+    #  nodes: 127.0.0.1:7001,127.0.0.1:7002,127.0.0.1:7003x
     #  commandTimeout: 5000
   datasource:
     # MySql