2022年12月1 17:44

blade-ops/blade-swagger/src/main/resources/application-dev.yml

@@ -46,4 +46,7 @@ knife4j:
       - name: 事务管理
         uri: 127.0.0.1:1080
         location: /trade-project/v2/api-docs
+      - name: 报关管理
+        uri: 127.0.0.1:1080
+        location: /blade-box-tube/v2/api-docs
 

blade-service-api/blade-box-tube-api/src/main/java/org/springblade/box/tube/entity/DeclareCustoms.java

@@ -470,42 +470,12 @@ public class DeclareCustoms implements Serializable {
 	private String remark;
 
 	/**
-	 * 备注
+	 * 唛头
 	 */
-	@ApiModelProperty(value = "备注")
+	@ApiModelProperty(value = "唛头")
 	private String shippingMark;
 
 	/**
-	 * 箱号
-	 */
-	@ApiModelProperty(value = "箱号")
-	private String caseNo;
-
-	/**
-	 * 箱型
-	 */
-	@ApiModelProperty(value = "箱型")
-	private String boxType;
-
-	/**
-	 * 拼箱标识(0否 1是)
-	 */
-	@ApiModelProperty(value = "lclSign")
-	private Integer lclSign;
-
-	/**
-	 * 单证代码
-	 */
-	@ApiModelProperty(value = "单证代码")
-	private String documentCode;
-
-	/**
-	 * 单证编号
-	 */
-	@ApiModelProperty(value = "单证编号")
-	private String documentNo;
-
-	/**
 	 * 进出口标识（BGJK进口，BGCK出口）
 	 */
 	@ApiModelProperty(value = "进出口标识（BGJK进口，BGCK出口）")
@@ -539,7 +509,7 @@ public class DeclareCustoms implements Serializable {
 	 * 附件明细
 	 */
 	@TableField(exist = false)
-	private List<CommonFile> fileList;
+	private List<DeclareCustomsFiles> fileList;
 
 	/**
 	 * 申报日期开始 结束时间

blade-service-api/blade-box-tube-api/src/main/java/org/springblade/box/tube/entity/DeclareCustomsFiles.java

@@ -0,0 +1,117 @@
+package org.springblade.box.tube.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 报关文件表实体类
+ *
+ * @author BladeX
+ * @since 2022-12-1
+ */
+@Data
+@TableName("declare_customs_files")
+@ApiModel(value = "DeclareCustomsFiles对象", description = "报关文件表")
+public class DeclareCustomsFiles implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	private Long id;
+
+	/**
+	 * 主表id
+	 */
+	@ApiModelProperty(value = "主表id")
+	private Long pid;
+	/**
+	 * 排序
+	 */
+	@ApiModelProperty(value = "排序")
+	private Integer sort;
+	/**
+	 * 文件名
+	 */
+	@ApiModelProperty(value = "文件名")
+	private String fileName;
+	/**
+	 * 文件地址
+	 */
+	@ApiModelProperty(value = "文件地址")
+	private String url;
+	/**
+	 * 备注
+	 */
+	@ApiModelProperty(value = "备注")
+	private String remarks;
+	/**
+	 * 版本
+	 */
+	@ApiModelProperty(value = "版本")
+	private String version;
+	/**
+	 * 创建人
+	 */
+	@ApiModelProperty(value = "创建人")
+	private Long createUser;
+	/**
+	 * 创建部门
+	 */
+	@ApiModelProperty(value = "创建部门")
+	private Long createDept;
+	/**
+	 * 创建时间
+	 */
+	@ApiModelProperty(value = "创建时间")
+	private Date createTime;
+	/**
+	 * 修改人
+	 */
+	@ApiModelProperty(value = "修改人")
+	private Long updateUser;
+	/**
+	 * 修改时间
+	 */
+	@ApiModelProperty(value = "修改时间")
+	private Date updateTime;
+	/**
+	 * 状态（0 正常 1停用）
+	 */
+	@ApiModelProperty(value = "状态（0 正常 1停用）")
+	private Integer status;
+	/**
+	 * 是否已删除（0 否 1是）
+	 */
+	@ApiModelProperty(value = "是否已删除（0 否 1是）")
+	private Integer isDeleted;
+
+	/**
+	 * 租户号
+	 */
+	@ApiModelProperty(value = "租户号")
+	private String tenantId;
+
+	/**
+	 * 分类（1 主表  2 明细）
+	 */
+	@ApiModelProperty(value = "分类")
+	private String type;
+
+	/**
+	 * 名称
+	 */
+	@TableField(exist = false)
+	private String label;
+
+	/**
+	 * 地址
+	 */
+	@TableField(exist = false)
+	private String value;
+
+}

blade-service-api/blade-box-tube-api/src/main/java/org/springblade/box/tube/vo/DeclareCustomsFilesVO.java

@@ -0,0 +1,19 @@
+package org.springblade.box.tube.vo;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.box.tube.entity.DeclareCustomsFiles;
+
+/**
+ * 报关文件表视图实体类
+ *
+ * @author BladeX
+ * @since 2022-12-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "DeclareCustomsFilesVO对象", description = "报关文件表")
+public class DeclareCustomsFilesVO extends DeclareCustomsFiles {
+	private static final long serialVersionUID = 1L;
+}

blade-service-api/blade-school-api/src/main/java/org/springblade/school/entity/SalaryItem.java

@@ -85,6 +85,11 @@ public class SalaryItem implements Serializable {
 		@ApiModelProperty(value = "身份证号")
 		private String idNumber;
 	/**
+	 * 职工类别
+	 */
+		@ApiModelProperty(value = "职工类别")
+		private String workersType;
+	/**
 	* 工资拨付标准
 	*/
 		@ApiModelProperty(value = "工资拨付标准")

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/declare/DeclareCustomsContainerController.java

@@ -19,12 +19,12 @@ import org.springframework.web.bind.annotation.*;
 import javax.validation.Valid;
 
 /**
- * 报关报关商品明细控制器
+ * 报关报关集装箱明细控制器
  */
 @RestController
 @AllArgsConstructor
 @RequestMapping("/declareContainer")
-@Api(value = "报关商品明细", tags = "报关商品明细")
+@Api(value = "报关集装箱明细", tags = "报关集装箱明细")
 public class DeclareCustomsContainerController extends BladeController {
 
 	private final IDeclareCustomsContainerService containerService;

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/declare/DeclareCustomsController.java

@@ -9,6 +9,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import org.springblade.box.tube.entity.DeclareCustoms;
+import org.springblade.box.tube.entity.TradingBox;
 import org.springblade.box.tube.excel.DeclareCustomsExcel;
 import org.springblade.box.tube.service.IDeclareCustomsService;
 import org.springblade.box.tube.vo.DeclareCustomsVo;
@@ -67,10 +68,14 @@ public class DeclareCustomsController extends BladeController {
 			.like(ObjectUtil.isNotEmpty(declareCustoms.getPreEntryNo()), DeclareCustoms::getPreEntryNo, declareCustoms.getPreEntryNo())//预录入编号
 			.like(ObjectUtil.isNotEmpty(declareCustoms.getCustomsNo()), DeclareCustoms::getCustomsNo, declareCustoms.getCustomsNo())//海关编号
 			.like(ObjectUtil.isNotEmpty(declareCustoms.getDeliveryNumbers()), DeclareCustoms::getDeliveryNumbers, declareCustoms.getDeliveryNumbers())//提运单号
-			.like(ObjectUtil.isNotEmpty(declareCustoms.getCustomsDeclarationPlace()), DeclareCustoms::getCustomsDeclarationPlace, declareCustoms.getCustomsDeclarationPlace())
-			.ge(ObjectUtil.isNotEmpty(declareCustoms.getDeclareDateList().get(0)), DeclareCustoms::getDeclareDate, declareCustoms.getDeclareDateList().get(0))//申报日期开始时间
-			.le(ObjectUtil.isNotEmpty(declareCustoms.getDeclareDateList().get(1)), DeclareCustoms::getDeclareDate, declareCustoms.getDeclareDateList().get(1))//申报日期结束日期
-			.orderByDesc(DeclareCustoms::getDeclareDate);
+			.like(ObjectUtil.isNotEmpty(declareCustoms.getCustomsDeclarationPlace()), DeclareCustoms::getCustomsDeclarationPlace, declareCustoms.getCustomsDeclarationPlace());
+
+		if (declareCustoms.getDeclareDateList() != null && declareCustoms.getDeclareDateList().size() > 1) {
+			lambdaQueryWrapper.ge(ObjectUtil.isNotEmpty(declareCustoms.getDeclareDateList().get(0)), DeclareCustoms::getDeclareDate, declareCustoms.getDeclareDateList().get(0));//申报日期开始时间
+			lambdaQueryWrapper.le(ObjectUtil.isNotEmpty(declareCustoms.getDeclareDateList().get(1)), DeclareCustoms::getDeclareDate, declareCustoms.getDeclareDateList().get(1));//申报日期结束日期
+		}
+
+		lambdaQueryWrapper.orderByDesc(DeclareCustoms::getDeclareDate);
 		IPage<DeclareCustoms> page = declareCustomsService.page(Condition.getPage(query), lambdaQueryWrapper);
 
 		return R.data(page);

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/declare/DeclareCustomsFilesController.java

@@ -0,0 +1,106 @@
+package org.springblade.box.tube.declare;
+
+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.springblade.box.tube.entity.DeclareCustomsFiles;
+import org.springblade.box.tube.service.IDeclareCustomsFilesService;
+import org.springblade.box.tube.vo.DeclareCustomsFilesVO;
+import org.springblade.core.boot.ctrl.BladeController;
+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 javax.validation.Valid;
+
+/**
+ * 报关进出口附件控制器
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/declareCustomsFiles")
+@Api(value = "报关附件表", tags = "报关附件表")
+public class DeclareCustomsFilesController extends BladeController {
+
+	private final IDeclareCustomsFilesService filesService;
+
+	/**
+	 * 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入tradingBoxFiles")
+	public R<DeclareCustomsFiles> detail(DeclareCustomsFiles declareCustomsFiles) {
+		DeclareCustomsFiles detail = filesService.getOne(Condition.getQueryWrapper(declareCustomsFiles));
+		return R.data(detail);
+	}
+
+	/**
+	 * 分页 买（卖）箱文件表
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入tradingBoxFiles")
+	public R<IPage<DeclareCustomsFiles>> list(DeclareCustomsFiles declareCustomsFiles, Query query) {
+		IPage<DeclareCustomsFiles> pages = filesService.page(Condition.getPage(query), Condition.getQueryWrapper(declareCustomsFiles));
+		return R.data(pages);
+	}
+
+	/**
+	 * 自定义分页 买（卖）箱文件表
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入tradingBoxFiles")
+	public R<IPage<DeclareCustomsFilesVO>> page(DeclareCustomsFilesVO declareCustomsFiles, Query query) {
+		IPage<DeclareCustomsFilesVO> pages = filesService.selectFilesPage(Condition.getPage(query), declareCustomsFiles);
+		return R.data(pages);
+	}
+
+	/**
+	 * 新增 买（卖）箱文件表
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入tradingBoxFiles")
+	public R save(@Valid @RequestBody DeclareCustomsFiles declareCustomsFiles) {
+		return R.status(filesService.save(declareCustomsFiles));
+	}
+
+	/**
+	 * 修改 买（卖）箱文件表
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入tradingBoxFiles")
+	public R update(@Valid @RequestBody DeclareCustomsFiles declareCustomsFiles) {
+		return R.status(filesService.updateById(declareCustomsFiles));
+	}
+
+	/**
+	 * 新增或修改 买（卖）箱文件表
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入tradingBoxFiles")
+	public R submit(@Valid @RequestBody DeclareCustomsFiles declareCustomsFiles) {
+		return R.status(filesService.saveOrUpdate(declareCustomsFiles));
+	}
+
+
+	/**
+	 * 删除 买（卖）箱文件表
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 8)
+	@ApiOperation(value = "删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(filesService.removeByIds(Func.toLongList(ids)));
+	}
+
+}

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/mapper/DeclareCustomsFilesMapper.java

@@ -0,0 +1,45 @@
+/*
+ *      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.box.tube.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.box.tube.entity.DeclareCustomsFiles;
+import org.springblade.box.tube.entity.TradingBoxFiles;
+import org.springblade.box.tube.vo.DeclareCustomsFilesVO;
+import org.springblade.box.tube.vo.TradingBoxFilesVO;
+
+import java.util.List;
+
+/**
+ * 报关文件表 Mapper 接口
+ *
+ * @author BladeX
+ * @since 2022-12-1
+ */
+public interface DeclareCustomsFilesMapper extends BaseMapper<DeclareCustomsFiles> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param declareCustomsFiles
+	 * @return
+	 */
+	List<DeclareCustomsFilesVO> selectFilesPage(IPage page, DeclareCustomsFilesVO declareCustomsFiles);
+
+}

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/mapper/DeclareCustomsFilesMapper.xml

@@ -0,0 +1,28 @@
+<?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.box.tube.mapper.DeclareCustomsFilesMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="declareCustomsFilesResultMap" type="org.springblade.box.tube.entity.DeclareCustomsFiles">
+        <id column="id" property="id"/>
+        <result column="pid" property="pid"/>
+        <result column="sort" property="sort"/>
+        <result column="file_name" property="fileName"/>
+        <result column="url" property="url"/>
+        <result column="remarks" property="remarks"/>
+        <result column="version" property="version"/>
+        <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"/>
+    </resultMap>
+
+
+    <select id="selectFilesPage" resultMap="declareCustomsFilesResultMap">
+        select * from declare_customs_files where is_deleted = 0
+    </select>
+
+</mapper>

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/service/IDeclareCustomsFilesService.java

@@ -0,0 +1,26 @@
+package org.springblade.box.tube.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.springblade.box.tube.entity.DeclareCustomsFiles;
+import org.springblade.box.tube.vo.DeclareCustomsFilesVO;
+
+/**
+ * 报关文件表 服务类
+ *
+ * @author BladeX
+ * @since 2022-11-14
+ */
+public interface IDeclareCustomsFilesService extends IService<DeclareCustomsFiles> {
+
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param declareCustomsFiles
+	 * @return
+	 */
+	IPage<DeclareCustomsFilesVO> selectFilesPage(IPage<DeclareCustomsFilesVO> page, DeclareCustomsFilesVO declareCustomsFiles);
+
+}

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/service/impl/DeclareCustomsFilesServiceImpl.java

@@ -0,0 +1,24 @@
+package org.springblade.box.tube.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springblade.box.tube.entity.DeclareCustomsFiles;
+import org.springblade.box.tube.mapper.DeclareCustomsFilesMapper;
+import org.springblade.box.tube.service.IDeclareCustomsFilesService;
+import org.springblade.box.tube.vo.DeclareCustomsFilesVO;
+import org.springframework.stereotype.Service;
+
+/**
+ * 报关文件表 服务实现类
+ *
+ * @author BladeX
+ * @since 2022-12-1
+ */
+@Service
+public class DeclareCustomsFilesServiceImpl extends ServiceImpl<DeclareCustomsFilesMapper, DeclareCustomsFiles> implements IDeclareCustomsFilesService {
+
+	@Override
+	public IPage<DeclareCustomsFilesVO> selectFilesPage(IPage<DeclareCustomsFilesVO> page, DeclareCustomsFilesVO declareCustomsFiles) {
+		return page.setRecords(baseMapper.selectFilesPage(page, declareCustomsFiles));
+	}
+}

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/service/impl/DeclareCustomsServiceImpl.java

@@ -59,6 +59,7 @@ public class DeclareCustomsServiceImpl extends ServiceImpl<DeclareCustomsMapper,
 	private final DeclareCustomsContainerMapper containerMapper;//报关集装箱明细
 	private final DeclareCustomsDocumentsMapper documentsMapper;//报关单证明细
 	private final DeclareCustomsFeesMapper feesMapper;//报关费用明细
+	private final DeclareCustomsFilesMapper filesMapper;//报关附件
 
 	private final ICheckClient iCheckClient;//审批
 	private final ICommonFileClient commonFileClient;//附件
@@ -111,13 +112,14 @@ public class DeclareCustomsServiceImpl extends ServiceImpl<DeclareCustomsMapper,
 			List<DeclareCustomsFees> feesList = feesMapper.selectList(feesLambdaQueryWrapper);
 			detail.setFeesList(feesList);
 
-			//附件明细
-			R<List<CommonFile>> fileList = commonFileClient.getList(detail.getId(), "DECLARE_CUSTOMS");
-			if (fileList.isSuccess() && fileList.getData() != null) {
-				detail.setFileList(fileList.getData());
-			} else {
-				detail.setFileList(Collections.emptyList());
-			}
+			//获取附件信息
+			LambdaQueryWrapper<DeclareCustomsFiles> filesLambdaQueryWrapper = new LambdaQueryWrapper<>();
+			filesLambdaQueryWrapper.eq(DeclareCustomsFiles::getIsDeleted, 0)
+				.eq(DeclareCustomsFiles::getTenantId, AuthUtil.getTenantId())
+				.eq(DeclareCustomsFiles::getType, "1")
+				.eq(DeclareCustomsFiles::getPid, detail.getId());
+			List<DeclareCustomsFiles> filesList = filesMapper.selectList(filesLambdaQueryWrapper);
+			detail.setFileList(filesList);
 		}
 		return detail;
 	}
@@ -243,17 +245,26 @@ public class DeclareCustomsServiceImpl extends ServiceImpl<DeclareCustomsMapper,
 			declareCustoms.setDocumentsList(documentsList);
 		}
 
-		//附件明细
-		List<CommonFile> fileList = declareCustoms.getFileList();
-		if (ObjectUtil.isNotEmpty(fileList)) {
-			fileList.forEach(file -> {
-				if (ObjectUtil.isEmpty(file.getId())) {
-					file.setPid(declareCustoms.getId());
-					file.setSource("DECLARE_CUSTOMS");
+		//主表附件
+		List<DeclareCustomsFiles> filesList = declareCustoms.getFileList();
+		if (ObjectUtils.isNotNull(filesList) && filesList.size() > 0) {
+			for (DeclareCustomsFiles files : filesList) {
+				if (files.getId() == null) {
+					files.setCreateUser(AuthUtil.getUserId());
+					files.setCreateTime(new Date());
+					files.setTenantId(AuthUtil.getTenantId());
+					files.setPid(declareCustoms.getId());
+					files.setType("1");
+					filesMapper.insert(files);
+				} else {
+					files.setUpdateUser(AuthUtil.getUserId());
+					files.setUpdateTime(new Date());
+					files.setPid(declareCustoms.getId());
+					files.setType("1");
+					filesMapper.updateById(files);
 				}
-			});
-			commonFileClient.saveList(fileList);
-			declareCustoms.setFileList(fileList);
+			}
+			declareCustoms.setFileList(filesList);
 		}
 
 		return declareCustoms;

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/service/impl/TradingBoxServiceImpl.java

@@ -354,6 +354,7 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 			}
 			tradingBox.setTradingBoxFilesList(tradingBoxFilesList);
 		}
+
 		return tradingBox;
 	}
 

blade-service/blade-school/src/main/java/org/springblade/school/excel/StaffInformation.java

@@ -27,4 +27,10 @@ public class StaffInformation implements Serializable {
 	@ExcelProperty(value = "身份证号(必填)")
 	@ColumnWidth(35)
 	private String idNumber;
+
+	/**
+	 * 职工类别
+	 */
+	@ExcelProperty(value = "职工类别")
+	private String workersType;
 }

blade-service/blade-school/src/main/java/org/springblade/school/service/impl/SalaryItemServiceImpl.java

@@ -2139,6 +2139,12 @@ public class SalaryItemServiceImpl extends ServiceImpl<SalaryItemMapper, SalaryI
 				salaryItem.setCreateTime(new Date());
 				baseMapper.insert(salaryItem);
 				message = ++ message;
+			}else {
+				salaryItem.setId(item.getId());
+				salaryItem.setUpdateUser(SecureUtil.getUserId());
+				salaryItem.setUpdateTime(new Date());
+				baseMapper.updateById(salaryItem);
+				message = ++ message;
 			}
 		}
 		//保存上传记录