bug处理-工作任务、日志导出

h5app/src/api/jobUserInfo/index.ts

@@ -27,7 +27,7 @@ export function getJobUserDataList(){
 export function getJobUserById(id: any) {
     return request(
         {
-            url: 'jobUserService/jobUser/getDataById',
+            url: 'jobUserService/jobUser/getDataByID',
             method: 'get',
             params: {id},
         },

h5app/src/api/workLog/index.ts

@@ -3,7 +3,7 @@ import {request} from '@/utils/request';
 export function getWorkLogList(params: any) {
     return request(
         {
-            url: 'doWork/getList',
+            url: 'taskAndLog/doWork/getList',
             method: 'get',
             params: params,
         },
@@ -16,7 +16,7 @@ export function getWorkLogList(params: any) {
 export function getWorkLogById(doWorkID:string) {
     return request(
         {
-            url: 'doWork/get',
+            url: 'taskAndLog/doWork/get',
             method: 'get',
             params: {doWorkID:doWorkID},
         },
@@ -27,7 +27,7 @@ export function getWorkLogById(doWorkID:string) {
 export function saveWorkLog(data: any) {
     return request(
         {
-            url: "doWork/save",
+            url: "taskAndLog/doWork/save",
             method: 'post',
             data: data
         },

h5app/src/api/workTask/index.ts

@@ -1,17 +1,5 @@
 import {request} from '@/utils/request';
-
-export function getWorkTaskList(params: any) {
-    return request(
-        {
-            url: 'taskAndLog/doTask/getList',
-            method: 'get',
-            params: params,
-        },
-        { isNew: true },
-    );
-}
-
-
+ 
 export function saveWorkTask(data: any) {
     return request(
         {

h5app/src/views/pages/jobhunt/edit.vue

@@ -195,7 +195,7 @@
           <ion-item>
             <ion-select name="provinceCode"  id="provinceCode" okText="确定" cancelText="取消" v-model="baseData.provinceCode"
                         interface="action-sheet" placeholder="请选择省份" style="width:100%;text-align:left;" @change="provinceChange()" >
-              <ion-select-option v-for=" (it,key) in provinceList" :key="key" :value="it.code">
+              <ion-select-option v-for=" (it,key) in provinceList" :key="key" :value="it.value">
                 {{ it.name }}
               </ion-select-option>
             </ion-select>
@@ -370,7 +370,7 @@ export default defineComponent({
     const userHealthList = ref<SelectProps[]>([]);
     const bloodTypeList  = ref<SelectProps[]>([]);
     const maritalStatusList  = ref<SelectProps[]>([]);
-    const provinceList  = ref([{code:'440000000000000',name:'广东省'}]);
+    const provinceList  = ref<SelectProps[]>([{name:'广东省',value:'440000000000000'}]);
     /*const nationList  = ref([{code:'001',name:'汉族'}]);*/
     const familyNatureList = ref([]);
     const politicsStatusList = ref([]);

h5app/src/views/pages/user/updatePassword.vue

@@ -86,9 +86,9 @@ const onCancel = () => {
 }
 
 onIonViewDidEnter(() => {
-  dataModel.value.userID = userInfo.userId || '';
-  dataModel.value.userName = userInfo.userName || '';
-  dataModel.value.loginID = userInfo.loginId || '';
+  dataModel.value.userID = userInfo.userID || '';
+  dataModel.value.userName = userInfo.siteUserName || '';
+  dataModel.value.loginID = userInfo.loginID || '';
   dataModel.value.pwd_default = "";
   dataModel.value.pwd_confirm = "";
 });

src/main/java/com/hz/employmentsite/controller/UserController.java

@@ -12,16 +12,13 @@ import com.hz.employmentsite.util.DesUtils;
 import com.hz.employmentsite.util.JsonMapper;
 import com.hz.employmentsite.vo.DesModel;
 import com.github.pagehelper.PageInfo;
-import com.hz.employmentsite.vo.baseSettings.InstitutionVo;
 import com.hz.employmentsite.vo.user.UserInfoModel;
-import lombok.Data;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-
-import javax.print.DocFlavor;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
+import lombok.Data;
 
 @RestController
 @RequestMapping(value = "/api/user")

src/main/java/com/hz/employmentsite/controller/baseSettings/InstitutionController.java

@@ -5,7 +5,6 @@ import com.hz.employmentsite.filter.exception.BaseResponse;
 import com.hz.employmentsite.filter.exception.RespGenerstor;
 import com.hz.employmentsite.model.SelectProps;
 import com.hz.employmentsite.util.ExcelHelper;
-import com.hz.employmentsite.vo.companyService.CompanyVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import com.hz.employmentsite.services.service.baseSettings.InstitutionService;

src/main/java/com/hz/employmentsite/controller/baseSettings/SiteInfoController.java

@@ -5,13 +5,11 @@ import com.hz.employmentsite.filter.exception.BaseResponse;
 import com.hz.employmentsite.filter.exception.RespGenerstor;
 import com.hz.employmentsite.model.SelectProps;
 import com.hz.employmentsite.util.ExcelHelper;
-import com.hz.employmentsite.vo.baseSettings.InstitutionVo;
 import com.hz.employmentsite.vo.baseSettings.SiteInfoVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import com.hz.employmentsite.services.service.baseSettings.SiteInfoService;
 import com.hz.employmentsite.services.service.AccountService;
-
 import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
 import java.util.Arrays;

src/main/java/com/hz/employmentsite/controller/baseSettings/SiteUserController.java

@@ -7,11 +7,9 @@ import com.hz.employmentsite.model.SelectProps;
 import com.hz.employmentsite.services.service.AccountService;
 import com.hz.employmentsite.services.service.baseSettings.SiteUserService;
 import com.hz.employmentsite.util.ExcelHelper;
-import com.hz.employmentsite.vo.baseSettings.SiteInfoVo;
 import com.hz.employmentsite.vo.baseSettings.SiteUserVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-
 import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
 import java.util.Arrays;

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

@@ -81,7 +81,7 @@ public class PostController {
     }
 
     @GetMapping("/getPostByID")
-    public BaseResponse<PostVo> getPostByID(@RequestParam(required = false) String id) {
+    public BaseResponse<PostVo> getPostById(@RequestParam(required = false) String id) {
         var data = postService.getDataById(id);
         if (data == null) {
             data = new PostVo();

src/main/java/com/hz/employmentsite/controller/jobUserManager/EducationController.java

@@ -6,7 +6,6 @@ import com.hz.employmentsite.filter.exception.RespGenerstor;
 import com.hz.employmentsite.model.PcEducation;
 import com.hz.employmentsite.services.service.AccountService;
 import com.hz.employmentsite.services.service.jobUserManager.EducationService;
-import com.hz.employmentsite.vo.jobUserManager.JobHuntVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import java.util.Date;

src/main/java/com/hz/employmentsite/controller/jobUserManager/ExperienceController.java

@@ -8,7 +8,6 @@ import com.hz.employmentsite.services.service.AccountService;
 import com.hz.employmentsite.services.service.jobUserManager.ExperienceService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-
 import java.util.Date;
 import java.util.UUID;
 

src/main/java/com/hz/employmentsite/controller/jobUserManager/JobHuntController.java

@@ -7,9 +7,7 @@ import com.hz.employmentsite.filter.exception.RespGenerstor;
 import com.hz.employmentsite.services.service.AccountService;
 import com.hz.employmentsite.services.service.jobUserManager.JobHuntService;
 import com.hz.employmentsite.util.ExcelHelper;
-import com.hz.employmentsite.vo.baseSettings.SiteInfoVo;
 import com.hz.employmentsite.vo.jobUserManager.JobHuntVo;
-import lombok.Data;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletResponse;

src/main/java/com/hz/employmentsite/controller/jobUserManager/JobUserController.java

@@ -14,7 +14,6 @@ import com.hz.employmentsite.util.ExcelHelper;
 import com.hz.employmentsite.vo.jobUserManager.JobUserVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-
 import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -45,7 +44,7 @@ public class JobUserController {
     }
 
     @ResponseBody
-    @GetMapping("/getDataById")
+    @GetMapping("/getDataByID")
     public BaseResponse<PcJobuser> getDataById(@RequestParam(required = false) String id) {
         var data = jobuserService.getDataById(id);
         if (data == null) {

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

@@ -14,7 +14,6 @@ import com.hz.employmentsite.vo.taskAndLog.DoTaskVo;
 import com.hz.employmentsite.vo.baseSettings.SiteUserVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-
 import javax.servlet.http.HttpServletResponse;
 import java.util.*;
 
@@ -52,7 +51,7 @@ public class DoTaskController {
     }
 
     @ResponseBody
-    @GetMapping("/getDataById")
+    @GetMapping("/getDataByID")
     public BaseResponse<DoTaskVo> getDataById(@RequestParam(required = false) String id) {
         var result = doTaskService.getDataById(id);
         if (result == null) {

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

@@ -12,14 +12,13 @@ import com.hz.employmentsite.vo.taskAndLog.DoWorkVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletResponse;
-import java.sql.Date;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.UUID;
 
 @RestController
-@RequestMapping(value = "/api/doWork")
+@RequestMapping(value = "/api/taskAndLog/doWork")
 public class DoWorkController {
     @Autowired
     private AccountService accountService;

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

@@ -2,7 +2,6 @@ package com.hz.employmentsite.mapper.cquery;
 
 import com.hz.employmentsite.vo.system.AnnouncementModel;
 import org.apache.ibatis.annotations.Param;
-
 import java.util.List;
 
 public interface AnnouncementCQuery {

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

@@ -4,7 +4,6 @@ import com.hz.employmentsite.vo.taskAndLog.DoTaskUserVo;
 import com.hz.employmentsite.vo.taskAndLog.DoTaskVo;
 import com.hz.employmentsite.vo.baseSettings.SiteUserVo;
 import org.apache.ibatis.annotations.Param;
-
 import java.util.List;
 
 public interface DoTaskCQuery {

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

@@ -2,7 +2,6 @@ package com.hz.employmentsite.mapper.cquery;
 
 import com.hz.employmentsite.vo.taskAndLog.DoWorkVo;
 import org.apache.ibatis.annotations.Param;
-
 import java.util.List;
 
 public interface DoWorkCQuery {

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

@@ -2,7 +2,6 @@ package com.hz.employmentsite.mapper.cquery;
 
 import com.hz.employmentsite.model.PcEducation;
 import org.apache.ibatis.annotations.Param;
-
 import java.util.List;
 
 public interface EductionCQuery {

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

@@ -2,7 +2,6 @@ package com.hz.employmentsite.mapper.cquery;
 
 import com.hz.employmentsite.model.PcExperience;
 import org.apache.ibatis.annotations.Param;
-
 import java.util.List;
 
 public interface ExperienceCQuery {

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

@@ -2,7 +2,6 @@ package com.hz.employmentsite.mapper.cquery;
 
 import com.hz.employmentsite.vo.baseSettings.InstitutionVo;
 import org.apache.ibatis.annotations.Param;
-
 import java.util.List;
 
 public interface InstitutionCQuery {

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

@@ -2,7 +2,6 @@ package com.hz.employmentsite.mapper.cquery;
 
 import com.hz.employmentsite.vo.jobUserManager.JobHuntVo;
 import org.apache.ibatis.annotations.Param;
-
 import java.math.BigDecimal;
 import java.util.List;
 

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

@@ -2,7 +2,6 @@ package com.hz.employmentsite.mapper.cquery;
 
 import com.hz.employmentsite.vo.jobUserManager.JobUserVo;
 import org.apache.ibatis.annotations.Param;
-
 import java.util.List;
 
 public interface JobUserCQuery {

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

@@ -4,7 +4,6 @@ import com.hz.employmentsite.model.PcPost;
 import com.hz.employmentsite.vo.companyService.RecommendPostVo;
 import com.hz.employmentsite.vo.companyService.PostVo;
 import org.apache.ibatis.annotations.Param;
-
 import java.util.List;
 
 public interface PostCQuery {

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

@@ -1,7 +1,7 @@
 package com.hz.employmentsite.mapper.cquery;
+
 import com.hz.employmentsite.vo.jobUserManager.RecommendVo;
 import org.apache.ibatis.annotations.Param;
-
 import java.util.List;
 
 public interface RecommendCQuery {

src/main/java/com/hz/employmentsite/services/impl/baseSettings/SiteUserImpl.java

@@ -16,12 +16,10 @@ import net.sourceforge.pinyin4j.format.HanyuPinyinCaseType;
 import net.sourceforge.pinyin4j.format.HanyuPinyinOutputFormat;
 import net.sourceforge.pinyin4j.format.HanyuPinyinToneType;
 import net.sourceforge.pinyin4j.format.exception.BadHanyuPinyinOutputFormatCombination;
-import org.apache.tomcat.util.security.MD5Encoder;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.DigestUtils;
 
-import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;

src/main/java/com/hz/employmentsite/services/impl/companyService/CompanyServiceImpl.java

@@ -2,7 +2,6 @@ package com.hz.employmentsite.services.impl.companyService;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.hz.employmentsite.filter.exception.BaseErrorEnum;
 import com.hz.employmentsite.filter.exception.BaseException;
 import com.hz.employmentsite.mapper.AreaCodeMapper;
 import com.hz.employmentsite.mapper.PcCompanyMapper;
@@ -15,7 +14,6 @@ import com.hz.employmentsite.services.service.system.DictionaryService;
 import com.hz.employmentsite.util.StringUtils;
 import com.hz.employmentsite.vo.companyService.AppCompanyPostVo;
 import com.hz.employmentsite.vo.companyService.CompanyVo;
-import org.apache.commons.codec.EncoderException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

src/main/java/com/hz/employmentsite/services/impl/jobUserManager/ExperienceServiceImpl.java

@@ -4,7 +4,6 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.hz.employmentsite.mapper.PcExperienceMapper;
 import com.hz.employmentsite.mapper.cquery.ExperienceCQuery;
-import com.hz.employmentsite.model.PcEducation;
 import com.hz.employmentsite.model.PcExperience;
 import com.hz.employmentsite.services.service.jobUserManager.ExperienceService;
 import com.hz.employmentsite.util.StringUtils;

src/main/java/com/hz/employmentsite/services/impl/jobUserManager/RecommendServiceImpl.java

@@ -4,12 +4,9 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.hz.employmentsite.mapper.cquery.RecommendCQuery;
 import com.hz.employmentsite.services.service.jobUserManager.RecommendService;
-import com.hz.employmentsite.vo.jobUserManager.JobUserVo;
 import com.hz.employmentsite.vo.jobUserManager.RecommendVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
 import java.util.List;
 
 @Service("RecommendService")

src/main/java/com/hz/employmentsite/vo/jobUserManager/JobUserVo.java

@@ -86,4 +86,6 @@ public class JobUserVo {
     public List<HashMap<String,Object>> jobExperience;
     /*已推荐岗位个数*/
     public Integer recommendedCount;
+
+
 }

vue/src/api/jobUserManager/jobuser/index.ts

@@ -26,7 +26,7 @@ export function getJobUserDataList(){
 export function getDataById(id: any) {
   return request(
     {
-      url: 'jobUserService/jobUser/getDataById',
+      url: 'jobUserService/jobUser/getDataByID',
       method: 'get',
       params: {id},
     },

vue/src/api/taskAndLog/dotask.ts

@@ -17,7 +17,7 @@ export function getList(params: any) {
 export function getDataById(id: any) {
   return request<object>(
     {
-      url: "taskAndLog/doTask/getDataById",
+      url: "taskAndLog/doTask/getDataByID",
       method: 'get',
       params: {id},
     },

vue/src/api/taskAndLog/dowork.ts

@@ -4,7 +4,7 @@ import {request} from "@/utils/request";
 export function getList(params: any) {
   return request<object>(
     {
-      url: "doWork/getList",
+      url: "taskAndLog/doWork/getList",
       method: 'get',
       params: params,
     },
@@ -16,7 +16,7 @@ export function getList(params: any) {
 export function get( doWorkID: string) {
   return request<object>(
     {
-      url: 'doWork/get',
+      url: 'taskAndLog/doWork/get',
       method: 'get',
       params: {doWorkID:doWorkID},
     },
@@ -29,7 +29,7 @@ export function get( doWorkID: string) {
 export function save(data: any) {
   return request<object>(
     {
-      url: 'doWork/save',
+      url: 'taskAndLog/doWork/save',
       method: 'post',
       data: data,
     },
@@ -44,7 +44,7 @@ export function save(data: any) {
 export function delWorkLog(data: any) {
   return request<object>(
     {
-      url: 'doWork/delete',
+      url: 'taskAndLog/doWork/delete',
       method: 'post',
       data: data,
     },

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

@@ -76,7 +76,7 @@
         <a-col :span="24" style="text-align: right">
           <a-button type="primary" html-type="submit" @click='onAdd' functioncode="T01040102">新增</a-button>
           <BExportExcel :title="'导出'" :filename="'任务信息'"
-                        :url="'/taskAndLog/doTask/export'"
+                        :url="'taskAndLog/doTask/export'"
                         :params="{...searchParams, isExport: true, rows:10000,doTaskIDList:formState.selectedRowKeys.join(',')}"></BExportExcel>
         </a-col>
       </a-row>

vue/src/views/taskAndLog/dowork/index.vue

@@ -66,7 +66,7 @@
       <a-row class="edit-operation">
         <a-col :span="24" style="text-align: right">
           <a-button type="primary" html-type="submit" functioncode="T01040202" @click='onAdd'>新增</a-button>
-          <BExportExcel :title="'导出'" :filename="'工作日志信息'" :url="'/doWork/export'" :params="{...searchParams, rows:100000,doWorkIDList:formState.selectedRowKeys.join(',')}"></BExportExcel>
+          <BExportExcel :title="'导出'" :filename="'工作日志信息'" :url="'taskAndLog/doWork/export'" :params="{...searchParams, rows:100000,doWorkIDList:formState.selectedRowKeys.join(',')}"></BExportExcel>
         </a-col>
       </a-row>
     </a-form>