瀏覽代碼

删除不用的文件

Administrator 1 年之前
父節點
當前提交
b040cc7d3b

+ 13 - 0
ruoyi-system/src/main/java/com/ruoyi/system/domain/InvestigateTable.java

@@ -36,6 +36,11 @@ public class InvestigateTable extends BaseEntity
     @Excel(name = "考察截止日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date endTime;
 
+    /** 考察开始日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "考察开始日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date beginTime;
+
     /** 访问密码 */
     @Excel(name = "访问密码")
     private String cipher;
@@ -53,6 +58,14 @@ public class InvestigateTable extends BaseEntity
     /** 考察配置组 */
     private Long[] investigateDispositionTableIds;
 
+    public Date getBeginTime() {
+        return beginTime;
+    }
+
+    public void setBeginTime(Date beginTime) {
+        this.beginTime = beginTime;
+    }
+
     public List<InvestigateDispositionTable> getInvestigateDispositionTableList() {
         return investigateDispositionTableList;
     }

+ 3 - 3
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/InvestigateDispositionServiceImpl.java

@@ -94,7 +94,7 @@ public class InvestigateDispositionServiceImpl implements IInvestigateDispositio
             InputStream inputStream = new FileInputStream(html);
             MultipartFile file = new org.springframework.mock.web.MockMultipartFile(html.getName(), html.getName(), "text/html", inputStream);
             // 上传并返回新文件名称
-             fileName = FileUploadUtils.upload(filePath, file);
+            fileName = FileUploadUtils.upload(filePath, file);
             html.delete();
             System.out.println("文件生成成功!");
         } catch (IOException e) {
@@ -113,10 +113,10 @@ public class InvestigateDispositionServiceImpl implements IInvestigateDispositio
     @Override
     public int updateInvestigateDisposition(InvestigateDisposition investigateDisposition) {
         String url = investigateDisposition.getUrl();
-        String  path=  url.replace("/profile",getProfile());
+        String path = url.replace("/profile", getProfile());
         // 删除原先的文件
         try {
-            Runtime.getRuntime().exec("rm -f "+path);
+            Runtime.getRuntime().exec("rm -f " + path);
         } catch (IOException e) {
             e.printStackTrace();
         }

+ 7 - 0
ruoyi-system/src/main/resources/mapper/system/InvestigateTableMapper.xml

@@ -8,6 +8,7 @@
         <result property="investigateTableId" column="investigate_table_id"/>
         <result property="investigateName" column="investigate_name"/>
         <result property="content" column="content"/>
+        <result property="beginTime" column="begin_time"/>
         <result property="endTime" column="end_time"/>
         <result property="cipher" column="cipher"/>
         <result property="createBy" column="create_by"/>
@@ -45,6 +46,7 @@
         select investigate_table_id,
                investigate_name,
                content,
+               begin_time,
                end_time,
                cipher,
                create_by,
@@ -61,6 +63,7 @@
         t.investigate_name,
         t.content,
         t.end_time,
+        t.begin_time,
         t.CIPHER,
         t.create_by,
         t.create_time,
@@ -98,6 +101,7 @@
             t.investigate_name,
             t.content,
             t.end_time,
+            t.begin_time,
             t.CIPHER,
             t.create_by,
             t.create_time,
@@ -128,6 +132,7 @@
             <if test="investigateName != null">investigate_name,</if>
             <if test="content != null">content,</if>
             <if test="endTime != null">end_time,</if>
+            <if test="beginTime != null">begin_time,</if>
             <if test="cipher != null">cipher,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
@@ -139,6 +144,7 @@
             <if test="investigateName != null">#{investigateName},</if>
             <if test="content != null">#{content},</if>
             <if test="endTime != null">#{endTime},</if>
+            <if test="beginTime != null">#{begin_time},</if>
             <if test="cipher != null">#{cipher},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
@@ -154,6 +160,7 @@
             <if test="investigateName != null">investigate_name = #{investigateName},</if>
             <if test="content != null">content = #{content},</if>
             <if test="endTime != null">end_time = #{endTime},</if>
+            <if test="beginTime != null">begin_time = #{beginTime},</if>
             <if test="cipher != null">cipher = #{cipher},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>