forked from kidgrow-microservices-platform
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderRecordServiceImpl.java
@@ -80,8 +80,8 @@ @Override public PageResult<ProductOrderJoinDetail> findAllList(Map<String, Object> params, SysUser sysUser) { Page<ProductOrderJoinDetail> page = new Page<>(MapUtils.getInteger(params, "page"), MapUtils.getInteger(params, "limit")); Map<String, Object> roleOrgMap = roleOrganizationService.getRoleOrgMap(sysUser); params.putAll(roleOrgMap); // Map<String, Object> roleOrgMap = roleOrganizationService.getRoleOrgMap(sysUser); // params.putAll(roleOrgMap); List<ProductOrderJoinDetail> list = baseMapper.findAllList(page, params); for (ProductOrderJoinDetail productOrderJoinDetail : list) { Date proBegintime = productOrderJoinDetail.getProBegintime(); kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderDetailMapper.xml
@@ -261,8 +261,7 @@ order_id IN ( SELECT id FROM product_order WHERE hospital_id = #{hospitalId} AND department_id = #{departmentId} AND is_del = 0 AND enabled = 1 ) AND is_del = 0 AND enabled = 1 ORDER BY create_time DESC ORDER BY id DESC </select> <select id="getUserdProduct" resultType="int"> SELECT kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderRecordMapper.xml
@@ -136,7 +136,7 @@ </if> <if test="!itemto.flag"> or ( is_del = 0 and enabled=1) <include refid="where_condition"></include> or ( DE.is_del = 0 and DE.enabled=1) <include refid="where_condition"></include> </if> </when> <when test="inx==2"> @@ -144,48 +144,48 @@ AND <foreach item="itemtoto" collection="itemto.object" separator="or" open="(" close=")" index=""> create_user_org_code = #{itemtoto.orgCode} DE.create_user_org_code = #{itemtoto.orgCode} </foreach> </if> <if test="!itemto.flag"> or ( <foreach item="itemtoto" collection="itemto.object" separator="or" open="(" close=")" index=""> create_user_org_code = #{itemtoto.orgCode} DE.create_user_org_code = #{itemtoto.orgCode} </foreach> and is_del = 0 and enabled=1 <include refid="where_condition"></include> and DE.is_del = 0 and DE.enabled=1 <include refid="where_condition"></include> ) </if> </when> <when test="inx == 3"> <if test="itemto.flag"> AND create_user_org_code = #{itemto.object} DE.create_user_org_code = #{itemto.object} </if> <if test="!itemto.flag"> or (create_user_org_code = #{itemto.object} and is_del = 0 and enabled=1) <include refid="where_condition"></include> or (DE.create_user_org_code = #{itemto.object} and DE.is_del = 0 and DE.enabled=1) <include refid="where_condition"></include> </if> </when> <when test="inx == 4"> <if test="itemto.flag"> AND create_user_org_code like '${itemto.object}%' DE.create_user_org_code like '${itemto.object}%' </if> <if test="!itemto.flag"> or (create_user_org_code like '${itemto.object}%' and is_del = 0 and enabled=1) <include refid="where_condition"></include> or (DE.create_user_org_code like '${itemto.object}%' and DE.is_del = 0 and DE.enabled=1) <include refid="where_condition"></include> </if> </when> <when test="inx == 5"> <if test="itemto.flag"> AND create_user_id = #{itemto.object} DE.create_user_id = #{itemto.object} </if> <if test="!itemto.flag"> or (create_user_id = #{itemto.object} and is_del = 0 and enabled=1) <include refid="where_condition"></include> or (DE.create_user_id = #{itemto.object} and DE.is_del = 0 and DE.enabled=1) <include refid="where_condition"></include> </if> </when> <otherwise> AND id is null AND DE.id is null </otherwise> </choose> </foreach> @@ -215,7 +215,10 @@ FROM product_order_record DE LEFT JOIN product_order PRO ON DE.order_id = PRO.id <include refid="wherelimit"/> <where> <include refid="where_condition"/> </where> order by DE.id desc </select> <select id="groupProductDetail" resultType="com.kidgrow.oprationcenter.vo.GroupProductDetail"> kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java
@@ -704,6 +704,7 @@ sysOrganizationH.setCreateUserId(createUserId); sysOrganizationH.setCreateUserName(createUserName); if (organizationService.save(sysOrganizationH)) { organizationHos=sysOrganizationH.getId(); //写科室组织数据 SysOrganization sysOrganizationD = new SysOrganization(); sysOrganizationD.setOrgLevel(2); @@ -713,6 +714,7 @@ sysOrganizationD.setCreateUserId(createUserId); sysOrganizationD.setCreateUserName(createUserName); if (organizationService.save(sysOrganizationD)) { organizationDep=sysOrganizationD.getId(); //写医院组织数据 SysHospital sysHospital = new SysHospital(); sysHospital.setHospitalName(userRegVo.getHospitalName()); @@ -852,6 +854,10 @@ if (dicBool) { //写用户组织关系表 SysHospital byId = hospitalService.getById(userRegVo.getHospitalId()); if(byId!=null){ organizationHos=byId.getOrgId(); } List<SysUserOrg> sysUserOrgList = new ArrayList<SysUserOrg>(); sysUserOrgH.setUserId(sysUser.getId()); sysUserOrgH.setOrgId(organizationHos); @@ -860,7 +866,10 @@ sysUserOrgH.setCreateUserId(isReg ? createUserId : sysUserd.getId()); sysUserOrgH.setCreateUserName(isReg ? createUserName : sysUserd.getUsername()); sysUserOrgList.add(sysUserOrgH); SysDepartment department = departmentService.getById(userRegVo.getDepartmentId()); if(department!=null){ organizationDep=department.getOrgId(); } sysUserOrgD.setUserId(sysUser.getId()); sysUserOrgD.setOrgId(organizationDep); sysUserOrgD.setFromId(userRegVo.getDepartmentId()); kidgrow-config/src/main/resources/application-dev.properties
@@ -74,11 +74,17 @@ ## appUrl \u9759\u6001\u6587\u4EF6\u4E0A\u4F20\u8DEF\u5F84 appUrl=http://192.168.2.240/upload/ ## C\u7AEF\u4EA7\u54C1\u516C\u4F17\u53F7\u914D\u7F6E\u4FE1\u606F ## \u5FAE\u4FE1\u7EDF\u4E00URL wechat.apiUrl=https://api.weixin.qq.com wechat.mp.appid=dev-wx1cc7074ce3014652 wechat.mp.secret=dev-0fa9eb188ae52aa8c2380744109f161c ## C\u7AEF\u4EA7\u54C1\u5C0F\u7A0B\u5E8F\u914D\u7F6E\u4FE1\u606F ## H\u7AEF\u4EA7\u54C1\u9AA8\u9F84\u5C0F\u7A0B\u5E8F\u914D\u7F6E\u4FE1\u606F wechat.miniapp.appid=wx5a9bc7ebd13eb6cc wechat.miniapp.secret=c16d8e42e42137bd7ba6e6999f226803 ## C\u7AEF\u4EA7\u54C1\u516C\u4F17\u53F7\u914D\u7F6E\u4FE1\u606F wechat.xigao.mp.appid=dev-wx1cc7074ce3014652 wechat.xigao.mp.secret=dev-0fa9eb188ae52aa8c2380744109f161c ## C\u7AEF\u4EA7\u54C1\u53EF\u7231\u9AD8\u7B5B\u67E5\u5C0F\u7A0B\u5E8F\u914D\u7F6E\u4FE1\u606F wechat.screening.applets.appid=wx5a9bc7ebd13eb6cc wechat.screening.applets.secret=c16d8e42e42137bd7ba6e6999f226803
