Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
A
Aidea
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
sa_aidea
Aidea
Commits
68fb4a4c
Commit
68fb4a4c
authored
Dec 06, 2020
by
卜远杰
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
报表
parent
51899f8c
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
21 changed files
with
1662 additions
and
418 deletions
+1662
-418
orderlist.html
...le-web/src/main/webapp/WEB-INF/views/order/orderlist.html
+2
-2
InvoiceUtil.java
...ule/src/main/java/com/cftech/order/utils/InvoiceUtil.java
+2
-2
reportform.html
...-web/src/main/webapp/WEB-INF/views/report/reportform.html
+10
-10
reportlist.html
...-web/src/main/webapp/WEB-INF/views/report/reportlist.html
+174
-91
ReportMapper.java
...ule/src/main/java/com/cftech/report/dao/ReportMapper.java
+41
-0
ReportMapper.xml
...dule/src/main/java/com/cftech/report/dao/ReportMapper.xml
+355
-0
ReportJob.java
...module/src/main/java/com/cftech/report/job/ReportJob.java
+256
-0
Report.java
...-module/src/main/java/com/cftech/report/model/Report.java
+109
-0
ReportCode.java
...ule/src/main/java/com/cftech/report/model/ReportCode.java
+25
-0
ReportDoctorInfo.java
...c/main/java/com/cftech/report/model/ReportDoctorInfo.java
+44
-0
ReportPeopleInfo.java
...c/main/java/com/cftech/report/model/ReportPeopleInfo.java
+63
-0
ReportService.java
...rc/main/java/com/cftech/report/service/ReportService.java
+44
-0
ReportServiceImpl.java
...ava/com/cftech/report/service/impl/ReportServiceImpl.java
+61
-0
ReportController.java
...src/main/java/com/cftech/report/web/ReportController.java
+256
-0
TestController.java
...e/src/main/java/com/cftech/report/web/TestController.java
+217
-0
ReportFormMapper.java
...main/java/com/cftech/reportform/dao/ReportFormMapper.java
+0
-27
ReportForm.java
...src/main/java/com/cftech/reportform/model/ReportForm.java
+0
-57
ReportFormDetail.java
...in/java/com/cftech/reportform/model/ReportFormDetail.java
+0
-151
ReportFormService.java
...java/com/cftech/reportform/service/ReportFormService.java
+0
-31
ReportFormServiceImpl.java
...cftech/reportform/service/impl/ReportFormServiceImpl.java
+0
-46
common-test.properties
cftech-common-web/src/main/resources/common-test.properties
+3
-1
No files found.
aidea-modules/order-module-web/src/main/webapp/WEB-INF/views/order/orderlist.html
View file @
68fb4a4c
...
@@ -921,10 +921,9 @@
...
@@ -921,10 +921,9 @@
//开发票
//开发票
function
exportInvoice
(
data
)
{
function
exportInvoice
(
data
)
{
var
qrCodeIds
=
isCheckedQyCode
.
join
(
","
);
var
email
=
$
(
"[name='email']"
).
val
();
var
email
=
$
(
"[name='email']"
).
val
();
$
(
'#peakButtom'
).
modal
(
'hide'
);
$
(
'#peakButtom'
).
modal
(
'hide'
);
if
(
qrCodeIds
==
''
||
qrCodeIds
==
null
){
if
(
isCheckedQyCode
.
filter
(
function
(
el
){
return
el
!==
undefined
})
==
''
){
Cfapp
.
alert
({
Cfapp
.
alert
({
message
:
"请勾选需求清单"
,
message
:
"请勾选需求清单"
,
btntext
:
"确定"
,
btntext
:
"确定"
,
...
@@ -933,6 +932,7 @@
...
@@ -933,6 +932,7 @@
});
});
return
;
return
;
}
}
var
qrCodeIds
=
isCheckedQyCode
.
join
(
","
);
if
(
email
==
''
||
email
==
null
){
if
(
email
==
''
||
email
==
null
){
Cfapp
.
alert
({
Cfapp
.
alert
({
message
:
"请填写邮箱"
,
message
:
"请填写邮箱"
,
...
...
aidea-modules/order-module/src/main/java/com/cftech/order/utils/InvoiceUtil.java
View file @
68fb4a4c
...
@@ -94,7 +94,7 @@ public class InvoiceUtil {
...
@@ -94,7 +94,7 @@ public class InvoiceUtil {
//销方电话 必填
//销方电话 必填
order
.
put
(
"salerTel"
,
SystemConfig
.
p
.
getProperty
(
"SALER_TEL"
));
order
.
put
(
"salerTel"
,
SystemConfig
.
p
.
getProperty
(
"SALER_TEL"
));
//订单号 (每个企业唯一) 必填
//订单号 (每个企业唯一) 必填
order
.
put
(
"orderNo"
,
"OD199812132"
);
//todo
order
.
put
(
"orderNo"
,
orderObj
.
getNumber
()
);
//todo
// 开票完成回传发票信息地址 非必填
// 开票完成回传发票信息地址 非必填
order
.
put
(
"callBackUrl"
,
"http:127.0.0.1/invoice/callback/"
);
order
.
put
(
"callBackUrl"
,
"http:127.0.0.1/invoice/callback/"
);
// 购方名称 必填
// 购方名称 必填
...
@@ -119,7 +119,7 @@ public class InvoiceUtil {
...
@@ -119,7 +119,7 @@ public class InvoiceUtil {
}
}
//购方手机(pushMode为1或2时,此项为必填) 必填
//购方手机(pushMode为1或2时,此项为必填) 必填
order
.
put
(
"buyerPhone"
,
"
18516234460
"
);
//todo
order
.
put
(
"buyerPhone"
,
""
);
//todo
//购方银行账号及开户行地址 非必填
//购方银行账号及开户行地址 非必填
order
.
put
(
"buyerAccount"
,
""
);
order
.
put
(
"buyerAccount"
,
""
);
//成品油标志:非成品油(默认):0;成品油:1 非必填
//成品油标志:非成品油(默认):0;成品油:1 非必填
...
...
aidea-modules/reportform-module-web/src/main/webapp/WEB-INF/views/report
Form/reportForm
form.html
→
aidea-modules/reportform-module-web/src/main/webapp/WEB-INF/views/report
/report
form.html
View file @
68fb4a4c
...
@@ -56,12 +56,12 @@
...
@@ -56,12 +56,12 @@
<section
class=
"content-header"
>
<section
class=
"content-header"
>
<h1>
<h1>
报表
管理
管理
报表
信息
管理
<small>
报表
管理
</small>
<small>
报表
信息
</small>
</h1>
</h1>
<ol
class=
"breadcrumb"
>
<ol
class=
"breadcrumb"
>
<li><a
href=
"#"
><i
class=
"fa fa-dashboard"
></i>
首页
</a></li>
<li><a
href=
"#"
><i
class=
"fa fa-dashboard"
></i>
首页
</a></li>
<li><a
class=
"active"
>
报表
管理
</a></li>
<li><a
class=
"active"
>
报表
信息
</a></li>
</ol>
</ol>
</section>
</section>
...
@@ -78,10 +78,10 @@
...
@@ -78,10 +78,10 @@
</div>
</div>
<div
class=
"box-footer"
>
<div
class=
"box-footer"
>
#if($shiro.hasPermission("qy:report
Form
:edit"))
#if($shiro.hasPermission("qy:report:edit"))
<input
class=
"btn btn-primary"
id=
"save"
value=
"保存"
type=
"submit"
>
<input
class=
"btn btn-primary"
id=
"save"
value=
"保存"
type=
"submit"
>
#end
#end
<a
href=
"#springUrl('/a/report
Form
/list')"
class=
"btn btn-default"
>
取消
</a>
<a
href=
"#springUrl('/a/report/list')"
class=
"btn btn-default"
>
取消
</a>
</div>
</div>
</form>
</form>
<!-- /.box-body -->
<!-- /.box-body -->
...
@@ -142,7 +142,7 @@
...
@@ -142,7 +142,7 @@
messages
:
{},
messages
:
{},
submitHandler
:
function
(
form
)
{
submitHandler
:
function
(
form
)
{
$
(
"#save"
).
attr
(
"disabled"
,
true
);
$
(
"#save"
).
attr
(
"disabled"
,
true
);
$
.
getJSON
(
"#springUrl('/a/report
Form
/formData')"
,
$
(
"#myForm"
).
serialize
(),
function
(
returnobj
)
{
$
.
getJSON
(
"#springUrl('/a/report/formData')"
,
$
(
"#myForm"
).
serialize
(),
function
(
returnobj
)
{
$
(
"#save"
).
attr
(
"disabled"
,
false
);
$
(
"#save"
).
attr
(
"disabled"
,
false
);
if
(
returnobj
.
errorNo
==
2
)
{
//保存成功
if
(
returnobj
.
errorNo
==
2
)
{
//保存成功
Cfapp
.
confirm
({
Cfapp
.
confirm
({
...
@@ -150,10 +150,10 @@
...
@@ -150,10 +150,10 @@
btnoktext
:
"继续添加"
,
btnoktext
:
"继续添加"
,
btncanceltext
:
"关闭"
,
btncanceltext
:
"关闭"
,
success
:
function
()
{
success
:
function
()
{
location
.
href
=
"#springUrl('/a/report
Form
/form')"
;
location
.
href
=
"#springUrl('/a/report/form')"
;
},
},
cancel
:
function
()
{
cancel
:
function
()
{
location
.
href
=
"#springUrl('/a/report
Form
/list')"
;
location
.
href
=
"#springUrl('/a/report/list')"
;
}
}
});
});
}
else
if
(
returnobj
.
errorNo
==
0
)
{
//修改成功
}
else
if
(
returnobj
.
errorNo
==
0
)
{
//修改成功
...
@@ -161,7 +161,7 @@
...
@@ -161,7 +161,7 @@
message
:
"更新成功"
,
message
:
"更新成功"
,
btntext
:
"确定"
,
btntext
:
"确定"
,
success
:
function
()
{
success
:
function
()
{
location
.
href
=
"#springUrl('/a/report
Form
/list')"
;
location
.
href
=
"#springUrl('/a/report/list')"
;
}
}
});
});
}
else
{
}
else
{
...
@@ -169,7 +169,7 @@
...
@@ -169,7 +169,7 @@
message
:
"创建失败"
,
message
:
"创建失败"
,
btntext
:
"确定"
,
btntext
:
"确定"
,
success
:
function
()
{
success
:
function
()
{
location
.
href
=
"#springUrl('/a/report
Form
/list')"
;
location
.
href
=
"#springUrl('/a/report/list')"
;
}
}
});
});
}
}
...
...
aidea-modules/reportform-module-web/src/main/webapp/WEB-INF/views/report
Form/reportForm
list.html
→
aidea-modules/reportform-module-web/src/main/webapp/WEB-INF/views/report
/report
list.html
View file @
68fb4a4c
This diff is collapsed.
Click to expand it.
aidea-modules/reportform-module/src/main/java/com/cftech/report/dao/ReportMapper.java
0 → 100644
View file @
68fb4a4c
package
com
.
cftech
.
report
.
dao
;
import
com.cftech.report.model.Report
;
import
com.cftech.core.generic.GenericDao
;
import
com.cftech.report.model.ReportCode
;
import
com.cftech.report.model.ReportDoctorInfo
;
import
com.cftech.report.model.ReportPeopleInfo
;
import
java.util.List
;
import
java.util.Map
;
/**
* 报表信息Mapper
*
* @author Buyj
* @date: 2020-12-02 11:26
*/
public
interface
ReportMapper
extends
GenericDao
<
Report
>
{
/**
* 查询报表人员信息
* @param params
* @return
*/
List
<
ReportPeopleInfo
>
selectReportPeopleInfo
(
Map
<
String
,
Object
>
params
);
/**
* 查询用户对应的扫码记录信息
* @param params
* @return
*/
List
<
ReportCode
>
selectReportCodeInfo
(
Map
<
String
,
Object
>
params
);
/**
* 根据医生id查询医生信息
* @param params
* @return
*/
ReportDoctorInfo
selectReportDoctorInfo
(
Map
<
String
,
Object
>
params
);
}
\ No newline at end of file
aidea-modules/reportform-module/src/main/java/com/cftech/report
form/dao/ReportForm
Mapper.xml
→
aidea-modules/reportform-module/src/main/java/com/cftech/report
/dao/Report
Mapper.xml
View file @
68fb4a4c
This diff is collapsed.
Click to expand it.
aidea-modules/reportform-module/src/main/java/com/cftech/report/job/ReportJob.java
0 → 100644
View file @
68fb4a4c
This diff is collapsed.
Click to expand it.
aidea-modules/reportform-module/src/main/java/com/cftech/report/model/Report.java
0 → 100644
View file @
68fb4a4c
package
com
.
cftech
.
report
.
model
;
import
com.cftech.core.poi.ExportConfig
;
import
lombok.Data
;
import
java.io.Serializable
;
import
java.util.Date
;
/**
* 报表信息
*
* @author Buyj
* @date: 2020-12-02 11:26
*/
@Data
public
class
Report
implements
Serializable
{
/* 主键id */
private
Long
id
;
/* 大区 */
@ExportConfig
(
value
=
"大区"
,
width
=
100
,
showLevel
=
1
)
private
String
region
;
/* 省份 */
@ExportConfig
(
value
=
"省份"
,
width
=
100
,
showLevel
=
1
)
private
String
province
;
/* 城市 */
@ExportConfig
(
value
=
"城市"
,
width
=
100
,
showLevel
=
1
)
private
String
city
;
/* 销售代表 */
@ExportConfig
(
value
=
"销售代表"
,
width
=
100
,
showLevel
=
1
)
private
String
salesRepresent
;
/* 医院 */
@ExportConfig
(
value
=
"医院"
,
width
=
100
,
showLevel
=
1
)
private
String
hospital
;
/* 科室 */
@ExportConfig
(
value
=
"科室"
,
width
=
100
,
showLevel
=
1
)
private
String
department
;
/* 医生姓名 */
@ExportConfig
(
value
=
"医生姓名"
,
width
=
100
,
showLevel
=
1
)
private
String
doctorName
;
/* 医生职称 */
@ExportConfig
(
value
=
"医生职称"
,
width
=
100
,
showLevel
=
1
)
private
String
doctorTitle
;
/* 性别 */
@ExportConfig
(
value
=
"性别"
,
width
=
100
,
showLevel
=
1
)
private
String
sex
;
/* 医生手机号码 */
@ExportConfig
(
value
=
"医生手机号码"
,
width
=
100
,
showLevel
=
1
)
private
String
doctorPhone
;
/* 处方医院 */
@ExportConfig
(
value
=
"处方医院"
,
width
=
100
,
showLevel
=
1
)
private
String
cfHospital
;
/* 处方医生 */
@ExportConfig
(
value
=
"处方医生"
,
width
=
100
,
showLevel
=
1
)
private
String
cfDoctor
;
/* 咨询单编码 */
@ExportConfig
(
value
=
"咨询单编码"
,
width
=
100
,
showLevel
=
1
)
private
String
consultNumber
;
/* 需求清单编码 */
@ExportConfig
(
value
=
"需求清单编码"
,
width
=
100
,
showLevel
=
1
)
private
String
orderNumber
;
/* 用户姓名 */
@ExportConfig
(
value
=
"用户姓名"
,
width
=
100
,
showLevel
=
1
)
private
String
userName
;
/* 用户手机号码 */
@ExportConfig
(
value
=
"用户手机号码"
,
width
=
100
,
showLevel
=
1
)
private
String
phone
;
/* 产品名称 */
@ExportConfig
(
value
=
"产品名称"
,
width
=
100
,
showLevel
=
1
)
private
String
productName
;
/* 购买数量 */
@ExportConfig
(
value
=
"购买数量"
,
width
=
100
,
showLevel
=
1
)
private
String
drugsNum
;
/* 付款时间 */
@ExportConfig
(
value
=
"付款时间"
,
width
=
100
,
showLevel
=
1
)
private
Date
fkTime
;
/* 发货时间 */
@ExportConfig
(
value
=
"发货时间"
,
width
=
100
,
showLevel
=
1
)
private
Date
fhTime
;
/* 收件时间 */
@ExportConfig
(
value
=
"收件时间"
,
width
=
100
,
showLevel
=
1
)
private
Date
sjTime
;
/* 所属的账号 */
private
Long
accountsId
;
/* 删除标识 */
private
boolean
delFlag
;
/* 状态 */
private
String
status
;
/* 创建时间 */
private
Date
createTime
;
/* 更新时间 */
private
Date
updateTime
;
/* 备注 */
private
String
description
;
/* 创建人 */
private
Long
createBy
;
/* 更新人 */
private
Long
updateBy
;
/**
* 用户的opendId
*/
private
String
openId
;
public
Report
()
{
this
.
delFlag
=
false
;
this
.
status
=
"0"
;
}
}
\ No newline at end of file
aidea-modules/reportform-module/src/main/java/com/cftech/report/model/ReportCode.java
0 → 100644
View file @
68fb4a4c
package
com
.
cftech
.
report
.
model
;
import
lombok.Data
;
/**
* @author BuYJ
*/
@Data
public
class
ReportCode
{
/**
* 用户openId
*/
private
String
openId
;
/**
* 类型 (3:医生 4:组织)
*/
private
String
type
;
/**
* 绑定的ID
*/
private
String
bindId
;
}
aidea-modules/reportform-module/src/main/java/com/cftech/report/model/ReportDoctorInfo.java
0 → 100644
View file @
68fb4a4c
package
com
.
cftech
.
report
.
model
;
import
lombok.Data
;
/**
* @author BuYJ
*/
@Data
public
class
ReportDoctorInfo
{
/**
* 医生ID
*/
private
String
id
;
/**
* 医生名称
*/
private
String
userName
;
/**
* 性别
*/
private
String
gender
;
/**
* 组织ID
*/
private
String
orgId
;
/**
* 组织名称
*/
private
String
orgName
;
/**
* 组织长编码
*/
private
String
orgParentIds
;
/**
* 用户类型
*/
private
String
userType
;
/**
* 医生手机号码
*/
private
String
userPhone
;
}
aidea-modules/reportform-module/src/main/java/com/cftech/report/model/ReportPeopleInfo.java
0 → 100644
View file @
68fb4a4c
package
com
.
cftech
.
report
.
model
;
import
lombok.Data
;
import
java.util.Date
;
/**
* @author BuYj
*/
@Data
public
class
ReportPeopleInfo
{
/**
* 产品名称
*/
private
String
productName
;
/**
* 产品数量
*/
private
String
drugsNum
;
/**
* 需求清单编码
*/
private
String
orderNumber
;
/**
* 咨询单编码
*/
private
String
consultNumber
;
/**
* 用户姓名
*/
private
String
userName
;
/**
* 用户手机
*/
private
String
phone
;
/**
* 处方医生
*/
private
String
cfDoctor
;
/**
* 处方医院
*/
private
String
cfHospital
;
/**
* 付款时间
*/
private
Date
fkTime
;
/**
* 发货时间
*/
private
Date
fhTime
;
/**
* 收件时间
*/
private
Date
sjTime
;
/**
* 用户openId
*/
private
String
openId
;
}
aidea-modules/reportform-module/src/main/java/com/cftech/report/service/ReportService.java
0 → 100644
View file @
68fb4a4c
package
com
.
cftech
.
report
.
service
;
import
com.cftech.core.sql.Conds
;
import
com.cftech.core.sql.Sort
;
import
com.cftech.report.model.Report
;
import
com.cftech.core.generic.GenericService
;
import
com.cftech.report.model.ReportCode
;
import
com.cftech.report.model.ReportDoctorInfo
;
import
com.cftech.report.model.ReportPeopleInfo
;
import
java.util.List
;
import
java.util.Map
;
/**
* 报表信息Service
*
* @author Buyj
* @date: 2020-12-02 11:26
*/
public
interface
ReportService
extends
GenericService
<
Report
>
{
/**
* 查询报表人员信息
* @param cond
* @param sort
* @return
*/
List
<
ReportPeopleInfo
>
selectReportPeopleInfo
(
Conds
cond
,
Sort
sort
);
/**
* 查询用户对应的扫码记录信息
* @param cond
* @param sort
* @return
*/
List
<
ReportCode
>
selectReportCodeInfo
(
Conds
cond
,
Sort
sort
);
/**
* 根据医生ID查询医生信息
* @param cond
* @return
*/
ReportDoctorInfo
selectReportDoctorInfo
(
Conds
cond
);
}
aidea-modules/reportform-module/src/main/java/com/cftech/report/service/impl/ReportServiceImpl.java
0 → 100644
View file @
68fb4a4c
package
com
.
cftech
.
report
.
service
.
impl
;
import
com.cftech.core.sql.Sort
;
import
com.cftech.report.model.Report
;
import
com.cftech.report.dao.ReportMapper
;
import
com.cftech.report.model.ReportCode
;
import
com.cftech.report.model.ReportDoctorInfo
;
import
com.cftech.report.model.ReportPeopleInfo
;
import
com.cftech.report.service.ReportService
;
import
com.cftech.core.generic.GenericDao
;
import
com.cftech.core.generic.GenericServiceImpl
;
import
com.cftech.core.sql.Conds
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Qualifier
;
import
org.springframework.stereotype.Service
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.Map
;
/**
* 报表信息ServiceImpl
*
* @author Buyj
* @date: 2020-12-02 11:26
*/
@Service
(
"reportService"
)
public
class
ReportServiceImpl
extends
GenericServiceImpl
<
Report
>
implements
ReportService
{
@Autowired
@Qualifier
(
"reportMapper"
)
private
ReportMapper
reportMapper
;
@Override
public
GenericDao
<
Report
>
getGenericMapper
()
{
return
reportMapper
;
}
@Override
public
List
<
ReportPeopleInfo
>
selectReportPeopleInfo
(
Conds
cond
,
Sort
sort
)
{
Map
<
String
,
Object
>
params
=
new
HashMap
<
String
,
Object
>();
params
.
put
(
"conds"
,
cond
);
params
.
put
(
"sort"
,
sort
);
return
reportMapper
.
selectReportPeopleInfo
(
params
);
}
@Override
public
List
<
ReportCode
>
selectReportCodeInfo
(
Conds
cond
,
Sort
sort
)
{
Map
<
String
,
Object
>
params
=
new
HashMap
<
String
,
Object
>();
params
.
put
(
"conds"
,
cond
);
params
.
put
(
"sort"
,
sort
);
return
reportMapper
.
selectReportCodeInfo
(
params
);
}
@Override
public
ReportDoctorInfo
selectReportDoctorInfo
(
Conds
cond
)
{
Map
<
String
,
Object
>
params
=
new
HashMap
<
String
,
Object
>();
params
.
put
(
"conds"
,
cond
);
return
reportMapper
.
selectReportDoctorInfo
(
params
);
}
}
\ No newline at end of file
aidea-modules/reportform-module/src/main/java/com/cftech/report
form/web/ReportForm
Controller.java
→
aidea-modules/reportform-module/src/main/java/com/cftech/report
/web/Report
Controller.java
View file @
68fb4a4c
This diff is collapsed.
Click to expand it.
aidea-modules/reportform-module/src/main/java/com/cftech/report/web/TestController.java
0 → 100644
View file @
68fb4a4c
This diff is collapsed.
Click to expand it.
aidea-modules/reportform-module/src/main/java/com/cftech/reportform/dao/ReportFormMapper.java
deleted
100644 → 0
View file @
51899f8c
package
com
.
cftech
.
reportform
.
dao
;
import
com.cftech.reportform.model.ReportForm
;
import
com.cftech.core.generic.GenericDao
;
import
com.cftech.reportform.model.ReportFormDetail
;
import
java.util.List
;
import
java.util.Map
;
/**
* 报表管理Mapper
*
* @author Licc
* @date: 2020-10-16 14:33
*/
public
interface
ReportFormMapper
extends
GenericDao
<
ReportForm
>
{
/**
* 查询报表
* @param params
* @return
*/
List
<
ReportFormDetail
>
selectReportDetail
(
Map
<
String
,
Object
>
params
);
}
\ No newline at end of file
aidea-modules/reportform-module/src/main/java/com/cftech/reportform/model/ReportForm.java
deleted
100644 → 0
View file @
51899f8c
package
com
.
cftech
.
reportform
.
model
;
import
com.cftech.core.poi.ExportConfig
;
import
lombok.Data
;
import
java.io.Serializable
;
import
java.util.Date
;
/**
* 报表管理
*
* @author Licc
* @date: 2020-10-16 14:33
*/
@Data
public
class
ReportForm
implements
Serializable
{
/*药师名称*/
@ExportConfig
(
value
=
"药师名称"
,
width
=
100
,
showLevel
=
1
)
private
String
pharmacist
;
/*客服名称*/
@ExportConfig
(
value
=
"客服名称"
,
width
=
100
,
showLevel
=
1
)
private
String
customerName
;
/*订单编号*/
@ExportConfig
(
value
=
"订单编号"
,
width
=
100
,
showLevel
=
1
)
private
String
number
;
/*订单金额*/
@ExportConfig
(
value
=
"订单金额"
,
width
=
100
,
showLevel
=
1
)
private
Double
orderAmount
;
/*咨询单号*/
@ExportConfig
(
value
=
"咨询单号"
,
width
=
100
,
showLevel
=
1
)
private
String
numberCode
;
/*物流单号 */
@ExportConfig
(
value
=
"物流单号"
,
width
=
100
,
showLevel
=
1
)
private
String
logisticsCode
;
/*物流状态*/
@ExportConfig
(
value
=
"物流状态"
,
width
=
100
,
showLevel
=
1
)
private
Long
logisticsStatus
;
/* 所属的账号 */
private
Long
accountsId
;
/* 删除标识 */
private
boolean
delFlag
;
/* 状态 */
private
String
status
;
/* 创建时间 */
private
Date
createTime
;
/* 更新时间 */
private
Date
updateTime
;
/* 备注 */
private
String
description
;
/* 创建人 */
private
Long
createBy
;
/* 更新人 */
private
Long
updateBy
;
}
\ No newline at end of file
aidea-modules/reportform-module/src/main/java/com/cftech/reportform/model/ReportFormDetail.java
deleted
100644 → 0
View file @
51899f8c
package
com
.
cftech
.
reportform
.
model
;
import
com.cftech.core.poi.ExportConfig
;
import
lombok.Data
;
/**
* 报表信息实体类
* @author BuYJ
*/
@Data
public
class
ReportFormDetail
{
/**
* 咨询单ID
*/
private
String
id
;
/**
* 咨询单编码 1
*/
@ExportConfig
(
value
=
"咨询单编码"
,
width
=
100
,
showLevel
=
1
)
private
String
consultId
;
/**
* 订单编码 2
*/
@ExportConfig
(
value
=
"订单编码"
,
width
=
100
,
showLevel
=
1
)
private
String
orderCode
;
/**
* 顺风编码 3
*/
@ExportConfig
(
value
=
"顺风编码"
,
width
=
100
,
showLevel
=
1
)
private
String
courierNumber
;
/**
* 物流编码 4
*/
@ExportConfig
(
value
=
"物流编码"
,
width
=
100
,
showLevel
=
1
)
private
String
waybillNumber
;
/**
* 战区 5
*/
@ExportConfig
(
value
=
"战区"
,
width
=
100
,
showLevel
=
1
)
private
String
warZone
;
/**
* 省 6
*/
@ExportConfig
(
value
=
"省"
,
width
=
100
,
showLevel
=
1
)
private
String
provinceName
;
/**
* 市 7
*/
@ExportConfig
(
value
=
"市"
,
width
=
100
,
showLevel
=
1
)
private
String
cityName
;
/**
* 医院名称 8
*/
@ExportConfig
(
value
=
"医院名称"
,
width
=
100
,
showLevel
=
1
)
private
String
hospital
;
/**
* 药师名称 9
*/
@ExportConfig
(
value
=
"药师名称"
,
width
=
100
,
showLevel
=
1
)
private
String
pharmaName
;
/**
* 客服名称 10
*/
@ExportConfig
(
value
=
"客服名称"
,
width
=
100
,
showLevel
=
1
)
private
String
customerName
;
/**
* 医生名称 11
*/
@ExportConfig
(
value
=
"医生名称"
,
width
=
100
,
showLevel
=
1
)
private
String
doctorName
;
/**
* 咨询人openId 12
*/
@ExportConfig
(
value
=
"咨询人openId"
,
width
=
100
,
showLevel
=
1
)
private
String
openId
;
/**
* 咨询人姓名 13
*/
@ExportConfig
(
value
=
"咨询人姓名"
,
width
=
100
,
showLevel
=
1
)
private
String
userName
;
/**
* 性别 14
*/
@ExportConfig
(
value
=
"性别"
,
width
=
100
,
showLevel
=
1
)
private
String
sex
;
/**
* 咨询人手机号码 15
*/
@ExportConfig
(
value
=
"咨询人手机号码"
,
width
=
100
,
showLevel
=
1
)
private
String
phone
;
/**
* 处方医院ID
*/
private
String
pastRecords
;
/**
* 医生ID
*/
private
String
doctorId
;
/**
* 客户ID
*/
private
String
serviceId
;
/**
* 咨询药品ID
*/
private
String
drugsId
;
/**
* 订单ID
*/
private
String
orderId
;
/**
* 处方医院ID
*/
private
String
allergy
;
}
aidea-modules/reportform-module/src/main/java/com/cftech/reportform/service/ReportFormService.java
deleted
100644 → 0
View file @
51899f8c
package
com
.
cftech
.
reportform
.
service
;
import
com.cftech.core.sql.Conds
;
import
com.cftech.core.sql.Sort
;
import
com.cftech.reportform.model.ReportForm
;
import
com.cftech.core.generic.GenericService
;
import
com.cftech.reportform.model.ReportFormDetail
;
import
java.util.List
;
import
java.util.Map
;
/**
* 报表管理Service
*
* @author Licc
* @date: 2020-10-16 14:33
*/
public
interface
ReportFormService
extends
GenericService
<
ReportForm
>
{
/**
* 查询报表
* @param conds
* @param sort
* @param page
* @param pageSize
* @return
*/
List
<
ReportFormDetail
>
selectReportDetail
(
Conds
conds
,
Sort
sort
,
int
page
,
int
pageSize
);
}
aidea-modules/reportform-module/src/main/java/com/cftech/reportform/service/impl/ReportFormServiceImpl.java
deleted
100644 → 0
View file @
51899f8c
package
com
.
cftech
.
reportform
.
service
.
impl
;
import
com.cftech.core.sql.Sort
;
import
com.cftech.reportform.model.ReportForm
;
import
com.cftech.reportform.dao.ReportFormMapper
;
import
com.cftech.reportform.model.ReportFormDetail
;
import
com.cftech.reportform.service.ReportFormService
;
import
com.cftech.core.generic.GenericDao
;
import
com.cftech.core.generic.GenericServiceImpl
;
import
com.cftech.core.sql.Conds
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Qualifier
;
import
org.springframework.stereotype.Service
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.Map
;
/**
* 报表管理ServiceImpl
*
* @author Licc
* @date: 2020-10-16 14:33
*/
@Service
(
"reportFormService"
)
public
class
ReportFormServiceImpl
extends
GenericServiceImpl
<
ReportForm
>
implements
ReportFormService
{
@Autowired
@Qualifier
(
"reportFormMapper"
)
private
ReportFormMapper
reportFormMapper
;
@Override
public
GenericDao
<
ReportForm
>
getGenericMapper
()
{
return
reportFormMapper
;
}
@Override
public
List
<
ReportFormDetail
>
selectReportDetail
(
Conds
conds
,
Sort
sort
,
int
page
,
int
pageSize
)
{
Map
<
String
,
Object
>
params
=
new
HashMap
<
String
,
Object
>();
params
.
put
(
"conds"
,
conds
);
params
.
put
(
"offset"
,
page
>
0
?
page
:
0
);
params
.
put
(
"limit"
,
pageSize
>
0
?
pageSize
:
0
);
params
.
put
(
"sort"
,
sort
);
return
reportFormMapper
.
selectReportDetail
(
params
);
}
}
\ No newline at end of file
cftech-common-web/src/main/resources/common-test.properties
View file @
68fb4a4c
...
@@ -44,7 +44,7 @@ LOG_URL=http://www.michang-tech.com.cn:6989/log/addlog
...
@@ -44,7 +44,7 @@ LOG_URL=http://www.michang-tech.com.cn:6989/log/addlog
#\u6821\u9A8C\u5151\u6362\u5BC6\u7801KEY
#\u6821\u9A8C\u5151\u6362\u5BC6\u7801KEY
MEMBER_PASSWORD_KEY
=
DONGCHANGINT9527;
MEMBER_PASSWORD_KEY
=
DONGCHANGINT9527;
list.refreshtoken
=
true
list.refreshtoken
=
true
jwt.domain
=
pd.shxrtech.com
jwt.domain
=
localhost
#\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
#\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
jwt.duration
=
86400000
jwt.duration
=
86400000
#\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u03AAtrue
#\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u03AAtrue
...
@@ -75,6 +75,8 @@ PAYEE=\u6C6A\u8A00\u52C7
...
@@ -75,6 +75,8 @@ PAYEE=\u6C6A\u8A00\u52C7
INVOICE_API
=
nuonuo.ElectronInvoice.requestBillingNew
INVOICE_API
=
nuonuo.ElectronInvoice.requestBillingNew
INVOICE_URL
=
https://sandbox.nuonuocs.cn/open/v1/services
INVOICE_URL
=
https://sandbox.nuonuocs.cn/open/v1/services
REGION_LONG_ID
=
0,1,5,
#\u5546\u6237\u53F7\u914D\u7F6E\u6587\u4EF6
#\u5546\u6237\u53F7\u914D\u7F6E\u6587\u4EF6
mch.mch_id
=
1604243615
mch.mch_id
=
1604243615
#\u7EC8\u7AEFid
#\u7EC8\u7AEFid
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment