福达修改

blade-service-api/blade-client-api/src/main/java/org/springblade/client/parities/entity/Parities.java

@@ -141,5 +141,21 @@ public class Parities implements Serializable {
 		@ApiModelProperty(value = "修改人中文名")
 		@TableField(exist = false)
 		private String updateUserName;
+	/**
+	 * 年
+	 */
+	@ApiModelProperty(value = "年")
+	private String annual;
+	/**
+	 * 月
+	 */
+	@ApiModelProperty(value = "月")
+	private String moon;
+	/**
+	 * 汇率类型
+	 */
+	@ApiModelProperty(value = "汇率类型")
+	private String paritiesType;
+
 
 }

blade-service/blade-client/src/main/java/org/springblade/client/corps/mapper/CorpsDescMapper.java

@@ -25,7 +25,6 @@ public interface CorpsDescMapper extends BaseMapper<CorpsDesc> {
 	 * @param corpsDesc
 	 * @return
 	 */
-	@DataAuth(code = "adminProfiles")
 	List<CorpsDescVO> selectCorpsDescPage(IPage page, @Param("CorpsDesc") CorpsDescVO corpsDesc);
 
 	/**

blade-service/blade-client/src/main/java/org/springblade/client/parities/controller/ParitiesController.java

@@ -109,9 +109,9 @@ public class ParitiesController extends BladeController {
 	@GetMapping("/page")
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "分页", notes = "传入parities")
-	public R<IPage<ParitiesVO>> page(ParitiesVO parities, Query query) {
+	public R<IPage<Parities>> page(Parities parities, Query query) {
 		parities.setTenantId(SecureUtil.getTenantId());
-		IPage<ParitiesVO> pages = paritiesService.selectParitiesPage(Condition.getPage(query), parities);
+		IPage<Parities> pages = paritiesService.page(Condition.getPage(query), Condition.getQueryWrapper(parities));
 		if (CollectionUtils.isNotEmpty(pages.getRecords())){
 			pages.getRecords().stream().forEach(item ->{
 				R<User> create = userClient.userInfoById(item.getCreateUser());
@@ -156,7 +156,7 @@ public class ParitiesController extends BladeController {
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "新增或修改", notes = "传入parities")
 	public R submit(@Valid @RequestBody Parities parities) {
-		return R.status(paritiesService.saveOrUpdate(parities));
+		return R.data(paritiesService.saveParities(parities));
 	}
 
 

blade-service/blade-client/src/main/java/org/springblade/client/parities/mapper/ParitiesMapper.xml

@@ -19,6 +19,9 @@
         <result column="update_time" property="updateTime"/>
         <result column="status" property="status"/>
         <result column="is_deleted" property="isDeleted"/>
+        <result column="annual" property="annual"/>
+        <result column="moon" property="moon"/>
+        <result column="parities_type" property="paritiesType"/>
     </resultMap>