add:增加报价单
This commit is contained in:
@@ -3,7 +3,7 @@ spring:
|
||||
type: com.alibaba.druid.pool.DruidDataSource
|
||||
druid:
|
||||
driver-class-name: com.mysql.cj.jdbc.Driver
|
||||
url: jdbc:mysql://localhost:3306/flowable?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
|
||||
url: jdbc:mysql://localhost:3306/basefast?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
|
||||
username: root
|
||||
password: 123456
|
||||
initial-size: 10
|
||||
|
||||
@@ -15,6 +15,8 @@ spring:
|
||||
jackson:
|
||||
time-zone: GMT+8
|
||||
date-format: yyyy-MM-dd HH:mm:ss
|
||||
mapper:
|
||||
accept-case-insensitive-properties: true
|
||||
servlet:
|
||||
multipart:
|
||||
max-file-size: 100MB
|
||||
|
||||
@@ -1,5 +0,0 @@
|
||||
====================================================================================================================
|
||||
|
||||
************* 欢迎使用 工作流Flowable管理系统 *************
|
||||
|
||||
====================================================================================================================
|
||||
@@ -9,10 +9,14 @@
|
||||
<result property="clientName" column="client_name"/>
|
||||
<result property="juridicalPerson" column="juridical_person"/>
|
||||
<result property="address" column="address"/>
|
||||
<result property="fax" column="address"/>
|
||||
<result property="tel" column="address"/>
|
||||
<result property="bank" column="address"/>
|
||||
<result property="card" column="address"/>
|
||||
<result property="industry" column="industry"/>
|
||||
<result property="isOn" column="is_on"/>
|
||||
<result property="createTime" column="create_time"/>
|
||||
</resultMap>
|
||||
|
||||
|
||||
</mapper>
|
||||
</mapper>
|
||||
|
||||
@@ -16,6 +16,36 @@
|
||||
<result property="acceptanceTime" column="acceptance_time"/>
|
||||
<result property="remarks" column="remarks"/>
|
||||
</resultMap>
|
||||
|
||||
|
||||
<resultMap type="com.boge.modules.contract.dto.ContractDto" id="contractDtoMap">
|
||||
<result property="contractId" column="contract_id"/>
|
||||
<result property="contractType" column="contract_type"/>
|
||||
<result property="isMaster" column="is_master"/>
|
||||
<result property="contractNumber" column="contract_number"/>
|
||||
<result property="clientId" column="client_id"/>
|
||||
<result property="materialJson" column="material_json"/>
|
||||
<result property="isAcceptance" column="is_acceptance"/>
|
||||
<result property="createTime" column="create_time"/>
|
||||
<result property="acceptanceTime" column="acceptance_time"/>
|
||||
<result property="remarks" column="remarks"/>
|
||||
<result property="storageId" column="storage_id"/>
|
||||
<result property="fileNo" column="file_no"/>
|
||||
<!-- ClientEntity关联对象 -->
|
||||
<association property="client" javaType="com.boge.modules.client.entity.ClientEntity">
|
||||
<result property="clientId" column="client_id"/>
|
||||
<result property="clientName" column="client_name"/>
|
||||
<result property="juridicalPerson" column="juridical_person"/>
|
||||
<result property="address" column="address"/>
|
||||
<result property="fax" column="address"/>
|
||||
<result property="tel" column="address"/>
|
||||
<result property="bank" column="address"/>
|
||||
<result property="card" column="address"/>
|
||||
<result property="industry" column="industry"/>
|
||||
<result property="isOn" column="is_on"/>
|
||||
<result property="createTime" column="create_time"/>
|
||||
</association>
|
||||
</resultMap>
|
||||
<select id="selectDtlById" resultMap="contractDtoMap">
|
||||
select * from sys_contract left join sys_client on sys_contract.client_id = sys_client.client_id
|
||||
where contract_id = #{id}
|
||||
</select>
|
||||
</mapper>
|
||||
|
||||
@@ -8,10 +8,12 @@
|
||||
<result property="materialId" column="material_id"/>
|
||||
<result property="materialCode" column="material_code"/>
|
||||
<result property="materialName" column="material_name"/>
|
||||
<result property="materialSpec" column="material_spec"/>
|
||||
<result property="unitName" column="unit_name"/>
|
||||
<result property="materialType" column="material_type"/>
|
||||
<result property="isOn" column="is_on"/>
|
||||
<result property="createTime" column="create_time"/>
|
||||
</resultMap>
|
||||
|
||||
|
||||
</mapper>
|
||||
</mapper>
|
||||
|
||||
@@ -4,19 +4,19 @@
|
||||
<mapper namespace="com.boge.modules.sys.dao.SysUserDao">
|
||||
<!-- 查询用户的所有权限 -->
|
||||
<select id="queryAllPerms" resultType="string">
|
||||
select m.perms from sys_user_role ur
|
||||
LEFT JOIN sys_role_menu rm on ur.role_id = rm.role_id
|
||||
LEFT JOIN sys_menu m on rm.menu_id = m.menu_id
|
||||
select m.perms from sys_user_role ur
|
||||
LEFT JOIN sys_role_menu rm on ur.role_id = rm.role_id
|
||||
LEFT JOIN sys_menu m on rm.menu_id = m.menu_id
|
||||
where ur.user_id = #{userId}
|
||||
</select>
|
||||
|
||||
<!-- 查询用户的所有菜单ID -->
|
||||
|
||||
<!-- 查询用户的所有菜单ID -->
|
||||
<select id="queryAllMenuId" resultType="long">
|
||||
select distinct rm.menu_id from sys_user_role ur
|
||||
LEFT JOIN sys_role_menu rm on ur.role_id = rm.role_id
|
||||
select distinct rm.menu_id from sys_user_role ur
|
||||
LEFT JOIN sys_role_menu rm on ur.role_id = rm.role_id
|
||||
where ur.user_id = #{userId}
|
||||
</select>
|
||||
|
||||
|
||||
<select id="queryByUserName" resultType="com.boge.modules.sys.entity.SysUserEntity">
|
||||
select * from sys_user where username = #{username}
|
||||
</select>
|
||||
@@ -28,4 +28,4 @@
|
||||
)
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
</mapper>
|
||||
|
||||
Reference in New Issue
Block a user