Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-zx-biz
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
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
Jobs
Commits
Open sidebar
项目统一框架
一体化_户用光伏项目代码
amos-boot-zx-biz
Commits
48a1dc5b
Commit
48a1dc5b
authored
Nov 20, 2024
by
hezhuozhi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
补全swagger注解
parent
8ca23553
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
110 additions
and
52 deletions
+110
-52
CommercialDto.java
.../yeejoin/amos/boot/module/hygf/api/dto/CommercialDto.java
+16
-16
DesignInformationDto.java
...n/amos/boot/module/hygf/api/dto/DesignInformationDto.java
+6
-6
InformationDto.java
...yeejoin/amos/boot/module/hygf/api/dto/InformationDto.java
+2
-2
PowerStationEngineeringInfoAllDto.java
...odule/hygf/api/dto/PowerStationEngineeringInfoAllDto.java
+22
-6
SurveyDetailsDto.java
...ejoin/amos/boot/module/hygf/api/dto/SurveyDetailsDto.java
+9
-9
SurveyInformationDto.java
...n/amos/boot/module/hygf/api/dto/SurveyInformationDto.java
+2
-2
UserMessageDto.java
...yeejoin/amos/boot/module/hygf/api/dto/UserMessageDto.java
+6
-6
UserMessagePageDto.java
...oin/amos/boot/module/hygf/api/dto/UserMessagePageDto.java
+7
-0
ConstructionAcceptanceRecords.java
...module/hygf/api/entity/ConstructionAcceptanceRecords.java
+12
-1
ConstructionGirdRecords.java
.../boot/module/hygf/api/entity/ConstructionGirdRecords.java
+11
-0
UserMessage.java
...yeejoin/amos/boot/module/hygf/api/entity/UserMessage.java
+9
-0
UnitInfoController.java
...s/boot/module/hygf/biz/controller/UnitInfoController.java
+0
-0
UserMessageController.java
...oot/module/hygf/biz/controller/UserMessageController.java
+6
-3
WorkOrderController.java
.../boot/module/hygf/biz/controller/WorkOrderController.java
+2
-1
No files found.
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/CommercialDto.java
View file @
48a1dc5b
...
@@ -64,67 +64,67 @@ public class CommercialDto extends BaseDto {
...
@@ -64,67 +64,67 @@ public class CommercialDto extends BaseDto {
@ApiModelProperty
(
value
=
"紧急联系人"
,
example
=
"13022982292"
)
@ApiModelProperty
(
value
=
"紧急联系人"
,
example
=
"13022982292"
)
private
String
legalEmergentTelephone
;
private
String
legalEmergentTelephone
;
@ApiModelProperty
(
value
=
"结婚证文件标识"
,
example
=
"[{
url
: \"/upload/common/BABC7F938A4FF56B5CAFD9B55F5E50CD.png\"}]"
)
@ApiModelProperty
(
value
=
"结婚证文件标识"
,
example
=
"[{
\"url\"
: \"/upload/common/BABC7F938A4FF56B5CAFD9B55F5E50CD.png\"}]"
)
@TableField
(
typeHandler
=
FastjsonTypeHandler
.
class
)
@TableField
(
typeHandler
=
FastjsonTypeHandler
.
class
)
private
List
<
Object
>
marriageCredit
;
private
List
<
Object
>
marriageCredit
;
@ApiModelProperty
(
value
=
"房产证文件标识"
,
example
=
"[{
url
: \"/upload/common/BABC7F938A125CAFD9B55F5E50CD.png\"}]"
)
@ApiModelProperty
(
value
=
"房产证文件标识"
,
example
=
"[{
\"url\"
: \"/upload/common/BABC7F938A125CAFD9B55F5E50CD.png\"}]"
)
@TableField
(
typeHandler
=
FastjsonTypeHandler
.
class
)
@TableField
(
typeHandler
=
FastjsonTypeHandler
.
class
)
private
List
<
Object
>
realEstateCredit
;
private
List
<
Object
>
realEstateCredit
;
@ApiModelProperty
(
value
=
"身份证正反面文件标识"
,
example
=
"[{
url
: \"/upload/common/BABC7F938A4213CAFD9B55F5E50CD.png\"}]"
)
@ApiModelProperty
(
value
=
"身份证正反面文件标识"
,
example
=
"[{
\"url\"
: \"/upload/common/BABC7F938A4213CAFD9B55F5E50CD.png\"}]"
)
@TableField
(
typeHandler
=
FastjsonTypeHandler
.
class
)
@TableField
(
typeHandler
=
FastjsonTypeHandler
.
class
)
private
List
<
Object
>
idCardCredit
;
private
List
<
Object
>
idCardCredit
;
@ApiModelProperty
(
value
=
"户口本文件标识"
,
example
=
"[{
url
: \"/upload/common/BABC7F938A4FF53213AFD9B55F5E50CD.png\"}]"
)
@ApiModelProperty
(
value
=
"户口本文件标识"
,
example
=
"[{
\"url\"
: \"/upload/common/BABC7F938A4FF53213AFD9B55F5E50CD.png\"}]"
)
@TableField
(
typeHandler
=
FastjsonTypeHandler
.
class
)
@TableField
(
typeHandler
=
FastjsonTypeHandler
.
class
)
private
List
<
Object
>
householdBookCredit
;
private
List
<
Object
>
householdBookCredit
;
@ApiModelProperty
(
value
=
"手持身份证文件标识"
,
example
=
"[{
url
: \"/upload/common/BABC7F9321356B5CAFD9B55F5E50CD.png\"}]"
)
@ApiModelProperty
(
value
=
"手持身份证文件标识"
,
example
=
"[{
\"url\"
: \"/upload/common/BABC7F9321356B5CAFD9B55F5E50CD.png\"}]"
)
@TableField
(
typeHandler
=
FastjsonTypeHandler
.
class
)
@TableField
(
typeHandler
=
FastjsonTypeHandler
.
class
)
private
List
<
Object
>
handIdCardCredit
;
private
List
<
Object
>
handIdCardCredit
;
@ApiModelProperty
(
value
=
"踏勘照片文件标识"
,
example
=
"[{
uid: \"0.qcyinzogdcd\", url
: \"/upload/common/4CE66E78D6367C67CB4B71C03C7F30.png\"}]"
)
@ApiModelProperty
(
value
=
"踏勘照片文件标识"
,
example
=
"[{
\"uid\": \"0.qcyinzogdcd\", \"url\"
: \"/upload/common/4CE66E78D6367C67CB4B71C03C7F30.png\"}]"
)
@TableField
(
typeHandler
=
FastjsonTypeHandler
.
class
)
@TableField
(
typeHandler
=
FastjsonTypeHandler
.
class
)
private
List
<
Object
>
surveyPhotosWeb
;
private
List
<
Object
>
surveyPhotosWeb
;
@ApiModelProperty
(
value
=
"组件平面图与组串连线图文件标识"
,
example
=
"[{
url
: \"/upload/common/B234234FF56B5CAFD9B55F5E50CD.png\"}]"
)
@ApiModelProperty
(
value
=
"组件平面图与组串连线图文件标识"
,
example
=
"[{
\"url\"
: \"/upload/common/B234234FF56B5CAFD9B55F5E50CD.png\"}]"
)
@TableField
(
typeHandler
=
FastjsonTypeHandler
.
class
)
@TableField
(
typeHandler
=
FastjsonTypeHandler
.
class
)
private
List
<
Object
>
formationWeb
;
private
List
<
Object
>
formationWeb
;
@ApiModelProperty
(
value
=
"房屋所有权继承说明文件标识"
,
example
=
"[{
url
: \"/upload/common/BABC7F938A4FF32423D9B55F5E50CD.png\"}]"
)
@ApiModelProperty
(
value
=
"房屋所有权继承说明文件标识"
,
example
=
"[{
\"url\"
: \"/upload/common/BABC7F938A4FF32423D9B55F5E50CD.png\"}]"
)
@TableField
(
typeHandler
=
FastjsonTypeHandler
.
class
)
@TableField
(
typeHandler
=
FastjsonTypeHandler
.
class
)
private
List
<
Object
>
inheritWeb
;
private
List
<
Object
>
inheritWeb
;
@ApiModelProperty
(
value
=
"户用光伏电站项目合作协议文件标识"
,
example
=
"[{
url
: \"/upload/common/BAB423423AFD9B55F5E50CD.png\"}]"
)
@ApiModelProperty
(
value
=
"户用光伏电站项目合作协议文件标识"
,
example
=
"[{
\"url\"
: \"/upload/common/BAB423423AFD9B55F5E50CD.png\"}]"
)
@TableField
(
typeHandler
=
FastjsonTypeHandler
.
class
)
@TableField
(
typeHandler
=
FastjsonTypeHandler
.
class
)
private
List
<
Object
>
agreementWeb
;
private
List
<
Object
>
agreementWeb
;
@ApiModelProperty
(
value
=
"用户手持身份证照片文件标识"
,
example
=
"[{
url
: \"/upload/common/BABC42342FD9B55F5E50CD.png\"}]"
)
@ApiModelProperty
(
value
=
"用户手持身份证照片文件标识"
,
example
=
"[{
\"url\"
: \"/upload/common/BABC42342FD9B55F5E50CD.png\"}]"
)
@TableField
(
typeHandler
=
FastjsonTypeHandler
.
class
)
@TableField
(
typeHandler
=
FastjsonTypeHandler
.
class
)
private
List
<
Object
>
handIdCardLegal
;
private
List
<
Object
>
handIdCardLegal
;
@ApiModelProperty
(
value
=
"法人营业执照文件标识"
,
example
=
"[{
url
: \"/upload/common/BABC7F9382423AFD9B55F5E50CD.png\"}]"
)
@ApiModelProperty
(
value
=
"法人营业执照文件标识"
,
example
=
"[{
\"url\"
: \"/upload/common/BABC7F9382423AFD9B55F5E50CD.png\"}]"
)
@TableField
(
typeHandler
=
FastjsonTypeHandler
.
class
)
@TableField
(
typeHandler
=
FastjsonTypeHandler
.
class
)
private
List
<
Object
>
licenseLegal
;
private
List
<
Object
>
licenseLegal
;
@ApiModelProperty
(
value
=
"法定代理人身份证文件标识"
,
example
=
"[{
url
: \"/upload/common/BABC7F938A4423423B55F5E50CD.png\"}]"
)
@ApiModelProperty
(
value
=
"法定代理人身份证文件标识"
,
example
=
"[{
\"url\"
: \"/upload/common/BABC7F938A4423423B55F5E50CD.png\"}]"
)
@TableField
(
typeHandler
=
FastjsonTypeHandler
.
class
)
@TableField
(
typeHandler
=
FastjsonTypeHandler
.
class
)
private
List
<
Object
>
agentLegal
;
private
List
<
Object
>
agentLegal
;
@ApiModelProperty
(
value
=
"房产证明文件或乡镇街道土管部门房屋产权证明文件文件标识"
,
example
=
"[{
url
: \"/upload/common/BABC7F938Aads5CAFD9B55F5E50CD.png\"}]"
)
@ApiModelProperty
(
value
=
"房产证明文件或乡镇街道土管部门房屋产权证明文件文件标识"
,
example
=
"[{
\"url\"
: \"/upload/common/BABC7F938Aads5CAFD9B55F5E50CD.png\"}]"
)
@TableField
(
typeHandler
=
FastjsonTypeHandler
.
class
)
@TableField
(
typeHandler
=
FastjsonTypeHandler
.
class
)
private
List
<
Object
>
realEstateLegal
;
private
List
<
Object
>
realEstateLegal
;
@ApiModelProperty
(
value
=
"房屋屋顶租赁协议/户用光伏共建开发协议文件标识"
,
example
=
"[{
url
: \"/upload/common/BABrwerF56B5CAFD9B55F5E50CD.png\"}]"
)
@ApiModelProperty
(
value
=
"房屋屋顶租赁协议/户用光伏共建开发协议文件标识"
,
example
=
"[{
\"url\"
: \"/upload/common/BABrwerF56B5CAFD9B55F5E50CD.png\"}]"
)
@TableField
(
typeHandler
=
FastjsonTypeHandler
.
class
)
@TableField
(
typeHandler
=
FastjsonTypeHandler
.
class
)
private
List
<
Object
>
houseAgreementLegal
;
private
List
<
Object
>
houseAgreementLegal
;
@ApiModelProperty
(
value
=
"法人的企业征信报告、工商内档文件标识"
,
example
=
"[{
url
: \"/upload/common/BABC7F938A4Fwqeqw9B55F5E50CD.png\"}]"
)
@ApiModelProperty
(
value
=
"法人的企业征信报告、工商内档文件标识"
,
example
=
"[{
\"url\"
: \"/upload/common/BABC7F938A4Fwqeqw9B55F5E50CD.png\"}]"
)
@TableField
(
typeHandler
=
FastjsonTypeHandler
.
class
)
@TableField
(
typeHandler
=
FastjsonTypeHandler
.
class
)
private
List
<
Object
>
creditReportLegal
;
private
List
<
Object
>
creditReportLegal
;
@ApiModelProperty
(
value
=
"项目备案证文件标识"
,
example
=
"[{
url
: \"/upload/common/BABdDsdadasdwrfAFSDSArf9B55F5E50CD.png\"}]"
)
@ApiModelProperty
(
value
=
"项目备案证文件标识"
,
example
=
"[{
\"url\"
: \"/upload/common/BABdDsdadasdwrfAFSDSArf9B55F5E50CD.png\"}]"
)
@TableField
(
typeHandler
=
FastjsonTypeHandler
.
class
)
@TableField
(
typeHandler
=
FastjsonTypeHandler
.
class
)
private
List
<
Object
>
filingsLegal
;
private
List
<
Object
>
filingsLegal
;
...
...
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/DesignInformationDto.java
View file @
48a1dc5b
...
@@ -24,30 +24,30 @@ public class DesignInformationDto extends BaseDto {
...
@@ -24,30 +24,30 @@ public class DesignInformationDto extends BaseDto {
private
static
final
long
serialVersionUID
=
1L
;
private
static
final
long
serialVersionUID
=
1L
;
@ApiModelProperty
(
value
=
"典型设计图信息"
,
example
=
"[{
uid: \"0.2fcslywd2ry\", name: \"11.dws\", url
: \"/upload/common/74FD9327D410951E60319A3215641DDE.dws\"}]"
)
@ApiModelProperty
(
value
=
"典型设计图信息"
,
example
=
"[{
\"uid\": \"0.2fcslywd2ry\", name: \"11.dws\", \"url\"
: \"/upload/common/74FD9327D410951E60319A3215641DDE.dws\"}]"
)
@TableField
(
typeHandler
=
FastjsonTypeHandler
.
class
)
@TableField
(
typeHandler
=
FastjsonTypeHandler
.
class
)
private
List
<
Object
>
typicalDiagram
;
private
List
<
Object
>
typicalDiagram
;
/**
/**
* 典型设计图信息
* 典型设计图信息
*/
*/
@ApiModelProperty
(
value
=
"典型设计图信息"
,
example
=
"[{
uid: \"0.qbiq6dutwl\", name: \"11.dwg\", url
: \"/upload/common/4B4C1D996B21A1F4CBBD9B72A92AFBA0.dwg\"}]"
)
@ApiModelProperty
(
value
=
"典型设计图信息"
,
example
=
"[{
\"uid\": \"0.qbiq6dutwl\", name: \"11.dwg\", \"url\"
: \"/upload/common/4B4C1D996B21A1F4CBBD9B72A92AFBA0.dwg\"}]"
)
@TableField
(
typeHandler
=
FastjsonTypeHandler
.
class
)
@TableField
(
typeHandler
=
FastjsonTypeHandler
.
class
)
private
List
<
Object
>
engineering
;
private
List
<
Object
>
engineering
;
@ApiModelProperty
(
value
=
"组件排布图"
,
example
=
"[{
uid: \"0.9bn4t1r35hf\", name: \"11.dwg\", url
: \"/upload/common/E42849CBDE341C85870262917024A.dwg\"}]"
)
@ApiModelProperty
(
value
=
"组件排布图"
,
example
=
"[{
\"uid\": \"0.9bn4t1r35hf\", name: \"11.dwg\", \"url\"
: \"/upload/common/E42849CBDE341C85870262917024A.dwg\"}]"
)
@TableField
(
typeHandler
=
FastjsonTypeHandler
.
class
)
@TableField
(
typeHandler
=
FastjsonTypeHandler
.
class
)
private
List
<
Object
>
componentLayout
;
private
List
<
Object
>
componentLayout
;
@ApiModelProperty
(
value
=
"组件支架图"
,
example
=
"[{
uid: \"0.26j7x3whyx8\", name: \"11.dws\", url
: \"/upload/common/D9B23BWADAWDAWD931251F9C1A257.dws\"}]"
)
@ApiModelProperty
(
value
=
"组件支架图"
,
example
=
"[{
\"uid\": \"0.26j7x3whyx8\", name: \"11.dws\", \"url\"
: \"/upload/common/D9B23BWADAWDAWD931251F9C1A257.dws\"}]"
)
@TableField
(
typeHandler
=
FastjsonTypeHandler
.
class
)
@TableField
(
typeHandler
=
FastjsonTypeHandler
.
class
)
private
List
<
Object
>
componentBracket
;
private
List
<
Object
>
componentBracket
;
@ApiModelProperty
(
value
=
"组串接线图"
,
example
=
"[{
uid: \"0.36j7x3whyx8\", name: \"11.dws\", url
: \"/upload/common/D9B23B3407AWADAWF9C1A257.dws\"}]"
)
@ApiModelProperty
(
value
=
"组串接线图"
,
example
=
"[{
\"uid\": \"0.36j7x3whyx8\", name: \"11.dws\", \"url\"
: \"/upload/common/D9B23B3407AWADAWF9C1A257.dws\"}]"
)
@TableField
(
typeHandler
=
FastjsonTypeHandler
.
class
)
@TableField
(
typeHandler
=
FastjsonTypeHandler
.
class
)
private
List
<
Object
>
connectionLine
;
private
List
<
Object
>
connectionLine
;
@ApiModelProperty
(
value
=
"一次接线图"
,
example
=
"[{
uid: \"0.46j7x3whyx8\", name: \"11.dws\", url
: \"/upload/common/D9B23B3DWAD51F9C1A257.dws\"}]"
)
@ApiModelProperty
(
value
=
"一次接线图"
,
example
=
"[{
\"uid\": \"0.46j7x3whyx8\", name: \"11.dws\", \"url\"
: \"/upload/common/D9B23B3DWAD51F9C1A257.dws\"}]"
)
@TableField
(
typeHandler
=
FastjsonTypeHandler
.
class
)
@TableField
(
typeHandler
=
FastjsonTypeHandler
.
class
)
private
List
<
Object
>
onceLine
;
private
List
<
Object
>
onceLine
;
...
...
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/InformationDto.java
View file @
48a1dc5b
...
@@ -30,11 +30,11 @@ public class InformationDto extends BaseDto {
...
@@ -30,11 +30,11 @@ public class InformationDto extends BaseDto {
@ApiModelProperty
(
value
=
"档案编号"
,
example
=
"DA002JXSRYG202411073242"
)
@ApiModelProperty
(
value
=
"档案编号"
,
example
=
"DA002JXSRYG202411073242"
)
private
String
archivesNumber
;
private
String
archivesNumber
;
@ApiModelProperty
(
value
=
"身份证文件标识"
,
example
=
"[{
url
: \"/upload/common/B1893353D7C528EE4F68EE2245959D8.png\"}]"
)
@ApiModelProperty
(
value
=
"身份证文件标识"
,
example
=
"[{
\"url\"
: \"/upload/common/B1893353D7C528EE4F68EE2245959D8.png\"}]"
)
@TableField
(
typeHandler
=
FastjsonTypeHandler
.
class
)
@TableField
(
typeHandler
=
FastjsonTypeHandler
.
class
)
private
List
<
Object
>
cardFile
;
private
List
<
Object
>
cardFile
;
@ApiModelProperty
(
value
=
" 房产证文件标识"
,
example
=
"[{
url
: \"/upload/common/BABC7F938A4FF56B5CAFD9B55F5E50CD.png\"}]"
)
@ApiModelProperty
(
value
=
" 房产证文件标识"
,
example
=
"[{
\"url\"
: \"/upload/common/BABC7F938A4FF56B5CAFD9B55F5E50CD.png\"}]"
)
@TableField
(
typeHandler
=
FastjsonTypeHandler
.
class
)
@TableField
(
typeHandler
=
FastjsonTypeHandler
.
class
)
private
List
<
Object
>
houseProve
;
private
List
<
Object
>
houseProve
;
...
...
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/PowerStationEngineeringInfoAllDto.java
View file @
48a1dc5b
...
@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.hygf.api.dto;
...
@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.hygf.api.dto;
import
com.yeejoin.amos.boot.module.hygf.api.entity.*
;
import
com.yeejoin.amos.boot.module.hygf.api.entity.*
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
lombok.Data
;
/**
/**
...
@@ -15,64 +16,79 @@ public class PowerStationEngineeringInfoAllDto {
...
@@ -15,64 +16,79 @@ public class PowerStationEngineeringInfoAllDto {
//并网验收审核记录
//并网验收审核记录
@ApiModelProperty
(
value
=
"并网验收审核记录"
)
LoggerDto
loggerDto
;
LoggerDto
loggerDto
;
//验收审核记录
//验收审核记录
@ApiModelProperty
(
value
=
"验收审核记录"
)
LoggerDto
loggerYsDto
;
LoggerDto
loggerYsDto
;
//自审信息
//自审信息
@ApiModelProperty
(
value
=
"自审信息"
)
ConstructionRecords
constructionRecords
;
ConstructionRecords
constructionRecords
;
@ApiModelProperty
(
value
=
"并网操作日志"
)
ConstructionGirdRecords
constructionGirdRecords
;
ConstructionGirdRecords
constructionGirdRecords
;
@ApiModelProperty
(
value
=
"验收操作日志"
)
ConstructionAcceptanceRecords
acceptanceRecords
;
ConstructionAcceptanceRecords
acceptanceRecords
;
// 基本信息
// 基本信息
@ApiModelProperty
(
value
=
"基本信息"
)
SurveyInformationDto
surveyInformation
;
SurveyInformationDto
surveyInformation
;
@ApiModelProperty
(
value
=
"施工派工单Id"
,
example
=
"1813102468939149314"
)
Long
workOrderPowerStationId
;
Long
workOrderPowerStationId
;
// 资料归档
// 资料归档
@ApiModelProperty
(
value
=
"资料归档"
)
InformationDto
information
;
InformationDto
information
;
// 勘察信息详情
// 勘察信息详情
@ApiModelProperty
(
value
=
"勘察信息详情"
)
SurveyDetailsDto
surveyDetails
;
SurveyDetailsDto
surveyDetails
;
// 扩展信息
// 扩展信息
@ApiModelProperty
(
value
=
"扩展信息"
)
ExtendedInformationDto
extendedInformation
;
ExtendedInformationDto
extendedInformation
;
// 商务信息
// 商务信息
@ApiModelProperty
(
value
=
"商务信息"
)
CommercialDto
commercial
;
CommercialDto
commercial
;
//设计信息
//设计信息
@ApiModelProperty
(
value
=
"订单跟踪"
)
DesignInformationDto
designInformation
;
DesignInformationDto
designInformation
;
//订单跟踪
//订单跟踪
@ApiModelProperty
(
value
=
"订单跟踪"
)
LoggerDto
orderTracking
;
LoggerDto
orderTracking
;
//工程信息
//工程信息
@ApiModelProperty
(
value
=
"工程信息"
)
PowerStationEngineeringInfo
powerStationEngineeringInfo
;
PowerStationEngineeringInfo
powerStationEngineeringInfo
;
//施工信息
//施工信息
@ApiModelProperty
(
value
=
"施工信息"
)
PowerStationConstructionData
powerStationConstructionData
;
PowerStationConstructionData
powerStationConstructionData
;
//并网信息
//并网信息
@ApiModelProperty
(
value
=
"并网信息"
)
HygfOnGrid
hygfOnGrid
;
HygfOnGrid
hygfOnGrid
;
//派工单信息
//派工单信息
@ApiModelProperty
(
value
=
"派工单信息"
)
WorkOrder
workOrder
;
WorkOrder
workOrder
;
//验收信息
//验收信息
@ApiModelProperty
(
value
=
"验收信息"
)
AcceptanceCheck
acceptanceCheck
;
AcceptanceCheck
acceptanceCheck
;
@ApiModelProperty
(
value
=
"保存标识"
,
example
=
"0"
)
//保存标识 0 保存 1保存并提交
//保存标识 0 保存 1保存并提交
Integer
commitFlag
;
Integer
commitFlag
;
@ApiModelProperty
(
value
=
"流程类型"
,
example
=
"0"
)
//流程类型 0 并网 1是验收
//流程类型 0 并网 1是验收
Integer
flowType
;
Integer
flowType
;
}
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/SurveyDetailsDto.java
View file @
48a1dc5b
...
@@ -55,7 +55,7 @@ public class SurveyDetailsDto extends BaseDto {
...
@@ -55,7 +55,7 @@ public class SurveyDetailsDto extends BaseDto {
private
String
houseBias
;
private
String
houseBias
;
@ApiModelProperty
(
value
=
"手机指南正截图"
,
example
=
"[{
uid: \"0.pe5rtqf7ape\", url
: \"/upload/common/A6FFBD14C06F7643B4FDD63E50FE19F2.png\"}]"
)
@ApiModelProperty
(
value
=
"手机指南正截图"
,
example
=
"[{
\"uid\": \"0.pe5rtqf7ape\", \"url\"
: \"/upload/common/A6FFBD14C06F7643B4FDD63E50FE19F2.png\"}]"
)
@TableField
(
typeHandler
=
FastjsonTypeHandler
.
class
)
@TableField
(
typeHandler
=
FastjsonTypeHandler
.
class
)
private
List
<
Object
>
compass
;
private
List
<
Object
>
compass
;
...
@@ -157,35 +157,35 @@ public class SurveyDetailsDto extends BaseDto {
...
@@ -157,35 +157,35 @@ public class SurveyDetailsDto extends BaseDto {
@ApiModelProperty
(
value
=
"关于邻居采光遮挡"
,
example
=
"32"
)
@ApiModelProperty
(
value
=
"关于邻居采光遮挡"
,
example
=
"32"
)
private
String
daylightingObstruction
;
private
String
daylightingObstruction
;
@ApiModelProperty
(
value
=
"房屋整体文件标识"
,
example
=
"[{
uid: \"0.9zkn4xwv7yd\", url
: \"/upload/common/2248466CA72D1563C439816C64179F6E.png\"}]"
)
@ApiModelProperty
(
value
=
"房屋整体文件标识"
,
example
=
"[{
\"uid\": \"0.9zkn4xwv7yd\", \"url\"
: \"/upload/common/2248466CA72D1563C439816C64179F6E.png\"}]"
)
@TableField
(
typeHandler
=
FastjsonTypeHandler
.
class
)
@TableField
(
typeHandler
=
FastjsonTypeHandler
.
class
)
private
List
<
Object
>
overallHousingSurvey
;
private
List
<
Object
>
overallHousingSurvey
;
@ApiModelProperty
(
value
=
"房屋周边文件标识"
,
example
=
"[{
uid: \"0.9zkn4xwv7yd\", url
: \"/upload/common/2248466CA72D1563C439816C64179F6E.png\"}]"
)
@ApiModelProperty
(
value
=
"房屋周边文件标识"
,
example
=
"[{
\"uid\": \"0.9zkn4xwv7yd\", \"url\"
: \"/upload/common/2248466CA72D1563C439816C64179F6E.png\"}]"
)
@TableField
(
typeHandler
=
FastjsonTypeHandler
.
class
)
@TableField
(
typeHandler
=
FastjsonTypeHandler
.
class
)
private
List
<
Object
>
surroundingHouseSurvey
;
private
List
<
Object
>
surroundingHouseSurvey
;
@ApiModelProperty
(
value
=
"房屋内部整体照片文件标识"
,
example
=
"[{
uid: \"0.9zkn4xwv7yd\", url
: \"/upload/common/2248466CA72D1563C439816C64179F6E.png\"}]"
)
@ApiModelProperty
(
value
=
"房屋内部整体照片文件标识"
,
example
=
"[{
\"uid\": \"0.9zkn4xwv7yd\", \"url\"
: \"/upload/common/2248466CA72D1563C439816C64179F6E.png\"}]"
)
@TableField
(
typeHandler
=
FastjsonTypeHandler
.
class
)
@TableField
(
typeHandler
=
FastjsonTypeHandler
.
class
)
private
List
<
Object
>
insideHouseSurvey
;
private
List
<
Object
>
insideHouseSurvey
;
@ApiModelProperty
(
value
=
"电表参数文件标识"
,
example
=
"[{
uid: \"0.pe5rtqf7ape\", url
: \"/upload/common/A6FFBD14C06F7643B4FDD63E50FE19F2.png\"}]"
)
@ApiModelProperty
(
value
=
"电表参数文件标识"
,
example
=
"[{
\"uid\": \"0.pe5rtqf7ape\", \"url\"
: \"/upload/common/A6FFBD14C06F7643B4FDD63E50FE19F2.png\"}]"
)
@TableField
(
typeHandler
=
FastjsonTypeHandler
.
class
)
@TableField
(
typeHandler
=
FastjsonTypeHandler
.
class
)
private
List
<
Object
>
electricitySurvey
;
private
List
<
Object
>
electricitySurvey
;
@ApiModelProperty
(
value
=
"屋顶全貌文件标识"
,
example
=
"[{
uid: \"0.kc339n1txcb\", url
: \"/upload/common/19F868769E539D6ABA4A954530CD62E.png\"}]"
)
@ApiModelProperty
(
value
=
"屋顶全貌文件标识"
,
example
=
"[{
\"uid\": \"0.kc339n1txcb\", \"url\"
: \"/upload/common/19F868769E539D6ABA4A954530CD62E.png\"}]"
)
@TableField
(
typeHandler
=
FastjsonTypeHandler
.
class
)
@TableField
(
typeHandler
=
FastjsonTypeHandler
.
class
)
private
List
<
Object
>
panoramaSurvey
;
private
List
<
Object
>
panoramaSurvey
;
@ApiModelProperty
(
value
=
"屋顶平面草图文件标识"
,
example
=
"[{
uid: \"0.tgglnu260c\", url
: \"/upload/common/719434819AB11D29A18253655579D1E.png\"}]"
)
@ApiModelProperty
(
value
=
"屋顶平面草图文件标识"
,
example
=
"[{
\"uid\": \"0.tgglnu260c\", \"url\"
: \"/upload/common/719434819AB11D29A18253655579D1E.png\"}]"
)
@TableField
(
typeHandler
=
FastjsonTypeHandler
.
class
)
@TableField
(
typeHandler
=
FastjsonTypeHandler
.
class
)
private
List
<
Object
>
planSketchSurvey
;
private
List
<
Object
>
planSketchSurvey
;
@ApiModelProperty
(
value
=
"房屋方位角文件标识"
,
example
=
"[{
uid: \"0.pe5rtqf7ape\", url
: \"/upload/common/A6FFBD14C06F7643B4FDD63E50FE19F2.png\"}]"
)
@ApiModelProperty
(
value
=
"房屋方位角文件标识"
,
example
=
"[{
\"uid\": \"0.pe5rtqf7ape\", \"url\"
: \"/upload/common/A6FFBD14C06F7643B4FDD63E50FE19F2.png\"}]"
)
@TableField
(
typeHandler
=
FastjsonTypeHandler
.
class
)
@TableField
(
typeHandler
=
FastjsonTypeHandler
.
class
)
private
List
<
Object
>
azimuthSurvey
;
private
List
<
Object
>
azimuthSurvey
;
@ApiModelProperty
(
value
=
"其他附件文件标识"
,
example
=
"[{
uid: \"0.9zkn4xwv7yd\", url
: \"/upload/common/2248466CA72D1563C439816C64179F6E.png\"}]"
)
@ApiModelProperty
(
value
=
"其他附件文件标识"
,
example
=
"[{
\"uid\": \"0.9zkn4xwv7yd\", \"url\"
: \"/upload/common/2248466CA72D1563C439816C64179F6E.png\"}]"
)
@TableField
(
typeHandler
=
FastjsonTypeHandler
.
class
)
@TableField
(
typeHandler
=
FastjsonTypeHandler
.
class
)
private
List
<
Object
>
otherAccessorySurvey
;
private
List
<
Object
>
otherAccessorySurvey
;
...
...
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/SurveyInformationDto.java
View file @
48a1dc5b
...
@@ -116,11 +116,11 @@ public class SurveyInformationDto extends BaseDto {
...
@@ -116,11 +116,11 @@ public class SurveyInformationDto extends BaseDto {
@ApiModelProperty
(
value
=
"农户id"
,
example
=
"1854346995112611841"
)
@ApiModelProperty
(
value
=
"农户id"
,
example
=
"1854346995112611841"
)
private
Long
peasantHouseholdId
;
private
Long
peasantHouseholdId
;
@ApiModelProperty
(
value
=
"身份证正面"
,
example
=
"[{
url
: \"/upload/common/F0DC9029F692D5D88F18CDAF8E45561.jpg\"}]"
)
@ApiModelProperty
(
value
=
"身份证正面"
,
example
=
"[{
\"url\"
: \"/upload/common/F0DC9029F692D5D88F18CDAF8E45561.jpg\"}]"
)
@TableField
(
typeHandler
=
FastjsonTypeHandler
.
class
)
@TableField
(
typeHandler
=
FastjsonTypeHandler
.
class
)
private
List
<
Object
>
idCardFront
;
private
List
<
Object
>
idCardFront
;
@ApiModelProperty
(
value
=
"身份证反面"
,
example
=
"[{
url
: \"/upload/common/2F7BD22F5A557469FC484C5E3E62B56D.jpg\"}]"
)
@ApiModelProperty
(
value
=
"身份证反面"
,
example
=
"[{
\"url\"
: \"/upload/common/2F7BD22F5A557469FC484C5E3E62B56D.jpg\"}]"
)
@TableField
(
typeHandler
=
FastjsonTypeHandler
.
class
)
@TableField
(
typeHandler
=
FastjsonTypeHandler
.
class
)
private
List
<
Object
>
idCardOpposite
;
private
List
<
Object
>
idCardOpposite
;
...
...
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/UserMessageDto.java
View file @
48a1dc5b
...
@@ -22,22 +22,22 @@ public class UserMessageDto extends BaseDto {
...
@@ -22,22 +22,22 @@ public class UserMessageDto extends BaseDto {
private
static
final
long
serialVersionUID
=
1L
;
private
static
final
long
serialVersionUID
=
1L
;
@ApiModelProperty
(
value
=
"任务类型"
)
@ApiModelProperty
(
value
=
"任务类型"
,
example
=
"经销商审核"
)
private
String
type
;
private
String
type
;
@ApiModelProperty
(
value
=
"业务id"
)
@ApiModelProperty
(
value
=
"业务id"
,
example
=
"1706869110685569025"
)
private
Long
businessId
;
private
Long
businessId
;
@ApiModelProperty
(
value
=
"用户id"
)
@ApiModelProperty
(
value
=
"用户id"
,
example
=
"5214012"
)
private
String
amosUserId
;
private
String
amosUserId
;
@ApiModelProperty
(
value
=
" 消息创建时间"
)
@ApiModelProperty
(
value
=
" 消息创建时间"
,
example
=
"2023-09-27 11:11:23"
)
private
Date
creationTime
;
private
Date
creationTime
;
@ApiModelProperty
(
value
=
"消息内容"
)
@ApiModelProperty
(
value
=
"消息内容"
,
example
=
"经销商四川锦绣天地建筑工程有限公司南昌分公司待经销商审核待完成"
)
private
String
taskName
;
private
String
taskName
;
@ApiModelProperty
(
value
=
"经销商orgCode"
)
@ApiModelProperty
(
value
=
"经销商orgCode"
,
example
=
"86*355*443*479"
)
private
String
amosOrgCode
;
private
String
amosOrgCode
;
}
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/UserMessagePageDto.java
View file @
48a1dc5b
...
@@ -3,6 +3,8 @@ package com.yeejoin.amos.boot.module.hygf.api.dto;
...
@@ -3,6 +3,8 @@ package com.yeejoin.amos.boot.module.hygf.api.dto;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.yeejoin.amos.boot.module.hygf.api.entity.UserMessage
;
import
com.yeejoin.amos.boot.module.hygf.api.entity.UserMessage
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
lombok.Data
;
import
java.util.Date
;
import
java.util.Date
;
...
@@ -13,6 +15,7 @@ import java.util.Date;
...
@@ -13,6 +15,7 @@ import java.util.Date;
* @createDate: 2023/8/21
* @createDate: 2023/8/21
*/
*/
@Data
@Data
@ApiModel
(
value
=
"UserMessagePageDto"
,
description
=
"人员消息分页"
)
public
class
UserMessagePageDto
extends
Page
<
UserMessage
>
{
public
class
UserMessagePageDto
extends
Page
<
UserMessage
>
{
...
@@ -20,22 +23,26 @@ public class UserMessagePageDto extends Page<UserMessage> {
...
@@ -20,22 +23,26 @@ public class UserMessagePageDto extends Page<UserMessage> {
/**
/**
* 任务类型
* 任务类型
*/
*/
@ApiModelProperty
(
value
=
"任务类型"
,
example
=
"经销商审核"
)
private
String
type
;
private
String
type
;
/**
/**
* 用户id
* 用户id
*/
*/
@ApiModelProperty
(
value
=
"用户id"
,
example
=
"5214012"
)
private
String
amosUserId
;
private
String
amosUserId
;
/**
/**
* 消息创建时间
* 消息创建时间
*/
*/
@ApiModelProperty
(
value
=
" 消息创建时间"
,
example
=
"2023-09-27 11:11:23"
)
private
Date
creationTime
;
private
Date
creationTime
;
/**
/**
* 消息内容
* 消息内容
*/
*/
@ApiModelProperty
(
value
=
"消息内容"
,
example
=
"经销商四川锦绣天地建筑工程有限公司南昌分公司待经销商审核待完成"
)
private
String
taskName
;
private
String
taskName
;
...
...
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/ConstructionAcceptanceRecords.java
View file @
48a1dc5b
...
@@ -3,6 +3,8 @@ package com.yeejoin.amos.boot.module.hygf.api.entity;
...
@@ -3,6 +3,8 @@ package com.yeejoin.amos.boot.module.hygf.api.entity;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
com.yeejoin.amos.boot.biz.common.entity.BaseEntity
;
import
com.yeejoin.amos.boot.biz.common.entity.BaseEntity
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
import
lombok.EqualsAndHashCode
;
import
lombok.experimental.Accessors
;
import
lombok.experimental.Accessors
;
...
@@ -10,7 +12,7 @@ import java.util.Date;
...
@@ -10,7 +12,7 @@ import java.util.Date;
import
java.util.List
;
import
java.util.List
;
/**
/**
*
并网
操作日志
*
验收
操作日志
*
*
* @author system_generator
* @author system_generator
* @date 2024-09-02
* @date 2024-09-02
...
@@ -19,6 +21,7 @@ import java.util.List;
...
@@ -19,6 +21,7 @@ import java.util.List;
@EqualsAndHashCode
(
callSuper
=
true
)
@EqualsAndHashCode
(
callSuper
=
true
)
@Accessors
(
chain
=
true
)
@Accessors
(
chain
=
true
)
@TableName
(
"hygf_construction_acceptance_records"
)
@TableName
(
"hygf_construction_acceptance_records"
)
@ApiModel
(
value
=
"ConstructionAcceptanceRecords"
,
description
=
"验收操作日志"
)
public
class
ConstructionAcceptanceRecords
extends
BaseEntity
{
public
class
ConstructionAcceptanceRecords
extends
BaseEntity
{
private
static
final
long
serialVersionUID
=
1L
;
private
static
final
long
serialVersionUID
=
1L
;
...
@@ -26,48 +29,56 @@ public class ConstructionAcceptanceRecords extends BaseEntity {
...
@@ -26,48 +29,56 @@ public class ConstructionAcceptanceRecords extends BaseEntity {
/**
/**
* 操作人
* 操作人
*/
*/
@ApiModelProperty
(
value
=
"操作人"
,
example
=
"admin"
)
@TableField
(
"operator"
)
@TableField
(
"operator"
)
private
String
operator
;
private
String
operator
;
/**
/**
* 操作内容
* 操作内容
*/
*/
@ApiModelProperty
(
value
=
"操作内容"
,
example
=
"提交验收审核"
)
@TableField
(
"operation_content"
)
@TableField
(
"operation_content"
)
private
String
operationContent
;
private
String
operationContent
;
/**
/**
* 操作时间
* 操作时间
*/
*/
@ApiModelProperty
(
value
=
"操作时间"
,
example
=
"2024-09-02 14:36:20"
)
@TableField
(
"operation_time"
)
@TableField
(
"operation_time"
)
private
Date
operationTime
;
private
Date
operationTime
;
/**
/**
* 操作结果
* 操作结果
*/
*/
@ApiModelProperty
(
value
=
"操作结果"
,
example
=
"通过"
)
@TableField
(
"operation_results"
)
@TableField
(
"operation_results"
)
private
String
operationResults
;
private
String
operationResults
;
/**
/**
* 施工单id
* 施工单id
*/
*/
@ApiModelProperty
(
value
=
"施工单id"
,
example
=
"1830494459985399809"
)
@TableField
(
"acceptance_id"
)
@TableField
(
"acceptance_id"
)
private
Long
acceptanceId
;
private
Long
acceptanceId
;
/**
/**
* 施工电站
* 施工电站
*/
*/
@ApiModelProperty
(
value
=
"施工电站"
,
example
=
"1813102468939149314"
)
@TableField
(
"work_order_power_station_id"
)
@TableField
(
"work_order_power_station_id"
)
private
Long
workOrderPowerStationId
;
private
Long
workOrderPowerStationId
;
/**
/**
* 农户id
* 农户id
*/
*/
@ApiModelProperty
(
value
=
"农户id"
,
example
=
"1801072960862187521"
)
@TableField
(
"peasant_household_id"
)
@TableField
(
"peasant_household_id"
)
private
Long
peasantHouseholdId
;
private
Long
peasantHouseholdId
;
/**
/**
* 备注
* 备注
*/
*/
@ApiModelProperty
(
value
=
"备注"
,
example
=
"经销商管理员审核通过"
)
@TableField
(
"notes"
)
@TableField
(
"notes"
)
private
String
notes
;
private
String
notes
;
...
...
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/ConstructionGirdRecords.java
View file @
48a1dc5b
...
@@ -3,6 +3,8 @@ package com.yeejoin.amos.boot.module.hygf.api.entity;
...
@@ -3,6 +3,8 @@ package com.yeejoin.amos.boot.module.hygf.api.entity;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
com.yeejoin.amos.boot.biz.common.entity.BaseEntity
;
import
com.yeejoin.amos.boot.biz.common.entity.BaseEntity
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
import
lombok.EqualsAndHashCode
;
import
lombok.experimental.Accessors
;
import
lombok.experimental.Accessors
;
...
@@ -19,6 +21,7 @@ import java.util.List;
...
@@ -19,6 +21,7 @@ import java.util.List;
@EqualsAndHashCode
(
callSuper
=
true
)
@EqualsAndHashCode
(
callSuper
=
true
)
@Accessors
(
chain
=
true
)
@Accessors
(
chain
=
true
)
@TableName
(
"hygf_construction_gird_records"
)
@TableName
(
"hygf_construction_gird_records"
)
@ApiModel
(
value
=
"ConstructionGirdRecords"
,
description
=
"并网操作日志"
)
public
class
ConstructionGirdRecords
extends
BaseEntity
{
public
class
ConstructionGirdRecords
extends
BaseEntity
{
private
static
final
long
serialVersionUID
=
1L
;
private
static
final
long
serialVersionUID
=
1L
;
...
@@ -26,42 +29,49 @@ public class ConstructionGirdRecords extends BaseEntity {
...
@@ -26,42 +29,49 @@ public class ConstructionGirdRecords extends BaseEntity {
/**
/**
* 操作人
* 操作人
*/
*/
@ApiModelProperty
(
value
=
"操作人"
,
example
=
"admin"
)
@TableField
(
"operator"
)
@TableField
(
"operator"
)
private
String
operator
;
private
String
operator
;
/**
/**
* 操作内容
* 操作内容
*/
*/
@ApiModelProperty
(
value
=
"操作内容"
,
example
=
"提交并网资料"
)
@TableField
(
"operation_content"
)
@TableField
(
"operation_content"
)
private
String
operationContent
;
private
String
operationContent
;
/**
/**
* 操作时间
* 操作时间
*/
*/
@ApiModelProperty
(
value
=
"操作时间"
,
example
=
"2024-09-02 10:57:18"
)
@TableField
(
"operation_time"
)
@TableField
(
"operation_time"
)
private
Date
operationTime
;
private
Date
operationTime
;
/**
/**
* 操作结果
* 操作结果
*/
*/
@ApiModelProperty
(
value
=
"操作结果"
,
example
=
"通过"
)
@TableField
(
"operation_results"
)
@TableField
(
"operation_results"
)
private
String
operationResults
;
private
String
operationResults
;
/**
/**
* 施工单id
* 施工单id
*/
*/
@ApiModelProperty
(
value
=
"施工单id"
,
example
=
"1829346281735065601"
)
@TableField
(
"grid_id"
)
@TableField
(
"grid_id"
)
private
Long
gridId
;
private
Long
gridId
;
/**
/**
* 施工电站
* 施工电站
*/
*/
@ApiModelProperty
(
value
=
"施工电站"
,
example
=
"1808655906133536770"
)
@TableField
(
"work_order_power_station_id"
)
@TableField
(
"work_order_power_station_id"
)
private
Long
workOrderPowerStationId
;
private
Long
workOrderPowerStationId
;
/**
/**
* 农户id
* 农户id
*/
*/
@ApiModelProperty
(
value
=
"农户id"
,
example
=
"1767379423369129985"
)
@TableField
(
"peasant_household_id"
)
@TableField
(
"peasant_household_id"
)
private
Long
peasantHouseholdId
;
private
Long
peasantHouseholdId
;
...
@@ -69,6 +79,7 @@ public class ConstructionGirdRecords extends BaseEntity {
...
@@ -69,6 +79,7 @@ public class ConstructionGirdRecords extends BaseEntity {
/**
/**
* 备注
* 备注
*/
*/
@ApiModelProperty
(
value
=
"备注"
,
example
=
"通过"
)
@TableField
(
"notes"
)
@TableField
(
"notes"
)
private
String
notes
;
private
String
notes
;
...
...
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/UserMessage.java
View file @
48a1dc5b
...
@@ -3,6 +3,8 @@ package com.yeejoin.amos.boot.module.hygf.api.entity;
...
@@ -3,6 +3,8 @@ package com.yeejoin.amos.boot.module.hygf.api.entity;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
com.yeejoin.amos.boot.biz.common.entity.BaseEntity
;
import
com.yeejoin.amos.boot.biz.common.entity.BaseEntity
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
import
lombok.EqualsAndHashCode
;
import
lombok.experimental.Accessors
;
import
lombok.experimental.Accessors
;
...
@@ -19,6 +21,7 @@ import java.util.Date;
...
@@ -19,6 +21,7 @@ import java.util.Date;
@EqualsAndHashCode
(
callSuper
=
true
)
@EqualsAndHashCode
(
callSuper
=
true
)
@Accessors
(
chain
=
true
)
@Accessors
(
chain
=
true
)
@TableName
(
"hygf_user_message"
)
@TableName
(
"hygf_user_message"
)
@ApiModel
(
value
=
"UserMessage"
,
description
=
"人员消息"
)
public
class
UserMessage
extends
BaseEntity
{
public
class
UserMessage
extends
BaseEntity
{
private
static
final
long
serialVersionUID
=
1L
;
private
static
final
long
serialVersionUID
=
1L
;
...
@@ -26,36 +29,42 @@ public class UserMessage extends BaseEntity {
...
@@ -26,36 +29,42 @@ public class UserMessage extends BaseEntity {
/**
/**
* 任务类型
* 任务类型
*/
*/
@ApiModelProperty
(
value
=
"任务类型"
,
example
=
"经销商审核"
)
@TableField
(
"type"
)
@TableField
(
"type"
)
private
String
type
;
private
String
type
;
/**
/**
* 业务id
* 业务id
*/
*/
@ApiModelProperty
(
value
=
"业务id"
,
example
=
"1706869110685569025"
)
@TableField
(
"business_id"
)
@TableField
(
"business_id"
)
private
Long
businessId
;
private
Long
businessId
;
/**
/**
* 用户id
* 用户id
*/
*/
@ApiModelProperty
(
value
=
"用户id"
,
example
=
"5214012"
)
@TableField
(
"amos_user_id"
)
@TableField
(
"amos_user_id"
)
private
String
amosUserId
;
private
String
amosUserId
;
/**
/**
* 消息创建时间
* 消息创建时间
*/
*/
@ApiModelProperty
(
value
=
" 消息创建时间"
,
example
=
"2023-09-27 11:11:23"
)
@TableField
(
"creation_time"
)
@TableField
(
"creation_time"
)
private
Date
creationTime
;
private
Date
creationTime
;
/**
/**
* 消息内容
* 消息内容
*/
*/
@ApiModelProperty
(
value
=
"消息内容"
,
example
=
"经销商四川锦绣天地建筑工程有限公司南昌分公司待经销商审核待完成"
)
@TableField
(
"task_name"
)
@TableField
(
"task_name"
)
private
String
taskName
;
private
String
taskName
;
/**
/**
* 经销商orgCode
* 经销商orgCode
*/
*/
@ApiModelProperty
(
value
=
"经销商orgCode"
,
example
=
"86*355*443*479"
)
@TableField
(
"amos_org_code"
)
@TableField
(
"amos_org_code"
)
private
String
amosOrgCode
;
private
String
amosOrgCode
;
...
...
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/UnitInfoController.java
View file @
48a1dc5b
This diff is collapsed.
Click to expand it.
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/UserMessageController.java
View file @
48a1dc5b
...
@@ -8,6 +8,7 @@ import com.yeejoin.amos.boot.module.hygf.api.entity.UserMessage;
...
@@ -8,6 +8,7 @@ import com.yeejoin.amos.boot.module.hygf.api.entity.UserMessage;
import
com.yeejoin.amos.boot.module.hygf.biz.service.impl.UserMessageServiceImpl
;
import
com.yeejoin.amos.boot.module.hygf.biz.service.impl.UserMessageServiceImpl
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiOperation
;
import
io.swagger.annotations.ApiOperation
;
import
io.swagger.annotations.ApiParam
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.bind.annotation.*
;
import
org.typroject.tyboot.core.foundation.enumeration.UserType
;
import
org.typroject.tyboot.core.foundation.enumeration.UserType
;
...
@@ -54,7 +55,8 @@ public class UserMessageController extends BaseController {
...
@@ -54,7 +55,8 @@ public class UserMessageController extends BaseController {
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@PutMapping
(
value
=
"/{sequenceNbr}"
)
@PutMapping
(
value
=
"/{sequenceNbr}"
)
@ApiOperation
(
httpMethod
=
"PUT"
,
value
=
"根据sequenceNbr更新人员消息"
,
notes
=
"根据sequenceNbr更新人员消息"
)
@ApiOperation
(
httpMethod
=
"PUT"
,
value
=
"根据sequenceNbr更新人员消息"
,
notes
=
"根据sequenceNbr更新人员消息"
)
public
ResponseModel
<
UserMessageDto
>
updateBySequenceNbrUserMessage
(
@RequestBody
UserMessageDto
model
,
@PathVariable
(
value
=
"sequenceNbr"
)
Long
sequenceNbr
)
{
public
ResponseModel
<
UserMessageDto
>
updateBySequenceNbrUserMessage
(
@RequestBody
UserMessageDto
model
,
@ApiParam
(
value
=
"主键"
,
example
=
"1706869110685569025"
)
@PathVariable
(
value
=
"sequenceNbr"
)
Long
sequenceNbr
)
{
model
.
setSequenceNbr
(
sequenceNbr
);
model
.
setSequenceNbr
(
sequenceNbr
);
return
ResponseHelper
.
buildResponse
(
userMessageServiceImpl
.
updateWithModel
(
model
));
return
ResponseHelper
.
buildResponse
(
userMessageServiceImpl
.
updateWithModel
(
model
));
}
}
...
@@ -68,7 +70,8 @@ public class UserMessageController extends BaseController {
...
@@ -68,7 +70,8 @@ public class UserMessageController extends BaseController {
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@DeleteMapping
(
value
=
"/{sequenceNbr}"
)
@DeleteMapping
(
value
=
"/{sequenceNbr}"
)
@ApiOperation
(
httpMethod
=
"DELETE"
,
value
=
"根据sequenceNbr删除人员消息"
,
notes
=
"根据sequenceNbr删除人员消息"
)
@ApiOperation
(
httpMethod
=
"DELETE"
,
value
=
"根据sequenceNbr删除人员消息"
,
notes
=
"根据sequenceNbr删除人员消息"
)
public
ResponseModel
<
Boolean
>
deleteBySequenceNbr
(
HttpServletRequest
request
,
@PathVariable
(
value
=
"sequenceNbr"
)
Long
sequenceNbr
){
public
ResponseModel
<
Boolean
>
deleteBySequenceNbr
(
HttpServletRequest
request
,
@ApiParam
(
value
=
"主键"
,
example
=
"1706869110685569025"
)
@PathVariable
(
value
=
"sequenceNbr"
)
Long
sequenceNbr
){
return
ResponseHelper
.
buildResponse
(
userMessageServiceImpl
.
removeById
(
sequenceNbr
));
return
ResponseHelper
.
buildResponse
(
userMessageServiceImpl
.
removeById
(
sequenceNbr
));
}
}
...
@@ -81,7 +84,7 @@ public class UserMessageController extends BaseController {
...
@@ -81,7 +84,7 @@ public class UserMessageController extends BaseController {
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@GetMapping
(
value
=
"/{sequenceNbr}"
)
@GetMapping
(
value
=
"/{sequenceNbr}"
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"根据sequenceNbr查询单个人员消息"
,
notes
=
"根据sequenceNbr查询单个人员消息"
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"根据sequenceNbr查询单个人员消息"
,
notes
=
"根据sequenceNbr查询单个人员消息"
)
public
ResponseModel
<
UserMessageDto
>
selectOne
(
@PathVariable
Long
sequenceNbr
)
{
public
ResponseModel
<
UserMessageDto
>
selectOne
(
@
ApiParam
(
value
=
"主键"
,
example
=
"1706869110685569025"
)
@
PathVariable
Long
sequenceNbr
)
{
return
ResponseHelper
.
buildResponse
(
userMessageServiceImpl
.
queryBySeq
(
sequenceNbr
));
return
ResponseHelper
.
buildResponse
(
userMessageServiceImpl
.
queryBySeq
(
sequenceNbr
));
}
}
...
...
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/WorkOrderController.java
View file @
48a1dc5b
...
@@ -340,7 +340,8 @@ public class WorkOrderController extends BaseController {
...
@@ -340,7 +340,8 @@ public class WorkOrderController extends BaseController {
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"完工登记详情"
,
notes
=
"完工登记详情"
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"完工登记详情"
,
notes
=
"完工登记详情"
)
@GetMapping
(
value
=
"/getPowerStationEngineeringInfoHistory"
)
@GetMapping
(
value
=
"/getPowerStationEngineeringInfoHistory"
)
public
ResponseModel
<
PowerStationEngineeringInfoAllDto
>
getPowerStationEngineeringInfoHistory
(
@ApiParam
(
name
=
"peasantHouseholdId"
,
value
=
"农户ID"
,
example
=
"1712383951215005697"
)
@RequestParam
(
value
=
"peasantHouseholdId"
)
Long
peasantHouseholdId
,
@RequestParam
(
value
=
"processInstanceId"
,
required
=
false
)
String
processInstanceId
)
{
public
ResponseModel
<
PowerStationEngineeringInfoAllDto
>
getPowerStationEngineeringInfoHistory
(
@ApiParam
(
name
=
"peasantHouseholdId"
,
value
=
"农户ID"
,
example
=
"1712383951215005697"
)
@RequestParam
(
value
=
"peasantHouseholdId"
)
Long
peasantHouseholdId
,
@ApiParam
(
value
=
"流程实例Id"
,
example
=
"f2d8aa89-7594-11ef-b7e1-02420a1c0012"
)
@RequestParam
(
value
=
"processInstanceId"
,
required
=
false
)
String
processInstanceId
)
{
PowerStationEngineeringInfoAllDto
returnDto
=
workOrderServiceImpl
.
getPowerStationEngineeringInfoHistory
(
peasantHouseholdId
,
processInstanceId
);
PowerStationEngineeringInfoAllDto
returnDto
=
workOrderServiceImpl
.
getPowerStationEngineeringInfoHistory
(
peasantHouseholdId
,
processInstanceId
);
return
ResponseHelper
.
buildResponse
(
returnDto
);
return
ResponseHelper
.
buildResponse
(
returnDto
);
...
...
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