From 55f5f479c21fd43cb4ab1217e31f2f2de25cd293 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sun, 22 Aug 2021 12:04:05 +0800
Subject: [PATCH] 通知公告，派遣修改
---
src/main/java/org/springblade/modules/dispatcher/entity/DispatcherUnit.java | 6 ++++++
src/main/java/org/springblade/modules/dispatcher/vo/DispatcherUnitVO.java | 10 ++++++++++
src/main/java/org/springblade/modules/recruitment/mapper/RecruitmentMapper.java | 1 +
src/main/java/org/springblade/modules/desk/mapper/NoticeMapper.xml | 3 +++
src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherMapper.java | 4 +++-
src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherUnitMapper.xml | 4 ++++
src/main/java/org/springblade/modules/apply/controller/ApplyController.java | 8 +++++---
src/main/java/org/springblade/modules/desk/entity/Notice.java | 11 +++++++++++
src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherUnitMapper.java | 1 +
src/main/java/org/springblade/modules/information/controller/InformationController.java | 8 +-------
src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherMapper.xml | 2 +-
11 files changed, 46 insertions(+), 12 deletions(-)
diff --git a/src/main/java/org/springblade/modules/apply/controller/ApplyController.java b/src/main/java/org/springblade/modules/apply/controller/ApplyController.java
index c1ce051..f616583 100644
--- a/src/main/java/org/springblade/modules/apply/controller/ApplyController.java
+++ b/src/main/java/org/springblade/modules/apply/controller/ApplyController.java
@@ -19,6 +19,7 @@
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.FTP.FtpUtil;
import org.springblade.modules.FTP.OutJson;
+import org.springblade.modules.FTP.monitor;
import org.springblade.modules.apply.entity.Apply;
import org.springblade.modules.apply.excel.ApplyExcel;
import org.springblade.modules.apply.excel.ApplyImporter;
@@ -147,14 +148,15 @@
"'" + "," + "'" + apply.getApplyStatus() + "'" + "," +"'" + apply.getIsExam() + "'" + ");" +
"update blade_user set is_apply = " + user1.getIsApply() + " " +"where id = " + "'" + user1.getId() + "'";
String json = JSON.toJSONString(s);
- OutJson.createJsonFile(json, "d:/", "wsql");
+ String response = String.valueOf((new Date()).getTime());
+ OutJson.createJsonFile(json, "d:/", "w"+response);
FileInputStream in = null;
try {
- in = new FileInputStream(new File("D:\\" + fileName));
+ in = new FileInputStream(new File("D:\\" + "w"+response+".json"));
} catch (FileNotFoundException e) {
e.printStackTrace();
}
- FtpUtil.uploadFile(ftpHost, ftpPort, ftpUserName, ftpPassword, "anbao/", "/", fileName, in);
+ FtpUtil.uploadFile(ftpHost, ftpPort, ftpUserName, ftpPassword, "anbao/", "/", "w"+response+".json", in);
}
diff --git a/src/main/java/org/springblade/modules/desk/entity/Notice.java b/src/main/java/org/springblade/modules/desk/entity/Notice.java
index 8e86044..73c8714 100644
--- a/src/main/java/org/springblade/modules/desk/entity/Notice.java
+++ b/src/main/java/org/springblade/modules/desk/entity/Notice.java
@@ -67,4 +67,15 @@
@TableField("dept_id")
private Long deptId;
+ /**
+ * 政策发布封面 url
+ */
+ @TableField("cover_url")
+ private String coverUrl;
+
+ /**
+ * 1.通知公告 2：政策发布
+ */
+ private Integer type;
+
}
diff --git a/src/main/java/org/springblade/modules/desk/mapper/NoticeMapper.xml b/src/main/java/org/springblade/modules/desk/mapper/NoticeMapper.xml
index 21d8414..00f7163 100644
--- a/src/main/java/org/springblade/modules/desk/mapper/NoticeMapper.xml
+++ b/src/main/java/org/springblade/modules/desk/mapper/NoticeMapper.xml
@@ -63,6 +63,9 @@
<if test="notice.category!=null">
and n.category = #{notice.category}
</if>
+ <if test="notice.type!=null">
+ and n.type = #{notice.type}
+ </if>
<if test="notice.deptId!=null and notice.jurisdiction!=null">
and (n.dept_id = #{notice.deptId} or bu.jurisdiction = #{notice.jurisdiction}
or n.dept_id = 1123598813738675201
diff --git a/src/main/java/org/springblade/modules/dispatcher/entity/DispatcherUnit.java b/src/main/java/org/springblade/modules/dispatcher/entity/DispatcherUnit.java
index db060ef..a6156a6 100644
--- a/src/main/java/org/springblade/modules/dispatcher/entity/DispatcherUnit.java
+++ b/src/main/java/org/springblade/modules/dispatcher/entity/DispatcherUnit.java
@@ -100,5 +100,11 @@
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date endTime;
+ /**
+ * 保安服务类型
+ */
+ @TableField("serve_type")
+ private String serveType;
+
}
diff --git a/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherMapper.java b/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherMapper.java
index ced270c..d8ceb11 100644
--- a/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherMapper.java
+++ b/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherMapper.java
@@ -16,6 +16,7 @@
*/
package org.springblade.modules.dispatcher.mapper;
+import com.baomidou.mybatisplus.annotation.SqlParser;
import org.apache.ibatis.annotations.Param;
import org.springblade.modules.dispatcher.entity.Dispatcher;
import org.springblade.modules.dispatcher.vo.DispatcherUnitVO;
@@ -53,5 +54,6 @@
* @param dispatcherUnitVO1
* @return
*/
- Integer getDispatcherCount(@Param("dispatcherUnit")DispatcherUnitVO dispatcherUnitVO1);
+ @SqlParser(filter = true)
+ Integer getDispatcherCount(@Param("dispatcherUnitVO1")DispatcherUnitVO dispatcherUnitVO1);
}
diff --git a/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherMapper.xml b/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherMapper.xml
index cf7eb95..22803cf 100644
--- a/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherMapper.xml
+++ b/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherMapper.xml
@@ -74,7 +74,7 @@
select ifnull(count(*),0) count from sys_dispatcher
where
1=1
- and dispatcher_unit_id #{dispatcherUnitVO1.id}
+ and dispatcher_unit_id = #{dispatcherUnitVO1.id}
</select>
</mapper>
diff --git a/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherUnitMapper.java b/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherUnitMapper.java
index 5dd4a38..350b9aa 100644
--- a/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherUnitMapper.java
+++ b/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherUnitMapper.java
@@ -16,6 +16,7 @@
*/
package org.springblade.modules.dispatcher.mapper;
+import com.baomidou.mybatisplus.annotation.SqlParser;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
diff --git a/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherUnitMapper.xml b/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherUnitMapper.xml
index 18742cf..5f5cf52 100644
--- a/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherUnitMapper.xml
+++ b/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherUnitMapper.xml
@@ -38,6 +38,10 @@
<if test="dispatcherUnit.district!=null">
and sdu.district = #{dispatcherUnit.district}
</if>
+ <if test="dispatcherUnit.beginTime!=null or dispatcherUnit.overTime!=null">
+ and sdu.end_time <= #{dispatcherUnit.overTime} and sdu.end_time >= #{dispatcherUnit.beginTime}
+ or ( sdu.start_time <= #{dispatcherUnit.overTime} and sdu.start_time >= #{dispatcherUnit.beginTime})
+ </if>
</select>
<!--自定义树-->
diff --git a/src/main/java/org/springblade/modules/dispatcher/vo/DispatcherUnitVO.java b/src/main/java/org/springblade/modules/dispatcher/vo/DispatcherUnitVO.java
index 603ea60..6c598c0 100644
--- a/src/main/java/org/springblade/modules/dispatcher/vo/DispatcherUnitVO.java
+++ b/src/main/java/org/springblade/modules/dispatcher/vo/DispatcherUnitVO.java
@@ -47,4 +47,14 @@
* 派遣人数
*/
private Integer num;
+
+ /**
+ * 开始时间
+ */
+ private String beginTime;
+
+ /**
+ * 结束时间
+ */
+ private String overTime;
}
diff --git a/src/main/java/org/springblade/modules/information/controller/InformationController.java b/src/main/java/org/springblade/modules/information/controller/InformationController.java
index a63b1bd..bde8cda 100644
--- a/src/main/java/org/springblade/modules/information/controller/InformationController.java
+++ b/src/main/java/org/springblade/modules/information/controller/InformationController.java
@@ -199,14 +199,8 @@
+ "'" + dept.getTenantId() + "'" + "," + "'" + information.getEnterprisename() + "'" + "," + "'" + dept.getAncestors() + "'" + "," + "'" + dept.getDeptCategory() + "'" + ")";
Object o = s;
String json = JSON.toJSONString(o);
- long l = System.currentTimeMillis();
- //new日期对
- Date date = new Date(l);
//转换提日期输出格式
- SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- System.out.println(dateFormat.format(date));
-
- String response = dateFormat.format(date).replaceAll("[[\\s-:punct:]]", "");
+ String response = String.valueOf((new Date()).getTime());
OutJson.createJsonFile(json, "d:/", "w"+response);
FileInputStream in = new FileInputStream(new File("D:\\" + "w"+response+".json"));
FtpUtil.uploadFile(ftpHost, ftpPort, ftpUserName, ftpPassword, "anbao/", "/", "w"+response+".json", in);
diff --git a/src/main/java/org/springblade/modules/recruitment/mapper/RecruitmentMapper.java b/src/main/java/org/springblade/modules/recruitment/mapper/RecruitmentMapper.java
index 699d494..b0f432c 100644
--- a/src/main/java/org/springblade/modules/recruitment/mapper/RecruitmentMapper.java
+++ b/src/main/java/org/springblade/modules/recruitment/mapper/RecruitmentMapper.java
@@ -1,5 +1,6 @@
package org.springblade.modules.recruitment.mapper;
+import com.baomidou.mybatisplus.annotation.SqlParser;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
--
Gitblit v1.9.3