app-岗位福利联动企业福利，工作任务完成日期显示

h5app/src/views/pages/company/editPost.vue

@@ -203,6 +203,7 @@ import {useRoute, useRouter} from "vue-router";
 import {alertController, onIonViewDidEnter} from "@ionic/vue";
 import {useVuelidate} from "@vuelidate/core";
 import {getPostByID,savePost} from "@/api/post";
+import {getCompanyById} from "@/api/company";
 import {required} from "@vuelidate/validators";
 import {getSysDictionaryList} from "@/api/system/dictionary";
 import dayjs from "dayjs";
@@ -336,8 +337,9 @@ export default defineComponent({
       formState.dataModel = reqData;
       formState.dataModel.companyID = companyID;
       formState.dataModel.loginUserID = loginUserInfo.userID == undefined?"":loginUserInfo.userID;
-      if(formState.dataModel.welfare == null){
-        formState.dataModel.welfare = formState.dataModel.bonus;
+      if(postID==null){
+        const curPostCompany :any = await getCompanyById(companyID,formState.dataModel.loginUserID);
+        formState.dataModel.welfare =  curPostCompany.bonus;
       }
       console.log("初始化岗位信息",formState.dataModel);
     };

h5app/src/views/pages/jobUserInfo/postEdit.vue

@@ -208,6 +208,7 @@ import {required} from "@vuelidate/validators";
 import {getSysDictionaryList} from "@/api/system/dictionary";
 import dayjs from "dayjs";
 import postSelection from "@/components/postSelection.vue";
+import {getCompanyById} from "@/api/company";
 
 interface StepParams{
   loginUserID: string,
@@ -421,8 +422,9 @@ export default defineComponent({
       const reqData = await getPostByID(postID);
       formState.dataModel = reqData;
       formState.dataModel.companyID = companyID;
-      if(formState.dataModel.welfare == null){
-        formState.dataModel.welfare = formState.dataModel.bonus;
+      if(postID==null){
+        const curPostCompany :any = await getCompanyById(companyID,loginUserID);
+        formState.dataModel.welfare =  curPostCompany.bonus;
       }
       console.log("初始化岗位信息",formState.dataModel);
     };

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

@@ -87,7 +87,7 @@ function loadData(doTaskID: any) {
       taskInfo[key] = data[key];
     })
   })
-
+  console.log(taskInfo);
   bodyLoading.value = false;
 }
 

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

@@ -129,7 +129,7 @@ export default defineComponent({
         workTypeName: '',
         taskStatus: null,
         taskStatusName: '',
-        completeTime: null
+        completeTime: dayjs().format("YYYY-MM-DD")
     }});
     // 任务完成状态字典
     const taskStatusCodeList = ref<Array<any>>([]);
@@ -200,6 +200,9 @@ export default defineComponent({
       searchParamsState.doTaskID = doTaskID;
       const reqData = await getMyWorkTasks(searchParamsState);
       workTaskData.dataModel = reqData.list[0];
+      if(workTaskData.dataModel.completeTime==null){
+        workTaskData.dataModel.completeTime = dayjs(new Date()).format("YYYY-MM-DD");
+      }
       console.log("初始化dataModel",workTaskData.dataModel);
 
       bodyLoading.value = false;

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

@@ -107,7 +107,7 @@ export default defineComponent({
         router.push({path: './edit', query: {reload: 1, doTaskID: data.doTaskID}});
       }
       if (data.taskStatus == 1) {
-        router.push({path: './detail', query: {reload: 1, doWorkID: data.doTaskID}});
+        router.push({path: './detail', query: {reload: 1, doTaskID: data.doTaskID}});
       }
     }
 

src/main/java/com/hz/employmentsite/controller/companyService/PostController.java

@@ -5,6 +5,7 @@ import com.hz.employmentsite.filter.exception.BaseErrorEnum;
 import com.hz.employmentsite.filter.exception.BaseException;
 import com.hz.employmentsite.filter.exception.BaseResponse;
 import com.hz.employmentsite.filter.exception.RespGenerstor;
+import com.hz.employmentsite.model.PcCompanyExample;
 import com.hz.employmentsite.services.service.AccountService;
 import com.hz.employmentsite.services.service.companyService.PostService;
 import com.hz.employmentsite.util.DateUtils;

src/main/java/com/hz/employmentsite/vo/companyService/PostVo.java

@@ -120,7 +120,6 @@ public class PostVo {
     public Integer workNatureID;
     public String workNatureName;
     public Integer tagID;
-    public String bonus;
 
     public String loginUserID;
 }

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

@@ -7,7 +7,7 @@
         post.workYear,post.cultureRank,post.postDesc,post.maxSalary,post.minSalary,post.welfare,post.postEmail,post.workTime,post.isTrail,post.trailMonths,
         post.TrailMaxSalary,post.trailMinSalary,post.createUserID,post.createTime,post.modifyUserID,post.modifyTime,post.validTime,post.startTime,post.endTime,
         post.jobPlace,post.contactName,post.contactMobile,post.contactEmail,post.workNatureID,post.tagID,company.userName,company.userMobile,company.companyEmail,
-        company.CompanyName,company.insuredCount,company.bonus,item.`Name` as cultureLevelName,work_nature.Name as
+        company.CompanyName,company.insuredCount,item.`Name` as cultureLevelName,work_nature.Name as
         workNatureName,item2.`Name` as workYearStr
         , IFNULL(count(rmgt.RecommendMgtID),0) as recommendNum
         , company.SiteID, site.SiteName, inSites.InstitutionID, company.RegionCode