Merge remote-tracking branch 'origin/master'

# Conflicts:
#	h5app/src/components/postSelection.vue

h5app/src/components/industrySelection.vue

@@ -139,11 +139,12 @@ ion-segment-button {
 <script lang="ts">
 import {defineComponent, reactive, ref} from 'vue';
 import {getAllIndustryList} from "@/api/recommendmgt";
+import {onIonViewDidEnter} from "@ionic/vue";
 
 export default defineComponent({
   name: "industrySelection",
   props: {
-    CurIndustryID: {type: String, default: ''},
+    IndustryId: {type: String, default: ''},
   },
   setup(props, context) {
     const selectType = {
@@ -170,27 +171,36 @@ export default defineComponent({
         industryId: '',
         industryList: [] as any
       }]);
-    const selectIndustryInfo = reactive({value: '', text: ''})
+    const selectIndustryInfo = reactive({value: '', text: ''});
     const allIndustryList = ref();
 
     const loadIndustryID = () => {
       getAllIndustryList().then(data => {
         allIndustryList.value = data;
-        if (!props.CurIndustryID) {
-          selectIndustryInfo.value = ""
-          selectIndustryInfo.text = ""
+        if (!props.IndustryId) {
+          selectIndustryInfo.text='';
+          selectIndustryInfo.value='';
           selectModelList[selectType.one].isSelect = true;
           selectModelList[selectType.one].disabled = false;
-          selectModelList[selectType.one].industryName = ''
-          selectModelList[selectType.one].industryId = ''
+          selectModelList[selectType.one].industryName = '';
+          selectModelList[selectType.one].industryId = '';
           selectModelList[selectType.one].industryList = allIndustryList.value.filter((x: any) => x.industryLevel == "1")
               .map((x: any) => ({
                 ...x,
                 isSelect: false
               }));
+          selectModelList[selectType.two].isSelect = false;
+          selectModelList[selectType.two].disabled = false;
+          selectModelList[selectType.two].industryName = '';
+          selectModelList[selectType.two].industryId = '';
+          selectModelList[selectType.two].industryList = allIndustryList.value.filter((x: any) => x.industryLevel == "2")
+              .map((x: any) => ({
+                ...x,
+                isSelect: false
+              }));
         }
         else {
-          const twoInfo = allIndustryList.value.find((x: any) => x.industryLevel == "2" && x.industryId == props.CurIndustryID);
+          const twoInfo = allIndustryList.value.find((x: any) => x.industryLevel == "2" && x.industryId == props.IndustryId);
           const oneInfo = allIndustryList.value.find((x: any) => x.industryLevel == "1" && x.industryId == twoInfo.parentId);
 
           selectModelList[selectType.one].isSelect = false;

h5app/src/components/ocCategorySelection.vue

@@ -179,8 +179,8 @@ export default defineComponent({
         if (!props.OccupationalID) {
           selectModelList[selectType.one].isSelect = true;
           selectModelList[selectType.one].disabled = false;
-          selectModelList[selectType.one].occupationalName = ''
-          selectModelList[selectType.one].occupationalID = ''
+          selectModelList[selectType.one].occupationalName = '';
+          selectModelList[selectType.one].occupationalID = '';
           selectModelList[selectType.one].occupationList = occupationalCategoryList.value.filter((x: any) => x.occupationalLevel == "1")
               .map((x: any) => ({
                 ...x,
@@ -222,10 +222,10 @@ export default defineComponent({
     const onSelectType = (type: number) => {
       if (selectType.one == type) {
         selectModelList.map(x => {
-          x.isSelect = false
-          x.disabled = true
-          x.occupationalName = ''
-          x.occupationalID = ''
+          x.isSelect = false,
+          x.disabled = true,
+          x.occupationalName = '',
+          x.occupationalID = '',
           x.occupationList = []
         });
 

h5app/src/components/postSelection.vue

@@ -88,8 +88,7 @@ ion-segment-button {
   </ion-button>
   <ion-page>
     <ion-content class="ion-padding">
-      <ion-modal trigger="open-modal" :backdrop-dismiss="false" @willPresent="onRest()" :is-open="isOpen"
-                 :initial-breakpoint="1"
+      <ion-modal trigger="open-modal" :backdrop-dismiss="false" :is-open="isOpen" :initial-breakpoint="1"
                  :breakpoints="[0, 1]">
         <ion-toolbar>
           <ion-item>
@@ -199,8 +198,8 @@ export default defineComponent({
         if (!props.ProfessionID) {
           selectModelList[selectType.one].isSelect = true;
           selectModelList[selectType.one].disabled = false;
-          selectModelList[selectType.one].professionName = ''
-          selectModelList[selectType.one].professionID = ''
+          selectModelList[selectType.one].professionName = '';
+          selectModelList[selectType.one].professionID = '';
           selectModelList[selectType.one].professionList = professionLevelList.value.filter((x: any) => x.professionLevel == "1")
               .map((x: any) => ({
                 ...x,
@@ -255,10 +254,10 @@ export default defineComponent({
       if (selectType.one == type) {
         selectModelList.map(x => {
           x.isSelect = false,
-              x.disabled = true,
-              x.professionName = '',
-              x.professionID = '',
-              x.professionList = []
+          x.disabled = true,
+          x.professionName = '',
+          x.professionID = '',
+          x.professionList = []
         });
 
         selectModelList[selectType.one].isSelect = true;
@@ -315,11 +314,12 @@ export default defineComponent({
 
       if (type == selectType.one) {
         onSelectType(selectType.two);
-      } else if (type == selectType.two) {
+      }else if (type == selectType.two) {
         onSelectType(selectType.three);
-      } else {
+      }else{
         getSelectProsession();
       }
+
     }
 
     const getSelectProsession = () => {
@@ -335,48 +335,11 @@ export default defineComponent({
       isOpen.value = false;
       context.emit("SetProfessionID", selectProfessionInfo);
     }
-
-    const onRest = () => {
-      selectModelList.splice(0, 1, {
-        index: 0,
-        name: '分类一',
-        isSelect: false,
-        disabled: true,
-        professionName: '',
-        professionID: '',
-        professionList: [] as any
-      });
-      selectModelList.splice(1, 1,
-          {
-            index: 1,
-            name: '分类二',
-            isSelect: false,
-            disabled: true,
-            professionName: '',
-            professionID: '',
-            professionList: [] as any
-          });
-      selectModelList.splice(2, 1,
-          {
-            index: 2,
-            name: '岗位',
-            isSelect: false,
-            disabled: true,
-            professionName: '',
-            professionID: '',
-            professionList: [] as any
-          });
-      selectProfessionInfo.text = '';
-      selectProfessionInfo.value = '';
-      professionLevelList.value = [];
-    }
-
     return {
       isOpen,
       selectType,
       selectModelList,
       selectProfessionInfo,
-      onRest,
       loadProfessionInfo,
       onSelectType,
       onSelect,

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

@@ -195,7 +195,7 @@
                            v-model="dataModel.industryName" class="custom" readonly >
                 </ion-input>
                 <ion-item style="width:22%;float: right;padding:0px;margin: 0px;">
-                  <industry-selection  :CurIndustryID="dataModel.industryID" @SetIndustryID="onSetIndustryID"></industry-selection>
+                  <industry-selection  :IndustryId="dataModel.industryID" @SetIndustryID="onSetIndustryID"></industry-selection>
                 </ion-item>
               </div>
 

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

@@ -186,14 +186,14 @@
                 </ion-select-option>
               </ion-select>
             </div>
-            <div class="form-select">
+            <div class="form-input">
               <ion-label>所属行业</ion-label>
               <div>
                 <ion-input placeholder="请选择所属行业" label-placement="stacked" style="float: left;width:78%;"
                            v-model="dataModel.industryName" class="custom" readonly >
                 </ion-input>
                 <ion-item style="width:22%;float: right;padding:0px;margin: 0px;">
-                  <industry-selection  :CurIndustryID="dataModel.industryID" @SetIndustryID="onSetIndustryID"></industry-selection>
+                  <industry-selection  :IndustryId="dataModel.industryID" @SetIndustryID="onSetIndustryID"></industry-selection>
                 </ion-item>
               </div>
 <!--              <ion-select interface="action-sheet" placeholder="请选择所属行业" cancel-text="取消"-->
@@ -313,6 +313,7 @@ interface StepParams{
 }
 export default defineComponent({
   name: "companyInfoEdit",
+  components:{IndustrySelection},
   setup() {
     const route = useRoute();
     const router = useRouter();

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

@@ -68,24 +68,22 @@
     <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,
+        doTaskUser.UserTaskStatus 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` =
-        (select UserTaskStatus from pc_dotask_user du where DotaskID = task.DotaskID and siteUserID = #{siteUserID})
+        left join sys_dictionary_item dic_taskStatus ON dic_taskStatus.DictionaryCode = 'TaskStatusType' and
+        dic_taskStatus.`Value` = doTaskUser.UserTaskStatus
         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'
         where item.DictionaryCode='TaskType'
-        and doTaskUser.siteUserID  = #{siteUserID}
+        and doTaskUser.siteUserID = #{siteUserID}
         <if test="doTaskID != '' and doTaskID != null">
             and task.dotaskID = #{doTaskID}
         </if>