基础信息查询逻辑代码提交

src/main/java/com/hz/employmentsite/vo/baseSettings/InstitutionModel.java

@@ -16,6 +16,8 @@ public class InstitutionModel {
     public String szfrname;
     public String szfrmobile;
 
+    public Integer SiteCount;
+
     public String szsaveuser;
     public String szsavetime;
     public String szupdateuser;

src/main/java/com/hz/employmentsite/vo/baseSettings/SiteInfoModel.java

@@ -17,7 +17,7 @@ public class SiteInfoModel {
     public String szusername;
     public String szusermobile;
 
-    public String CompanyNameSiteInfoModel;
+    public String CompanyName;
 
     public String szsaveuser;
     public String szsavetime;

src/main/java/com/hz/employmentsite/vo/baseSettings/UserInfoModel.java

@@ -1,12 +1,13 @@
 package com.hz.employmentsite.vo.baseSettings;
 import lombok.Data;
-import net.sf.jsqlparser.expression.DateTimeLiteralExpression;
+import java.sql.Time;
 
 @Data
 public class UserInfoModel {
 
     public String UserID;
     public Integer UserTypeID;
+    public String UserTypeName;
     public String LoginID;
     public String Password;
     public String Name;
@@ -14,8 +15,8 @@ public class UserInfoModel {
     public Integer RecordStatus;
 
     public String CreateBy;
-    public DateTimeLiteralExpression.DateTime CreateTime;
+    public Time CreateTime;
     public String UpdateBy;
-    public DateTimeLiteralExpression.DateTime UpdateTime;
+    public Time UpdateTime;
 
 }

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

@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.hz.employmentsite.mapper.cquery.InstitutionCQuery">
-
     <select id="getList" resultType="com.hz.employmentsite.vo.baseSettings.InstitutionModel">
-        select  * from pc_institution where 1=1
+        select  A.*,Count(B.szkey)as SiteCount from pc_institution A,pc_site_institution B where A.szkey = B.szinstitutionkey  and 1=1
         <if test="primaryKey!='' and primaryKey!=null">
             and szkey in (${primaryKey})
         </if>
@@ -11,7 +10,7 @@
             and szcompanyname like Concat('%',#{companyName},'%')
         </if>
         <if test="companyAddress!='' and companyAddress!=null">
-            and szcomaddress = #{companyAddress}
+            and szcomaddress like Concat('%',#{companyAddress},'%')
         </if>
         <if test="dutyUserName!='' and dutyUserName!=null">
             and szcomusername like Concat('%',#{dutyUserName},'%')

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

@@ -11,10 +11,10 @@
             and szcode like Concat('%',#{siteCode},'%')
         </if>
         <if test="siteName!='' and siteName!=null">
-            and sznamae = #{siteName}
+            and szname like Concat('%',#{siteName},'%')
         </if>
         <if test="institutionName!='' and institutionName!=null">
-            and CompanyName like Concat('%',#{institutionName},'%')
+            and C.szcompanyname like Concat('%',#{institutionName},'%')
         </if>
         <if test="regionName!='' and regionName!=null">
             and szregion like Concat('%',#{regionName},'%')

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

@@ -2,9 +2,10 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.hz.employmentsite.mapper.cquery.UserInfoCQuery">
     <select id="getList" resultType="com.hz.employmentsite.vo.baseSettings.UserInfoModel">
-        select * from pc_user and 1=1
+        select A.*,B.Name as UserTypeName from sys_user A,(select * from  sys_dictionary_item where DictionaryCode ='UserType') B
+        where A.UserTypeID = B.Value and 1=1
         <if test="primaryKey!='' and primaryKey!=null">
-            and szkey in (${primaryKey})
+            and UserID in (${primaryKey})
         </if>
         <if test="userName!='' and userName!=null">
             and Name like Concat('%',#{userName},'%')

vue/src/router/generator-router.tsx

@@ -111,7 +111,7 @@ export function filterAsyncRoute(
  */
 export const generatorDynamicRouter = (asyncMenus: API.Menu[]) => {
   try {
-    // console.log('asyncMenus', asyncMenus);
+    console.log('asyncMenus', asyncMenus);
     const routeList = filterAsyncRoute(asyncMenus);
     const layout = routes.find((item) => item.name == 'Layout')!;
     // console.log(routeList, '根据后端返回的权限路由生成');

vue/src/views/baseSettings/institution/index.vue

@@ -136,7 +136,7 @@ export default defineComponent({
       {title: '法人电话', dataIndex: 'szfrmobile', key: 'szfmobile', align: "center"},
       {title: '企业机构代码', dataIndex: 'szcompanycode', key: 'szcompanycode', align: "center"},
       {
-        title: '管理驿站数量', dataIndex: 'institunum', key: 'institunum', align: "center",
+        title: '管理驿站数量', dataIndex: 'SiteCount', key: 'SiteCount', align: "center",
         /*customRender:  ({record}) => record.resolveDate == null?"":dayjs(record.resolveDate).format('YYYY-MM-DD')*/
       },
       {title: '操作', key: 'operation', fixed: 'right',width:170, align: "center"},