Merge branch 'master' of http://39.98.153.250:9080/bowintek/EmploymentSite

src/main/java/com/hz/employmentsite/controller/system/AreaCodeController.java

@@ -0,0 +1,32 @@
+package com.hz.employmentsite.controller.system;
+
+import com.hz.employmentsite.filter.exception.BaseResponse;
+import com.hz.employmentsite.filter.exception.RespGenerstor;
+import com.hz.employmentsite.model.AreaCode;
+import com.hz.employmentsite.services.service.system.CityAreaService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/api/system/area")
+public class AreaCodeController {
+    @Autowired
+    private CityAreaService cityAreaService;
+
+    @ResponseBody
+    @GetMapping("/getCityList")
+    public BaseResponse<List<AreaCode>> getCityList() {
+        List<AreaCode> list = cityAreaService.getCityList();
+        return RespGenerstor.success(list);
+    }
+
+    @ResponseBody
+    @GetMapping("/getAreaList")
+    public BaseResponse<List<AreaCode>> getAreaList(@RequestParam("code") String code) {
+        List<AreaCode> list = cityAreaService.getAreaList(code);
+        return RespGenerstor.success(list);
+    }
+
+}

src/main/java/com/hz/employmentsite/controller/taskAndLog/DotaskController.java

@@ -21,10 +21,12 @@ public class DotaskController {
                                 @RequestParam(required = false) String name,  @RequestParam(required = false) String startTime,
                                 @RequestParam(required = false) String endTime,  @RequestParam(required = false) String finishStartTime,
                                 @RequestParam(required = false) String finishEndTime,  @RequestParam(required = false) String regionCode,
-                                @RequestParam(required = false) String streetCode,  @RequestParam(required = false) Integer workTypeId
+                                @RequestParam(required = false) String streetCode,  @RequestParam(required = false) String workTypeId
                                 ){
         PageInfo<DotaskVo> result = dotaskService.getList(pageIndex, pageSize,name, startTime, endTime,finishStartTime,finishEndTime,regionCode,streetCode,workTypeId);
         return RespGenerstor.success(result);
     }
 
+
+
 }

src/main/java/com/hz/employmentsite/mapper/AreaCodeMapper.java

@@ -0,0 +1,30 @@
+package com.hz.employmentsite.mapper;
+
+import com.hz.employmentsite.model.AreaCode;
+import com.hz.employmentsite.model.AreaCodeExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface AreaCodeMapper {
+    long countByExample(AreaCodeExample example);
+
+    int deleteByExample(AreaCodeExample example);
+
+    int deleteByPrimaryKey(String code);
+
+    int insert(AreaCode row);
+
+    int insertSelective(AreaCode row);
+
+    List<AreaCode> selectByExample(AreaCodeExample example);
+
+    AreaCode selectByPrimaryKey(String code);
+
+    int updateByExampleSelective(@Param("row") AreaCode row, @Param("example") AreaCodeExample example);
+
+    int updateByExample(@Param("row") AreaCode row, @Param("example") AreaCodeExample example);
+
+    int updateByPrimaryKeySelective(AreaCode row);
+
+    int updateByPrimaryKey(AreaCode row);
+}

src/main/java/com/hz/employmentsite/mapper/PcDotaskUserMapper.java

@@ -0,0 +1,22 @@
+package com.hz.employmentsite.mapper;
+
+import com.hz.employmentsite.model.PcDotaskUser;
+import com.hz.employmentsite.model.PcDotaskUserExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface PcDotaskUserMapper {
+    long countByExample(PcDotaskUserExample example);
+
+    int deleteByExample(PcDotaskUserExample example);
+
+    int insert(PcDotaskUser row);
+
+    int insertSelective(PcDotaskUser row);
+
+    List<PcDotaskUser> selectByExample(PcDotaskUserExample example);
+
+    int updateByExampleSelective(@Param("row") PcDotaskUser row, @Param("example") PcDotaskUserExample example);
+
+    int updateByExample(@Param("row") PcDotaskUser row, @Param("example") PcDotaskUserExample example);
+}

src/main/java/com/hz/employmentsite/mapper/PcSiteUserMapper.java

@@ -0,0 +1,22 @@
+package com.hz.employmentsite.mapper;
+
+import com.hz.employmentsite.model.PcSiteUser;
+import com.hz.employmentsite.model.PcSiteUserExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface PcSiteUserMapper {
+    long countByExample(PcSiteUserExample example);
+
+    int deleteByExample(PcSiteUserExample example);
+
+    int insert(PcSiteUser row);
+
+    int insertSelective(PcSiteUser row);
+
+    List<PcSiteUser> selectByExample(PcSiteUserExample example);
+
+    int updateByExampleSelective(@Param("row") PcSiteUser row, @Param("example") PcSiteUserExample example);
+
+    int updateByExample(@Param("row") PcSiteUser row, @Param("example") PcSiteUserExample example);
+}

src/main/java/com/hz/employmentsite/mapper/cquery/DotaskCQuery.java

@@ -8,6 +8,6 @@ import java.util.Date;
 
 public interface DotaskCQuery {
     List<DotaskVo> selectDotaskList(@Param("name")String name, @Param("startTime")String startTime, @Param("endTime")String endTime,
-                                    @Param("startTime")String finishStartTime, @Param("endTime")String finishEndTime,
-                           @Param("regionCode")String regionCode, @Param("streetCode")String streetCode, @Param("workTypeId")int workTypeId);
+                                    @Param("finishStartTime")String finishStartTime, @Param("finishEndTime")String finishEndTime,
+                           @Param("regionCode")String regionCode, @Param("streetCode")String streetCode, @Param("workTypeId")String workTypeId);
 }

src/main/java/com/hz/employmentsite/model/AreaCode.java

@@ -0,0 +1,53 @@
+package com.hz.employmentsite.model;
+
+public class AreaCode {
+    private String code;
+
+    private String name;
+
+    private String fid;
+
+    private String fullname;
+
+    private String lv;
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code == null ? null : code.trim();
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name == null ? null : name.trim();
+    }
+
+    public String getFid() {
+        return fid;
+    }
+
+    public void setFid(String fid) {
+        this.fid = fid == null ? null : fid.trim();
+    }
+
+    public String getFullname() {
+        return fullname;
+    }
+
+    public void setFullname(String fullname) {
+        this.fullname = fullname == null ? null : fullname.trim();
+    }
+
+    public String getLv() {
+        return lv;
+    }
+
+    public void setLv(String lv) {
+        this.lv = lv == null ? null : lv.trim();
+    }
+}

src/main/java/com/hz/employmentsite/model/AreaCodeExample.java

@@ -0,0 +1,549 @@
+package com.hz.employmentsite.model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class AreaCodeExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public AreaCodeExample() {
+        oredCriteria = new ArrayList<>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andCodeIsNull() {
+            addCriterion("code is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeIsNotNull() {
+            addCriterion("code is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeEqualTo(String value) {
+            addCriterion("code =", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeNotEqualTo(String value) {
+            addCriterion("code <>", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeGreaterThan(String value) {
+            addCriterion("code >", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeGreaterThanOrEqualTo(String value) {
+            addCriterion("code >=", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeLessThan(String value) {
+            addCriterion("code <", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeLessThanOrEqualTo(String value) {
+            addCriterion("code <=", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeLike(String value) {
+            addCriterion("code like", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeNotLike(String value) {
+            addCriterion("code not like", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeIn(List<String> values) {
+            addCriterion("code in", values, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeNotIn(List<String> values) {
+            addCriterion("code not in", values, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeBetween(String value1, String value2) {
+            addCriterion("code between", value1, value2, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeNotBetween(String value1, String value2) {
+            addCriterion("code not between", value1, value2, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIsNull() {
+            addCriterion("name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIsNotNull() {
+            addCriterion("name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameEqualTo(String value) {
+            addCriterion("name =", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotEqualTo(String value) {
+            addCriterion("name <>", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameGreaterThan(String value) {
+            addCriterion("name >", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameGreaterThanOrEqualTo(String value) {
+            addCriterion("name >=", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLessThan(String value) {
+            addCriterion("name <", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLessThanOrEqualTo(String value) {
+            addCriterion("name <=", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLike(String value) {
+            addCriterion("name like", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotLike(String value) {
+            addCriterion("name not like", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIn(List<String> values) {
+            addCriterion("name in", values, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotIn(List<String> values) {
+            addCriterion("name not in", values, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameBetween(String value1, String value2) {
+            addCriterion("name between", value1, value2, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotBetween(String value1, String value2) {
+            addCriterion("name not between", value1, value2, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andFidIsNull() {
+            addCriterion("fid is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFidIsNotNull() {
+            addCriterion("fid is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFidEqualTo(String value) {
+            addCriterion("fid =", value, "fid");
+            return (Criteria) this;
+        }
+
+        public Criteria andFidNotEqualTo(String value) {
+            addCriterion("fid <>", value, "fid");
+            return (Criteria) this;
+        }
+
+        public Criteria andFidGreaterThan(String value) {
+            addCriterion("fid >", value, "fid");
+            return (Criteria) this;
+        }
+
+        public Criteria andFidGreaterThanOrEqualTo(String value) {
+            addCriterion("fid >=", value, "fid");
+            return (Criteria) this;
+        }
+
+        public Criteria andFidLessThan(String value) {
+            addCriterion("fid <", value, "fid");
+            return (Criteria) this;
+        }
+
+        public Criteria andFidLessThanOrEqualTo(String value) {
+            addCriterion("fid <=", value, "fid");
+            return (Criteria) this;
+        }
+
+        public Criteria andFidLike(String value) {
+            addCriterion("fid like", value, "fid");
+            return (Criteria) this;
+        }
+
+        public Criteria andFidNotLike(String value) {
+            addCriterion("fid not like", value, "fid");
+            return (Criteria) this;
+        }
+
+        public Criteria andFidIn(List<String> values) {
+            addCriterion("fid in", values, "fid");
+            return (Criteria) this;
+        }
+
+        public Criteria andFidNotIn(List<String> values) {
+            addCriterion("fid not in", values, "fid");
+            return (Criteria) this;
+        }
+
+        public Criteria andFidBetween(String value1, String value2) {
+            addCriterion("fid between", value1, value2, "fid");
+            return (Criteria) this;
+        }
+
+        public Criteria andFidNotBetween(String value1, String value2) {
+            addCriterion("fid not between", value1, value2, "fid");
+            return (Criteria) this;
+        }
+
+        public Criteria andFullnameIsNull() {
+            addCriterion("fullname is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFullnameIsNotNull() {
+            addCriterion("fullname is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFullnameEqualTo(String value) {
+            addCriterion("fullname =", value, "fullname");
+            return (Criteria) this;
+        }
+
+        public Criteria andFullnameNotEqualTo(String value) {
+            addCriterion("fullname <>", value, "fullname");
+            return (Criteria) this;
+        }
+
+        public Criteria andFullnameGreaterThan(String value) {
+            addCriterion("fullname >", value, "fullname");
+            return (Criteria) this;
+        }
+
+        public Criteria andFullnameGreaterThanOrEqualTo(String value) {
+            addCriterion("fullname >=", value, "fullname");
+            return (Criteria) this;
+        }
+
+        public Criteria andFullnameLessThan(String value) {
+            addCriterion("fullname <", value, "fullname");
+            return (Criteria) this;
+        }
+
+        public Criteria andFullnameLessThanOrEqualTo(String value) {
+            addCriterion("fullname <=", value, "fullname");
+            return (Criteria) this;
+        }
+
+        public Criteria andFullnameLike(String value) {
+            addCriterion("fullname like", value, "fullname");
+            return (Criteria) this;
+        }
+
+        public Criteria andFullnameNotLike(String value) {
+            addCriterion("fullname not like", value, "fullname");
+            return (Criteria) this;
+        }
+
+        public Criteria andFullnameIn(List<String> values) {
+            addCriterion("fullname in", values, "fullname");
+            return (Criteria) this;
+        }
+
+        public Criteria andFullnameNotIn(List<String> values) {
+            addCriterion("fullname not in", values, "fullname");
+            return (Criteria) this;
+        }
+
+        public Criteria andFullnameBetween(String value1, String value2) {
+            addCriterion("fullname between", value1, value2, "fullname");
+            return (Criteria) this;
+        }
+
+        public Criteria andFullnameNotBetween(String value1, String value2) {
+            addCriterion("fullname not between", value1, value2, "fullname");
+            return (Criteria) this;
+        }
+
+        public Criteria andLvIsNull() {
+            addCriterion("lv is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLvIsNotNull() {
+            addCriterion("lv is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLvEqualTo(String value) {
+            addCriterion("lv =", value, "lv");
+            return (Criteria) this;
+        }
+
+        public Criteria andLvNotEqualTo(String value) {
+            addCriterion("lv <>", value, "lv");
+            return (Criteria) this;
+        }
+
+        public Criteria andLvGreaterThan(String value) {
+            addCriterion("lv >", value, "lv");
+            return (Criteria) this;
+        }
+
+        public Criteria andLvGreaterThanOrEqualTo(String value) {
+            addCriterion("lv >=", value, "lv");
+            return (Criteria) this;
+        }
+
+        public Criteria andLvLessThan(String value) {
+            addCriterion("lv <", value, "lv");
+            return (Criteria) this;
+        }
+
+        public Criteria andLvLessThanOrEqualTo(String value) {
+            addCriterion("lv <=", value, "lv");
+            return (Criteria) this;
+        }
+
+        public Criteria andLvLike(String value) {
+            addCriterion("lv like", value, "lv");
+            return (Criteria) this;
+        }
+
+        public Criteria andLvNotLike(String value) {
+            addCriterion("lv not like", value, "lv");
+            return (Criteria) this;
+        }
+
+        public Criteria andLvIn(List<String> values) {
+            addCriterion("lv in", values, "lv");
+            return (Criteria) this;
+        }
+
+        public Criteria andLvNotIn(List<String> values) {
+            addCriterion("lv not in", values, "lv");
+            return (Criteria) this;
+        }
+
+        public Criteria andLvBetween(String value1, String value2) {
+            addCriterion("lv between", value1, value2, "lv");
+            return (Criteria) this;
+        }
+
+        public Criteria andLvNotBetween(String value1, String value2) {
+            addCriterion("lv not between", value1, value2, "lv");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

src/main/java/com/hz/employmentsite/model/PcDotask.java

@@ -75,6 +75,22 @@ public class PcDotask {
         this.siteID = siteID == null ? null : siteID.trim();
     }
 
+    public String getDotaskName() {
+        return dotaskName;
+    }
+
+    public void setDotaskName(String dotaskName) {
+        this.dotaskName = dotaskName == null ? null : dotaskName.trim();
+    }
+
+    public Date getFinishTime() {
+        return finishTime;
+    }
+
+    public void setFinishTime(Date finishTime) {
+        this.finishTime = finishTime;
+    }
+
     public String getCreateUserID() {
         return createUserID;
     }
@@ -106,19 +122,4 @@ public class PcDotask {
     public void setModifyTime(Date modifyTime) {
         this.modifyTime = modifyTime;
     }
-    public Date getFnishTime() {
-        return finishTime;
-    }
-
-    public void setFnishTime(Date fnishTime) {
-        this.finishTime = fnishTime;
-    }
-
-    public String getDotaskName() {
-        return dotaskName;
-    }
-
-    public void setDotaskName(String dotaskName) {
-        this.dotaskName = dotaskName;
-    }
 }

src/main/java/com/hz/employmentsite/model/PcDotaskExample.java

@@ -445,143 +445,203 @@ public class PcDotaskExample {
             return (Criteria) this;
         }
 
-        public Criteria andUserIDIsNull() {
-            addCriterion("UserID is null");
+        public Criteria andSiteIDIsNull() {
+            addCriterion("SiteID is null");
             return (Criteria) this;
         }
 
-        public Criteria andUserIDIsNotNull() {
-            addCriterion("UserID is not null");
+        public Criteria andSiteIDIsNotNull() {
+            addCriterion("SiteID is not null");
             return (Criteria) this;
         }
 
-        public Criteria andUserIDEqualTo(String value) {
-            addCriterion("UserID =", value, "userID");
+        public Criteria andSiteIDEqualTo(String value) {
+            addCriterion("SiteID =", value, "siteID");
             return (Criteria) this;
         }
 
-        public Criteria andUserIDNotEqualTo(String value) {
-            addCriterion("UserID <>", value, "userID");
+        public Criteria andSiteIDNotEqualTo(String value) {
+            addCriterion("SiteID <>", value, "siteID");
             return (Criteria) this;
         }
 
-        public Criteria andUserIDGreaterThan(String value) {
-            addCriterion("UserID >", value, "userID");
+        public Criteria andSiteIDGreaterThan(String value) {
+            addCriterion("SiteID >", value, "siteID");
             return (Criteria) this;
         }
 
-        public Criteria andUserIDGreaterThanOrEqualTo(String value) {
-            addCriterion("UserID >=", value, "userID");
+        public Criteria andSiteIDGreaterThanOrEqualTo(String value) {
+            addCriterion("SiteID >=", value, "siteID");
             return (Criteria) this;
         }
 
-        public Criteria andUserIDLessThan(String value) {
-            addCriterion("UserID <", value, "userID");
+        public Criteria andSiteIDLessThan(String value) {
+            addCriterion("SiteID <", value, "siteID");
             return (Criteria) this;
         }
 
-        public Criteria andUserIDLessThanOrEqualTo(String value) {
-            addCriterion("UserID <=", value, "userID");
+        public Criteria andSiteIDLessThanOrEqualTo(String value) {
+            addCriterion("SiteID <=", value, "siteID");
             return (Criteria) this;
         }
 
-        public Criteria andUserIDLike(String value) {
-            addCriterion("UserID like", value, "userID");
+        public Criteria andSiteIDLike(String value) {
+            addCriterion("SiteID like", value, "siteID");
             return (Criteria) this;
         }
 
-        public Criteria andUserIDNotLike(String value) {
-            addCriterion("UserID not like", value, "userID");
+        public Criteria andSiteIDNotLike(String value) {
+            addCriterion("SiteID not like", value, "siteID");
             return (Criteria) this;
         }
 
-        public Criteria andUserIDIn(List<String> values) {
-            addCriterion("UserID in", values, "userID");
+        public Criteria andSiteIDIn(List<String> values) {
+            addCriterion("SiteID in", values, "siteID");
             return (Criteria) this;
         }
 
-        public Criteria andUserIDNotIn(List<String> values) {
-            addCriterion("UserID not in", values, "userID");
+        public Criteria andSiteIDNotIn(List<String> values) {
+            addCriterion("SiteID not in", values, "siteID");
             return (Criteria) this;
         }
 
-        public Criteria andUserIDBetween(String value1, String value2) {
-            addCriterion("UserID between", value1, value2, "userID");
+        public Criteria andSiteIDBetween(String value1, String value2) {
+            addCriterion("SiteID between", value1, value2, "siteID");
             return (Criteria) this;
         }
 
-        public Criteria andUserIDNotBetween(String value1, String value2) {
-            addCriterion("UserID not between", value1, value2, "userID");
+        public Criteria andSiteIDNotBetween(String value1, String value2) {
+            addCriterion("SiteID not between", value1, value2, "siteID");
             return (Criteria) this;
         }
 
-        public Criteria andSiteIDIsNull() {
-            addCriterion("SiteID is null");
+        public Criteria andDotaskNameIsNull() {
+            addCriterion("DotaskName is null");
             return (Criteria) this;
         }
 
-        public Criteria andSiteIDIsNotNull() {
-            addCriterion("SiteID is not null");
+        public Criteria andDotaskNameIsNotNull() {
+            addCriterion("DotaskName is not null");
             return (Criteria) this;
         }
 
-        public Criteria andSiteIDEqualTo(String value) {
-            addCriterion("SiteID =", value, "siteID");
+        public Criteria andDotaskNameEqualTo(String value) {
+            addCriterion("DotaskName =", value, "dotaskName");
             return (Criteria) this;
         }
 
-        public Criteria andSiteIDNotEqualTo(String value) {
-            addCriterion("SiteID <>", value, "siteID");
+        public Criteria andDotaskNameNotEqualTo(String value) {
+            addCriterion("DotaskName <>", value, "dotaskName");
             return (Criteria) this;
         }
 
-        public Criteria andSiteIDGreaterThan(String value) {
-            addCriterion("SiteID >", value, "siteID");
+        public Criteria andDotaskNameGreaterThan(String value) {
+            addCriterion("DotaskName >", value, "dotaskName");
             return (Criteria) this;
         }
 
-        public Criteria andSiteIDGreaterThanOrEqualTo(String value) {
-            addCriterion("SiteID >=", value, "siteID");
+        public Criteria andDotaskNameGreaterThanOrEqualTo(String value) {
+            addCriterion("DotaskName >=", value, "dotaskName");
             return (Criteria) this;
         }
 
-        public Criteria andSiteIDLessThan(String value) {
-            addCriterion("SiteID <", value, "siteID");
+        public Criteria andDotaskNameLessThan(String value) {
+            addCriterion("DotaskName <", value, "dotaskName");
             return (Criteria) this;
         }
 
-        public Criteria andSiteIDLessThanOrEqualTo(String value) {
-            addCriterion("SiteID <=", value, "siteID");
+        public Criteria andDotaskNameLessThanOrEqualTo(String value) {
+            addCriterion("DotaskName <=", value, "dotaskName");
             return (Criteria) this;
         }
 
-        public Criteria andSiteIDLike(String value) {
-            addCriterion("SiteID like", value, "siteID");
+        public Criteria andDotaskNameLike(String value) {
+            addCriterion("DotaskName like", value, "dotaskName");
             return (Criteria) this;
         }
 
-        public Criteria andSiteIDNotLike(String value) {
-            addCriterion("SiteID not like", value, "siteID");
+        public Criteria andDotaskNameNotLike(String value) {
+            addCriterion("DotaskName not like", value, "dotaskName");
             return (Criteria) this;
         }
 
-        public Criteria andSiteIDIn(List<String> values) {
-            addCriterion("SiteID in", values, "siteID");
+        public Criteria andDotaskNameIn(List<String> values) {
+            addCriterion("DotaskName in", values, "dotaskName");
             return (Criteria) this;
         }
 
-        public Criteria andSiteIDNotIn(List<String> values) {
-            addCriterion("SiteID not in", values, "siteID");
+        public Criteria andDotaskNameNotIn(List<String> values) {
+            addCriterion("DotaskName not in", values, "dotaskName");
             return (Criteria) this;
         }
 
-        public Criteria andSiteIDBetween(String value1, String value2) {
-            addCriterion("SiteID between", value1, value2, "siteID");
+        public Criteria andDotaskNameBetween(String value1, String value2) {
+            addCriterion("DotaskName between", value1, value2, "dotaskName");
             return (Criteria) this;
         }
 
-        public Criteria andSiteIDNotBetween(String value1, String value2) {
-            addCriterion("SiteID not between", value1, value2, "siteID");
+        public Criteria andDotaskNameNotBetween(String value1, String value2) {
+            addCriterion("DotaskName not between", value1, value2, "dotaskName");
+            return (Criteria) this;
+        }
+
+        public Criteria andFinishTimeIsNull() {
+            addCriterion("FinishTime is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFinishTimeIsNotNull() {
+            addCriterion("FinishTime is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFinishTimeEqualTo(Date value) {
+            addCriterion("FinishTime =", value, "finishTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andFinishTimeNotEqualTo(Date value) {
+            addCriterion("FinishTime <>", value, "finishTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andFinishTimeGreaterThan(Date value) {
+            addCriterion("FinishTime >", value, "finishTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andFinishTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("FinishTime >=", value, "finishTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andFinishTimeLessThan(Date value) {
+            addCriterion("FinishTime <", value, "finishTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andFinishTimeLessThanOrEqualTo(Date value) {
+            addCriterion("FinishTime <=", value, "finishTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andFinishTimeIn(List<Date> values) {
+            addCriterion("FinishTime in", values, "finishTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andFinishTimeNotIn(List<Date> values) {
+            addCriterion("FinishTime not in", values, "finishTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andFinishTimeBetween(Date value1, Date value2) {
+            addCriterion("FinishTime between", value1, value2, "finishTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andFinishTimeNotBetween(Date value1, Date value2) {
+            addCriterion("FinishTime not between", value1, value2, "finishTime");
             return (Criteria) this;
         }
 

src/main/java/com/hz/employmentsite/model/PcDotaskUser.java

@@ -2,7 +2,9 @@ package com.hz.employmentsite.model;
 
 public class PcDotaskUser {
     private String dotaskUserID;
+
     private String dotaskID;
+
     private String siteUserID;
 
     public String getDotaskUserID() {
@@ -10,7 +12,7 @@ public class PcDotaskUser {
     }
 
     public void setDotaskUserID(String dotaskUserID) {
-        this.dotaskUserID = dotaskUserID;
+        this.dotaskUserID = dotaskUserID == null ? null : dotaskUserID.trim();
     }
 
     public String getDotaskID() {
@@ -18,7 +20,7 @@ public class PcDotaskUser {
     }
 
     public void setDotaskID(String dotaskID) {
-        this.dotaskID = dotaskID;
+        this.dotaskID = dotaskID == null ? null : dotaskID.trim();
     }
 
     public String getSiteUserID() {
@@ -26,8 +28,6 @@ public class PcDotaskUser {
     }
 
     public void setSiteUserID(String siteUserID) {
-        this.siteUserID = siteUserID;
+        this.siteUserID = siteUserID == null ? null : siteUserID.trim();
     }
-
-
-}
+}

src/main/java/com/hz/employmentsite/model/PcDotaskUserExample.java

@@ -0,0 +1,409 @@
+package com.hz.employmentsite.model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PcDotaskUserExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public PcDotaskUserExample() {
+        oredCriteria = new ArrayList<>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andDotaskUserIDIsNull() {
+            addCriterion("DotaskUserID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDotaskUserIDIsNotNull() {
+            addCriterion("DotaskUserID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDotaskUserIDEqualTo(String value) {
+            addCriterion("DotaskUserID =", value, "dotaskUserID");
+            return (Criteria) this;
+        }
+
+        public Criteria andDotaskUserIDNotEqualTo(String value) {
+            addCriterion("DotaskUserID <>", value, "dotaskUserID");
+            return (Criteria) this;
+        }
+
+        public Criteria andDotaskUserIDGreaterThan(String value) {
+            addCriterion("DotaskUserID >", value, "dotaskUserID");
+            return (Criteria) this;
+        }
+
+        public Criteria andDotaskUserIDGreaterThanOrEqualTo(String value) {
+            addCriterion("DotaskUserID >=", value, "dotaskUserID");
+            return (Criteria) this;
+        }
+
+        public Criteria andDotaskUserIDLessThan(String value) {
+            addCriterion("DotaskUserID <", value, "dotaskUserID");
+            return (Criteria) this;
+        }
+
+        public Criteria andDotaskUserIDLessThanOrEqualTo(String value) {
+            addCriterion("DotaskUserID <=", value, "dotaskUserID");
+            return (Criteria) this;
+        }
+
+        public Criteria andDotaskUserIDLike(String value) {
+            addCriterion("DotaskUserID like", value, "dotaskUserID");
+            return (Criteria) this;
+        }
+
+        public Criteria andDotaskUserIDNotLike(String value) {
+            addCriterion("DotaskUserID not like", value, "dotaskUserID");
+            return (Criteria) this;
+        }
+
+        public Criteria andDotaskUserIDIn(List<String> values) {
+            addCriterion("DotaskUserID in", values, "dotaskUserID");
+            return (Criteria) this;
+        }
+
+        public Criteria andDotaskUserIDNotIn(List<String> values) {
+            addCriterion("DotaskUserID not in", values, "dotaskUserID");
+            return (Criteria) this;
+        }
+
+        public Criteria andDotaskUserIDBetween(String value1, String value2) {
+            addCriterion("DotaskUserID between", value1, value2, "dotaskUserID");
+            return (Criteria) this;
+        }
+
+        public Criteria andDotaskUserIDNotBetween(String value1, String value2) {
+            addCriterion("DotaskUserID not between", value1, value2, "dotaskUserID");
+            return (Criteria) this;
+        }
+
+        public Criteria andDotaskIDIsNull() {
+            addCriterion("DotaskID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDotaskIDIsNotNull() {
+            addCriterion("DotaskID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDotaskIDEqualTo(String value) {
+            addCriterion("DotaskID =", value, "dotaskID");
+            return (Criteria) this;
+        }
+
+        public Criteria andDotaskIDNotEqualTo(String value) {
+            addCriterion("DotaskID <>", value, "dotaskID");
+            return (Criteria) this;
+        }
+
+        public Criteria andDotaskIDGreaterThan(String value) {
+            addCriterion("DotaskID >", value, "dotaskID");
+            return (Criteria) this;
+        }
+
+        public Criteria andDotaskIDGreaterThanOrEqualTo(String value) {
+            addCriterion("DotaskID >=", value, "dotaskID");
+            return (Criteria) this;
+        }
+
+        public Criteria andDotaskIDLessThan(String value) {
+            addCriterion("DotaskID <", value, "dotaskID");
+            return (Criteria) this;
+        }
+
+        public Criteria andDotaskIDLessThanOrEqualTo(String value) {
+            addCriterion("DotaskID <=", value, "dotaskID");
+            return (Criteria) this;
+        }
+
+        public Criteria andDotaskIDLike(String value) {
+            addCriterion("DotaskID like", value, "dotaskID");
+            return (Criteria) this;
+        }
+
+        public Criteria andDotaskIDNotLike(String value) {
+            addCriterion("DotaskID not like", value, "dotaskID");
+            return (Criteria) this;
+        }
+
+        public Criteria andDotaskIDIn(List<String> values) {
+            addCriterion("DotaskID in", values, "dotaskID");
+            return (Criteria) this;
+        }
+
+        public Criteria andDotaskIDNotIn(List<String> values) {
+            addCriterion("DotaskID not in", values, "dotaskID");
+            return (Criteria) this;
+        }
+
+        public Criteria andDotaskIDBetween(String value1, String value2) {
+            addCriterion("DotaskID between", value1, value2, "dotaskID");
+            return (Criteria) this;
+        }
+
+        public Criteria andDotaskIDNotBetween(String value1, String value2) {
+            addCriterion("DotaskID not between", value1, value2, "dotaskID");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteUserIDIsNull() {
+            addCriterion("SiteUserID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteUserIDIsNotNull() {
+            addCriterion("SiteUserID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteUserIDEqualTo(String value) {
+            addCriterion("SiteUserID =", value, "siteUserID");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteUserIDNotEqualTo(String value) {
+            addCriterion("SiteUserID <>", value, "siteUserID");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteUserIDGreaterThan(String value) {
+            addCriterion("SiteUserID >", value, "siteUserID");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteUserIDGreaterThanOrEqualTo(String value) {
+            addCriterion("SiteUserID >=", value, "siteUserID");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteUserIDLessThan(String value) {
+            addCriterion("SiteUserID <", value, "siteUserID");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteUserIDLessThanOrEqualTo(String value) {
+            addCriterion("SiteUserID <=", value, "siteUserID");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteUserIDLike(String value) {
+            addCriterion("SiteUserID like", value, "siteUserID");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteUserIDNotLike(String value) {
+            addCriterion("SiteUserID not like", value, "siteUserID");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteUserIDIn(List<String> values) {
+            addCriterion("SiteUserID in", values, "siteUserID");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteUserIDNotIn(List<String> values) {
+            addCriterion("SiteUserID not in", values, "siteUserID");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteUserIDBetween(String value1, String value2) {
+            addCriterion("SiteUserID between", value1, value2, "siteUserID");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteUserIDNotBetween(String value1, String value2) {
+            addCriterion("SiteUserID not between", value1, value2, "siteUserID");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

src/main/java/com/hz/employmentsite/model/PcSiteUser.java

@@ -4,14 +4,29 @@ import java.util.Date;
 
 public class PcSiteUser {
     private String siteUserID;
+
     private String name;
 
+    private Integer gender;
+
+    private String mobile;
+
+    private Integer roleID;
+
+    private String createUserID;
+
+    private Date createTime;
+
+    private String updateBy;
+
+    private Date updateTime;
+
     public String getSiteUserID() {
         return siteUserID;
     }
 
     public void setSiteUserID(String siteUserID) {
-        this.siteUserID = siteUserID;
+        this.siteUserID = siteUserID == null ? null : siteUserID.trim();
     }
 
     public String getName() {
@@ -19,14 +34,14 @@ public class PcSiteUser {
     }
 
     public void setName(String name) {
-        this.name = name;
+        this.name = name == null ? null : name.trim();
     }
 
-    public int getGender() {
+    public Integer getGender() {
         return gender;
     }
 
-    public void setGender(int gender) {
+    public void setGender(Integer gender) {
         this.gender = gender;
     }
 
@@ -35,14 +50,14 @@ public class PcSiteUser {
     }
 
     public void setMobile(String mobile) {
-        this.mobile = mobile;
+        this.mobile = mobile == null ? null : mobile.trim();
     }
 
-    public int getRoleID() {
+    public Integer getRoleID() {
         return roleID;
     }
 
-    public void setRoleID(int roleID) {
+    public void setRoleID(Integer roleID) {
         this.roleID = roleID;
     }
 
@@ -51,7 +66,7 @@ public class PcSiteUser {
     }
 
     public void setCreateUserID(String createUserID) {
-        this.createUserID = createUserID;
+        this.createUserID = createUserID == null ? null : createUserID.trim();
     }
 
     public Date getCreateTime() {
@@ -62,28 +77,19 @@ public class PcSiteUser {
         this.createTime = createTime;
     }
 
-    public String getModifyUserID() {
-        return modifyUserID;
+    public String getUpdateBy() {
+        return updateBy;
     }
 
-    public void setModifyUserID(String modifyUserID) {
-        this.modifyUserID = modifyUserID;
+    public void setUpdateBy(String updateBy) {
+        this.updateBy = updateBy == null ? null : updateBy.trim();
     }
 
-    public Date getModifyTime() {
-        return modifyTime;
+    public Date getUpdateTime() {
+        return updateTime;
     }
 
-    public void setModifyTime(Date modifyTime) {
-        this.modifyTime = modifyTime;
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
     }
-
-    private  int gender;
-    private  String mobile;
-    private  int roleID;
-    private String createUserID;
-    private Date createTime;
-    private String modifyUserID;
-    private Date modifyTime;
-
-}
+}

src/main/java/com/hz/employmentsite/model/PcSiteUserExample.java

@@ -0,0 +1,790 @@
+package com.hz.employmentsite.model;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class PcSiteUserExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public PcSiteUserExample() {
+        oredCriteria = new ArrayList<>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andSiteUserIDIsNull() {
+            addCriterion("SiteUserID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteUserIDIsNotNull() {
+            addCriterion("SiteUserID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteUserIDEqualTo(String value) {
+            addCriterion("SiteUserID =", value, "siteUserID");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteUserIDNotEqualTo(String value) {
+            addCriterion("SiteUserID <>", value, "siteUserID");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteUserIDGreaterThan(String value) {
+            addCriterion("SiteUserID >", value, "siteUserID");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteUserIDGreaterThanOrEqualTo(String value) {
+            addCriterion("SiteUserID >=", value, "siteUserID");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteUserIDLessThan(String value) {
+            addCriterion("SiteUserID <", value, "siteUserID");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteUserIDLessThanOrEqualTo(String value) {
+            addCriterion("SiteUserID <=", value, "siteUserID");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteUserIDLike(String value) {
+            addCriterion("SiteUserID like", value, "siteUserID");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteUserIDNotLike(String value) {
+            addCriterion("SiteUserID not like", value, "siteUserID");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteUserIDIn(List<String> values) {
+            addCriterion("SiteUserID in", values, "siteUserID");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteUserIDNotIn(List<String> values) {
+            addCriterion("SiteUserID not in", values, "siteUserID");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteUserIDBetween(String value1, String value2) {
+            addCriterion("SiteUserID between", value1, value2, "siteUserID");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteUserIDNotBetween(String value1, String value2) {
+            addCriterion("SiteUserID not between", value1, value2, "siteUserID");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIsNull() {
+            addCriterion("Name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIsNotNull() {
+            addCriterion("Name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameEqualTo(String value) {
+            addCriterion("Name =", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotEqualTo(String value) {
+            addCriterion("Name <>", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameGreaterThan(String value) {
+            addCriterion("Name >", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameGreaterThanOrEqualTo(String value) {
+            addCriterion("Name >=", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLessThan(String value) {
+            addCriterion("Name <", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLessThanOrEqualTo(String value) {
+            addCriterion("Name <=", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLike(String value) {
+            addCriterion("Name like", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotLike(String value) {
+            addCriterion("Name not like", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIn(List<String> values) {
+            addCriterion("Name in", values, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotIn(List<String> values) {
+            addCriterion("Name not in", values, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameBetween(String value1, String value2) {
+            addCriterion("Name between", value1, value2, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotBetween(String value1, String value2) {
+            addCriterion("Name not between", value1, value2, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andGenderIsNull() {
+            addCriterion("Gender is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andGenderIsNotNull() {
+            addCriterion("Gender is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andGenderEqualTo(Integer value) {
+            addCriterion("Gender =", value, "gender");
+            return (Criteria) this;
+        }
+
+        public Criteria andGenderNotEqualTo(Integer value) {
+            addCriterion("Gender <>", value, "gender");
+            return (Criteria) this;
+        }
+
+        public Criteria andGenderGreaterThan(Integer value) {
+            addCriterion("Gender >", value, "gender");
+            return (Criteria) this;
+        }
+
+        public Criteria andGenderGreaterThanOrEqualTo(Integer value) {
+            addCriterion("Gender >=", value, "gender");
+            return (Criteria) this;
+        }
+
+        public Criteria andGenderLessThan(Integer value) {
+            addCriterion("Gender <", value, "gender");
+            return (Criteria) this;
+        }
+
+        public Criteria andGenderLessThanOrEqualTo(Integer value) {
+            addCriterion("Gender <=", value, "gender");
+            return (Criteria) this;
+        }
+
+        public Criteria andGenderIn(List<Integer> values) {
+            addCriterion("Gender in", values, "gender");
+            return (Criteria) this;
+        }
+
+        public Criteria andGenderNotIn(List<Integer> values) {
+            addCriterion("Gender not in", values, "gender");
+            return (Criteria) this;
+        }
+
+        public Criteria andGenderBetween(Integer value1, Integer value2) {
+            addCriterion("Gender between", value1, value2, "gender");
+            return (Criteria) this;
+        }
+
+        public Criteria andGenderNotBetween(Integer value1, Integer value2) {
+            addCriterion("Gender not between", value1, value2, "gender");
+            return (Criteria) this;
+        }
+
+        public Criteria andMobileIsNull() {
+            addCriterion("Mobile is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMobileIsNotNull() {
+            addCriterion("Mobile is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMobileEqualTo(String value) {
+            addCriterion("Mobile =", value, "mobile");
+            return (Criteria) this;
+        }
+
+        public Criteria andMobileNotEqualTo(String value) {
+            addCriterion("Mobile <>", value, "mobile");
+            return (Criteria) this;
+        }
+
+        public Criteria andMobileGreaterThan(String value) {
+            addCriterion("Mobile >", value, "mobile");
+            return (Criteria) this;
+        }
+
+        public Criteria andMobileGreaterThanOrEqualTo(String value) {
+            addCriterion("Mobile >=", value, "mobile");
+            return (Criteria) this;
+        }
+
+        public Criteria andMobileLessThan(String value) {
+            addCriterion("Mobile <", value, "mobile");
+            return (Criteria) this;
+        }
+
+        public Criteria andMobileLessThanOrEqualTo(String value) {
+            addCriterion("Mobile <=", value, "mobile");
+            return (Criteria) this;
+        }
+
+        public Criteria andMobileLike(String value) {
+            addCriterion("Mobile like", value, "mobile");
+            return (Criteria) this;
+        }
+
+        public Criteria andMobileNotLike(String value) {
+            addCriterion("Mobile not like", value, "mobile");
+            return (Criteria) this;
+        }
+
+        public Criteria andMobileIn(List<String> values) {
+            addCriterion("Mobile in", values, "mobile");
+            return (Criteria) this;
+        }
+
+        public Criteria andMobileNotIn(List<String> values) {
+            addCriterion("Mobile not in", values, "mobile");
+            return (Criteria) this;
+        }
+
+        public Criteria andMobileBetween(String value1, String value2) {
+            addCriterion("Mobile between", value1, value2, "mobile");
+            return (Criteria) this;
+        }
+
+        public Criteria andMobileNotBetween(String value1, String value2) {
+            addCriterion("Mobile not between", value1, value2, "mobile");
+            return (Criteria) this;
+        }
+
+        public Criteria andRoleIDIsNull() {
+            addCriterion("RoleID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRoleIDIsNotNull() {
+            addCriterion("RoleID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRoleIDEqualTo(Integer value) {
+            addCriterion("RoleID =", value, "roleID");
+            return (Criteria) this;
+        }
+
+        public Criteria andRoleIDNotEqualTo(Integer value) {
+            addCriterion("RoleID <>", value, "roleID");
+            return (Criteria) this;
+        }
+
+        public Criteria andRoleIDGreaterThan(Integer value) {
+            addCriterion("RoleID >", value, "roleID");
+            return (Criteria) this;
+        }
+
+        public Criteria andRoleIDGreaterThanOrEqualTo(Integer value) {
+            addCriterion("RoleID >=", value, "roleID");
+            return (Criteria) this;
+        }
+
+        public Criteria andRoleIDLessThan(Integer value) {
+            addCriterion("RoleID <", value, "roleID");
+            return (Criteria) this;
+        }
+
+        public Criteria andRoleIDLessThanOrEqualTo(Integer value) {
+            addCriterion("RoleID <=", value, "roleID");
+            return (Criteria) this;
+        }
+
+        public Criteria andRoleIDIn(List<Integer> values) {
+            addCriterion("RoleID in", values, "roleID");
+            return (Criteria) this;
+        }
+
+        public Criteria andRoleIDNotIn(List<Integer> values) {
+            addCriterion("RoleID not in", values, "roleID");
+            return (Criteria) this;
+        }
+
+        public Criteria andRoleIDBetween(Integer value1, Integer value2) {
+            addCriterion("RoleID between", value1, value2, "roleID");
+            return (Criteria) this;
+        }
+
+        public Criteria andRoleIDNotBetween(Integer value1, Integer value2) {
+            addCriterion("RoleID not between", value1, value2, "roleID");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIDIsNull() {
+            addCriterion("CreateUserID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIDIsNotNull() {
+            addCriterion("CreateUserID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIDEqualTo(String value) {
+            addCriterion("CreateUserID =", value, "createUserID");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIDNotEqualTo(String value) {
+            addCriterion("CreateUserID <>", value, "createUserID");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIDGreaterThan(String value) {
+            addCriterion("CreateUserID >", value, "createUserID");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIDGreaterThanOrEqualTo(String value) {
+            addCriterion("CreateUserID >=", value, "createUserID");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIDLessThan(String value) {
+            addCriterion("CreateUserID <", value, "createUserID");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIDLessThanOrEqualTo(String value) {
+            addCriterion("CreateUserID <=", value, "createUserID");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIDLike(String value) {
+            addCriterion("CreateUserID like", value, "createUserID");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIDNotLike(String value) {
+            addCriterion("CreateUserID not like", value, "createUserID");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIDIn(List<String> values) {
+            addCriterion("CreateUserID in", values, "createUserID");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIDNotIn(List<String> values) {
+            addCriterion("CreateUserID not in", values, "createUserID");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIDBetween(String value1, String value2) {
+            addCriterion("CreateUserID between", value1, value2, "createUserID");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIDNotBetween(String value1, String value2) {
+            addCriterion("CreateUserID not between", value1, value2, "createUserID");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("CreateTime is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("CreateTime is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(Date value) {
+            addCriterion("CreateTime =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(Date value) {
+            addCriterion("CreateTime <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(Date value) {
+            addCriterion("CreateTime >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("CreateTime >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(Date value) {
+            addCriterion("CreateTime <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("CreateTime <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<Date> values) {
+            addCriterion("CreateTime in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<Date> values) {
+            addCriterion("CreateTime not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(Date value1, Date value2) {
+            addCriterion("CreateTime between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("CreateTime not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByIsNull() {
+            addCriterion("UpdateBy is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByIsNotNull() {
+            addCriterion("UpdateBy is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByEqualTo(String value) {
+            addCriterion("UpdateBy =", value, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByNotEqualTo(String value) {
+            addCriterion("UpdateBy <>", value, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByGreaterThan(String value) {
+            addCriterion("UpdateBy >", value, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByGreaterThanOrEqualTo(String value) {
+            addCriterion("UpdateBy >=", value, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByLessThan(String value) {
+            addCriterion("UpdateBy <", value, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByLessThanOrEqualTo(String value) {
+            addCriterion("UpdateBy <=", value, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByLike(String value) {
+            addCriterion("UpdateBy like", value, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByNotLike(String value) {
+            addCriterion("UpdateBy not like", value, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByIn(List<String> values) {
+            addCriterion("UpdateBy in", values, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByNotIn(List<String> values) {
+            addCriterion("UpdateBy not in", values, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByBetween(String value1, String value2) {
+            addCriterion("UpdateBy between", value1, value2, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByNotBetween(String value1, String value2) {
+            addCriterion("UpdateBy not between", value1, value2, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNull() {
+            addCriterion("UpdateTime is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNotNull() {
+            addCriterion("UpdateTime is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeEqualTo(Date value) {
+            addCriterion("UpdateTime =", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotEqualTo(Date value) {
+            addCriterion("UpdateTime <>", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThan(Date value) {
+            addCriterion("UpdateTime >", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("UpdateTime >=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThan(Date value) {
+            addCriterion("UpdateTime <", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("UpdateTime <=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIn(List<Date> values) {
+            addCriterion("UpdateTime in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotIn(List<Date> values) {
+            addCriterion("UpdateTime not in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeBetween(Date value1, Date value2) {
+            addCriterion("UpdateTime between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("UpdateTime not between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

src/main/java/com/hz/employmentsite/services/impl/system/CityAreaImpl.java

@@ -0,0 +1,34 @@
+package com.hz.employmentsite.services.impl.system;
+
+import com.hz.employmentsite.mapper.AreaCodeMapper;
+import com.hz.employmentsite.model.AreaCode;
+import com.hz.employmentsite.model.AreaCodeExample;
+import com.hz.employmentsite.services.service.system.CityAreaService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service("CityAreaService")
+public class CityAreaImpl implements CityAreaService {
+
+    @Autowired
+    private AreaCodeMapper areaCodeMapper;
+
+    @Override
+    public List<AreaCode> getCityList() {
+        AreaCodeExample exp=new AreaCodeExample();
+        exp.or().andLvEqualTo("3");
+        exp.setOrderByClause("code");
+        return areaCodeMapper.selectByExample(exp);
+    }
+
+    @Override
+    public List<AreaCode> getAreaList(String code) {
+        AreaCodeExample exp=new AreaCodeExample();
+        exp.or().andLvEqualTo("4")
+        .andFidEqualTo(code);
+        exp.setOrderByClause("code");
+        return areaCodeMapper.selectByExample(exp);
+    }
+}

src/main/java/com/hz/employmentsite/services/impl/taskAndLog/DotaskImpl.java

@@ -9,6 +9,7 @@ import com.hz.employmentsite.vo.taskAndLog.DotaskVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.sql.SQLException;
 import java.util.Date;
 import java.util.List;
 
@@ -19,10 +20,14 @@ public class DotaskImpl implements DotaskService {
     private DotaskCQuery dotaskCQuery;
 
     @Override
-    public PageInfo<DotaskVo> getList(Integer page, Integer rows, String name, String startTime, String endTime,String finishStartTime, String finishEndTime, String regionCode, String streetCode, int workTypeId) {
-       List<DotaskVo> list=dotaskCQuery.selectDotaskList(name,startTime,endTime,finishStartTime,finishEndTime,regionCode,streetCode,workTypeId);
-        PageInfo<DotaskVo> result = new PageInfo(list);
-        return result;
+    public PageInfo<DotaskVo> getList(Integer page, Integer rows, String name, String startTime, String endTime, String finishStartTime, String finishEndTime, String regionCode, String streetCode, String workTypeId) {
+        try {
+            List<DotaskVo> list = dotaskCQuery.selectDotaskList(name, startTime, endTime, finishStartTime, finishEndTime, regionCode, streetCode, workTypeId);
+            PageInfo<DotaskVo> result = new PageInfo(list);
+            return result;
+        } catch (Exception e) {
+            throw new RuntimeException("Database query exception: " + e.getMessage(), e);
+        }
     }
 
 

src/main/java/com/hz/employmentsite/services/service/system/CityAreaService.java

@@ -0,0 +1,10 @@
+package com.hz.employmentsite.services.service.system;
+
+import com.hz.employmentsite.model.AreaCode;
+
+import java.util.List;
+
+public interface CityAreaService {
+    List<AreaCode> getCityList();
+    List<AreaCode> getAreaList(String code);
+}

src/main/java/com/hz/employmentsite/services/service/taskAndLog/DotaskService.java

@@ -7,6 +7,6 @@ import java.util.Date;
 
 public interface DotaskService {
     PageInfo<DotaskVo> getList(Integer page, Integer rows, String name, String startTime, String endTime,String finishStartTime, String finishEndTime,
-                               String regionCode,String streetCode, int workTypeId);
+                               String regionCode,String streetCode, String workTypeId);
 
 }

src/main/java/com/hz/employmentsite/vo/taskAndLog/DotaskVo.java

@@ -10,25 +10,13 @@ public class DotaskVo {
 
     public Integer workTypeID;
 
-    public String regionCode;
-
-    public String streetCode;
-
     public String content;
 
-    public String siteID;
-
     public String dotaskName;
 
-    public Date finishTime;
-
-    public String createUserID;
+    public String finishTime;
 
-    public Date createTime;
-
-    public String modifyUserID;
-
-    public Date modifyTime;
+    public String createTime;
 
     public  String createName;
 
@@ -39,4 +27,8 @@ public class DotaskVo {
     public String regionName;
     
     public String streetName;
+
+    public String regionCode;
+
+    public String streetCode;
 }

src/main/resources/generatorConfig.xml

@@ -93,6 +93,11 @@
         <table schema="" tableName="pc_site"><property name="useActualColumnNames" value="true"/></table>
         <table schema="" tableName="pc_site_institution"><property name="useActualColumnNames" value="true"/></table>
         <table schema="" tableName="pc_stall"><property name="useActualColumnNames" value="true"/></table>
+          <table schema="" tableName="area_code"><property name="useActualColumnNames" value="true"/></table>
+        <table schema="" tableName="pc_dotask_user"><property name="useActualColumnNames" value="true"/></table>
+        <table schema="" tableName="pc_site_user"><property name="useActualColumnNames" value="true"/></table>
+
+        <table schema="" tableName="pc_dotask"><property name="useActualColumnNames" value="true"/></table>
         -->
 
 

src/main/resources/mapping/AreaCodeMapper.xml

@@ -0,0 +1,211 @@
+<?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.hz.employmentsite.mapper.AreaCodeMapper">
+  <resultMap id="BaseResultMap" type="com.hz.employmentsite.model.AreaCode">
+    <id column="code" jdbcType="VARCHAR" property="code" />
+    <result column="name" jdbcType="VARCHAR" property="name" />
+    <result column="fid" jdbcType="VARCHAR" property="fid" />
+    <result column="fullname" jdbcType="VARCHAR" property="fullname" />
+    <result column="lv" jdbcType="VARCHAR" property="lv" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    code, name, fid, fullname, lv
+  </sql>
+  <select id="selectByExample" parameterType="com.hz.employmentsite.model.AreaCodeExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from area_code
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from area_code
+    where code = #{code,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from area_code
+    where code = #{code,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.hz.employmentsite.model.AreaCodeExample">
+    delete from area_code
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.hz.employmentsite.model.AreaCode">
+    insert into area_code (code, name, fid, 
+      fullname, lv)
+    values (#{code,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{fid,jdbcType=VARCHAR}, 
+      #{fullname,jdbcType=VARCHAR}, #{lv,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.hz.employmentsite.model.AreaCode">
+    insert into area_code
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="code != null">
+        code,
+      </if>
+      <if test="name != null">
+        name,
+      </if>
+      <if test="fid != null">
+        fid,
+      </if>
+      <if test="fullname != null">
+        fullname,
+      </if>
+      <if test="lv != null">
+        lv,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="code != null">
+        #{code,jdbcType=VARCHAR},
+      </if>
+      <if test="name != null">
+        #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="fid != null">
+        #{fid,jdbcType=VARCHAR},
+      </if>
+      <if test="fullname != null">
+        #{fullname,jdbcType=VARCHAR},
+      </if>
+      <if test="lv != null">
+        #{lv,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.hz.employmentsite.model.AreaCodeExample" resultType="java.lang.Long">
+    select count(*) from area_code
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update area_code
+    <set>
+      <if test="row.code != null">
+        code = #{row.code,jdbcType=VARCHAR},
+      </if>
+      <if test="row.name != null">
+        name = #{row.name,jdbcType=VARCHAR},
+      </if>
+      <if test="row.fid != null">
+        fid = #{row.fid,jdbcType=VARCHAR},
+      </if>
+      <if test="row.fullname != null">
+        fullname = #{row.fullname,jdbcType=VARCHAR},
+      </if>
+      <if test="row.lv != null">
+        lv = #{row.lv,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="example != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update area_code
+    set code = #{row.code,jdbcType=VARCHAR},
+      name = #{row.name,jdbcType=VARCHAR},
+      fid = #{row.fid,jdbcType=VARCHAR},
+      fullname = #{row.fullname,jdbcType=VARCHAR},
+      lv = #{row.lv,jdbcType=VARCHAR}
+    <if test="example != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.hz.employmentsite.model.AreaCode">
+    update area_code
+    <set>
+      <if test="name != null">
+        name = #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="fid != null">
+        fid = #{fid,jdbcType=VARCHAR},
+      </if>
+      <if test="fullname != null">
+        fullname = #{fullname,jdbcType=VARCHAR},
+      </if>
+      <if test="lv != null">
+        lv = #{lv,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where code = #{code,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.hz.employmentsite.model.AreaCode">
+    update area_code
+    set name = #{name,jdbcType=VARCHAR},
+      fid = #{fid,jdbcType=VARCHAR},
+      fullname = #{fullname,jdbcType=VARCHAR},
+      lv = #{lv,jdbcType=VARCHAR}
+    where code = #{code,jdbcType=VARCHAR}
+  </update>
+</mapper>

src/main/resources/mapping/PcDotaskMapper.xml

@@ -7,8 +7,9 @@
     <result column="RegionCode" jdbcType="VARCHAR" property="regionCode" />
     <result column="StreetCode" jdbcType="VARCHAR" property="streetCode" />
     <result column="Content" jdbcType="VARCHAR" property="content" />
-    <result column="UserID" jdbcType="VARCHAR" property="userID" />
     <result column="SiteID" jdbcType="VARCHAR" property="siteID" />
+    <result column="DotaskName" jdbcType="VARCHAR" property="dotaskName" />
+    <result column="FinishTime" jdbcType="TIMESTAMP" property="finishTime" />
     <result column="CreateUserID" jdbcType="VARCHAR" property="createUserID" />
     <result column="CreateTime" jdbcType="TIMESTAMP" property="createTime" />
     <result column="ModifyUserID" jdbcType="VARCHAR" property="modifyUserID" />
@@ -73,8 +74,8 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    DotaskID, WorkTypeID, RegionCode, StreetCode, Content, UserID, SiteID, CreateUserID, 
-    CreateTime, ModifyUserID, ModifyTime
+    DotaskID, WorkTypeID, RegionCode, StreetCode, Content, SiteID, DotaskName, FinishTime, 
+    CreateUserID, CreateTime, ModifyUserID, ModifyTime
   </sql>
   <select id="selectByExample" parameterType="com.hz.employmentsite.model.PcDotaskExample" resultMap="BaseResultMap">
     select
@@ -108,13 +109,15 @@
   </delete>
   <insert id="insert" parameterType="com.hz.employmentsite.model.PcDotask">
     insert into pc_dotask (DotaskID, WorkTypeID, RegionCode, 
-      StreetCode, Content, UserID, 
-      SiteID, CreateUserID, CreateTime, 
-      ModifyUserID, ModifyTime)
+      StreetCode, Content, SiteID, 
+      DotaskName, FinishTime, CreateUserID, 
+      CreateTime, ModifyUserID, ModifyTime
+      )
     values (#{dotaskID,jdbcType=VARCHAR}, #{workTypeID,jdbcType=INTEGER}, #{regionCode,jdbcType=VARCHAR}, 
-      #{streetCode,jdbcType=VARCHAR}, #{content,jdbcType=VARCHAR}, #{userID,jdbcType=VARCHAR}, 
-      #{siteID,jdbcType=VARCHAR}, #{createUserID,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{modifyUserID,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP})
+      #{streetCode,jdbcType=VARCHAR}, #{content,jdbcType=VARCHAR}, #{siteID,jdbcType=VARCHAR}, 
+      #{dotaskName,jdbcType=VARCHAR}, #{finishTime,jdbcType=TIMESTAMP}, #{createUserID,jdbcType=VARCHAR}, 
+      #{createTime,jdbcType=TIMESTAMP}, #{modifyUserID,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.hz.employmentsite.model.PcDotask">
     insert into pc_dotask
@@ -134,12 +137,15 @@
       <if test="content != null">
         Content,
       </if>
-      <if test="userID != null">
-        UserID,
-      </if>
       <if test="siteID != null">
         SiteID,
       </if>
+      <if test="dotaskName != null">
+        DotaskName,
+      </if>
+      <if test="finishTime != null">
+        FinishTime,
+      </if>
       <if test="createUserID != null">
         CreateUserID,
       </if>
@@ -169,12 +175,15 @@
       <if test="content != null">
         #{content,jdbcType=VARCHAR},
       </if>
-      <if test="userID != null">
-        #{userID,jdbcType=VARCHAR},
-      </if>
       <if test="siteID != null">
         #{siteID,jdbcType=VARCHAR},
       </if>
+      <if test="dotaskName != null">
+        #{dotaskName,jdbcType=VARCHAR},
+      </if>
+      <if test="finishTime != null">
+        #{finishTime,jdbcType=TIMESTAMP},
+      </if>
       <if test="createUserID != null">
         #{createUserID,jdbcType=VARCHAR},
       </if>
@@ -213,12 +222,15 @@
       <if test="row.content != null">
         Content = #{row.content,jdbcType=VARCHAR},
       </if>
-      <if test="row.userID != null">
-        UserID = #{row.userID,jdbcType=VARCHAR},
-      </if>
       <if test="row.siteID != null">
         SiteID = #{row.siteID,jdbcType=VARCHAR},
       </if>
+      <if test="row.dotaskName != null">
+        DotaskName = #{row.dotaskName,jdbcType=VARCHAR},
+      </if>
+      <if test="row.finishTime != null">
+        FinishTime = #{row.finishTime,jdbcType=TIMESTAMP},
+      </if>
       <if test="row.createUserID != null">
         CreateUserID = #{row.createUserID,jdbcType=VARCHAR},
       </if>
@@ -243,8 +255,9 @@
       RegionCode = #{row.regionCode,jdbcType=VARCHAR},
       StreetCode = #{row.streetCode,jdbcType=VARCHAR},
       Content = #{row.content,jdbcType=VARCHAR},
-      UserID = #{row.userID,jdbcType=VARCHAR},
       SiteID = #{row.siteID,jdbcType=VARCHAR},
+      DotaskName = #{row.dotaskName,jdbcType=VARCHAR},
+      FinishTime = #{row.finishTime,jdbcType=TIMESTAMP},
       CreateUserID = #{row.createUserID,jdbcType=VARCHAR},
       CreateTime = #{row.createTime,jdbcType=TIMESTAMP},
       ModifyUserID = #{row.modifyUserID,jdbcType=VARCHAR},
@@ -268,12 +281,15 @@
       <if test="content != null">
         Content = #{content,jdbcType=VARCHAR},
       </if>
-      <if test="userID != null">
-        UserID = #{userID,jdbcType=VARCHAR},
-      </if>
       <if test="siteID != null">
         SiteID = #{siteID,jdbcType=VARCHAR},
       </if>
+      <if test="dotaskName != null">
+        DotaskName = #{dotaskName,jdbcType=VARCHAR},
+      </if>
+      <if test="finishTime != null">
+        FinishTime = #{finishTime,jdbcType=TIMESTAMP},
+      </if>
       <if test="createUserID != null">
         CreateUserID = #{createUserID,jdbcType=VARCHAR},
       </if>
@@ -295,8 +311,9 @@
       RegionCode = #{regionCode,jdbcType=VARCHAR},
       StreetCode = #{streetCode,jdbcType=VARCHAR},
       Content = #{content,jdbcType=VARCHAR},
-      UserID = #{userID,jdbcType=VARCHAR},
       SiteID = #{siteID,jdbcType=VARCHAR},
+      DotaskName = #{dotaskName,jdbcType=VARCHAR},
+      FinishTime = #{finishTime,jdbcType=TIMESTAMP},
       CreateUserID = #{createUserID,jdbcType=VARCHAR},
       CreateTime = #{createTime,jdbcType=TIMESTAMP},
       ModifyUserID = #{modifyUserID,jdbcType=VARCHAR},

src/main/resources/mapping/PcDotaskUserMapper.xml

@@ -0,0 +1,153 @@
+<?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.hz.employmentsite.mapper.PcDotaskUserMapper">
+  <resultMap id="BaseResultMap" type="com.hz.employmentsite.model.PcDotaskUser">
+    <result column="DotaskUserID" jdbcType="VARCHAR" property="dotaskUserID" />
+    <result column="DotaskID" jdbcType="VARCHAR" property="dotaskID" />
+    <result column="SiteUserID" jdbcType="VARCHAR" property="siteUserID" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    DotaskUserID, DotaskID, SiteUserID
+  </sql>
+  <select id="selectByExample" parameterType="com.hz.employmentsite.model.PcDotaskUserExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from pc_dotask_user
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <delete id="deleteByExample" parameterType="com.hz.employmentsite.model.PcDotaskUserExample">
+    delete from pc_dotask_user
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.hz.employmentsite.model.PcDotaskUser">
+    insert into pc_dotask_user (DotaskUserID, DotaskID, SiteUserID
+      )
+    values (#{dotaskUserID,jdbcType=VARCHAR}, #{dotaskID,jdbcType=VARCHAR}, #{siteUserID,jdbcType=VARCHAR}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.hz.employmentsite.model.PcDotaskUser">
+    insert into pc_dotask_user
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="dotaskUserID != null">
+        DotaskUserID,
+      </if>
+      <if test="dotaskID != null">
+        DotaskID,
+      </if>
+      <if test="siteUserID != null">
+        SiteUserID,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="dotaskUserID != null">
+        #{dotaskUserID,jdbcType=VARCHAR},
+      </if>
+      <if test="dotaskID != null">
+        #{dotaskID,jdbcType=VARCHAR},
+      </if>
+      <if test="siteUserID != null">
+        #{siteUserID,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.hz.employmentsite.model.PcDotaskUserExample" resultType="java.lang.Long">
+    select count(*) from pc_dotask_user
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update pc_dotask_user
+    <set>
+      <if test="row.dotaskUserID != null">
+        DotaskUserID = #{row.dotaskUserID,jdbcType=VARCHAR},
+      </if>
+      <if test="row.dotaskID != null">
+        DotaskID = #{row.dotaskID,jdbcType=VARCHAR},
+      </if>
+      <if test="row.siteUserID != null">
+        SiteUserID = #{row.siteUserID,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="example != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update pc_dotask_user
+    set DotaskUserID = #{row.dotaskUserID,jdbcType=VARCHAR},
+      DotaskID = #{row.dotaskID,jdbcType=VARCHAR},
+      SiteUserID = #{row.siteUserID,jdbcType=VARCHAR}
+    <if test="example != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+</mapper>

src/main/resources/mapping/PcSiteUserMapper.xml

@@ -0,0 +1,223 @@
+<?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.hz.employmentsite.mapper.PcSiteUserMapper">
+  <resultMap id="BaseResultMap" type="com.hz.employmentsite.model.PcSiteUser">
+    <result column="SiteUserID" jdbcType="VARCHAR" property="siteUserID" />
+    <result column="Name" jdbcType="VARCHAR" property="name" />
+    <result column="Gender" jdbcType="INTEGER" property="gender" />
+    <result column="Mobile" jdbcType="VARCHAR" property="mobile" />
+    <result column="RoleID" jdbcType="INTEGER" property="roleID" />
+    <result column="CreateUserID" jdbcType="VARCHAR" property="createUserID" />
+    <result column="CreateTime" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="UpdateBy" jdbcType="VARCHAR" property="updateBy" />
+    <result column="UpdateTime" jdbcType="TIMESTAMP" property="updateTime" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    SiteUserID, Name, Gender, Mobile, RoleID, CreateUserID, CreateTime, UpdateBy, UpdateTime
+  </sql>
+  <select id="selectByExample" parameterType="com.hz.employmentsite.model.PcSiteUserExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from pc_site_user
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <delete id="deleteByExample" parameterType="com.hz.employmentsite.model.PcSiteUserExample">
+    delete from pc_site_user
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.hz.employmentsite.model.PcSiteUser">
+    insert into pc_site_user (SiteUserID, Name, Gender, 
+      Mobile, RoleID, CreateUserID, 
+      CreateTime, UpdateBy, UpdateTime
+      )
+    values (#{siteUserID,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{gender,jdbcType=INTEGER}, 
+      #{mobile,jdbcType=VARCHAR}, #{roleID,jdbcType=INTEGER}, #{createUserID,jdbcType=VARCHAR}, 
+      #{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.hz.employmentsite.model.PcSiteUser">
+    insert into pc_site_user
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="siteUserID != null">
+        SiteUserID,
+      </if>
+      <if test="name != null">
+        Name,
+      </if>
+      <if test="gender != null">
+        Gender,
+      </if>
+      <if test="mobile != null">
+        Mobile,
+      </if>
+      <if test="roleID != null">
+        RoleID,
+      </if>
+      <if test="createUserID != null">
+        CreateUserID,
+      </if>
+      <if test="createTime != null">
+        CreateTime,
+      </if>
+      <if test="updateBy != null">
+        UpdateBy,
+      </if>
+      <if test="updateTime != null">
+        UpdateTime,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="siteUserID != null">
+        #{siteUserID,jdbcType=VARCHAR},
+      </if>
+      <if test="name != null">
+        #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="gender != null">
+        #{gender,jdbcType=INTEGER},
+      </if>
+      <if test="mobile != null">
+        #{mobile,jdbcType=VARCHAR},
+      </if>
+      <if test="roleID != null">
+        #{roleID,jdbcType=INTEGER},
+      </if>
+      <if test="createUserID != null">
+        #{createUserID,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateBy != null">
+        #{updateBy,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.hz.employmentsite.model.PcSiteUserExample" resultType="java.lang.Long">
+    select count(*) from pc_site_user
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update pc_site_user
+    <set>
+      <if test="row.siteUserID != null">
+        SiteUserID = #{row.siteUserID,jdbcType=VARCHAR},
+      </if>
+      <if test="row.name != null">
+        Name = #{row.name,jdbcType=VARCHAR},
+      </if>
+      <if test="row.gender != null">
+        Gender = #{row.gender,jdbcType=INTEGER},
+      </if>
+      <if test="row.mobile != null">
+        Mobile = #{row.mobile,jdbcType=VARCHAR},
+      </if>
+      <if test="row.roleID != null">
+        RoleID = #{row.roleID,jdbcType=INTEGER},
+      </if>
+      <if test="row.createUserID != null">
+        CreateUserID = #{row.createUserID,jdbcType=VARCHAR},
+      </if>
+      <if test="row.createTime != null">
+        CreateTime = #{row.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="row.updateBy != null">
+        UpdateBy = #{row.updateBy,jdbcType=VARCHAR},
+      </if>
+      <if test="row.updateTime != null">
+        UpdateTime = #{row.updateTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    <if test="example != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update pc_site_user
+    set SiteUserID = #{row.siteUserID,jdbcType=VARCHAR},
+      Name = #{row.name,jdbcType=VARCHAR},
+      Gender = #{row.gender,jdbcType=INTEGER},
+      Mobile = #{row.mobile,jdbcType=VARCHAR},
+      RoleID = #{row.roleID,jdbcType=INTEGER},
+      CreateUserID = #{row.createUserID,jdbcType=VARCHAR},
+      CreateTime = #{row.createTime,jdbcType=TIMESTAMP},
+      UpdateBy = #{row.updateBy,jdbcType=VARCHAR},
+      UpdateTime = #{row.updateTime,jdbcType=TIMESTAMP}
+    <if test="example != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+</mapper>

src/main/resources/mapping/cquery/DotaskCQuery.xml

@@ -2,33 +2,42 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.hz.employmentsite.mapper.cquery.DotaskCQuery">
     <select id="selectDotaskList" resultType="com.hz.employmentsite.vo.taskAndLog.DotaskVo">
-        select task.*,u.`Name`,
-        (select count(*) from pc_dotask_user du where du.DotaskID = task.DotaskID)as userCount,
-        city.`name` as regionName,area.`name` as streetName
+        select task.dotaskID,task.workTypeID,task.content,task.dotaskName,u.`Name` as createName,
+        task.finishTime,task.createTime,(select count(*) from pc_dotask_user du where du.DotaskID = task.DotaskID)as userCount,
+        city.`name` as regionName,area.`name` as streetName,item.`Name` as workTypeName,task.regionCode,task.streetCode
         from pc_dotask task
+        left join sys_dictionary_item item
+        on item.`Value` = task.WorkTypeID
         left join sys_user u
         on u.UserID = task.CreateUserID
         left join area_code city
         on city.`code` = task.RegionCode
         join area_code area
         on area.`code` = task.StreetCode
-        <where>
-            <if test="DotaskName != '' and DotaskName != null">
-                and task.dotaskName like Concat('%',#{postName},'%')
-            </if>
-            <if test="startTime != null and startTime != ''">
-                and task.createTime <![CDATA[ >= ]]> STR_TO_DATE(#{beiginDate},'%Y-%m-%d')
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and task.createTime <![CDATA[ <= ]]> STR_TO_DATE(#{endTime},'%Y-%m-%d')
-            </if>
-            <if test="finishStartTime != null and finishStartTime != ''">
-                and task.finishTime <![CDATA[ >= ]]> STR_TO_DATE(#{finishStartTime},'%Y-%m-%d')
-            </if>
-            <if test="finishEndTime != null and finishEndTime != ''">
-                and task.finishTime <![CDATA[ <= ]]> STR_TO_DATE(#{finishEndTime},'%Y-%m-%d')
-            </if>
-
-        </where>
+        where item.DictionaryCode='WorkType'
+        <if test="name != '' and name != null">
+            and task.dotaskName like Concat('%',#{name},'%')
+        </if>
+        <if test="startTime != null and startTime != ''">
+            and task.createTime <![CDATA[ >= ]]> STR_TO_DATE(#{beiginDate},'%Y-%m-%d')
+        </if>
+        <if test="endTime != null and endTime != ''">
+            and task.createTime <![CDATA[ <= ]]> STR_TO_DATE(#{endTime},'%Y-%m-%d')
+        </if>
+        <if test="finishStartTime != null and finishStartTime != ''">
+            and task.finishTime <![CDATA[ >= ]]> STR_TO_DATE(#{finishStartTime},'%Y-%m-%d')
+        </if>
+        <if test="finishEndTime != null and finishEndTime != ''">
+            and task.finishTime <![CDATA[ <= ]]> STR_TO_DATE(#{finishEndTime},'%Y-%m-%d')
+        </if>
+        <if test="regionCode != null and regionCode != ''">
+            and task.regionCode = #{regionCode}
+        </if>
+        <if test="streetCode != null and streetCode != ''">
+            and task.streetCode = #{streetCode}
+        </if>
+        <if test="workTypeId != null and workTypeId != ''">
+            and task.workTypeID = #{workTypeId}
+        </if>
     </select>
 </mapper>

vue/src/views/taskAndLog/dotask/index.vue

@@ -23,25 +23,25 @@
       </a-row>
       <a-row>
         <a-col :span="6">
-          <a-form-item label="所属县区" :label-col="{span:6}" name="RegionCode">
+          <a-form-item label="所属县区" :label-col="{span:6}" name="regionCode">
             <a-select
               ref="select"
-              v-model:value="searchParams.RegionCode"
+              v-model:value="searchParams.regionCode"
               :options="regionList"
-              :field-names="{ label: 'name', value: 'value' }"
+              :field-names="{ label: 'name', value: 'code' }"
               :allow-clear="true"
-              @change="loadData"
+              @change="changeCity"
             >
             </a-select>
           </a-form-item>
         </a-col>
         <a-col :span="6">
-          <a-form-item label="所属街道" :label-col="{span:6}" name="StreetCode">
+          <a-form-item label="所属街道" :label-col="{span:6}" name="streetCode">
             <a-select
               ref="select"
-              v-model:value="searchParams.StreetCode"
+              v-model:value="searchParams.streetCode"
               :options="streetList"
-              :field-names="{ label: 'name', value: 'value' }"
+              :field-names="{ label: 'name', value: 'code' }"
               :allow-clear="true"
               @change="loadData"
             >
@@ -49,10 +49,10 @@
           </a-form-item>
         </a-col>
         <a-col :span="6">
-          <a-form-item label="任务类型" :label-col="{span:6}" name="WorkTypeID">
+          <a-form-item label="任务类型" :label-col="{span:6}" name="workTypeId">
             <a-select
               ref="select"
-              v-model:value="searchParams.WorkTypeID"
+              v-model:value="searchParams.workTypeId"
               :options="taskTypeList"
               :field-names="{ label: 'name', value: 'value' }"
               :allow-clear="true"
@@ -91,6 +91,7 @@
 </template>
 
 <script lang="ts">
+import {get} from '@/api/common';
 import {reactive, ref, computed, defineComponent} from 'vue';
 import {DownOutlined, UpOutlined} from '@ant-design/icons-vue';
 import type {FormInstance,SelectProps} from 'ant-design-vue';
@@ -109,14 +110,14 @@ export default defineComponent({
       pageIndex: 1,
       pageSize: 20,
       primaryKey: '',
-      minCount:0,
-      maxCount:0,
       recordStatus:1,
-      startTime:null,
-      endTime:null,
-      finishStartTime:null,
-      finishEndTime:null,
-      workTypeId:0
+      startTime:'',
+      endTime:'',
+      finishStartTime:'',
+      finishEndTime:'',
+      workTypeId:'',
+      regionCode:'',
+      streetCode:''
     });
     const formState = reactive({
       total: 0,
@@ -140,7 +141,9 @@ export default defineComponent({
       {title: '所属县区', dataIndex: 'regionName', key: 'regionName', align: "center"},
       {title: '所属街道', dataIndex: 'streetName', key: 'streetName', align: "center"},
       {title: '执行用户数', dataIndex: 'userCount', key: 'userCount', align: "center"},
-      {title: '下达时间', dataIndex: 'createTime', key: 'createTime', align: "center"},
+      {title: '下达时间', dataIndex: 'createTime', key: 'createTime', align: "center",customRender:(item)=>{
+          return item.record.createTime==null?"": (dayjs(item.record.createTime).format('YYYY-MM-DD'))
+        }},
       {title: '下达人', dataIndex: 'createName', key: 'createName', align: "center"},
       {title: '操作', key: 'operation', fixed: 'right', width: 170, align: "center"},
     ];
@@ -156,6 +159,27 @@ export default defineComponent({
     const streetList = ref<SelectProps['options']>();
     const taskTypeList = ref<SelectProps['options']>();
     const dataList = ref([]);
+
+    get('system/area/getCityList',{}).then(data=>{
+      console.log(data);
+      regionList.value=data;
+      console.log(regionList.value);
+    });
+
+    get('system/dictionary/getDictionaryItemByCodeList',{code:'WorkType'}).then(data=>{
+      console.log(data);
+      taskTypeList.value=data;
+    });
+
+    const changeCity=()=>{
+      get('system/area/getAreaList',{code:searchParams.regionCode}).then(data=>{
+        console.log(data);
+        streetList.value=data;
+        console.log(streetList.value);
+      })
+      loadData();
+    }
+
     const loadData = async function () {
       formState.loading = true;
       const result: any = await getList(searchParams);
@@ -214,6 +238,7 @@ export default defineComponent({
     };
 
     return {
+      changeCity,
       regionList,
       streetList,
       taskTypeList,