feat: 工作任务添加完成时间字段

h5app/src/api/workTask/index.ts

@@ -11,12 +11,15 @@ export function saveWorkTask(data: any) {
     );
 }
 
-export function taskFinish(doTaskID: any) {
+export function taskFinish(doTaskID: any, completeTime: any) {
     return request(
         {
             url: 'taskAndLog/doTask/taskFinish',
             method: 'post',
-            params: {doTaskID:doTaskID},
+            params: {
+                doTaskID,
+                completeTime
+            },
         },
         { isNew: true },
     );

h5app/src/router/index.ts

@@ -108,6 +108,10 @@ const routes: Array<RouteRecordRaw> = [
                 path: 'tabMain/work/task/edit',
                 component: () => import('@/views/pages/work/task/edit.vue')
             },
+            {
+                path: 'tabMain/work/task/detail',
+                component: () => import('@/views/pages/work/task/detail.vue')
+            },
             {
                 path: 'tabMain/work/task/myTask',
                 component: () => import('@/views/pages/work/task/myTask.vue')

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

@@ -0,0 +1,112 @@
+<template>
+  <ion-page>
+    <ion-header class="header-theme2">
+      <ion-toolbar>
+        <ion-buttons slot="start">
+          <ion-icon :icon="arrowBackOutline" @click="onCancel"></ion-icon>
+        </ion-buttons>
+        <ion-title>工作任务完成情况</ion-title>
+      </ion-toolbar>
+    </ion-header>
+    <ion-content>
+      <div class="bw-vue-form">
+        <div class="form-title">工作任务详细信息</div>
+        <div class="form-detail">
+          <ion-label>任务名称</ion-label>
+          <ion-text>{{ taskInfo.doTaskName }}</ion-text>
+        </div>
+        <div class="form-detail">
+          <ion-label>要求完成时间</ion-label>
+          <ion-text>{{ taskInfo.finishTime ? dayjs(taskInfo.finishTime).format("YYYY-MM-DD") : '' }}</ion-text>
+        </div>
+        <div class="form-detail">
+          <ion-label>任务类型</ion-label>
+          <ion-text>{{ taskInfo.workTypeName }}</ion-text>
+        </div>
+        <div class="form-detail">
+          <ion-label>任务内容</ion-label>
+          <ion-text>{{ taskInfo.content }}</ion-text>
+        </div>
+        <div class="form-detail">
+          <ion-label>任务完成情况</ion-label>
+          <ion-text>{{ taskInfo.taskStatusName }}</ion-text>
+        </div>
+        <div class="form-detail">
+          <ion-label>任务完成时间</ion-label>
+          <ion-text>{{ dayjs(taskInfo.completeTime).format("YYYY-MM-DD") }}</ion-text>
+        </div>
+      </div>
+    </ion-content>
+
+    <ion-loading
+        :is-open="bodyLoading"
+        message="加载中..."
+        @didDismiss="setBodyLoadingOpen(false)">
+    </ion-loading>
+  </ion-page>
+</template>
+
+<script setup lang="ts">
+
+import {arrowBackOutline} from "ionicons/icons";
+import {useRoute, useRouter} from "vue-router";
+import dayjs from "dayjs";
+import {onMounted, reactive, ref} from "vue";
+import {getMyWorkTasks} from "@/api/workTask";
+
+const router = useRouter();
+const route = useRoute();
+
+// 任务信息
+const taskInfo = reactive<any>({
+  doTaskName: "",
+  finishTime: "",
+  workTypeName: "",
+  content: "",
+  taskStatusName: "",
+  completeTime: ""
+})
+// 查询数据
+const searchParamsState = reactive({
+  pageIndex: 1,
+  pageSize: 10,
+  total: 0,
+  doTaskID: '',
+  taskName: ''
+});
+// 页面加载动画开关
+const bodyLoading = ref(false);
+
+function loadData(doTaskID: any) {
+  bodyLoading.value = true;
+
+  searchParamsState.doTaskID = doTaskID;
+  getMyWorkTasks(searchParamsState).then((result: any) => {
+    const data = result.list[0];
+    Object.keys(taskInfo).forEach(key => {
+      taskInfo[key] = data[key];
+    })
+  })
+
+  bodyLoading.value = false;
+}
+
+// 设置加载动画状态
+function setBodyLoadingOpen(value: boolean) {
+  bodyLoading.value = value;
+}
+
+// 返回
+function onCancel() {
+  router.go(-1);
+}
+
+// 初始化
+onMounted(() => {
+  loadData(route.query.doTaskID)
+})
+</script>
+
+<style scoped>
+
+</style>

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

@@ -5,79 +5,79 @@
         <ion-buttons slot="start">
           <ion-icon :icon="arrowBackOutline" @click="onCancel"></ion-icon>
         </ion-buttons>
-        <ion-title>工作任务详情</ion-title>
+        <ion-title>工作任务完成情况</ion-title>
       </ion-toolbar>
     </ion-header>
     <ion-content>
-      <form autocomplete="off">
-        <ion-item>
-          <div class="panel-title2">
-            <div class="item-flag"></div>
-            基本信息
-          </div>
-        </ion-item>
-        <ion-list>
-          <ion-label class="title-item">任务名称</ion-label>
-          <ion-item> <!--:class="[workTaskValid.dataModel.doTaskName.$error?'ion-invalid':'ion-valid']"-->
-<!--            <ion-input name="doTaskName" id="doTaskName" style="text-align: left;" class="custom"
-                       placeholder="请输入任务名称" v-model="dataModel.doTaskName" ></ion-input>-->
-<!--            <ion-note slot="error">任务名称不能为空</ion-note>-->
-              {{dataModel.doTaskName}}
-          </ion-item>
-          <ion-label class="title-item">任务执行人员</ion-label>
-          <ion-item>
-            {{curTaskUserStr}}
-          </ion-item>
-          <ion-label class="title-item">完成时间</ion-label>
-          <ion-item>
-            <!--:class="[workTaskValid.dataModel.finishTime.$error?'ion-invalid':'ion-valid']"-->
-            <!--<ion-datetime-button datetime="finishTime"></ion-datetime-button>
+      <div class="bw-vue-form">
+        <div class="form-title">工作任务详细信息</div>
+        <div class="form-detail">
+          <ion-label>任务名称</ion-label>
+          <ion-text>{{ dataModel.doTaskName }}</ion-text>
+        </div>
+        <div class="form-detail">
+          <ion-label>要求完成时间</ion-label>
+          <ion-text>{{ dataModel.finishTime ? dayjs(dataModel.finishTime).format("YYYY-MM-DD") : '' }}</ion-text>
+        </div>
+        <div class="form-detail">
+          <ion-label>任务类型</ion-label>
+          <ion-text>{{ dataModel.workTypeName }}</ion-text>
+        </div>
+        <div class="form-detail">
+          <ion-label>任务内容</ion-label>
+          <ion-text>{{ dataModel.content }}</ion-text>
+        </div>
+      </div>
+      <!-- 任务完成情况选择 -->
+      <div class="bw-vue-form">
+        <div class="form-select">
+          <ion-label>
+            任务完成情况
+          </ion-label>
+          <ion-select name="doTypeID" id="doTypeID" interface="action-sheet" okText="确定" cancelText="取消"
+                      v-model="dataModel.taskStatus" placeholder="请选择任务完成情况">
+            <ion-select-option v-for="(it,key) in taskStatusCodeList" :key="key" :value="it.value">
+              {{ it.name }}
+            </ion-select-option>
+          </ion-select>
+        </div>
+        <div class="form-input">
+          <ion-label>
+            任务完成日期
+          </ion-label>
+          <div class="dateTimeBox">
+            <ion-datetime-button datetime="completeTime"></ion-datetime-button>
             <ion-modal :keep-contents-mounted="true">
-              <ion-datetime id="finishTime" placeholder="完成时间"
-                            v-model="dataModel.finishTime" :prefer-wheel="true"
+              <ion-datetime id="completeTime" placeholder="日期"
+                            v-model="dataModel.completeTime" :prefer-wheel="true"
                             dataformatas="YYYY-MM-DD" presentation="date" cancel-text="取消" done-text="确定"
                             :show-default-buttons="true">
               </ion-datetime>
-            </ion-modal>-->
-            <!--<ion-note slot="error">完成时间不能为空</ion-note>-->
-              {{ dayjs(dataModel.finishTime).format("YYYY-MM-DD")}}
-          </ion-item>
-          <ion-label class="title-item">任务类型</ion-label>
-          <ion-item>
-            <!--:class="[workTaskValid.dataModel.workTypeID.$error?'ion-invalid':'ion-valid']"  style="margin-bottom: 10px;">-->
-            <!--<ion-select name="workTypeID"  id="workTypeID" okText="确定" cancelText="取消"  v-model="dataModel.workTypeID"
-                        interface="action-sheet" placeholder="请选择任务类型" style="width:100%;text-align: left;"  >
-              <ion-select-option v-for="(it,key) in taskTypeList" :key="key" :value="it.value" >
-                {{ it.name }}
-              </ion-select-option>
-            </ion-select>-->
-            <!--<ion-note slot="error">任务类型不能为空</ion-note>-->
-              {{dataModel.workTypeName}}
-          </ion-item>
-          <ion-label class="title-item">任务内容</ion-label>
-          <ion-item>
-            <!--:class="[workTaskValid.dataModel.content.$error?'ion-invalid':'ion-valid']">-->
-            <ion-textarea name="content" id="content" v-model="dataModel.content"  label-placement="stacked"
-                          placeholder="请输入工作内容" rows="8"  class="custom"></ion-textarea>
-            <!--<ion-note slot="error">任务内容不能为空</ion-note>-->
-          </ion-item>
-        </ion-list>
-      </form>
-
+            </ion-modal>
+          </div>
+        </div>
+      </div>
     </ion-content>
-    <!--<ion-footer>
+    <ion-footer>
       <ion-button shape="round" expand="block" @click="onSave">提交</ion-button>
-    </ion-footer>-->
+    </ion-footer>
+    <ion-loading
+        :is-open="bodyLoading"
+        message="加载中..."
+        @didDismiss="setBodyLoadingOpen(false)">
+    </ion-loading>
   </ion-page>
 </template>
 <script lang="ts">
-import {defineComponent, reactive, ref, toRefs} from "vue";
+import {computed, defineComponent, onMounted, reactive, ref, toRefs} from "vue";
 import {getSysDictionaryList} from '@/api/system/dictionary';
-import {getMyWorkTasks,getWorkUserList} from '@/api/workTask';
+import {getMyWorkTasks, getWorkUserList, saveWorkTask, taskFinish} from '@/api/workTask';
 import {useRoute, useRouter} from "vue-router";
-import {onIonViewDidEnter} from "@ionic/vue";
+import {alertController, onIonViewDidEnter} from "@ionic/vue";
 import {arrowBackOutline} from 'ionicons/icons';
 import dayjs from "dayjs";
+import {useVuelidate} from "@vuelidate/core";
+import {required} from "@vuelidate/validators";
 
 interface SiteUserModel{
   siteUserID:string,
@@ -91,6 +91,10 @@ interface workTaskModel {
     workTypeID: any,
     content:string,
     finishTime:any,
+    workTypeName: string,
+    taskStatus: any,
+    taskStatusName: string,
+    completeTime: any
   }
 }
 
@@ -99,12 +103,6 @@ interface SelectProps {
   value: string
 }
 
-
-interface CheckProps {
-  text: string,
-  value: string,
-  checked: boolean
-}
 export default defineComponent({
   name: 'WorkTaskEdit',
   setup() {
@@ -128,19 +126,27 @@ export default defineComponent({
         workTypeID: null,
         content:'',
         finishTime:null,
+        workTypeName: '',
+        taskStatus: null,
+        taskStatusName: '',
+        completeTime: null
     }});
-    /*const workTaskRules = computed(()=>{
+    // 任务完成状态字典
+    const taskStatusCodeList = ref<Array<any>>([]);
+    // 页面加载动画开关
+    const bodyLoading = ref(false);
+    const workTaskRules = computed(() => {
       return {dataModel:{
           doTaskName:{required},
           workTypeID:{required},
           content:{required},
           finishTime:{required},
         }}});
-    const workTaskValid = useVuelidate(workTaskRules,workTaskData);*/
+    const workTaskValid = useVuelidate(workTaskRules, workTaskData);
 
-   /* const presentAlert = async (message: string) => {
+    const presentAlert = async (header: string, message: string) => {
       const alert = await alertController.create({
-        header: '错误！',
+        header: header,
         message: message,
         buttons: [
           '确定'
@@ -148,31 +154,23 @@ export default defineComponent({
       });
 
       await alert.present();
-    }*/
+    }
 
     const selectTaskUser = (item:any)=>{
       item.checked = !item.checked;
       console.log("itemData",item);
     }
 
-
-    /*const onSave = async function (){
-      const isFormCorrect = await workTaskValid.value.$validate();
-      if(!isFormCorrect) {
-        console.log("当前数据", workTaskData.dataModel);
-        await presentAlert("请填写完整的信息！");
-        return null;
-      }
-      curTaskUserList.value =[];
-      saveWorkTask(workTaskData.dataModel).then(result => {
+    function onSave() {
+      taskFinish(workTaskData.dataModel.doTaskID, workTaskData.dataModel.completeTime).then(result => {
         if (result) {
-          router.push("./list");
+          router.go(-1);
         }
-      });
-    }*/
+      })
+    }
 
     const onCancel = () => {
-      router.push("./list");
+      router.go(-1);
     }
 
     const getWorkTypeList = async function(){
@@ -194,6 +192,8 @@ export default defineComponent({
     }
 
     const loadData = async (doTaskID: any) => {
+      bodyLoading.value = true;
+
       curTaskUserStr.value ="";
       await getWorkTypeList();
       await loadCurTaskUserList(doTaskID);
@@ -201,6 +201,8 @@ export default defineComponent({
       const reqData = await getMyWorkTasks(searchParamsState);
       workTaskData.dataModel = reqData.list[0];
       console.log("初始化dataModel",workTaskData.dataModel);
+
+      bodyLoading.value = false;
     };
 
     const reload = (doTaskID: any) => {
@@ -208,11 +210,23 @@ export default defineComponent({
       loadData(doTaskID);
     }
 
+    // 设置加载动画状态
+    function setBodyLoadingOpen(value: boolean) {
+      bodyLoading.value = value;
+    }
+
     onIonViewDidEnter(() => {
       if (route.query.reload)
         reload(route.query.doTaskID);
     });
 
+    onMounted(() => {
+      // 获取任务完成状态字典数据
+      getSysDictionaryList("TaskStatusType").then((result: any) => {
+        taskStatusCodeList.value = result;
+      })
+    })
+
 
     return {
       ...toRefs(workTaskData),
@@ -225,10 +239,13 @@ export default defineComponent({
       curTaskUserStr,
       selectTaskUser,
       loadData,
-      /*onSave,*/
+      onSave,
       onCancel,
-      dayjs
-      /*workTaskValid*/
+      dayjs,
+      workTaskValid,
+      taskStatusCodeList,
+      bodyLoading,
+      setBodyLoadingOpen
     }
   }
 });
@@ -248,5 +265,11 @@ export default defineComponent({
   font-size: 16px;
 }
 
-
+.dateTimeBox {
+  width: 100%;
+  display: flex;
+  margin-top: 5px;
+  justify-content: space-between;
+  align-content: center;
+}
 </style>

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

@@ -18,16 +18,20 @@
         <ion-button slot="end" style="height: 33px;width: 70px;margin-left: 10px;--box-shadow: none;--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  @click="onDetail(record.doTaskID)">
-          <ion-avatar aria-hidden="true" slot="start">
-            <img alt="" src="@/assets/icon/icon-mine-punish.png" />
-          </ion-avatar>
+        <ion-item v-for="(record,key) in dataList" :key="key" detail @click="onDetail(record)">
           <ion-label>
             <h3>{{ record.doTaskName}}</h3>
-            <p>{{ record.workTypeName }}：{{dayjs(record.finishTime).format("YYYY-MM-DD")}}</p>
+            <p style="margin-top: 8px">任务类型：{{ record.workTypeName }}</p>
+            <p>
+              要求完成时间：{{ dayjs(record.finishTime).format("YYYY-MM-DD") }}
+            </p>
+            <p v-if="record.taskStatus == 1 && record.completeTime">
+              任务完成时间：{{ dayjs(record.completeTime).format("YYYY-MM-DD") }}
+            </p>
           </ion-label>
           <ion-avatar aria-hidden="true" slot="end">
             <p>{{ record.taskStatusName}}</p>
+
           </ion-avatar>
         </ion-item>
       </ion-list>
@@ -93,8 +97,13 @@ export default defineComponent({
     const onBack =()=>{
       router.push('../');
     }
-    const onDetail = (doTaskID:string) =>{
-      router.push({path: './edit', query: {reload:1, doTaskID: doTaskID}});
+    const onDetail = (data: any) => {
+      if (data.taskStatus == 0) {
+        router.push({path: './edit', query: {reload: 1, doTaskID: data.doTaskID}});
+      }
+      if (data.taskStatus == 1) {
+        router.push({path: './detail', query: {reload: 1, doWorkID: data.doTaskID}});
+      }
     }
 
     const reload = () => {

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

@@ -100,7 +100,7 @@ export default defineComponent({
     };
 
     const onSave = async function (){
-      taskFinish(myTaskData.dataModel.doTaskID).then(result=>{
+      taskFinish(myTaskData.dataModel.doTaskID, "").then(result => {
         if(result){
           router.back();
         }

h5app/src/views/sapp/tabMain.vue

@@ -56,7 +56,7 @@
       <div class="panel">
         <div class="panel_title">
           <div class="panel_title_text">工作任务安排</div>
-          <div class="panel_more">更多＞</div>
+          <div class="panel_more" @click="onTaskList">更多＞</div>
         </div>
         <div class="panel_content">
           <div style="padding: 10px 0;">
@@ -112,7 +112,11 @@ export default defineComponent({
     }
 
     const onDetail = (doTaskID:string) =>{
-      router.push({path: "/tabs/tabMain/work/task/myTask", query: {reload:1, doTaskID: doTaskID}});
+      router.push({path: "/tabs/tabMain/work/task/edit", query: {reload: 1, doTaskID: doTaskID}});
+    }
+
+    function onTaskList() {
+      router.push("/tabs/tabMain/work/task/list");
     }
 
     const onScroll = (e: any) => {
@@ -142,7 +146,8 @@ export default defineComponent({
       onDetail,
       onScroll,
       reload,
-      dayjs
+      dayjs,
+      onTaskList
     }
   }
 });

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

@@ -64,8 +64,8 @@ public class DoTaskController {
 
     @ResponseBody
     @PostMapping("/taskFinish")
-    public BaseResponse taskFinish(String doTaskID) {
-        var result = doTaskService.taskFinish(doTaskID, accountService.getLoginUserID());
+    public BaseResponse taskFinish(String doTaskID, Date completeTime) {
+        var result = doTaskService.taskFinish(doTaskID, accountService.getLoginUserID(), completeTime);
         return RespGenerstor.success(result);
     }
 

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

@@ -1,5 +1,7 @@
 package com.hz.employmentsite.model;
 
+import java.util.Date;
+
 public class PcDotaskUser {
     private String dotaskUserID;
 
@@ -9,6 +11,8 @@ public class PcDotaskUser {
 
     private Integer userTaskStatus;
 
+    private Date completeTime;
+
     public String getDotaskUserID() {
         return dotaskUserID;
     }
@@ -40,4 +44,12 @@ public class PcDotaskUser {
     public void setUserTaskStatus(Integer userTaskStatus) {
         this.userTaskStatus = userTaskStatus;
     }
+
+    public Date getCompleteTime() {
+        return completeTime;
+    }
+
+    public void setCompleteTime(Date completeTime) {
+        this.completeTime = completeTime;
+    }
 }

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

@@ -94,7 +94,7 @@ public class DoTaskImpl implements DoTaskService {
     }
 
     @Override
-    public int taskFinish(String doTaskID,String finishUserID){
+    public int taskFinish(String doTaskID,String finishUserID, Date completeTime){
         int result = 0;
         PcSiteUserExample siteUserExp = new PcSiteUserExample();
         PcSiteUserExample.Criteria siteUserCro = siteUserExp.createCriteria();
@@ -110,6 +110,7 @@ public class DoTaskImpl implements DoTaskService {
         var curUserTaskInfo = doTaskUserMapper.selectByExample(taskUserExp).stream().findFirst().orElse(null);
         if (curUserTaskInfo != null) {
             curUserTaskInfo.setUserTaskStatus(1);
+            curUserTaskInfo.setCompleteTime(completeTime);
             result = doTaskUserMapper.updateByExample(curUserTaskInfo,taskUserExp);
         }
         return result;

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

@@ -4,6 +4,8 @@ import com.github.pagehelper.PageInfo;
 import com.hz.employmentsite.vo.taskAndLog.DoTaskUserVo;
 import com.hz.employmentsite.vo.taskAndLog.DoTaskVo;
 import com.hz.employmentsite.vo.baseSettings.SiteUserVo;
+
+import java.util.Date;
 import java.util.List;
 
 public interface DoTaskService {
@@ -18,7 +20,7 @@ public interface DoTaskService {
 
     DoTaskVo getDataById(String id);
 
-    int taskFinish(String doTaskID, String finishUserID);
+    int taskFinish(String doTaskID, String finishUserID, Date completeTime);
 
     int save(DoTaskVo data, String userId);
 

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

@@ -44,4 +44,6 @@ public class DoTaskVo {
 
     public String taskStatusName;
 
+    public Date completeTime;
+
 }

src/main/resources/mapping/PcDotaskUserMapper.xml

@@ -6,6 +6,7 @@
     <result column="DotaskID" jdbcType="VARCHAR" property="dotaskID" />
     <result column="SiteUserID" jdbcType="VARCHAR" property="siteUserID" />
     <result column="UserTaskStatus" jdbcType="INTEGER" property="userTaskStatus" />
+    <result column="CompleteTime" jdbcType="DATE" property="completeTime" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -156,7 +157,8 @@
     set DotaskUserID = #{row.dotaskUserID,jdbcType=VARCHAR},
       DotaskID = #{row.dotaskID,jdbcType=VARCHAR},
       SiteUserID = #{row.siteUserID,jdbcType=VARCHAR},
-      UserTaskStatus = #{row.userTaskStatus,jdbcType=INTEGER}
+      UserTaskStatus = #{row.userTaskStatus,jdbcType=INTEGER},
+      CompleteTime = #{row.completeTime, jdbcType=DATE}
     <if test="example != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>

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

@@ -48,7 +48,7 @@
     <select id="getListByUserID" 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 UserTaskStatus from pc_dotask_user du where DotaskID = task.DotaskID and siteUserID = #{siteUserID}) AS taskStatus,
-        dic_taskStatus.Name as taskStatusName,  city.`name` as regionName,area.`name` as streetName,item.`Name` as workTypeName,task.regionCode,task.streetCode
+        dic_taskStatus.Name as taskStatusName, doTaskUser.CompleteTime,  city.`name` as regionName,area.`name` as streetName,item.`Name` as workTypeName,task.regionCode,task.streetCode
         from pc_dotask task
         left join pc_dotask_user doTaskUser on task.dotaskID = doTaskUser.dotaskID
         left join sys_dictionary_item item  on item.`Value` = task.WorkTypeID