diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/filemanager/TdFileProvideController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/filemanager/TdFileProvideController.java index 7c42917..fb8cf64 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/filemanager/TdFileProvideController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/filemanager/TdFileProvideController.java @@ -8,6 +8,7 @@ import com.ruoyi.common.utils.sql.SqlUtil; import com.ruoyi.common.utils.uuid.Seq; import com.ruoyi.framework.web.domain.server.Sys; import com.ruoyi.system.domain.SysPost; +import com.ruoyi.system.domain.TdFileReceive; import com.ruoyi.system.service.ISysDeptService; import com.ruoyi.system.service.ISysPostService; import com.ruoyi.system.service.ITdFileReceiveService; @@ -103,8 +104,17 @@ public class TdFileProvideController extends BaseController public AjaxResult addSave(TdFileProvide tdFileProvide) { tdFileProvide.setFileId("File_"+Seq.getId(Seq.commSeqType)); + String[] tar = tdFileProvide.getTargetDepart().split(","); + for (String depart : tar) { + TdFileReceive tdFileReceive = new TdFileReceive(); + tdFileReceive.setFileId(tdFileProvide.getFileId()); + tdFileReceive.setFileName(tdFileProvide.getFileName()); + tdFileReceive.setProvideDepart(tdFileProvide.getProvideDepart()); + tdFileReceive.setProvideDate(tdFileProvide.getProvideDate()); + tdFileReceive.setReceiveDepartid(depart); + tdFileReceiveService.insertTdFileReceive(tdFileReceive); + } - System.out.println(tdFileProvide.getTargetDepart()); return toAjax(tdFileProvideService.insertTdFileProvide(tdFileProvide)); } diff --git a/ruoyi-admin/src/main/resources/templates/system/filereceive/add.html b/ruoyi-admin/src/main/resources/templates/system/filereceive/add.html index 19dd3f1..9418472 100644 --- a/ruoyi-admin/src/main/resources/templates/system/filereceive/add.html +++ b/ruoyi-admin/src/main/resources/templates/system/filereceive/add.html @@ -5,107 +5,128 @@ -
-
-
- -
- -
+
+ +
+ +
+
-
- -
- -
+
+
+ +
+
-
- -
- -
+
+
+ +
+
-
- -
- +
+
+ +
+
+ +
-
- -
-
- - -
-
+
+
+ +
+
-
- -
- -
+
+
+ +
+
-
- -
- -
+
+
+ +
+
-
- -
- +
+
+ +
+
+ +
-
- -
-
- - -
-
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
-
- -
- +
+
+ +
+
+ +
- -
- - - + $("input[name='extractDate']").datetimepicker({ + format: "yyyy-mm-dd", + minView: "month", + autoclose: true + }); + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/filereceive/edit.html b/ruoyi-admin/src/main/resources/templates/system/filereceive/edit.html index 73709d2..0f71128 100644 --- a/ruoyi-admin/src/main/resources/templates/system/filereceive/edit.html +++ b/ruoyi-admin/src/main/resources/templates/system/filereceive/edit.html @@ -5,108 +5,129 @@ -
-
- -
- -
- -
+
+ + +
+ +
+
-
- -
- -
+
+
+ +
+
-
- -
- -
+
+
+ +
+
-
- -
- +
+
+ +
+
+ +
-
- -
-
- - -
-
+
+
+ +
+
-
- -
- -
+
+
+ +
+
-
- -
- -
+
+
+ +
+
-
- -
- +
+
+ +
+
+ +
-
- -
-
- - -
-
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
-
- -
- +
+
+ +
+
+ +
- -
- - - + $("input[name='extractDate']").datetimepicker({ + format: "yyyy-mm-dd", + minView: "month", + autoclose: true + }); + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/filereceive/filereceive.html b/ruoyi-admin/src/main/resources/templates/system/filereceive/filereceive.html index f9fd337..7f59bc0 100644 --- a/ruoyi-admin/src/main/resources/templates/system/filereceive/filereceive.html +++ b/ruoyi-admin/src/main/resources/templates/system/filereceive/filereceive.html @@ -4,109 +4,71 @@ -
-
-
-
-
-
    -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • -  搜索 -  重置 -
    • -
-
-
-
+
+
+
+
+
+
    +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
- -
-
-
+ +
+
- - + }; + $.table.init(options); + }); + \ No newline at end of file diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdFileReceive.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdFileReceive.java index d1ee1b2..eba8c7b 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdFileReceive.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdFileReceive.java @@ -24,6 +24,19 @@ public class TdFileReceive extends BaseEntity @Excel(name = "文件编号") private String fileId; + /** 文件名称 */ + @Excel(name = "文件名称") + private String fileName; + + /** 发文单位 */ + @Excel(name = "发文单位") + private String provideDepart; + + /** 发文日期 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "发文日期", width = 30, dateFormat = "yyyy-MM-dd") + private Date provideDate; + /** 接收单位 */ @Excel(name = "接收单位") private String receiveDepartid; @@ -80,6 +93,34 @@ public class TdFileReceive extends BaseEntity { return fileId; } + + public void setFileName(String fileName) + { + this.fileName = fileName; + } + + public String getFileName() + { + return fileName; + } + public void setProvideDepart(String provideDepart) + { + this.provideDepart = provideDepart; + } + + public String getProvideDepart() + { + return provideDepart; + } + public void setProvideDate(Date provideDate) + { + this.provideDate = provideDate; + } + + public Date getProvideDate() + { + return provideDate; + } public void setReceiveDepartid(String receiveDepartid) { this.receiveDepartid = receiveDepartid; @@ -167,6 +208,9 @@ public class TdFileReceive extends BaseEntity return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) .append("receiveId", getReceiveId()) .append("fileId", getFileId()) + .append("fileName", getFileName()) + .append("provideDepart", getProvideDepart()) + .append("provideDate", getProvideDate()) .append("receiveDepartid", getReceiveDepartid()) .append("receiveState", getReceiveState()) .append("receiveUserid", getReceiveUserid()) diff --git a/ruoyi-system/src/main/resources/mapper/system/TdFileReceiveMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TdFileReceiveMapper.xml index 53c832a..65297fe 100644 --- a/ruoyi-system/src/main/resources/mapper/system/TdFileReceiveMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/TdFileReceiveMapper.xml @@ -7,6 +7,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + @@ -19,13 +22,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select receive_id, file_id, receive_departid, receive_state, receive_userid, receive_date, extract_state, extract_departid, extract_userid, extract_date, destory_state from td_file_receive + select receive_id, file_id, file_name, provide_depart, provide_date, receive_departid, receive_state, receive_userid, receive_date, extract_state, extract_departid, extract_userid, extract_date, destory_state from td_file_receive