1
0

2 Commity 7967b27c33 ... f9506b84a3

Autor SHA1 Správa Dátum
  zjh f9506b84a3 Merge branch '1.0' of http://gogs.tcmbrain.com/zjh/pre_paramater into 1.0 2 rokov pred
  zjh 55df07567a 1 2 rokov pred

BIN
cbkj_web_parameter/src/main/java/com/jiuzhekan/cbkj/service/sysService/AdminMenuService.java


+ 1 - 1
cbkj_web_parameter/src/main/resources/mappers/drug/TAppMaterialMappingMapper.xml

@@ -55,7 +55,7 @@
                  JOIN t_material AS tm2 ON ( tm2.status = '0' AND tm2.is_del='0' AND tm2.mat_id = tmp.mat_id )
                  LEFT JOIN b_material m ON m.k_mat_name = substring_index(substring_index(substring_index(substring_index(replace(replace(replace(replace(replace(replace(replace(replace(replace(replace(REPLACE(tm2.mat_name,'【配送】',''),'5',''),'1',''),'*',''),'d',''),'K',''),'G',''),'P',''),'Z',''),'配方颗粒',''),'颗粒',''),'(',1),'(',1),'[',1),'<',1)
                  LEFT JOIN t_app_material_mapping p (ON p.mat_price_id = tmp.mat_price_id and p.k_mat_id=m.k_mat_id)
-        WHERE tm2.is_del = '0' and tm2.drug_id = #{drugId} AND p.mat_price_id IS NULL AND m.k_mat_id IS NOT NULL
+        WHERE tmp.status = '0' and tm2.is_del = '0' and tm2.drug_id = #{drugId} AND p.mat_price_id IS NULL AND m.k_mat_id IS NOT NULL
     </insert>
 
     <update id="updateByPrimaryKey" parameterType="TAppMaterialMapping">

+ 2 - 2
cbkj_web_parameter/src/main/resources/mappers/drug/TCenterHisMappingMapper.xml

@@ -56,14 +56,14 @@
                '1'
         FROM t_material_price tmp
                  JOIN t_material AS tm2 ON (tm2.status = '0' AND tm2.is_del = '0' AND tm2.mat_id = tmp.mat_id)
-                 left join t_material_price as tmp2 on(1=1)
+                 left join t_material_price as tmp2 on(tmp2.status='0')
             LEFT JOIN t_material m ON (
             tmp2.mat_id=m.mat_id and m.status='0' and m.is_del='0' and
             m.mat_name = substring_index(substring_index(substring_index(substring_index(replace(replace(replace(replace(replace(replace(replace(replace(replace(replace(REPLACE(tm2.mat_name,'【配送】',''),'5',''),'1',''),'*',''),'d',''),'K',''),'G',''),'P',''),'Z',''),'配方颗粒',''),'颗粒',''),'(',1),'(',1),'[',1),'&lt;',1)
             )
             left join t_drug_list as tdl on( tdl.drug_id=m.drug_id and tdl.drug_type='1' )
             LEFT JOIN t_center_his_mapping p ON (p.mat_price_id = tmp.mat_price_id and p.mat_price_id_his=tmp2.mat_price_id)
-        WHERE  tm2.drug_id = #{drugId} AND p.mat_price_id IS NULL AND m.mat_id IS NOT NULL
+        WHERE  tmp.status = '0' and tm2.drug_id = #{drugId} AND p.mat_price_id IS NULL AND m.mat_id IS NOT NULL
     </insert>
 
     <update id="updateByPrimaryKey" parameterType="TCenterHisMapping">

+ 1 - 1
cbkj_web_parameter/src/main/resources/mappers/drug/TStandardMaterialMappingMapper.xml

@@ -175,7 +175,7 @@ group by tm2.mat_id
         FROM t_material mx
                  LEFT JOIN b_standard_mat m ON  m.s_mat_type='2' and m.s_mat_name = substring_index(substring_index(substring_index(substring_index(replace(replace(replace(replace(replace(replace(replace(replace(replace(replace(REPLACE(mx.mat_name,'【配送】',''),'5',''),'1',''),'*',''),'d',''),'K',''),'G',''),'P',''),'Z',''),'配方颗粒',''),'颗粒',''),'(',1),'(',1),'[',1),'&lt;',1)
                  LEFT JOIN t_standard_material_mapping p ON (p.mat_id = mx.mat_id AND p.s_id=m.s_id)
-        WHERE mx.is_del = '0' and mx.drug_id = #{drugId} AND p.mat_id IS NULL AND m.s_id IS NOT NULL
+        WHERE mx.status='0' and mx.is_del = '0' and mx.drug_id = #{drugId} AND p.mat_id IS NULL AND m.s_id IS NOT NULL
 
     </insert>
     <select id="insertautoMappingCount" parameterType="StandTMAutoMappingVO" resultType="Long">

+ 13 - 13
cbkj_web_parameter/src/main/resources/mappers/sysMappers/AdminInfoMapper.xml

@@ -53,17 +53,17 @@ update_user,update_time,professional,professional_pic_path
     <select id="selectAdminRoleById" parameterType="java.lang.String" resultMap="lazyLoadRoles">
         select
         <include refid="Base_Column_List"/>
-        ,(select ins_name from sys_institution ins where ins.status = '1' and ins.ins_code = ai.ins_code) as ins_name
+        ,(select ins_name from sys_institution ins where ins.status = '0' and ins.ins_code = ai.ins_code) as ins_name
         from sys_admin_info ai
-        where user_id = #{id,jdbcType=VARCHAR} and status = '1'
+        where user_id = #{id,jdbcType=VARCHAR} and status = '0'
     </select>
 
     <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List"/>
-        ,(select ins_name from sys_institution ins where ins.status = '1' and ins.ins_code = ai.ins_code) as ins_name
+        ,(select ins_name from sys_institution ins where ins.status = '0' and ins.ins_code = ai.ins_code) as ins_name
         from sys_admin_info ai
-        where user_id = #{id,jdbcType=VARCHAR} and status = '1'
+        where user_id = #{id,jdbcType=VARCHAR} and status = '0'
     </select>
 
     <select id="selectByPrimaryOriginID" parameterType="com.jiuzhekan.cbkj.beans.sysBeans.AdminInfo" resultMap="BaseResultMap">
@@ -76,7 +76,7 @@ update_user,update_time,professional,professional_pic_path
         status,is_qualifier,dept_id_his,dept_name_his,
         personal_share,qualifier_pic_path
         from sys_admin_info
-        where status='1'
+        where status='0'
         <if test="appId != null">
             and APP_ID = #{appId}
         </if>
@@ -431,9 +431,9 @@ update_user,update_time,professional,professional_pic_path
     <select id="loadUserByUsername" resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List"/>
-        ,(select ins_name from sys_institution ins where ins.status = '1' and ins.app_id = ai.app_id and ins.ins_code = ai.ins_code) as ins_name
+        ,(select ins_name from sys_institution ins where ins.status = '0' and ins.app_id = ai.app_id and ins.ins_code = ai.ins_code) as ins_name
         from sys_admin_info ai
-        where (user_name = #{username} ) and status = '1'
+        where (user_name = #{username} ) and status = '0'
     </select>
 
     <select id="getPageDatas" parameterType="AdminInfo" resultType="Map">
@@ -478,7 +478,7 @@ update_user,update_time,professional,professional_pic_path
         LEFT JOIN sys_doctor_multipoint ap ON ap.user_id = a.user_id
         left join sys_app p on ap.app_id = p.app_id
         left join sys_institution i on ap.app_id = i.APP_ID and ap.ins_code = i.INS_CODE
-        WHERE a.status in ('1','2','3')
+        WHERE a.status in ('0','2','3')
         <if test="userName != null and userName != ''">
             and (a.user_name like concat('%',trim(#{userName}),'%') or a.name_zh like concat('%',trim(#{userName}),'%')
              )
@@ -564,7 +564,7 @@ update_user,update_time,professional,professional_pic_path
     </delete>
 
     <update id="deleteBylis" parameterType="Map">
-        update sys_admin_info set status = '0' where id in
+        update sys_admin_info set status = '1' where id in
         <foreach collection="array" item="item" open="(" separator="," close=")">
             #{item}
         </foreach>
@@ -572,7 +572,7 @@ update_user,update_time,professional,professional_pic_path
     </update>
 
     <select id="getAdmins" resultType="Map" parameterType="String">
-     select user_id uuid,user_name,user_heand heand,email from sys_admin_info where user_id != #{id} and status ='1'
+     select user_id uuid,user_name,user_heand heand,email from sys_admin_info where user_id != #{id} and status ='0'
 
   </select>
 
@@ -611,7 +611,7 @@ update_user,update_time,professional,professional_pic_path
         FROM
         sys_admin_info AS a
         <where>
-            a.status = '1'
+            a.status = '0'
             <if test="name != null and name !=''">
                 and a.user_name = #{name}
             </if>
@@ -639,7 +639,7 @@ update_user,update_time,professional,professional_pic_path
      EXPIRE_DATE,create_user_name,
         status
         from sys_admin_info
-        where status='1'
+        where status='0'
         <if test="name != null">
             and (user_name like concat('%',#{name},'%') or name_zh like concat('%',#{name},'%'))
         </if>
@@ -656,7 +656,7 @@ update_user,update_time,professional,professional_pic_path
         from sys_admin_info ai
         left join sys_doctor_multipoint ap on ap.user_id = ai.user_id
         <where>
-            ai.status = '1'
+            ai.status = '0'
             <if test="appId != null and appId != ''">
                 and ap.app_id = #{appId}
             </if>

+ 7 - 7
cbkj_web_parameter/src/main/resources/mappers/sysMappers/AdminMenuMapper.xml

@@ -75,7 +75,7 @@
         where m.menu_id = rm.menu_id
           and rm.role_id = ur.role_id
           and ur.user_id = #{uid}
-          and m.status ='1' and m.menu_type in
+          and m.status ='0' and m.menu_type in
         <foreach collection="menuTypes.split(',')" item="item" open="(" close=")" separator=",">
             #{item}
         </foreach>
@@ -95,7 +95,7 @@
         from sys_admin_menu m
         left join sys_admin_rule_menu mr on m.`menu_id`= mr.`menu_id`
         left join sys_admin_rule r on mr.`role_id`= r.`role_id`
-        WHERE m.`status`='1' order by m.menu_level, m.sort
+        WHERE m.`status`='0' order by m.menu_level, m.sort
   </select>
 
     <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
@@ -165,12 +165,12 @@
   </update>
 
     <select id="selectAllMenu" resultType="Map">
-      select menu_id,menu_name,menu_class,parent_menu_id from sys_admin_menu where status = '1'
+      select menu_id,menu_name,menu_class,parent_menu_id from sys_admin_menu where status = '0'
   </select>
 
 
     <select id="selectAllMenuByM" resultType="Map">
-      select menu_id,menu_name,menu_class,parent_menu_id from sys_admin_menu where status = 1 and menu_type ='1'
+      select menu_id,menu_name,menu_class,parent_menu_id from sys_admin_menu where status = '0' and menu_type ='1'
   </select>
 
     <select id="getMenuByRid" resultType="Map" parameterType="String">
@@ -231,7 +231,7 @@
 
     <select id="getMenuObjByMID" resultMap="ADMINMENUMAP" parameterType="String">
         select <include refid="Base_Column_List" /> from sys_admin_menu
-        WHERE status = '1' and menu_id = #{id}
+        WHERE status = '0' and menu_id = #{id}
         ORDER  by sort ASC
     </select>
 
@@ -240,7 +240,7 @@
        a.btn_class,a.btn_type,a.btn_weight,a.sort,a.open_type
        FROM sys_admin_menu a
        left join sys_admin_rule_menu c on c.menu_id = a.menu_id
-       WHERE a.status = '1' AND c.role_id =#{id}
+       WHERE a.status = '0' AND c.role_id =#{id}
        GROUP BY a.menu_id ORDER  by a.sort ASC
     </select>
 
@@ -250,7 +250,7 @@
        LEFT JOIN sys_admin_menu b ON b.menu_id = a.parent_menu_id
        left join sys_admin_rule_menu c on c.menu_id = a.menu_id
        left join sys_admin_info_rule d on d.role_id = c.role_id
-       WHERE a.status = '1' AND b.menu_path=#{menuPath} and a.menu_type =2 and d.user_id=#{adminId} and c.rmid is not null
+       WHERE a.status = '0' AND b.menu_path=#{menuPath} and a.menu_type =2 and d.user_id=#{adminId} and c.rmid is not null
        GROUP BY a.menu_id ORDER  by a.sort ASC
     </select>