fix: 工作任务bug fix

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

@@ -35,6 +35,10 @@
           <ion-label>任务完成时间</ion-label>
           <ion-text>{{ dayjs(taskInfo.completeTime).format("YYYY-MM-DD") }}</ion-text>
         </div>
+        <div class="form-detail">
+          <ion-label>任务完成详情</ion-label>
+          <ion-text>{{ taskInfo.completeDesc }}</ion-text>
+        </div>
       </div>
     </ion-content>
 
@@ -64,7 +68,8 @@ const taskInfo = reactive<any>({
   workTypeName: "",
   content: "",
   taskStatusName: "",
-  completeTime: ""
+  completeTime: "",
+  completeDesc: ""
 })
 // 查询数据
 const searchParamsState = reactive({

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

@@ -48,6 +48,7 @@ public class DoTaskVo {
     public String taskStatusName;
 
     public Date completeTime;
+    public String completeDesc;
 
     private String modifyUserID;
     private String modifyUserName;

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

@@ -43,6 +43,7 @@ public class DoWorkVo {
 
     @SiteID
     private String siteID;
+    private String siteName;
     @InstitutionID
     public String institutionID;
 }

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

@@ -7,7 +7,8 @@
         task.taskStatus,dic_taskStatus.Name as taskStatusName,
         (select count(*) from pc_dotask_user du where du.DotaskID = task.DotaskID group by task.DotaskID)as userCount,
         city.`name` as regionName,
-        area.`name` as streetName,item.`Name` as workTypeName,task.regionCode,task.streetCode,doTaskUser.siteUserID,
+        area.`name` as streetName,item.`Name` as
+        workTypeName,task.regionCode,task.streetCode,doTaskUser.siteUserID,doTaskUser.completeDesc,
         modifyUser.Name as modifyUserName
         , task.taskLevel,dic_taskLevel.name as taskLevelName
         from pc_dotask task
@@ -65,19 +66,24 @@
     </select>
 
     <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, doTaskUser.CompleteTime,  city.`name` as regionName,area.`name` as streetName,item.`Name` as workTypeName,task.regionCode,task.streetCode
+        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, doTaskUser.CompleteTime,doTaskUser.completeDesc, city.`name` as
+        regionName,area.`name` as streetName,item.`Name` as workTypeName,task.regionCode,task.streetCode
         , task.taskLevel,dic_taskLevel.name as taskLevelName
         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
-        left join (select * from sys_dictionary_item where DictionaryCode ='TaskStatusType') dic_taskStatus  on dic_taskStatus.`Value` =
+        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` =
         (select UserTaskStatus from pc_dotask_user du where DotaskID = task.DotaskID and siteUserID = #{siteUserID})
         left join sys_user u on u.UserID = task.CreateUserID
         left join area_code city on city.`code` = task.RegionCode
         left join area_code area on area.`code` = task.StreetCode
-        left join sys_dictionary_item dic_taskLevel on task.taskLevel = dic_taskLevel.value and dic_taskLevel.DictionaryCode = 'TaskLevel'
+        left join sys_dictionary_item dic_taskLevel on task.taskLevel = dic_taskLevel.value and
+        dic_taskLevel.DictionaryCode = 'TaskLevel'
         where item.DictionaryCode='TaskType'
         and doTaskUser.siteUserID  = #{siteUserID}
         <if test="doTaskID != '' and doTaskID != null">

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

@@ -3,8 +3,9 @@
 <mapper namespace="com.hz.employmentsite.mapper.cquery.DoWorkCQuery">
     <select id="getList" resultType="com.hz.employmentsite.vo.taskAndLog.DoWorkVo">
         select workLog.*,siteUser.SiteUserName as UserName,siteUser.UserId as UserId, region.name as
-        RegionName,street.name as
-        StreetName,dic_logType.name as LogTypeName,modifyUser.Name as modifyUserName,
+        RegionName,street.name as StreetName, site.SiteName as siteName,dic_logType.name as LogTypeName,modifyUser.Name
+        as
+        modifyUserName,
         (
         SELECT COUNT(company.CompanyID) FROM pc_company company WHERE company.CreateUserID = siteUser.UserId AND
         DATE(company.CreateTime) = DATE(workLog.WorkTime)

vue/src/views/taskAndLog/dowork/edit.vue

@@ -4,7 +4,8 @@
       <a-divider orientation="left">工作日志信息</a-divider>
       <a-row type="flex">
         <a-col :span="7">
-          <a-form-item label="姓名" name="siteUserID" :label-col="{span:7}" :rules="[{ required: true, message: '请选择站点人员!' }]">
+          <a-form-item label="姓名" name="userId" :label-col="{span:7}"
+                       :rules="[{ required: true, message: '请选择站点人员!' }]">
             <label v-if="opCategory==3">{{dataModel.userName}}</label>
             <a-select ref="select"   show-search optionFilterProp="label"
                       v-model:value="dataModel.userId"
@@ -77,6 +78,7 @@ import type {SelectProps} from "ant-design-vue";
 import {getSysDictionaryList} from "@/api/system/dictionary";
 import {getRegionCodeList, getStreetCodeList} from "@/api/system/area/index";
 import {getSiteUserDataList} from "@/api/baseSettings/userInfo";
+import {useUserStore} from "@/store/modules/user";
 
 interface InstitutionModel {
   dataModel: any;
@@ -91,6 +93,8 @@ export default defineComponent({
     }
   },
   setup() {
+    const userStore = useUserStore();
+    const userInfo = ref(userStore.getUserInfo);
     const title = ref();
     const opCategory = ref<any>();
     const tabsViewStore = useTabsViewStore();
@@ -224,6 +228,7 @@ export default defineComponent({
       recordsCount,
       siteUserChange,
       workTimeChange,
+      userInfo
     };
   },
   created() {