Merge remote-tracking branch 'origin/main'

policeManagement/src/components/form/FormProMax.vue

@@ -40,12 +40,15 @@
           />
           <a-radio-group v-else-if="item.type === 'radioGroup'" v-model:value="modelValue[field]" style="width: 100%" v-bind="item.componentsProps" :options="item.options" />
           <a-checkbox-group v-else-if="item.type === 'checkboxGroup'" v-model:value="modelValue[field]" style="width: 100%" v-bind="item.componentsProps" :options="item.options" />
+          <!-- :show-search="item.showSearch" -->
+          <!-- :placeholder="getPlaceholder(item)" -->
+          <!-- :placeholder="item.placeholder" -->
           <a-select
             v-else-if="item.type === 'select'"
             v-model:value="modelValue[field]"
             style="width: 100%"
+            :placeholder="item.placeholder"
             v-bind="item.componentsProps"
-            :placeholder="getPlaceholder(item)"
             :allowClear="item.componentsProps?.allowClear ?? true"
             :options="item.options"
           />
@@ -162,7 +165,13 @@ const getResponsive = (item: FormProMaxItemProps): Grid => {
 }
 
 //优先级: 组件本身=》formItem=》label
-const getPlaceholder = (item: FormProMaxItemProps) => item.componentsProps?.placeholder ?? item.placeholder ?? (item.type.includes('input') ? `请输入${item.label}` : `请选择${item.label}`)
+const getPlaceholder = function (item: FormProMaxItemProps) {
+  // console.log('getPlaceholder____________________________', item)
+  // console.log('getPlaceholder_______________________placeholder', item.placeholder)
+  // console.log(item.componentsProps?.placeholder ?? item.placeholder ?? (item.type.includes('input') ? `请输入${item.label}` : `请选择${item.label}`))
+
+  return item.componentsProps?.placeholder ?? item.placeholder ?? (item.type.includes('input') ? `请输入${item.label}` : `请选择${item.label}`)
+}
 
 defineExpose<FormExpose>({
   validate: (nameList, options) => formProMaxRef.value?.validate(nameList, options),

policeManagement/src/views/query/publicUnit.vue

@@ -17,9 +17,9 @@
         </a-space>
       </template>
     </TableProMax>
-    <a-modal v-model:open="visible" :title="serviceTitle" @ok="submit" @cancel="closeModal">
+    <!-- <a-modal v-model:open="visible" :title="serviceTitle" @ok="submit" @cancel="closeModal">
       <FormProMax ref="formRef" v-model:value="formParams" :form-item-options="formItemOptions" />
-    </a-modal>
+    </a-modal> -->
   </div>
 </template>
 
@@ -31,7 +31,8 @@ import { AutoComplete, Button, Input, message, Modal, Space } from 'ant-design-v
 import { debounce } from 'lodash-es'
 import FormProMax from '@/components/form/FormProMax.vue'
 import api from '@/axios'
-import { ref, reactive, computed, onMounted } from 'vue'
+// createVNode
+import { ref, reactive, computed, onMounted, createVNode } from 'vue'
 import TableProMax from '@/components/table/TableProMax.vue'
 import { TableProMaxProps } from '@/types/components/table/index.ts'
 import { ComponentExposed } from 'vue-component-type-helpers'
@@ -41,6 +42,7 @@ import { FormProMaxItemOptions } from '@/types/components/form//index.ts'
 import { FormExpose } from 'ant-design-vue/es/form/Form'
 import { serviceProjectSaveOrUpdateParams_ } from '@/types/views/serviceManagement'
 import { showEnterprisesUnit } from './index.tsx'
+var modal: any
 type _FormType = EnterprisesUnitSaveOrUpdateParams & {
   contactPersonInfoName?: string
   contactPersonInfoTelephone?: string
@@ -238,6 +240,7 @@ const saveOrUpdateEnterprisesUnit = (params: _FormType, callback: Function) => {
       type: 'select',
       label: '单位类型',
       required: true,
+      placeholder: '请选择单位类型',
       // @ts-ignore
       options: dictSelectNodes('EnterprisesUnitType'),
     },
@@ -352,7 +355,7 @@ const netType = computed(() => {
 const formParams = ref<{
   snowFlakeId?: string
   enterprisesUnitId: string
-  securityUnitId: string
+  securityUnitId: string | null
   administrativeDivisionCodes?: null
   projectManagerMiniProgramUserId?: string
   projectManagerMiniProgramUserName?: string
@@ -372,7 +375,7 @@ const formParams = ref<{
   name: '',
   enterprisesUnitId: '',
   type: 'security',
-  securityUnitId: '',
+  securityUnitId: null, // 初始值得设置为null，不然 placeholder 显示不出来
 })
 const securityUnitIdList = ref<any>([])
 const formItemOptions = ref<FormProMaxItemOptions<serviceProjectSaveOrUpdateParams_>>({
@@ -387,6 +390,15 @@ const formItemOptions = ref<FormProMaxItemOptions<serviceProjectSaveOrUpdatePara
     label: '保安单位',
     required: true,
     options: securityUnitIdList,
+    placeholder: '请选择或搜索保安单位',
+    componentsProps: {
+      // placeholder: '请选择或搜索保安单位',
+      showSearch: true,
+      // 是否根据输入项进行筛选。当其为一个函数时，会接收 inputValue option 两个参数，当 option 符合筛选条件时，应返回 true，反之则返回 false。
+      filterOption: (input: string, option: any) => {
+        return option.label.toLowerCase().includes(input?.toLowerCase())
+      },
+    },
   },
   type: {
     type: 'radioGroup',
@@ -616,7 +628,7 @@ const expandedRowRender: TableProMaxProps['expandedRowRender'] = ({ record }) =>
             <a-button
               class='btn-warn'
               onClick={async () => {
-                visible.value = true
+                // visible.value = true
                 serviceTitle.value = '编辑服务项目'
                 idNumberDisabled.value = record.twoType.value !== 'outsource'
                 formParams.value.securityUnitId = record.securityUnitId //企事业单位id
@@ -635,6 +647,20 @@ const expandedRowRender: TableProMaxProps['expandedRowRender'] = ({ record }) =>
                 formParams.value.houseTotal = record.houseTotal //户数
                 formParams.value.staffTotal = record.staffTotal //工作人员数量
                 formParams.value.securityUserTotal = record.securityUserTotal //保安人员数量
+
+                modal = Modal.confirm({
+                  title: serviceTitle.value,
+                  icon: createVNode('div'),
+                  width: 600,
+                  centered: true,
+                  content: () => <FormProMax ref={formRef} v-model:value={formParams.value} formItemOptions={formItemOptions.value} />,
+                  onOk: async () => {
+                    await submit()
+                  },
+                  onCancel: async () => {
+                    await closeModal()
+                  },
+                })
               }}
             >
               编辑
@@ -676,9 +702,10 @@ const expandedRowRender: TableProMaxProps['expandedRowRender'] = ({ record }) =>
 }
 
 const closeModal = async () => {
+  console.log(modal)
   visible.value = false
   formParams.value = {
-    securityUnitId: '',
+    securityUnitId: null,
     enterprisesUnitId: '',
     administrativeDivisionCodes: '',
     name: '',
@@ -695,6 +722,9 @@ const closeModal = async () => {
   enterprisesUnitId.value = ''
   serviceTitle.value = '新增服务项目'
   idNumberDisabled.value = false
+  modal.destroy()
+  // console.log(modal)
+  Modal.destroyAll()
 }
 
 const submit = async () => {
@@ -704,6 +734,7 @@ const submit = async () => {
   message.success(resp.message)
   await _tableRef.value.requestGetTableData()
   await closeModal()
+  // modal.destroy()
 }
 
 onMounted(async () => {
@@ -711,7 +742,21 @@ onMounted(async () => {
   securityUnitIdList.value = res.data
 })
 const addService = function (record) {
+  // modal.destroy()
   formParams.value.enterprisesUnitId = record.snowFlakeId //企事业单位Id
-  visible.value = true
+  // visible.value = true
+  modal = Modal.confirm({
+    title: serviceTitle.value,
+    icon: createVNode('div'),
+    width: 600,
+    centered: true,
+    content: () => <FormProMax ref={formRef} v-model:value={formParams.value} formItemOptions={formItemOptions.value} />,
+    onOk: async () => {
+      await submit()
+    },
+    onCancel: async () => {
+      await closeModal()
+    },
+  })
 }
 </script>

policeSecurityServer/src/main/java/com/changhu/pojo/dto/SecurityUnitUseStatisticsDTO.java

@@ -43,6 +43,8 @@ public class SecurityUnitUseStatisticsDTO {
 
     @Schema(description = "公安单位id")
     private Long policeUnitId;
+    @Schema(description = "公安代为代码")
+    private String policeUnitCode;
     @Schema(description = "公安单位名称")
     private String policeUnitName;
 

policeSecurityServer/src/main/java/com/changhu/pojo/dto/ServiceProjectDTO.java

@@ -1,6 +1,7 @@
 package com.changhu.pojo.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
+import com.changhu.common.db.enums.EducationLevel;
 import com.changhu.common.db.enums.ServiceProjectType;
 import com.changhu.common.db.enums.Sex;
 import com.changhu.pojo.model.LegalPersonInfo;
@@ -81,6 +82,9 @@ public class ServiceProjectDTO {
     static class SecurityUserInfo {
         @Schema(description = "id")
         private Long snowFlakeId;
+        @JSONField(serializeUsing = MinioPrefixSerializer.class)
+        @Schema(description = "照片")
+        private String photo;
         @Schema(description = "名字")
         private String name;
         @Schema(description = "手机号")
@@ -103,5 +107,7 @@ public class ServiceProjectDTO {
         private String remark;
         @Schema(description = "创建时间")
         private String createTime;
+        @Schema(description = "文化程度")
+        private EducationLevel educationLevel;
     }
 }

policeSecurityServer/src/main/java/com/changhu/support/fastjson2/serializer/MinioPrefixSerializer.java

@@ -1,5 +1,6 @@
 package com.changhu.support.fastjson2.serializer;
 
+import cn.hutool.core.util.StrUtil;
 import cn.hutool.extra.spring.SpringUtil;
 import com.alibaba.fastjson2.JSONWriter;
 import com.alibaba.fastjson2.writer.ObjectWriter;
@@ -22,6 +23,10 @@ public class MinioPrefixSerializer implements ObjectWriter<String> {
 
     @Override
     public void write(JSONWriter jsonWriter, Object object, Object fieldName, Type fieldType, long features) {
+        if (object instanceof String path && StrUtil.isNotEmpty(path)) {
             jsonWriter.writeString(minioPrefix + object);
+        } else {
+            jsonWriter.writeString("");
+        }
     }
 }

policeSecurityServer/src/main/resources/mapper/OpenApiMapper.xml

@@ -43,42 +43,43 @@
                 property="securityUserList" />
     </resultMap>
     <select id="getServiceProjectByEnterprisesUnitId" resultMap="ServiceProjectDTOResultMap">
-        SELECT
+        SELECT sp.*,
-            sp.*,
+               IF(mpu.snow_flake_id IS NOT NULL,
-            IF(mpu.snow_flake_id IS NOT NULL,json_object( 'name', mpu.NAME, 'sex', mpu.sex, 'telephone', mpu.telephone, 'idCard', mpu.id_card ),NULL) AS 'projectManagerInfo',
+                  json_object('name', mpu.NAME, 'sex', mpu.sex, 'telephone', mpu.telephone, 'idCard', mpu.id_card),
+                  NULL)                                                        AS 'projectManagerInfo',
                json_object(
-                    'name',su1.name,
+                       'name', su1.name,
-                    'socialCode',su1.social_code,
+                       'socialCode', su1.social_code,
-                    'businessLicense',su1.business_license,
+                       'businessLicense', su1.business_license,
-                    'legalPersonInfo',su1.legal_person_info,
+                       'legalPersonInfo', su1.legal_person_info,
-                    'address',su1.address,
+                       'address', su1.address,
-                    'nature',su1.nature
+                       'nature', su1.nature
                )                                                               as 'securityUnitInfo',
-            if(COUNT(su.snow_flake_id)>0,JSON_ARRAYAGG(json_object(
+               if(COUNT(su.snow_flake_id) > 0, JSON_ARRAYAGG(json_object(
-                    'snowFlakeId',su.snow_flake_id,
+                       'snowFlakeId', su.snow_flake_id,
-                    'name',su.name,
+                       'photo', su.photo,
-                    'telephone',su.telephone,
+                       'name', su.name,
-                    'workPost',su.work_post,
+                       'telephone', su.telephone,
-                    'sex',su.sex,
+                       'workPost', su.work_post,
-                    'nativePlace',su.native_place,
+                       'sex', su.sex,
-                    'idCard',su.id_card,
+                       'nativePlace', su.native_place,
-                    'dateOfBirth',su.date_of_birth,
+                       'idCard', su.id_card,
-                    'securityNumber',su.security_number,
+                       'dateOfBirth', su.date_of_birth,
-                    'homeAddress',su.home_address,
+                       'securityNumber', su.security_number,
-                    'remark',su.remark,
+                       'homeAddress', su.home_address,
-                    'createTime',su.create_time
+                       'remark', su.remark,
-                                                       )),JSON_ARRAY()) as 'securityUserList'
+                       'educationLevel', su.education_level,
-        FROM
+                       'createTime', su.create_time
-            service_project sp
+                                                             )), JSON_ARRAY()) as 'securityUserList'
+        FROM service_project sp
                  left join security_unit su1 on sp.security_unit_id = su1.snow_flake_id
-                LEFT JOIN mini_program_user mpu ON sp.project_manager_mini_program_user_id = mpu.snow_flake_id AND mpu.identity = 'project_manager'
+                 LEFT JOIN mini_program_user mpu ON sp.project_manager_mini_program_user_id = mpu.snow_flake_id AND
+                                                    mpu.identity = 'project_manager'
                  left join security_user su on su.service_project_id = sp.snow_flake_id and su.delete_flag = 0
-        WHERE
+        WHERE sp.delete_flag = 0
-            sp.delete_flag = 0
           AND sp.enterprises_unit_id = #{enterprisesUnitId}
         group by sp.snow_flake_id
-        ORDER BY
+        ORDER BY sp.create_time DESC
-            sp.create_time DESC
     </select>
     <resultMap id="SecurityUnitUseStatisticsDTOResultMap" type="com.changhu.pojo.dto.SecurityUnitUseStatisticsDTO">
         <result
@@ -109,6 +110,7 @@
         ad4.name as 'streetName',
         eu.address as 'address',
         pu.snow_flake_id as 'policeUnitId',
+        pu.code as 'policeUnitCode',
         pu.name as 'policeUnitName',
         json_arrayagg(
         json_object(
@@ -170,6 +172,7 @@
                TIMESTAMPDIFF(YEAR, su.date_of_birth, CURDATE()) AS 'age',
                su.id_card,
                su.telephone,
+               su.education_level,
                eu.name                                          as 'enterprisesUnitName',
                suu.name                                         as 'securityUnitName',
                su.security_number
@@ -199,10 +202,12 @@
         TIMESTAMPDIFF(YEAR, su.date_of_birth, CURDATE()) AS 'age',
         su.id_card,
         su.telephone,
+        su.education_level,
         eu.name as 'enterprisesUnitName',
         suu.name as 'securityUnitName',
         su.security_number
         from enterprises_unit eu
+        LEFT join police_unit pu on eu.police_unit_id = pu.snow_flake_id and pu.delete_flag = 0
         LEFT JOIN service_project sp ON sp.enterprises_unit_id = eu.snow_flake_id AND sp.delete_flag = 0
         JOIN security_user su ON su.service_project_id = sp.snow_flake_id AND su.delete_flag = 0
         LEFT JOIN security_unit suu ON su.security_unit_id = suu.snow_flake_id AND suu.delete_flag = 0