app-任务表新增任务状态字段，我的任务逻辑代码调整

h5app/src/api/workTask/index.ts

@@ -33,6 +33,17 @@ export function saveWorkTask(data: any) {
     );
 }
 
+export function taskFinish(doTaskID: any) {
+    return request(
+        {
+            url: 'taskAndLog/doTask/taskFinish',
+            method: 'post',
+            params: {doTaskID:doTaskID},
+        },
+        { isNew: true },
+    );
+}
+
 export function getMyWorkTasks(params: any) {
     return request(
         {

h5app/src/views/pages/work/log/edit.vue

@@ -1,5 +1,5 @@
 <template>
-  <ion-page class="work-log-page">
+  <ion-page>
     <ion-header class="header-theme2">
       <ion-toolbar>
         <ion-buttons slot="start">
@@ -50,7 +50,7 @@
       </form>
     </ion-content>
     <ion-footer>
-      <ion-button class="save-btn" @click="onSave">提交</ion-button>
+      <ion-button shape="round" expand="block" @click="onSave">提交</ion-button>
     </ion-footer>
   </ion-page>
 </template>
@@ -176,21 +176,4 @@ export default defineComponent({
   font-size: 20px;
 }
 
-.work-log-page {
-  .save-btn {
-    width: 100%;
-    --border-radius: 0px;
-    --background: #f2f2f5;
-    margin: 20px 0 0 0;
-    color: #363432;
-    font-size: 14px;
-  }
-
-  /*input[type="date"]:before {
-    content: attr(placeholder);
-    color: #00d9ff;
-  }*/
-}
-
-
 </style>

h5app/src/views/pages/work/log/list.vue

@@ -13,10 +13,10 @@
     </ion-header>
     <ion-content>
       <ion-item class="search-item">
-        <ion-input type="date" mode="md" v-model="searchParamsState.workStartDate" placeholder="开始时间" @change="reload"></ion-input>
-        <ion-label style="margin-right:10px;margin-left: 10px;">至</ion-label>
-        <ion-input type="date" mode="md" v-model="searchParamsState.workEndDate"  placeholder="结束时间"  @change="reload"></ion-input>
-        <ion-button slot="end" style="height: 33px;width: 70px;margin-left: 10px;--box-shadow: none;--border-radius: 14px;" @click="reload">搜索</ion-button>
+        <ion-input type="date" mode="md" v-model="searchParamsState.workStartDate" style="width: 120px;" @change="reload"></ion-input>
+        <ion-label style="margin:0px 10px 0px 10px">至</ion-label>
+        <ion-input type="date" mode="md" v-model="searchParamsState.workEndDate" style="width: 120px;" @change="reload"></ion-input>
+        <ion-button slot="end" style="height: 33px;width:80px;--border-radius: 14px;" @click="reload">搜索</ion-button>
       </ion-item>
       <ion-list class="list-content">
         <ion-item v-for="(record,key) in dataList" :key="key" detail>
@@ -71,8 +71,8 @@ export default defineComponent({
       pageIndex: 1,
       pageSize: 10,
       total:0,
-      workStartDate: new Date(new Date().getFullYear(),new Date().getMonth(),2,new Date().getHours()-16,0,0),
-      workEndDate: new Date(new Date().getFullYear(),new Date().getMonth(),new Date().getDate()+1,new Date().getHours()-16,0,0)
+      workStartDate: '2024-01-01',
+      workEndDate: '2024-12-31'
     })
     const loading = ref(true);
     const dataList = ref<any>([]);

h5app/src/views/pages/work/task/edit.vue

@@ -1,5 +1,5 @@
 <template>
-  <ion-page class="work-log-page">
+  <ion-page>
     <ion-header class="header-theme2">
       <ion-toolbar>
         <ion-buttons slot="start">
@@ -65,7 +65,7 @@
 
     </ion-content>
     <ion-footer>
-      <ion-button class="save-btn" @click="onSave">提交</ion-button>
+      <ion-button shape="round" expand="block" @click="onSave">提交</ion-button>
     </ion-footer>
   </ion-page>
 </template>
@@ -88,11 +88,12 @@ interface CurDataProps{
 
 interface workTaskModel {
   dataModel: {
+    doTaskID:any,
     doTaskUser: CurDataProps[],
-    doTaskName: null,
-    workTypeID: null,
-    content:null,
-    finishTime:null,
+    doTaskName: string,
+    workTypeID: any,
+    content:string,
+    finishTime:any,
   }
 }
 
@@ -118,10 +119,11 @@ export default defineComponent({
     const allTaskUserList = ref<CheckProps[]>([]);
     const workTaskData = reactive<workTaskModel>({
       dataModel:{
+        doTaskID:null,
         doTaskUser: [],
-        doTaskName: null,
+        doTaskName: '',
         workTypeID: null,
-        content:null,
+        content:'',
         finishTime:null,
     }});
     const workTaskRules = computed(()=>{
@@ -167,11 +169,11 @@ export default defineComponent({
           (curTaskUserList.value as any[]).push({siteUserID:item.value,name:item.text});
         }
       });
-      console.log("curTaskUserList",curTaskUserList.value);
+      /*console.log("curTaskUserList",curTaskUserList.value);
       if(curTaskUserList.value.length <= 0){
         await presentAlert("至少选择一位指派人！");
         return null;
-      }
+      }*/
       workTaskData.dataModel.doTaskUser = curTaskUserList.value;
       saveWorkTask(workTaskData.dataModel).then(result => {
         if (result) {
@@ -220,14 +222,15 @@ export default defineComponent({
     const loadData = async (doTaskID: any) => {
       await getWorkTypeList();
       await getAllTaskUserList();
-      await getCurTaskUserList(doTaskID);
-      loadCurTaskUserList();
       const reqData = await getWorkTaskByID(doTaskID);
       workTaskData.dataModel = reqData;
+      await getCurTaskUserList(workTaskData.dataModel.doTaskID);
+      loadCurTaskUserList();
       console.log("初始化dataModel",workTaskData.dataModel);
     };
 
     const reload = (doTaskID: any) => {
+      curTaskUserList.value = [];
       loadData(doTaskID);
     }
 
@@ -270,21 +273,5 @@ export default defineComponent({
   font-size: 20px;
 }
 
-.work-log-page {
-  .save-btn {
-    width: 100%;
-    --border-radius: 0px;
-    --background: #f2f2f5;
-    margin: 20px 0 0 0;
-    color: #363432;
-    font-size: 14px;
-  }
-
-  /*input[type="date"]:before {
-    content: attr(placeholder);
-    color: #00d9ff;
-  }*/
-}
-
 
 </style>

h5app/src/views/pages/work/task/myTask.vue

@@ -25,7 +25,7 @@
       </form>
     </ion-content>
     <ion-footer>
-      <ion-button shape="round" expand="block"   @click="onSave">已完成</ion-button>
+      <ion-button shape="round" expand="block"  @click="onSave" :disabled="dataModel.taskStatus==1" >完成</ion-button>
     </ion-footer>
     <ion-loading
         :is-open="loading"
@@ -36,7 +36,7 @@
 </template>
 <script lang="ts">
 import {defineComponent, reactive, ref, toRefs} from "vue";
-import {getWorkTaskByID} from '@/api/workTask';
+import {getWorkTaskByID,taskFinish} from '@/api/workTask';
 import {useRoute, useRouter} from "vue-router";
 import {alertController, onIonViewDidEnter} from "@ionic/vue";
 import {arrowBackOutline} from 'ionicons/icons';
@@ -49,11 +49,14 @@ interface CurDataProps{
 
 interface myTaskModel{
   dataModel: {
+    doTaskID:any,
     doTaskUser: CurDataProps[],
     doTaskName: any,
     workTypeID: any,
     content:string,
     finishTime:any,
+    taskStatus:number,
+    taskStatusName:string,
   }
 }
 
@@ -65,11 +68,14 @@ export default defineComponent({
     const loading = ref(false);
     const myTaskData = reactive<myTaskModel>({
       dataModel:{
+        doTaskID:null,
         doTaskUser: [],
         doTaskName: '',
         workTypeID: null,
         content:'',
         finishTime:null,
+        taskStatus:0,
+        taskStatusName:'',
       }});
 
     const presentAlert = async (message: string) => {
@@ -88,8 +94,11 @@ export default defineComponent({
     };
 
     const onSave = async function (){
-      await presentAlert("干得漂亮");
-      router.back();
+      taskFinish(myTaskData.dataModel.doTaskID).then(result=>{
+        if(result){
+          router.back();
+        }
+      })
     }
 
     const onCancel = () => {
@@ -101,7 +110,7 @@ export default defineComponent({
       const reqData = await getWorkTaskByID(doTaskID);
       myTaskData.dataModel = reqData;
       loading.value = false;
-      console.log(myTaskData.dataModel);
+      console.log("myTaskData",myTaskData.dataModel);
     };
 
     const reload = (doTaskID: any) => {

h5app/src/views/sapp/tabMain.vue

@@ -49,7 +49,7 @@
             我的任务
           </div>
           <ion-list class="list-content" >
-            <ion-item style="font-size: 12px;" v-for="(record,key) in dataList" :key="key" detail  @click="onDetail(record.doTaskID)">
+            <ion-item style="font-size: 12px;" v-for="(record,key) in dataList" :key="key" detail  @click="onDetail(record.doTaskID)" v-show="record.taskStatus==0">
               <ion-label>
                 ▎{{record.doTaskName}}
               </ion-label>
@@ -79,11 +79,17 @@ import {getMyWorkTasks} from '@/api/workTask';
 import {onIonViewDidEnter} from "@ionic/vue";
 import dayjs from "dayjs";
 
+
+
+interface taskModel{
+  doTaskID:string,
+  taskStatus:number
+}
 export default defineComponent({
   name:"TabMainList",
   setup() {
     const router = useRouter();
-    const dataList = ref<any>([]);
+    const dataList = ref<taskModel[]>([]);
     const loading = ref(true);
     const searchParamsState = reactive({
       pageIndex: 1,

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

@@ -32,13 +32,13 @@ public class DoTaskController {
 
     @ResponseBody
     @GetMapping("/getList")
-    public BaseResponse getList(@RequestParam("pageIndex") int pageIndex, @RequestParam("pageSize") int pageSize,
+    public BaseResponse getList(@RequestParam("pageIndex") int pageIndex, @RequestParam("pageSize") int pageSize, @RequestParam(required = false) String doTaskID,
                                 @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) String workTypeId)
+                                @RequestParam(required = false) String streetCode, @RequestParam(required = false) String workTypeId,@RequestParam(required = false)Integer taskStatus)
     {
-        PageInfo<DoTaskVo> result = doTaskService.getList(pageIndex, pageSize, name, startTime, endTime, finishStartTime, finishEndTime, regionCode, streetCode, workTypeId);
+        PageInfo<DoTaskVo> result = doTaskService.getList(pageIndex, pageSize, doTaskID,name, startTime, endTime, finishStartTime, finishEndTime, regionCode, streetCode, workTypeId,taskStatus);
         return RespGenerstor.success(result);
     }
 
@@ -61,6 +61,13 @@ public class DoTaskController {
         return RespGenerstor.success(result);
     }
 
+    @ResponseBody
+    @PostMapping("/taskFinish")
+    public BaseResponse taskFinish(String doTaskID) {
+        var result = doTaskService.taskFinish(doTaskID, accountService.getLoginUserID());
+        return RespGenerstor.success(result);
+    }
+
     @ResponseBody
     @PostMapping("/save")
     public BaseResponse save(@RequestBody DoTaskVo data) {
@@ -95,13 +102,13 @@ public class DoTaskController {
 
     @GetMapping("/export")
     public BaseResponse export(HttpServletResponse response, @RequestParam(required = false) Boolean isExport,
-                               @RequestParam("pageIndex") int pageIndex, @RequestParam("pageSize") int pageSize,
+                               @RequestParam("pageIndex") int pageIndex, @RequestParam("pageSize") int pageSize, @RequestParam(required = false) String doTaskID,
                                @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) String workTypeId) throws Exception {
+                               @RequestParam(required = false) String streetCode, @RequestParam(required = false) String workTypeId, @RequestParam(required = false) Integer taskStatus) throws Exception {
 
-        PageInfo<DoTaskVo> result = doTaskService.getList(pageIndex, pageSize, name, startTime, endTime, finishStartTime, finishEndTime, regionCode, streetCode, workTypeId);
+        PageInfo<DoTaskVo> result = doTaskService.getList(pageIndex, pageSize, doTaskID, name, startTime, endTime, finishStartTime, finishEndTime, regionCode, streetCode, workTypeId,taskStatus);
         if (isExport == null || !isExport) {
             return RespGenerstor.success(result);
         } else {

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

@@ -8,10 +8,10 @@ import org.apache.ibatis.annotations.Param;
 import java.util.List;
 
 public interface DoTaskCQuery {
-    List<DoTaskVo> getList(@Param("id") String id, @Param("name") String name, @Param("startTime") String startTime, @Param("endTime") String endTime,
+    List<DoTaskVo> getList(@Param("doTaskID") String doTaskID, @Param("name") String name, @Param("startTime") String startTime, @Param("endTime") String endTime,
                            @Param("finishStartTime") String finishStartTime, @Param("finishEndTime") String finishEndTime,
                            @Param("regionCode") String regionCode, @Param("streetCode") String streetCode,
-                           @Param("workTypeId") String workTypeId);
+                           @Param("workTypeId") String workTypeId, @Param("taskStatus") Integer taskStatus);
 
     List<DoTaskUserVo> getWorkUserList(String doTaskID);
 

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

@@ -27,6 +27,8 @@ public class PcDotask {
 
     private Date modifyTime;
 
+    private Integer taskStatus;
+
     public String getDotaskID() {
         return dotaskID;
     }
@@ -122,4 +124,12 @@ public class PcDotask {
     public void setModifyTime(Date modifyTime) {
         this.modifyTime = modifyTime;
     }
+
+    public Integer getTaskStatus() {
+        return taskStatus;
+    }
+
+    public void setTaskStatus(Integer taskStatus) {
+        this.taskStatus = taskStatus;
+    }
 }

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

@@ -904,6 +904,66 @@ public class PcDotaskExample {
             addCriterion("ModifyTime not between", value1, value2, "modifyTime");
             return (Criteria) this;
         }
+
+        public Criteria andTaskStatusIsNull() {
+            addCriterion("TaskStatus is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskStatusIsNotNull() {
+            addCriterion("TaskStatus is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskStatusEqualTo(Integer value) {
+            addCriterion("TaskStatus =", value, "taskStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskStatusNotEqualTo(Integer value) {
+            addCriterion("TaskStatus <>", value, "taskStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskStatusGreaterThan(Integer value) {
+            addCriterion("TaskStatus >", value, "taskStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskStatusGreaterThanOrEqualTo(Integer value) {
+            addCriterion("TaskStatus >=", value, "taskStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskStatusLessThan(Integer value) {
+            addCriterion("TaskStatus <", value, "taskStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskStatusLessThanOrEqualTo(Integer value) {
+            addCriterion("TaskStatus <=", value, "taskStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskStatusIn(List<Integer> values) {
+            addCriterion("TaskStatus in", values, "taskStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskStatusNotIn(List<Integer> values) {
+            addCriterion("TaskStatus not in", values, "taskStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskStatusBetween(Integer value1, Integer value2) {
+            addCriterion("TaskStatus between", value1, value2, "taskStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskStatusNotBetween(Integer value1, Integer value2) {
+            addCriterion("TaskStatus not between", value1, value2, "taskStatus");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

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

@@ -39,10 +39,10 @@ public class DoTaskImpl implements DoTaskService {
     private PcDotaskUserMapper doTaskUserMapper;
 
     @Override
-    public PageInfo<DoTaskVo> getList(Integer page, Integer rows, String name, String startTime, String endTime, String finishStartTime, String finishEndTime, String regionCode, String streetCode, String workTypeId) {
+    public PageInfo<DoTaskVo> getList(Integer page, Integer rows,String doTaskID, String name, String startTime, String endTime, String finishStartTime, String finishEndTime, String regionCode, String streetCode, String workTypeId,Integer taskStatus) {
         try {
             PageHelper.startPage(page, rows);
-            List<DoTaskVo> list = doTaskCQuery.getList(null, name, startTime, endTime, finishStartTime, finishEndTime, regionCode, streetCode, workTypeId);
+            List<DoTaskVo> list = doTaskCQuery.getList(doTaskID, name, startTime, endTime, finishStartTime, finishEndTime, regionCode, streetCode, workTypeId,taskStatus);
             PageInfo<DoTaskVo> result = new PageInfo(list);
             return result;
         } catch (Exception e) {
@@ -71,9 +71,7 @@ public class DoTaskImpl implements DoTaskService {
             };
             try {
                 if(curDoTaskIDs.size()>0){
-                    PageHelper.startPage(page,rows);
-                    List<DoTaskVo> list = doTaskCQuery.getList(stringUtils.ListToInSql(curDoTaskIDs),null,null,null,null,null,null,null,null);
-                    PageInfo<DoTaskVo> result = new PageInfo(list);
+                    var result = getList(page,rows,stringUtils.ListToInSql(curDoTaskIDs),null,null,null,null,null,null,null,null,null);
                     return result;
                 }
                 return null;
@@ -102,7 +100,20 @@ public class DoTaskImpl implements DoTaskService {
         }
         List<String> ids = new ArrayList<>();
         ids.add(id);
-        return doTaskCQuery.getList(stringUtils.ListToInSql(ids), null, null, null, null, null, null, null, null).stream().findFirst().orElse(null);
+        return doTaskCQuery.getList(stringUtils.ListToInSql(ids), null, null, null, null, null, null, null, null,null).stream().findFirst().orElse(null);
+    }
+
+    @Override
+    public int taskFinish(String doTaskID,String finishUserID){
+        int result = 0;
+        PcDotask dbData = doTaskMapper.selectByPrimaryKey(doTaskID);
+        if (dbData != null) {
+            dbData.setModifyUserID(finishUserID);
+            dbData.setModifyTime(new Date());
+            dbData.setTaskStatus(1);
+            result = doTaskMapper.updateByPrimaryKeySelective(dbData);
+        }
+        return result;
     }
 
     @Override
@@ -125,6 +136,7 @@ public class DoTaskImpl implements DoTaskService {
             dbData.setFinishTime(data.getFinishTime());
             dbData.setCreateTime(new Date());
             dbData.setCreateUserID(userId);
+            dbData.setTaskStatus(data.getTaskStatus());
             result = doTaskMapper.insert(dbData);
         } else {
             dbData.setWorkTypeID(data.workTypeID);
@@ -136,6 +148,7 @@ public class DoTaskImpl implements DoTaskService {
             dbData.setFinishTime(data.finishTime);
             dbData.setModifyTime(new Date());
             dbData.setModifyUserID(userId);
+            dbData.setTaskStatus(data.taskStatus);
             result = doTaskMapper.updateByPrimaryKeySelective(dbData);
         }
         if (result == 1) {

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

@@ -7,8 +7,8 @@ import com.hz.employmentsite.vo.baseSettings.SiteUserVo;
 import java.util.List;
 
 public interface DoTaskService {
-    PageInfo<DoTaskVo> getList(Integer page, Integer rows, String name, String startTime, String endTime, String finishStartTime, String finishEndTime,
-                               String regionCode, String streetCode, String workTypeId);
+    PageInfo<DoTaskVo> getList(Integer page, Integer rows, String doTaskID, String name, String startTime, String endTime, String finishStartTime, String finishEndTime,
+                               String regionCode, String streetCode, String workTypeId,Integer taskStatus);
 
     PageInfo<DoTaskVo> getMyTasks(Integer page, Integer rows, String userID);
 
@@ -18,6 +18,8 @@ public interface DoTaskService {
 
     DoTaskVo getDataById(String id);
 
+    int taskFinish(String doTaskID, String finishUserID);
+
     int save(DoTaskVo data, String userId);
 
     int delete(List<String> ids);

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

@@ -20,9 +20,9 @@ public class DoTaskVo {
 
     public Date createTime;
 
-    public  String createName;
+    public String createName;
 
-    public  int userCount;
+    public int userCount;
 
     public String workTypeName;
     
@@ -38,4 +38,8 @@ public class DoTaskVo {
 
     public List<SiteUserVo> doTaskUser;
 
+    public int taskStatus;
+
+    public String taskStatusName;
+
 }

src/main/resources/generatorConfig.xml

@@ -79,7 +79,7 @@
         <table schema="" tableName="sys_user_sys_role"><property name="useActualColumnNames" value="true"/></table>
          <table schema="" tableName="pc_company"><property name="useActualColumnNames" value="true"/></table>
          <table schema="" tableName="pc_company"><property name="useActualColumnNames" value="true"/></table>
-    <table schema="" tableName="pc_dotask"><property name="useActualColumnNames" value="true"/></table>
+        <table schema="" tableName="pc_dotask"><property name="useActualColumnNames" value="true"/></table>
         <table schema="" tableName="pc_dowork"><property name="useActualColumnNames" value="true"/></table>
         <table schema="" tableName="pc_education"><property name="useActualColumnNames" value="true"/></table>
         <table schema="" tableName="pc_experience"><property name="useActualColumnNames" value="true"/></table>

src/main/resources/mapping/PcDotaskMapper.xml

@@ -14,6 +14,7 @@
     <result column="CreateTime" jdbcType="TIMESTAMP" property="createTime" />
     <result column="ModifyUserID" jdbcType="VARCHAR" property="modifyUserID" />
     <result column="ModifyTime" jdbcType="TIMESTAMP" property="modifyTime" />
+    <result column="TaskStatus" jdbcType="INTEGER" property="taskStatus" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -75,7 +76,7 @@
   </sql>
   <sql id="Base_Column_List">
     DotaskID, WorkTypeID, RegionCode, StreetCode, Content, SiteID, DotaskName, FinishTime, 
-    CreateUserID, CreateTime, ModifyUserID, ModifyTime
+    CreateUserID, CreateTime, ModifyUserID, ModifyTime, TaskStatus
   </sql>
   <select id="selectByExample" parameterType="com.hz.employmentsite.model.PcDotaskExample" resultMap="BaseResultMap">
     select
@@ -111,13 +112,13 @@
     insert into pc_dotask (DotaskID, WorkTypeID, RegionCode, 
       StreetCode, Content, SiteID, 
       DotaskName, FinishTime, CreateUserID, 
-      CreateTime, ModifyUserID, ModifyTime
-      )
+      CreateTime, ModifyUserID, ModifyTime, 
+      TaskStatus)
     values (#{dotaskID,jdbcType=VARCHAR}, #{workTypeID,jdbcType=INTEGER}, #{regionCode,jdbcType=VARCHAR}, 
       #{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}
-      )
+      #{createTime,jdbcType=TIMESTAMP}, #{modifyUserID,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}, 
+      #{taskStatus,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="com.hz.employmentsite.model.PcDotask">
     insert into pc_dotask
@@ -158,6 +159,9 @@
       <if test="modifyTime != null">
         ModifyTime,
       </if>
+      <if test="taskStatus != null">
+        TaskStatus,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="dotaskID != null">
@@ -196,6 +200,9 @@
       <if test="modifyTime != null">
         #{modifyTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="taskStatus != null">
+        #{taskStatus,jdbcType=INTEGER},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.hz.employmentsite.model.PcDotaskExample" resultType="java.lang.Long">
@@ -243,6 +250,9 @@
       <if test="row.modifyTime != null">
         ModifyTime = #{row.modifyTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="row.taskStatus != null">
+        TaskStatus = #{row.taskStatus,jdbcType=INTEGER},
+      </if>
     </set>
     <if test="example != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -261,7 +271,8 @@
       CreateUserID = #{row.createUserID,jdbcType=VARCHAR},
       CreateTime = #{row.createTime,jdbcType=TIMESTAMP},
       ModifyUserID = #{row.modifyUserID,jdbcType=VARCHAR},
-      ModifyTime = #{row.modifyTime,jdbcType=TIMESTAMP}
+      ModifyTime = #{row.modifyTime,jdbcType=TIMESTAMP},
+      TaskStatus = #{row.taskStatus,jdbcType=INTEGER}
     <if test="example != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -302,6 +313,9 @@
       <if test="modifyTime != null">
         ModifyTime = #{modifyTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="taskStatus != null">
+        TaskStatus = #{taskStatus,jdbcType=INTEGER},
+      </if>
     </set>
     where DotaskID = #{dotaskID,jdbcType=VARCHAR}
   </update>
@@ -317,7 +331,8 @@
       CreateUserID = #{createUserID,jdbcType=VARCHAR},
       CreateTime = #{createTime,jdbcType=TIMESTAMP},
       ModifyUserID = #{modifyUserID,jdbcType=VARCHAR},
-      ModifyTime = #{modifyTime,jdbcType=TIMESTAMP}
+      ModifyTime = #{modifyTime,jdbcType=TIMESTAMP},
+      TaskStatus = #{taskStatus,jdbcType=INTEGER}
     where DotaskID = #{dotaskID,jdbcType=VARCHAR}
-  </update>
+  </update> 
 </mapper>

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

@@ -2,15 +2,17 @@
 <!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="getList" resultType="com.hz.employmentsite.vo.taskAndLog.DoTaskVo">
-        select task.dotaskID,task.workTypeID,task.content,task.dotaskName,u.`Name` as createName,task.finishTime,task.createTime,
+        select task.dotaskID,task.workTypeID,task.content,task.dotaskName,u.`Name` as createName,task.finishTime,task.createTime,task.taskStatus,dic_taskStatus.Name as taskStatusName,
         (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
+        area.`name` as streetName,item.`Name` as workTypeName,task.regionCode,task.streetCode,doTaskUser.siteUserID from pc_dotask task
+        left join sys_dictionary_item item  on item.`Value` = task.WorkTypeID
+        left join (select * from sys_dictionary_item where DictionaryCode ='TaskStatusType') dic_taskStatus  on dic_taskStatus.`Value` = task.taskStatus
         left join sys_user u on u.UserID = task.CreateUserID
+        left join pc_dotask_user doTaskUser on task.dotaskID = doTaskUser.dotaskID
         left join area_code city on city.`code` = task.RegionCode
-        join area_code area on area.`code` = task.StreetCode where item.DictionaryCode='TaskType'
-        <if test="id != '' and id != null">
-            and task.dotaskID in (${id})
+        left join area_code area on area.`code` = task.StreetCode  where item.DictionaryCode='TaskType'
+        <if test="doTaskID != '' and doTaskID != null">
+            and task.dotaskID in (${doTaskID})
         </if>
         <if test="name != '' and name != null">
             and task.dotaskName like Concat('%',#{name},'%')
@@ -36,6 +38,9 @@
         <if test="workTypeId != null and workTypeId != ''">
             and task.workTypeID = #{workTypeId}
         </if>
+        <if test="taskStatus != null and taskStatus != ''">
+            and task.taskStatus = #{taskStatus}
+        </if>
     </select>
 
     <select id="getWorkUserList" resultType="com.hz.employmentsite.vo.taskAndLog.DoTaskUserVo">