Skip to content

D
data_management_system
Commit 1e3936a4 authored by 秦嘉's avatar 秦嘉
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 3907edba f3cc878e
Expand all Show whitespace changes
Inline Side-by-side
Showing with 774 additions and 698 deletions
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/FcryController.java
View file @ 1e3936a4
......@@ -130,7 +130,7 @@ public class FcryController extends BaseController
/**
* 导出方舱人员模板
*/
@PreAuthorize("@ss.hasPermi('system:fcry:exportTemplate')")
@PreAuthorize("@ss.hasPermi('system:fcry:import')")
@Log(title = "方舱人员", businessType = BusinessType.EXPORT)
@PostMapping("/exportTemplate")
public void exportTemplate(HttpServletResponse response) throws Exception {
......
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/FkqkController.java
View file @ 1e3936a4
......@@ -124,7 +124,7 @@ public class FkqkController extends BaseController
/**
* 导出小区封控情况模板
*/
@PreAuthorize("@ss.hasPermi('system:fkqk:exportTemplate')")
@PreAuthorize("@ss.hasPermi('system:fkqk:import')")
@Log(title = "小区封控情况", businessType = BusinessType.EXPORT)
@PostMapping("/exportTemplate")
public void exportTemplate(HttpServletResponse response) throws Exception {
......
ruoyi-system/src/main/java/com/ruoyi/system/domain/Fcry.java
View file @ 1e3936a4
......@@ -76,7 +76,14 @@ public class Fcry extends BaseEntity
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "转入时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date zrTime;
/** 从其他方舱转来时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "从其他方舱转来时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date otherFcTime;
/** 从其他隔离点转来时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "从其他隔离点转来时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date otherGldTime;
/** 转出时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "转出时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
......@@ -102,15 +109,6 @@ public class Fcry extends BaseEntity
private String value;
/** 从其他隔离点转来时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date otherGldTime;
/** 从其他方舱转来时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date otherFcTime;
public String getRemark() {
return remark;
}
......
ruoyi-system/src/main/java/com/ruoyi/system/domain/FcryDTO.java
View file @ 1e3936a4
......@@ -75,6 +75,14 @@ public class FcryDTO extends BaseEntity
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "转入时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date zrTime;
/** 从其他方舱转来时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "从其他方舱转来时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date otherFcTime;
/** 从其他隔离点转来时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "从其他隔离点转来时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date otherGldTime;
/** 转出时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
......@@ -93,6 +101,22 @@ public class FcryDTO extends BaseEntity
/** 删除标志（0代表存在 2代表删除） */
private String delFlag;
public Date getOtherFcTime() {
return otherFcTime;
}
public void setOtherFcTime(Date otherFcTime) {
this.otherFcTime = otherFcTime;
}
public Date getOtherGldTime() {
return otherGldTime;
}
public void setOtherGldTime(Date otherGldTime) {
this.otherGldTime = otherGldTime;
}
public String getCommittee() {
return committee;
}
......
ruoyi-system/src/main/resources/mapper/system/FcryMapper.xml
View file @ 1e3936a4
......@@ -146,11 +146,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</insert>
<insert id="insertBatchFcry" parameterType="Fcry">
insert into fcry (fc_place,room,jz_name,card_no,phone,area,street,community,floor,
unit,doorplate,zr_time,zc_time,gl_place,create_by,create_time,remark,check_card,is_positive,positive_only,people_type) values
unit,doorplate,zr_time,zc_time,gl_place,create_by,create_time,remark,check_card,is_positive,positive_only,people_type,other_fc_time,other_gld_time) values
<foreach item="item" index="index" collection="list" separator=",">
(#{item.fcPlace},#{item.room},#{item.jzName},#{item.cardNo},#{item.phone},#{item.area},#{item.street},#{item.community},#{item.floor},
#{item.unit},#{item.doorplate},#{item.zrTime},#{item.zcTime},#{item.glPlace},#{item.createBy},
#{item.createTime},#{item.remark},#{item.checkCard},#{item.isPositive},#{item.positiveOnly},#{item.peopleType})
#{item.createTime},#{item.remark},#{item.checkCard},#{item.isPositive},#{item.positiveOnly},#{item.peopleType},#{item.otherFcTime},#{item.otherGldTime})
</foreach>
</insert>
......
ruoyi-ui/src/views/system/fcry/index.vue
View file @ 1e3936a4
This diff is collapsed.
ruoyi-ui/src/views/system/fkqk/index.vue
View file @ 1e3936a4
This diff is collapsed.
ruoyi-ui/src/views/system/gldry/index.vue
View file @ 1e3936a4
This diff is collapsed.
ruoyi-ui/src/views/system/hscj/index.vue
View file @ 1e3936a4
......@@ -730,13 +730,13 @@ export default {
{ name: "同祥城第二社区居委会",code: "67",parent: "1" },
{ name: "同祥城第一社区居委会",code: "68",parent: "1" },
{ name: "想象国际社区居委会",code: "69",parent: "1" },
{ name: "小岗上村委会",code: "70",parent: "3" },
{ name: "星辰花园社区居委会",code: "71",parent: "3" },
{ name: "长九花园社区居委会",code: "72",parent: "3" },
{ name: "赵村村委会",code: "73",parent: "3" },
{ name: "周通村委会",code: "74",parent: "3" },
{ name: "珠峰国际花园社区居委会",code: "75",parent: "3" },
{ name: "筑业花园社区居委会",code: "76",parent: "3" }
{ name: "小岗上村委会",code: "70",parent: "1" },
{ name: "星辰花园社区居委会",code: "71",parent: "1" },
{ name: "长九花园社区居委会",code: "72",parent: "1" },
{ name: "赵村村委会",code: "73",parent: "1" },
{ name: "周通村委会",code: "74",parent: "1" },
{ name: "珠峰国际花园社区居委会",code: "75",parent: "1" },
{ name: "筑业花园社区居委会",code: "76",parent: "1" }
],
cun: [],
cunList: [
......@@ -819,7 +819,7 @@ export default {
{ name: "私立一中宿舍",code: "356",parent: "60" },
{ name: "华阳公寓",code: "357",parent: "60" },
{ name: "国宾一号",code: "358",parent: "60" },
{ name: "留村村委会",code: "368",parent: "61" },
{ name: "留村新东区",code: "368",parent: "61" },
{ name: "留村旧东区",code: "369",parent: "61" },
{ name: "留村南区",code: "370",parent: "61" },
{ name: "留村新西区",code: "371",parent: "61" },
......
ruoyi-ui/src/views/system/ycsb/index.vue
View file @ 1e3936a4
......@@ -519,13 +519,13 @@ export default {
{ name: "同祥城第二社区居委会",code: "67",parent: "1" },
{ name: "同祥城第一社区居委会",code: "68",parent: "1" },
{ name: "想象国际社区居委会",code: "69",parent: "1" },
{ name: "小岗上村委会",code: "70",parent: "3" },
{ name: "星辰花园社区居委会",code: "71",parent: "3" },
{ name: "长九花园社区居委会",code: "72",parent: "3" },
{ name: "赵村村委会",code: "73",parent: "3" },
{ name: "周通村委会",code: "74",parent: "3" },
{ name: "珠峰国际花园社区居委会",code: "75",parent: "3" },
{ name: "筑业花园社区居委会",code: "76",parent: "3" }
{ name: "小岗上村委会",code: "70",parent: "1" },
{ name: "星辰花园社区居委会",code: "71",parent: "1" },
{ name: "长九花园社区居委会",code: "72",parent: "1" },
{ name: "赵村村委会",code: "73",parent: "1" },
{ name: "周通村委会",code: "74",parent: "1" },
{ name: "珠峰国际花园社区居委会",code: "75",parent: "1" },
{ name: "筑业花园社区居委会",code: "76",parent: "1" }
],
cun: [],
cunList: [
......@@ -608,7 +608,7 @@ export default {
{ name: "私立一中宿舍",code: "356",parent: "60" },
{ name: "华阳公寓",code: "357",parent: "60" },
{ name: "国宾一号",code: "358",parent: "60" },
{ name: "留村村委会",code: "368",parent: "61" },
{ name: "留村新东区",code: "368",parent: "61" },
{ name: "留村旧东区",code: "369",parent: "61" },
{ name: "留村南区",code: "370",parent: "61" },
{ name: "留村新西区",code: "371",parent: "61" },
......
ruoyi-ui/src/views/system/yxry/index.vue
View file @ 1e3936a4
......@@ -694,13 +694,13 @@ export default {
{ name: "同祥城第二社区居委会",code: "67",parent: "1" },
{ name: "同祥城第一社区居委会",code: "68",parent: "1" },
{ name: "想象国际社区居委会",code: "69",parent: "1" },
{ name: "小岗上村委会",code: "70",parent: "3" },
{ name: "星辰花园社区居委会",code: "71",parent: "3" },
{ name: "长九花园社区居委会",code: "72",parent: "3" },
{ name: "赵村村委会",code: "73",parent: "3" },
{ name: "周通村委会",code: "74",parent: "3" },
{ name: "珠峰国际花园社区居委会",code: "75",parent: "3" },
{ name: "筑业花园社区居委会",code: "76",parent: "3" }
{ name: "小岗上村委会",code: "70",parent: "1" },
{ name: "星辰花园社区居委会",code: "71",parent: "1" },
{ name: "长九花园社区居委会",code: "72",parent: "1" },
{ name: "赵村村委会",code: "73",parent: "1" },
{ name: "周通村委会",code: "74",parent: "1" },
{ name: "珠峰国际花园社区居委会",code: "75",parent: "1" },
{ name: "筑业花园社区居委会",code: "76",parent: "1" }
],
cun: [],
cunList: [
......@@ -783,7 +783,7 @@ export default {
{ name: "私立一中宿舍",code: "356",parent: "60" },
{ name: "华阳公寓",code: "357",parent: "60" },
{ name: "国宾一号",code: "358",parent: "60" },
{ name: "留村村委会",code: "368",parent: "61" },
{ name: "留村新东区",code: "368",parent: "61" },
{ name: "留村旧东区",code: "369",parent: "61" },
{ name: "留村南区",code: "370",parent: "61" },
{ name: "留村新西区",code: "371",parent: "61" },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment