Merge remote-tracking branch 'origin/master' into master

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/JcglryController.java

+package com.ruoyi.web.controller.system;
+
+import java.util.List;
+import java.util.stream.Collectors;
+import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.core.domain.entity.SysDictData;
+import com.ruoyi.common.utils.DataUtils;
+import com.ruoyi.common.utils.DictUtils;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.domain.Gldry;
+import com.ruoyi.system.mapper.SysUserMapper;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.system.domain.Jcglry;
+import com.ruoyi.system.service.IJcglryService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 解除隔离人员Controller
+ * 
+ * @author ruoyi
+ * @date 2022-12-01
+ */
+@RestController
+@RequestMapping("/system/jcglry")
+public class JcglryController extends BaseController
+{
+    @Autowired
+    private IJcglryService jcglryService;
+    @Autowired
+    private SysUserMapper sysUserMapper;
+    /**
+     * 查询解除隔离人员列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:jcglry:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(Jcglry jcglry)
+    {
+        String userType = sysUserMapper.selectUserTypeById(SecurityUtils.getUserId());
+        jcglry.setUserType(userType);
+        if ("2".equals(userType))
+            jcglry.setValue(DataUtils.getKey(null, String.valueOf(SecurityUtils.getUserId()),null,null,null));
+        else if ("3".equals(userType))
+            jcglry.setValue(DataUtils.getKey(null,null, String.valueOf(SecurityUtils.getUserId()),null,null));
+        startPage();
+        List<Jcglry> list = jcglryService.selectJcglryList(jcglry);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出解除隔离人员列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:jcglry:export')")
+    @Log(title = "解除隔离人员", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, Jcglry jcglry)
+    {
+        String userType = sysUserMapper.selectUserTypeById(SecurityUtils.getUserId());
+        jcglry.setUserType(userType);
+        if ("2".equals(userType))
+            jcglry.setValue(DataUtils.getKey(null, String.valueOf(SecurityUtils.getUserId()),null,null,null));
+        else if ("3".equals(userType))
+            jcglry.setValue(DataUtils.getKey(null,null, String.valueOf(SecurityUtils.getUserId()),null,null));
+        List<Jcglry> list = jcglryService.selectJcglryList(jcglry);
+        List<SysDictData> shelters = DictUtils.getDictCache("shelters");
+        List<SysDictData> isolationPoint = DictUtils.getDictCache("isolation_point");
+        List<SysDictData> street = DictUtils.getDictCache("street_town");
+        for (Jcglry yxry1 : list) {
+            if (StringUtils.isNotEmpty(yxry1.getStreet())) {
+                List<String> labels = street.stream().filter(l -> yxry1.getStreet().equals(l.getDictValue()))
+                        .map(SysDictData::getDictLabel).collect(Collectors.toList());
+                if (!labels.isEmpty())
+                    yxry1.setStreet(labels.get(0));
+            }
+            if (StringUtils.isNotEmpty(yxry1.getGlPlace())) {
+                List<String> labels = shelters.stream().filter(l -> yxry1.getGlPlace().equals(l.getDictValue()))
+                        .map(SysDictData::getDictLabel).collect(Collectors.toList());
+                if (!labels.isEmpty())
+                    yxry1.setGlPlace(labels.get(0));
+                else {
+                    List<String> point = isolationPoint.stream().filter(l -> yxry1.getGlPlace().equals(l.getDictValue()))
+                            .map(SysDictData::getDictLabel).collect(Collectors.toList());
+                    if (!point.isEmpty())
+                        yxry1.setGlPlace(point.get(0));
+                }
+            }
+        }
+        ExcelUtil<Jcglry> util = new ExcelUtil<Jcglry>(Jcglry.class);
+        util.exportExcel(response, list, "解除隔离人员数据");
+    }
+
+    /**
+     * 获取解除隔离人员详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:jcglry:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(jcglryService.selectJcglryById(id));
+    }
+
+    /**
+     * 新增解除隔离人员
+     */
+    @PreAuthorize("@ss.hasPermi('system:jcglry:add')")
+    @Log(title = "解除隔离人员", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody Jcglry jcglry)
+    {
+        return toAjax(jcglryService.insertJcglry(jcglry));
+    }
+
+    /**
+     * 修改解除隔离人员
+     */
+    @PreAuthorize("@ss.hasPermi('system:jcglry:edit')")
+    @Log(title = "解除隔离人员", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody Jcglry jcglry)
+    {
+        return toAjax(jcglryService.updateJcglry(jcglry));
+    }
+
+    /**
+     * 删除解除隔离人员
+     */
+    @PreAuthorize("@ss.hasPermi('system:jcglry:remove')")
+    @Log(title = "解除隔离人员", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(jcglryService.deleteJcglryByIds(ids));
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/YcsbController.java

@@ -137,6 +137,18 @@ public class YcsbController extends BaseController
         return toAjax(ycsbService.insertYcsb(ycsb));
     }
 
+    /**
+     * 新增抗原异常上报
+     */
+//    @PreAuthorize("@ss.hasPermi('system:ycsb:add')")
+    @Log(title = "抗原异常上报", businessType = BusinessType.INSERT)
+    @PostMapping("/addMobile")
+    public AjaxResult addMobile(@RequestBody Ycsb ycsb)
+    {
+        ycsb.setSource("1");
+        return toAjax(ycsbService.insertYcsb(ycsb));
+    }
+
     /**
      * 修改抗原异常上报
      */
@@ -172,7 +184,7 @@ public class YcsbController extends BaseController
         String[] hasAcid = new String[]{"是", "否"};
         ExcelUtil.setClassExcelAttribute( clazz,"hasAcid","combo",hasAcid);
         //设置文本格式表头在第几列
-        String columes = "3";
+        String columes = "4";
         util.importTemplateExcelSetHead(response,"抗原异常上报",columes);
     }
 

ruoyi-common/src/main/java/com/ruoyi/common/utils/DataUtils.java

@@ -17,7 +17,7 @@ public class DataUtils {
             "\"street\":{\"1\":\"101\",\"2\":\"103\", \"3\":\"102\", \"4\":\"104\",\"5\":\"105\", \"6\":\"106\", \"7\":\"121\", \"8\":\"120\", \"9\":\"117\", \"10\":\"119\", \"11\":\"118\"}," +
             "\"community\":{\"1\":\"125\",\"2\":\"126\", \"3\":\"127\",\"4\":\"128\", \"5\":\"129\", \"6\":\"130\", \"7\":\"131\", \"17\":\"132\", \"18\":\"133\", \"19\":\"134\", \"20\":\"135\", \"21\":\"136\", \"22\":\"137\", \"23\":\"138\", \"24\":\"139\", \"34\":\"140\", \"35\":\"141\", \"36\":\"142\", \"37\":\"143\", \"38\":\"144\", \"39\":\"145\", \"40\":\"146\", \"41\":\"147\", \"42\":\"148\", \"43\":\"149\",\"44\":\"150\",\"45\":\"151\",\"46\":\"152\",\"47\":\"153\",\"48\":\"154\",\"49\":\"155\",\"50\":\"156\", \"60\":\"157\", \"61\":\"158\", \"62\":\"159\", \"63\":\"160\", \"64\":\"161\", \"65\":\"162\", \"66\":\"163\", \"67\":\"164\", \"68\":\"181\", \"69\":\"165\", \"70\":\"166\", \"71\":\"167\", \"72\":\"168\", \"73\":\"169\", \"74\":\"170\", \"75\":\"171\", \"76\":\"172\"}," +
             "\"shelters\":{\"1\":\"107\",\"2\":\"108\", \"3\":\"109\", \"4\":\"110\",\"5\":\"111\", \"6\":\"112\", \"7\":\"113\", \"8\":\"114\", \"9\":\"115\", \"10\":\"116\", \"11\":\"182\"}," +
-            "\"isolation\":{\"1\":\"173\",\"2\":\"174\", \"3\":\"175\", \"4\":\"176\",\"5\":\"177\", \"6\":\"178\", \"7\":\"179\", \"8\":\"180\"}}";
+            "\"isolation\":{\"01\":\"173\",\"02\":\"174\", \"03\":\"175\", \"04\":\"176\",\"05\":\"177\", \"06\":\"178\", \"07\":\"179\", \"08\":\"180\"}}";
 
     public static String getValue(String area, String street, String community) {
         JSONObject map = JSON.parseObject(dateMap);

ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java

@@ -112,6 +112,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 .authorizeRequests()
                 // 对于登录login 注册register 验证码captchaImage 允许匿名访问
                 .antMatchers("/login", "/register", "/captchaImage").permitAll()
+                .antMatchers("/system/ycsb/addMobile").permitAll()
                 // 静态资源，可匿名访问
                 .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
                 .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()

ruoyi-system/src/main/java/com/ruoyi/system/domain/Jcglry.java

+package com.ruoyi.system.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import org.springframework.data.annotation.Transient;
+
+/**
+ * 解除隔离人员对象 jcglry
+ * 
+ * @author ruoyi
+ * @date 2022-12-01
+ */
+public class Jcglry extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    private Long id;
+
+    /** 是否区内 */
+    @Excel(name = "区域类别",dictType = "is_area")
+    private String isArea;
+
+    /** 姓名 */
+    @Excel(name = "接触人员姓名")
+    private String name;
+
+    /** 隔离位置 */
+    @Excel(name = "解除酒店")
+    private String glPlace;
+
+    /** 隔离时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "入住时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date rzTime;
+
+    /** 解除时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "解除时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date jcTime;
+
+    /** 人员类别 */
+    @Excel(name = "人员类别")
+    private String rylb;
+
+    /** 身份证号码 */
+    @Excel(name = "身份证号")
+    private String cardNo;
+
+    /** 联系方式 */
+    @Excel(name = "联系方式")
+    private String phone;
+
+    /** 街道/镇 */
+    @Excel(name = "所属街道")
+    private String street;
+
+    /** 居委会 */
+//    @Excel(name = "居委会")
+    private String committee;
+
+    /** 小区/村名称 */
+//    @Excel(name = "小区/村名称")
+    private String community;
+
+    /** 家庭住址 */
+    @Excel(name = "家庭住址")
+    private String address;
+
+    /** 转运状态 */
+    @Excel(name = "是否已转走",readConverterExp = "0=是,1=否")
+    private String zyStatus;
+
+    /** 是否安排司机 */
+    @Excel(name = "是否安排司机",dictType = "arrange_drivers")
+    private String arrangeDrivers;
+
+    /** 备注街道 */
+//    @Excel(name = "备注街道")
+    private String bzStreet;
+
+    /** 备注住址 */
+//    @Excel(name = "备注住址")
+    private String bzAddress;
+
+    /** 状态（0正常 1停用） */
+//    @Excel(name = "状态", readConverterExp = "0=正常,1=停用")
+    private String status;
+
+    /** 删除标志（0代表存在 1代表删除） */
+    private String delFlag;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remark;
+
+    //当前登录人类别
+    @Transient
+    private String userType;
+
+    //当前登录人所属value
+    @Transient
+    private String value;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setIsArea(String isArea) 
+    {
+        this.isArea = isArea;
+    }
+
+    public String getIsArea() 
+    {
+        return isArea;
+    }
+    public void setName(String name) 
+    {
+        this.name = name;
+    }
+
+    public String getName() 
+    {
+        return name;
+    }
+    public void setGlPlace(String glPlace) 
+    {
+        this.glPlace = glPlace;
+    }
+
+    public String getGlPlace() 
+    {
+        return glPlace;
+    }
+    public void setRzTime(Date rzTime) 
+    {
+        this.rzTime = rzTime;
+    }
+
+    public Date getRzTime() 
+    {
+        return rzTime;
+    }
+    public void setJcTime(Date jcTime) 
+    {
+        this.jcTime = jcTime;
+    }
+
+    public Date getJcTime() 
+    {
+        return jcTime;
+    }
+    public void setRylb(String rylb) 
+    {
+        this.rylb = rylb;
+    }
+
+    public String getRylb() 
+    {
+        return rylb;
+    }
+    public void setCardNo(String cardNo) 
+    {
+        this.cardNo = cardNo;
+    }
+
+    public String getCardNo() 
+    {
+        return cardNo;
+    }
+    public void setPhone(String phone) 
+    {
+        this.phone = phone;
+    }
+
+    public String getPhone() 
+    {
+        return phone;
+    }
+    public void setStreet(String street) 
+    {
+        this.street = street;
+    }
+
+    public String getStreet() 
+    {
+        return street;
+    }
+    public void setCommittee(String committee) 
+    {
+        this.committee = committee;
+    }
+
+    public String getCommittee() 
+    {
+        return committee;
+    }
+    public void setCommunity(String community) 
+    {
+        this.community = community;
+    }
+
+    public String getCommunity() 
+    {
+        return community;
+    }
+    public void setAddress(String address) 
+    {
+        this.address = address;
+    }
+
+    public String getAddress() 
+    {
+        return address;
+    }
+    public void setZyStatus(String zyStatus) 
+    {
+        this.zyStatus = zyStatus;
+    }
+
+    public String getZyStatus() 
+    {
+        return zyStatus;
+    }
+    public void setArrangeDrivers(String arrangeDrivers) 
+    {
+        this.arrangeDrivers = arrangeDrivers;
+    }
+
+    public String getArrangeDrivers() 
+    {
+        return arrangeDrivers;
+    }
+    public void setBzStreet(String bzStreet) 
+    {
+        this.bzStreet = bzStreet;
+    }
+
+    public String getBzStreet() 
+    {
+        return bzStreet;
+    }
+    public void setBzAddress(String bzAddress) 
+    {
+        this.bzAddress = bzAddress;
+    }
+
+    public String getBzAddress() 
+    {
+        return bzAddress;
+    }
+    public void setStatus(String status) 
+    {
+        this.status = status;
+    }
+
+    public String getStatus() 
+    {
+        return status;
+    }
+    public void setDelFlag(String delFlag) 
+    {
+        this.delFlag = delFlag;
+    }
+
+    public String getDelFlag() 
+    {
+        return delFlag;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("isArea", getIsArea())
+            .append("name", getName())
+            .append("glPlace", getGlPlace())
+            .append("rzTime", getRzTime())
+            .append("jcTime", getJcTime())
+            .append("rylb", getRylb())
+            .append("cardNo", getCardNo())
+            .append("phone", getPhone())
+            .append("street", getStreet())
+            .append("committee", getCommittee())
+            .append("community", getCommunity())
+            .append("address", getAddress())
+            .append("zyStatus", getZyStatus())
+            .append("arrangeDrivers", getArrangeDrivers())
+            .append("bzStreet", getBzStreet())
+            .append("bzAddress", getBzAddress())
+            .append("status", getStatus())
+            .append("delFlag", getDelFlag())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+
+    @Override
+    public String getRemark() {
+        return remark;
+    }
+
+    @Override
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getUserType() {
+        return userType;
+    }
+
+    public void setUserType(String userType) {
+        this.userType = userType;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/domain/Ycsb.java

@@ -29,6 +29,10 @@ public class Ycsb extends BaseEntity
     @Excel(name = "姓名")
     private String userName;
 
+    /** 抗原结果 */
+    @Excel(name = "抗原结果",readConverterExp = "0=异常,1=正常")
+    private String kyResult;
+
     /** 是否做核酸 */
     @Excel(name = "是否做核酸")
     private String hasAcid;
@@ -76,6 +80,10 @@ public class Ycsb extends BaseEntity
     @Excel(name = "家庭现住址")
     private String address;
 
+    /** 是否已处理 */
+    @Excel(name = "是否已处理",readConverterExp = "0=已处理,1=未处理",type = Excel.Type.EXPORT)
+    private String isHandle;
+
     /** 备注 */
     @Excel(name = "备注")
     private String remark;
@@ -86,6 +94,8 @@ public class Ycsb extends BaseEntity
     /** 删除标志（0代表存在 2代表删除） */
     private String delFlag;
 
+    /** 来源（0管理端 1移动端） */
+    private String source;
 
     /** 创建时间 */
     // 新增于2022-11-30
@@ -285,4 +295,28 @@ public class Ycsb extends BaseEntity
     public void setRemark(String remark) {
         this.remark = remark;
     }
+
+    public String getKyResult() {
+        return kyResult;
+    }
+
+    public void setKyResult(String kyResult) {
+        this.kyResult = kyResult;
+    }
+
+    public String getIsHandle() {
+        return isHandle;
+    }
+
+    public void setIsHandle(String isHandle) {
+        this.isHandle = isHandle;
+    }
+
+    public String getSource() {
+        return source;
+    }
+
+    public void setSource(String source) {
+        this.source = source;
+    }
 }

ruoyi-system/src/main/java/com/ruoyi/system/mapper/JcglryMapper.java

+package com.ruoyi.system.mapper;
+
+import java.util.List;
+import com.ruoyi.system.domain.Jcglry;
+
+/**
+ * 解除隔离人员Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2022-12-01
+ */
+public interface JcglryMapper 
+{
+    /**
+     * 查询解除隔离人员
+     * 
+     * @param id 解除隔离人员主键
+     * @return 解除隔离人员
+     */
+    public Jcglry selectJcglryById(Long id);
+
+    /**
+     * 查询解除隔离人员列表
+     * 
+     * @param jcglry 解除隔离人员
+     * @return 解除隔离人员集合
+     */
+    public List<Jcglry> selectJcglryList(Jcglry jcglry);
+
+    /**
+     * 新增解除隔离人员
+     * 
+     * @param jcglry 解除隔离人员
+     * @return 结果
+     */
+    public int insertJcglry(Jcglry jcglry);
+
+    /**
+     * 修改解除隔离人员
+     * 
+     * @param jcglry 解除隔离人员
+     * @return 结果
+     */
+    public int updateJcglry(Jcglry jcglry);
+
+    /**
+     * 删除解除隔离人员
+     * 
+     * @param id 解除隔离人员主键
+     * @return 结果
+     */
+    public int deleteJcglryById(Long id);
+
+    /**
+     * 批量删除解除隔离人员
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteJcglryByIds(Long[] ids);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/IJcglryService.java

+package com.ruoyi.system.service;
+
+import java.util.List;
+import com.ruoyi.system.domain.Jcglry;
+
+/**
+ * 解除隔离人员Service接口
+ * 
+ * @author ruoyi
+ * @date 2022-12-01
+ */
+public interface IJcglryService 
+{
+    /**
+     * 查询解除隔离人员
+     * 
+     * @param id 解除隔离人员主键
+     * @return 解除隔离人员
+     */
+    public Jcglry selectJcglryById(Long id);
+
+    /**
+     * 查询解除隔离人员列表
+     * 
+     * @param jcglry 解除隔离人员
+     * @return 解除隔离人员集合
+     */
+    public List<Jcglry> selectJcglryList(Jcglry jcglry);
+
+    /**
+     * 新增解除隔离人员
+     * 
+     * @param jcglry 解除隔离人员
+     * @return 结果
+     */
+    public int insertJcglry(Jcglry jcglry);
+
+    /**
+     * 修改解除隔离人员
+     * 
+     * @param jcglry 解除隔离人员
+     * @return 结果
+     */
+    public int updateJcglry(Jcglry jcglry);
+
+    /**
+     * 批量删除解除隔离人员
+     * 
+     * @param ids 需要删除的解除隔离人员主键集合
+     * @return 结果
+     */
+    public int deleteJcglryByIds(Long[] ids);
+
+    /**
+     * 删除解除隔离人员信息
+     * 
+     * @param id 解除隔离人员主键
+     * @return 结果
+     */
+    public int deleteJcglryById(Long id);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/JcglryServiceImpl.java

+package com.ruoyi.system.service.impl;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.annotation.DataScope;
+import com.ruoyi.system.mapper.JcglryMapper;
+import com.ruoyi.system.domain.Jcglry;
+import com.ruoyi.system.service.IJcglryService;
+
+/**
+ * 解除隔离人员Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2022-12-01
+ */
+@Service
+public class JcglryServiceImpl implements IJcglryService 
+{
+    @Autowired
+    private JcglryMapper jcglryMapper;
+
+    /**
+     * 查询解除隔离人员
+     * 
+     * @param id 解除隔离人员主键
+     * @return 解除隔离人员
+     */
+    @Override
+    public Jcglry selectJcglryById(Long id)
+    {
+        return jcglryMapper.selectJcglryById(id);
+    }
+
+    /**
+     * 查询解除隔离人员列表
+     * 
+     * @param jcglry 解除隔离人员
+     * @return 解除隔离人员
+     */
+    @Override
+    @DataScope(deptAlias = "d", userAlias = "u")
+    public List<Jcglry> selectJcglryList(Jcglry jcglry)
+    {
+        return jcglryMapper.selectJcglryList(jcglry);
+    }
+
+    /**
+     * 新增解除隔离人员
+     * 
+     * @param jcglry 解除隔离人员
+     * @return 结果
+     */
+    @Override
+    public int insertJcglry(Jcglry jcglry)
+    {
+        jcglry.setCreateBy(String.valueOf(SecurityUtils.getUserId()));
+        jcglry.setCreateTime(DateUtils.getNowDate());
+        return jcglryMapper.insertJcglry(jcglry);
+    }
+
+    /**
+     * 修改解除隔离人员
+     * 
+     * @param jcglry 解除隔离人员
+     * @return 结果
+     */
+    @Override
+    public int updateJcglry(Jcglry jcglry)
+    {
+        jcglry.setUpdateTime(DateUtils.getNowDate());
+        return jcglryMapper.updateJcglry(jcglry);
+    }
+
+    /**
+     * 批量删除解除隔离人员
+     * 
+     * @param ids 需要删除的解除隔离人员主键
+     * @return 结果
+     */
+    @Override
+    public int deleteJcglryByIds(Long[] ids)
+    {
+        return jcglryMapper.deleteJcglryByIds(ids);
+    }
+
+    /**
+     * 删除解除隔离人员信息
+     * 
+     * @param id 解除隔离人员主键
+     * @return 结果
+     */
+    @Override
+    public int deleteJcglryById(Long id)
+    {
+        return jcglryMapper.deleteJcglryById(id);
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/YcsbServiceImpl.java

@@ -219,6 +219,7 @@ public class YcsbServiceImpl implements IYcsbService
                     ycsbMapper.updateYcsb(ycsb);
                     continue;
                 }
+                ycsb.setIsHandle("0");
                 ycsbMapper.insertYcsb(ycsb);
             }
         }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/YxryServiceImpl.java

@@ -270,16 +270,16 @@ public class YxryServiceImpl implements IYxryService {
             map.put("glName", null);
         } else if (fcryList.size() > 0 && gldryList.size() > 0) { // 都没转出
             map.put("glPlace", "其他");
-            map.put("fcName", fcryList.stream().map(Fcry::getFcPlace).collect(Collectors.toList()));
-            map.put("glName", gldryList.stream().map(Gldry::getGlPlace).collect(Collectors.toList()));
+            map.put("fcName", fcryList.stream().map(Fcry::getFcPlace).collect(Collectors.joining(",")));
+            map.put("glName", gldryList.stream().map(Gldry::getGlPlace).collect(Collectors.joining(",")));
         } else if (fcryList.size() > 0) {
             map.put("glPlace", "方舱隔离");
-            map.put("fcName", fcryList.stream().map(Fcry::getFcPlace).collect(Collectors.toList()));
+            map.put("fcName", fcryList.stream().map(Fcry::getFcPlace).collect(Collectors.joining(",")));
             map.put("glName", null);
         } else {
             map.put("glPlace", "隔离点隔离");
             map.put("fcName", null);
-            map.put("glName", gldryList.stream().map(Gldry::getGlPlace).collect(Collectors.toList()));
+            map.put("glName", gldryList.stream().map(Gldry::getGlPlace).collect(Collectors.joining(",")));
         }
         map.put("card",zlqks.isEmpty());
         return map;

ruoyi-system/src/main/resources/mapper/system/FcryMapper.xml

@@ -96,6 +96,7 @@
         <if test="userType != null  and userType == '00'.toString()">${params.dataScope}</if>
         <if test="userType != null  and userType == '2'.toString()">and a.street = #{value}</if>
         <if test="userType != null  and userType == '3'.toString()">and a.committee = #{value}</if>
+        order by a.create_time desc
     </select>
 
     <select id="selectFcryById" parameterType="Long" resultMap="FcryResult">
@@ -127,7 +128,6 @@
                a.check_card,
                a.is_positive,
                a.positive_only,
-               a.other_point_time,
                a.people_type,
                a.other_fc_time,
                a.other_gld_time

ruoyi-system/src/main/resources/mapper/system/FkqkMapper.xml

@@ -49,6 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="floor != null and floor != ''"> and a.floor like concat('%', #{floor}, '%')</if>
             <if test="status != null  and status != ''"> and a.status = #{status}</if>
         ${params.dataScope}
+        order by a.create_time desc
     </select>
 
     <select id="selectFkqkById" parameterType="Long" resultMap="FkqkResult">

ruoyi-system/src/main/resources/mapper/system/GldryMapper.xml

@@ -63,6 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="userType != null  and userType == '00'.toString()"> ${params.dataScope} </if>
         <if test="userType != null  and userType == '2'.toString()"> and a.street = #{value} </if>
         <if test="userType != null  and userType == '3'.toString()"> and a.committee = #{value} </if>
+        order by a.create_time desc
     </select>
 
     <select id="selectGldryById" parameterType="Long" resultMap="GldryResult">

ruoyi-system/src/main/resources/mapper/system/HscjMapper.xml

@@ -108,6 +108,7 @@
         <if test="boxhao != null  and boxhao != ''">and a.boxhao like concat('%', #{boxhao}, '%')</if>
         <if test="status != null  and status != ''">and a.status = #{status}</if>
         ${params.dataScope}
+        order by a.create_time desc
     </select>
 
     <select id="selectHscjById" parameterType="Long" resultMap="HscjResult">

ruoyi-system/src/main/resources/mapper/system/JcglryMapper.xml

+<?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="com.ruoyi.system.mapper.JcglryMapper">
+    
+    <resultMap type="Jcglry" id="JcglryResult">
+        <result property="id"    column="id"    />
+        <result property="isArea"    column="is_area"    />
+        <result property="name"    column="name"    />
+        <result property="glPlace"    column="gl_place"    />
+        <result property="rzTime"    column="rz_time"    />
+        <result property="jcTime"    column="jc_time"    />
+        <result property="rylb"    column="rylb"    />
+        <result property="cardNo"    column="card_no"    />
+        <result property="phone"    column="phone"    />
+        <result property="street"    column="street"    />
+        <result property="committee"    column="committee"    />
+        <result property="community"    column="community"    />
+        <result property="address"    column="address"    />
+        <result property="zyStatus"    column="zy_status"    />
+        <result property="arrangeDrivers"    column="arrange_drivers"    />
+        <result property="bzStreet"    column="bz_street"    />
+        <result property="bzAddress"    column="bz_address"    />
+        <result property="status"    column="status"    />
+        <result property="delFlag"    column="del_flag"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectJcglryVo">
+        select id, is_area, name, gl_place, rz_time, jc_time, rylb, card_no, phone, street, committee, community, address, zy_status, arrange_drivers, bz_street, bz_address, status, del_flag, create_by, create_time, update_by, update_time, remark from jcglry
+    </sql>
+
+    <select id="selectJcglryList" parameterType="Jcglry" resultMap="JcglryResult">
+        select a.id, a.is_area, a.name, a.gl_place, a.rz_time, a.jc_time, a.rylb, a.card_no, a.phone, a.street, a.committee, a.community, a.address, a.zy_status, a.arrange_drivers, a.bz_street, a.bz_address, a.status, a.del_flag, a.create_by, a.create_time, a.update_by, a.update_time, a.remark from jcglry a
+        left join sys_user u on u.user_id = a.create_by
+        left join sys_dept d on u.dept_id = d.dept_id
+        where a.del_flag = 0
+            <if test="isArea != null  and isArea != ''"> and a.is_area = #{isArea}</if>
+            <if test="name != null  and name != ''"> and a.name like concat('%', #{name}, '%')</if>
+            <if test="glPlace != null  and glPlace != ''"> and a.gl_place = #{glPlace}</if>
+            <if test="rzTime != null "> and a.rz_time = #{rzTime}</if>
+            <if test="jcTime != null "> and a.jc_time = #{jcTime}</if>
+            <if test="rylb != null  and rylb != ''"> and a.rylb like concat('%', #{rylb}, '%')</if>
+            <if test="cardNo != null  and cardNo != ''"> and a.card_no like concat('%', #{cardNo}, '%')</if>
+            <if test="phone != null  and phone != ''"> and a.phone like concat('%', #{phone}, '%')</if>
+            <if test="street != null  and street != ''"> and a.street = #{street}</if>
+            <if test="committee != null  and committee != ''"> and a.committee = #{committee}</if>
+            <if test="community != null  and community != ''"> and a.community = #{community}</if>
+            <if test="address != null  and address != ''"> and a.address like concat('%', #{address}, '%')</if>
+            <if test="zyStatus != null  and zyStatus != ''"> and a.zy_status = #{zyStatus}</if>
+            <if test="arrangeDrivers != null  and arrangeDrivers != ''"> and a.arrange_drivers = #{arrangeDrivers}</if>
+            <if test="bzStreet != null  and bzStreet != ''"> and a.bz_street like concat('%', #{bzStreet}, '%')</if>
+            <if test="bzAddress != null  and bzAddress != ''"> and a.bz_address like concat('%', #{bzAddress}, '%')</if>
+            <if test="status != null  and status != ''"> and a.status = #{status}</if>
+        <if test="userType != null  and userType == '00'.toString()"> ${params.dataScope} </if>
+        <if test="userType != null  and userType == '2'.toString()"> and a.street = #{value} </if>
+        <if test="userType != null  and userType == '3'.toString()"> and a.committee = #{value} </if>
+        order by a.create_time desc
+    </select>
+    
+    <select id="selectJcglryById" parameterType="Long" resultMap="JcglryResult">
+        <include refid="selectJcglryVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertJcglry" parameterType="Jcglry" useGeneratedKeys="true" keyProperty="id">
+        insert into jcglry
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="isArea != null">is_area,</if>
+            <if test="name != null">name,</if>
+            <if test="glPlace != null">gl_place,</if>
+            <if test="rzTime != null">rz_time,</if>
+            <if test="jcTime != null">jc_time,</if>
+            <if test="rylb != null">rylb,</if>
+            <if test="cardNo != null">card_no,</if>
+            <if test="phone != null">phone,</if>
+            <if test="street != null">street,</if>
+            <if test="committee != null">committee,</if>
+            <if test="community != null">community,</if>
+            <if test="address != null">address,</if>
+            <if test="zyStatus != null">zy_status,</if>
+            <if test="arrangeDrivers != null">arrange_drivers,</if>
+            <if test="bzStreet != null">bz_street,</if>
+            <if test="bzAddress != null">bz_address,</if>
+            <if test="status != null">status,</if>
+            <if test="delFlag != null">del_flag,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="isArea != null">#{isArea},</if>
+            <if test="name != null">#{name},</if>
+            <if test="glPlace != null">#{glPlace},</if>
+            <if test="rzTime != null">#{rzTime},</if>
+            <if test="jcTime != null">#{jcTime},</if>
+            <if test="rylb != null">#{rylb},</if>
+            <if test="cardNo != null">#{cardNo},</if>
+            <if test="phone != null">#{phone},</if>
+            <if test="street != null">#{street},</if>
+            <if test="committee != null">#{committee},</if>
+            <if test="community != null">#{community},</if>
+            <if test="address != null">#{address},</if>
+            <if test="zyStatus != null">#{zyStatus},</if>
+            <if test="arrangeDrivers != null">#{arrangeDrivers},</if>
+            <if test="bzStreet != null">#{bzStreet},</if>
+            <if test="bzAddress != null">#{bzAddress},</if>
+            <if test="status != null">#{status},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateJcglry" parameterType="Jcglry">
+        update jcglry
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="isArea != null">is_area = #{isArea},</if>
+            <if test="name != null">name = #{name},</if>
+            <if test="glPlace != null">gl_place = #{glPlace},</if>
+            <if test="rzTime != null">rz_time = #{rzTime},</if>
+            <if test="jcTime != null">jc_time = #{jcTime},</if>
+            <if test="rylb != null">rylb = #{rylb},</if>
+            <if test="cardNo != null">card_no = #{cardNo},</if>
+            <if test="phone != null">phone = #{phone},</if>
+            <if test="street != null">street = #{street},</if>
+            <if test="committee != null">committee = #{committee},</if>
+            <if test="community != null">community = #{community},</if>
+            <if test="address != null">address = #{address},</if>
+            <if test="zyStatus != null">zy_status = #{zyStatus},</if>
+            <if test="arrangeDrivers != null">arrange_drivers = #{arrangeDrivers},</if>
+            <if test="bzStreet != null">bz_street = #{bzStreet},</if>
+            <if test="bzAddress != null">bz_address = #{bzAddress},</if>
+            <if test="status != null">status = #{status},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteJcglryById" parameterType="Long">
+        delete from jcglry where id = #{id}
+    </delete>
+
+    <delete id="deleteJcglryByIds" parameterType="String">
+        update jcglry set del_flag = '1' where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file

ruoyi-system/src/main/resources/mapper/system/YcsbMapper.xml

@@ -26,6 +26,8 @@
         <result property="building" column="building"/>
         <result property="house" column="house"/>
         <result property="checkCard" column="check_card"/>
+        <result property="kyResult" column="ky_result"/>
+        <result property="isHandle" column="is_handle"/>
     </resultMap>
 
     <sql id="selectYcsbVo">
@@ -46,13 +48,14 @@
                create_time,
                update_by,
                update_time,
-               remark,address,house,building,check_card
+               remark,address,house,building,check_card,is_handle,ky_result
         from ycsb
     </sql>
 
     <select id="selectYcsbList" parameterType="Ycsb" resultMap="YcsbResult">
         select a.id, a.sb_date, a.user_name, a.card_no, a.phone, a.area, a.street,a.committee, a.community, a.unit,a.check_card,
-        a.has_acid, a.status, a.del_flag, a.create_by, a.create_time, a.update_by, a.update_time, a.remark,a.address,a.house,a.building
+        a.has_acid, a.status, a.del_flag, a.create_by, a.create_time, a.update_by, a.update_time, a.remark,a.address,a.house,
+               a.building,a.is_handle,a.ky_result
         from ycsb a
         left join sys_user u on u.user_id = a.create_by
         left join sys_dept d on u.dept_id = d.dept_id
@@ -69,6 +72,7 @@
         <if test="hasAcid != null  and hasAcid != ''">and a.has_acid like concat('%', #{hasAcid}, '%')</if>
         <if test="status != null  and status != ''">and a.status = #{status}</if>
         ${params.dataScope}
+        order by a.create_time desc
     </select>
 
     <select id="selectYcsbById" parameterType="Long" resultMap="YcsbResult">
@@ -105,6 +109,8 @@
             <if test="updateTime != null">update_time,</if>
             <if test="remark != null">remark,</if>
             <if test="checkCard != null">check_card,</if>
+            <if test="isHandle != null">is_handle,</if>
+            <if test="kyResult != null">ky_result,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="sbDate != null">#{sbDate},</if>
@@ -128,6 +134,8 @@
             <if test="updateTime != null">#{updateTime},</if>
             <if test="remark != null">#{remark},</if>
             <if test="checkCard != null">#{checkCard},</if>
+            <if test="isHandle != null">#{isHandle},</if>
+            <if test="kyResult != null">#{kyResult},</if>
         </trim>
     </insert>
 
@@ -155,6 +163,8 @@
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="remark != null">remark = #{remark},</if>
             <if test="checkCard != null">check_card = #{checkCard},</if>
+            <if test="isHandle != null">is_handle = #{isHandle},</if>
+            <if test="kyResult != null">ky_result = #{kyResult},</if>
         </trim>
         where id = #{id}
     </update>

ruoyi-system/src/main/resources/mapper/system/YxryMapper.xml

@@ -98,7 +98,6 @@
         from yxry a
         left join sys_user u on u.user_id = a.create_by
         left join sys_dept d on u.dept_id = d.dept_id
-        left join fcry f on f.card_no = a.card_no
         where a.del_flag = 0
         <if test="sbDate != null ">and a.sb_date = #{sbDate}</if>
         <if test="cyTime != null ">and a.cy_time = #{cyTime}</if>

ruoyi-system/src/main/resources/mapper/system/ZlqkMapper.xml

@@ -38,6 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="medication != null  and medication != ''"> and a.medication like concat('%', #{medication}, '%')</if>
             <if test="status != null  and status != ''"> and a.status = #{status}</if>
         ${params.dataScope}
+        order by a.create_time desc
     </select>
 
     <select id="selectZlqkByCard"  resultMap="ZlqkResult">

ruoyi-ui/.env.development

 # 页面标题
-VUE_APP_TITLE = 若依管理系统
+VUE_APP_TITLE = 高新区数据管理系统
 
 # 开发环境配置
 ENV = 'development'

ruoyi-ui/.env.production

 # 页面标题
-VUE_APP_TITLE = 若依管理系统
+VUE_APP_TITLE = 高新区数据管理系统
 
 # 生产环境配置
 ENV = 'production'

ruoyi-ui/.env.staging

 # 页面标题
-VUE_APP_TITLE = 若依管理系统
+VUE_APP_TITLE = 高新区数据管理系统
 
 NODE_ENV = production
 

ruoyi-ui/package.json

 {
   "name": "ruoyi",
   "version": "3.8.4",
-  "description": "若依管理系统",
+  "description": "高新区数据管理系统",
   "author": "若依",
   "license": "MIT",
   "scripts": {

ruoyi-ui/public/index.html

@@ -5,8 +5,9 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="renderer" content="webkit">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
-    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
-    <title><%= webpackConfig.name %></title>
+<!--    <link rel="icon" href="<%= BASE_URL %>favicon.ico">-->
+<!--    <title><%= webpackConfig.name %></title>-->
+    <title>高新区数据管理系统</title>
     <!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]-->
 	  <style>
     html,

ruoyi-ui/src/api/system/jcglry.js

+import request from '@/utils/request'
+
+// 查询解除隔离人员列表
+export function listJcglry(query) {
+  return request({
+    url: '/system/jcglry/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询解除隔离人员详细
+export function getJcglry(id) {
+  return request({
+    url: '/system/jcglry/' + id,
+    method: 'get'
+  })
+}
+
+// 新增解除隔离人员
+export function addJcglry(data) {
+  return request({
+    url: '/system/jcglry',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改解除隔离人员
+export function updateJcglry(data) {
+  return request({
+    url: '/system/jcglry',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除解除隔离人员
+export function delJcglry(id) {
+  return request({
+    url: '/system/jcglry/' + id,
+    method: 'delete'
+  })
+}

ruoyi-ui/src/permission.js

@@ -8,9 +8,14 @@ import { isRelogin } from '@/utils/request'
 
 NProgress.configure({ showSpinner: false })
 
-const whiteList = ['/login', '/auth-redirect', '/bind', '/register']
+const whiteList = ['/login', '/auth-redirect', '/bind', '/register','/kfInfoAdd']
 
 router.beforeEach((to, from, next) => {
+  if (to.meta.browserTitle) {
+    document.title = to.meta.browserTitle
+  } else {
+    document.title = '高新区数据管理系统' //此处写默认的title
+  }
   NProgress.start()
   if (getToken()) {
     to.meta.title && store.dispatch('settings/setTitle', to.meta.title)

ruoyi-ui/src/router/index.js

@@ -46,6 +46,14 @@ export const constantRoutes = [
     component: () => import('@/views/login'),
     hidden: true
   },
+  {
+    path: '/kfInfoAdd',
+    component: () => import('@/views/kfInfoAdd'),
+    hidden: true,
+    meta: {
+      browserTitle: '抗原异常信息填报'
+    }
+  },
   {
     path: '/register',
     component: () => import('@/views/register'),

ruoyi-ui/src/views/register.vue

 <template>
   <div class="register">
     <el-form ref="registerForm" :model="registerForm" :rules="registerRules" class="register-form">
-      <h3 class="title">若依后台管理系统</h3>
+      <h3 class="title">高新区数据管理系统</h3>
       <el-form-item prop="username">
         <el-input v-model="registerForm.username" type="text" auto-complete="off" placeholder="账号">
           <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />

ruoyi-ui/src/views/system/ycsb/index.vue

@@ -252,6 +252,14 @@
           </el-col>
         </el-row>
         <el-row>
+          <el-col :span="12">
+            <el-form-item label="抗原结果" prop="kyResult">
+              <el-radio-group v-model="form.kyResult">
+                <el-radio :label="'0'">异常</el-radio>
+                <el-radio :label="'1'">正常</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
           <el-col :span="12">
             <el-form-item label="是否做核酸" prop="hasAcid">
               <el-radio-group v-model="form.hasAcid">
@@ -260,18 +268,20 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="12">
             <el-form-item label="身份证号码" prop="cardNo">
               <el-input v-model="form.cardNo" placeholder="请输入身份证号码" />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
           <el-col :span="12">
             <el-form-item label="联系方式" prop="phone">
               <el-input v-model="form.phone" placeholder="请输入联系方式" />
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="12">
             <el-form-item label="居住地所在区" prop="area">
               <el-select style="width: 100%" v-model="form.area" placeholder="请选择居住地所在区" @change="quSelect">
@@ -284,8 +294,6 @@
               </el-select>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
           <el-col :span="12">
             <el-form-item
               label="街道/镇"
@@ -304,6 +312,8 @@
               </el-select>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="12">
             <el-form-item
               label="居委会"
@@ -322,8 +332,6 @@
               </el-select>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
           <el-col :span="12">
             <el-form-item
               label="小区/村名称"
@@ -342,31 +350,41 @@
               </el-select>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="12">
             <el-form-item label="楼号" prop="building">
               <el-input v-model="form.building" maxlength="30" show-word-limit placeholder="请输入楼号" />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
           <el-col :span="12">
             <el-form-item label="单元号" prop="unit">
               <el-input v-model="form.unit" maxlength="4" show-word-limit placeholder="请输入单元号" />
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="12">
             <el-form-item label="门牌号" prop="house">
               <el-input v-model="form.house" maxlength="4" show-word-limit placeholder="请输入门牌号" />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
           <el-col :span="12">
             <el-form-item label="家庭现住址" prop="address">
               <el-input v-model="form.address" maxlength="80" show-word-limit placeholder="请输入家庭现住址" />
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="是否已处理" prop="isHandle">
+              <el-radio-group v-model="form.isHandle">
+                <el-radio :label="'0'">已处理</el-radio>
+                <el-radio :label="'1'">未处理</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row>
           <el-col :span="24">
             <el-form-item label="备注" prop="remark">
@@ -949,6 +967,7 @@ export default {
         cardNo: null,
         phone: null,
         address: null,
+        isHandle: '0',
         area: null,
         committee: null,
         street: null,
@@ -957,6 +976,7 @@ export default {
         community: null,
         unit: null,
         hasAcid: null,
+        kyResult: '0',
         status: "0",
         delFlag: null,
         createBy: null,