fix: bug清单修改

h5app/src/api/workTask/index.ts

@@ -11,7 +11,7 @@ export function saveWorkTask(data: any) {
     );
 }
 
-export function taskFinish(doTaskID: any, completeTime: any,completeDesc:string) {
+export function taskFinish(doTaskID: any, completeTime: any, completeDesc: string, taskStatus: any) {
     return request(
         {
             url: 'taskAndLog/doTask/taskFinish',
@@ -19,7 +19,8 @@ export function taskFinish(doTaskID: any, completeTime: any,completeDesc:string)
             params: {
                 doTaskID,
                 completeTime,
-                completeDesc
+                completeDesc,
+                taskStatus
             },
         },
         { isNew: true },

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

@@ -60,7 +60,7 @@
           </div>
           <div class="form-detail">
             <ion-label>法定代表人(负责人)</ion-label>
-            <ion-text>{{ dataModel.userName }}</ion-text>
+            <ion-text>{{ dataModel.frName }}</ion-text>
           </div>
           <div class="form-detail">
             <ion-label>营业执照有效期</ion-label>

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

@@ -178,7 +178,7 @@ export default defineComponent({
         await presentAlert('提示','请输入完整信息！');
         return null;
       }
-      taskFinish(workTaskData.dataModel.doTaskID, workTaskData.dataModel.completeTime,workTaskData.dataModel.completeDesc).then(result => {
+      taskFinish(workTaskData.dataModel.doTaskID, workTaskData.dataModel.completeTime, workTaskData.dataModel.completeDesc, workTaskData.dataModel.taskStatus).then(result => {
         if (result) {
           router.go(-1);
         }

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, "", "", 0).then(result => {
         if(result){
           router.back();
         }

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

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

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

@@ -98,13 +98,13 @@ public class DoTaskImpl implements DoTaskService {
     }
 
     @Override
-    public int taskFinish(String doTaskID,String finishUserID, Date completeTime,String completeDesc){
+    public int taskFinish(String doTaskID, String finishUserID, Date completeTime, String completeDesc, Integer taskStatus) {
         int result = 0;
         PcSiteUserExample siteUserExp = new PcSiteUserExample();
         PcSiteUserExample.Criteria siteUserCro = siteUserExp.createCriteria();
         siteUserCro.andUserIDEqualTo(finishUserID);
         var curSiteUserInfo = pcSiteUserMapper.selectByExample(siteUserExp).stream().findFirst().orElse(null);
-        if(curSiteUserInfo==null){
+        if (curSiteUserInfo == null) {
             throw new RuntimeException("当前用户未绑定站点人员，未能查询到相关工作任务！");
         }
         PcDotaskUserExample taskUserExp = new PcDotaskUserExample();
@@ -113,7 +113,7 @@ public class DoTaskImpl implements DoTaskService {
         taskUserCro.andDotaskIDEqualTo(doTaskID);
         var curUserTaskInfo = doTaskUserMapper.selectByExample(taskUserExp).stream().findFirst().orElse(null);
         if (curUserTaskInfo != null) {
-            curUserTaskInfo.setUserTaskStatus(1);
+            curUserTaskInfo.setUserTaskStatus(taskStatus);
             curUserTaskInfo.setCompleteTime(completeTime);
             curUserTaskInfo.setCompleteDesc(completeDesc);
             result = doTaskUserMapper.updateByExampleWithBLOBs(curUserTaskInfo,taskUserExp);

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

@@ -20,7 +20,7 @@ public interface DoTaskService {
 
     DoTaskVo getDataById(String id);
 
-    int taskFinish(String doTaskID, String finishUserID, Date completeTime,String completeDesc);
+    int taskFinish(String doTaskID, String finishUserID, Date completeTime, String completeDesc, Integer taskStatus);
 
     int save(DoTaskVo data, String userId);
 

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

@@ -142,7 +142,7 @@
     </select>
     <!--    推荐求职人员信息-->
     <select id="getRecommendJobList" resultType="com.hz.employmentsite.vo.jobUserManager.RecommendJobVo">
-        select a.jobhuntid,b.username,b.usermobile,e.sitename,dic1.`name` as culturerankname,dic2.`name` as
+        select a.jobhuntid,b.name as userName,b.usermobile,e.sitename,dic1.`name` as culturerankname,dic2.`name` as
         keypersontypename,a.workyear,a.minsalary,a.maxsalary,
         case when d.recommendmgtid is null then '未推荐' else '已推荐' end as
         isrecommend,d.recommendMgtID,a.professionid,c.professionname