Commit 4c2fd0af7438c2b15fb4bda2a095da2b6d3c1646
1 parent
10e976f5
Exists in
master
导出功能
Showing
12 changed files
with
671 additions
and
1 deletions
Show diff stats
backend/chkpower/src/main/java/com/hotent/chkpower/controller/WCurrentReportController.java
0 → 100644
@@ -0,0 +1,55 @@ | @@ -0,0 +1,55 @@ | ||
1 | +package com.hotent.chkpower.controller; | ||
2 | + | ||
3 | + | ||
4 | +import org.springframework.web.bind.annotation.GetMapping; | ||
5 | +import org.springframework.web.bind.annotation.PostMapping; | ||
6 | +import org.springframework.web.bind.annotation.RequestBody; | ||
7 | +import org.springframework.web.bind.annotation.RequestMapping; | ||
8 | +import org.springframework.web.bind.annotation.RequestParam; | ||
9 | +import com.hotent.base.model.CommonResult; | ||
10 | +import com.hotent.base.util.StringUtil; | ||
11 | +import io.swagger.annotations.ApiOperation; | ||
12 | +import io.swagger.annotations.ApiParam; | ||
13 | +import org.springframework.web.bind.annotation.RestController; | ||
14 | +import com.hotent.base.controller.BaseController; | ||
15 | +import com.hotent.chkpower.model.WCurrentReport; | ||
16 | +import com.hotent.chkpower.manager.WCurrentReportManager; | ||
17 | + | ||
18 | +/** | ||
19 | + * 活期账户汇报 前端控制器 | ||
20 | + * | ||
21 | + * @company 广州宏天软件股份有限公司 | ||
22 | + * @author cw | ||
23 | + * @since 2024-07-09 | ||
24 | + */ | ||
25 | +@RestController | ||
26 | +@RequestMapping("/wCurrentReport/v1/") | ||
27 | +public class WCurrentReportController extends BaseController<WCurrentReportManager, WCurrentReport> { | ||
28 | + | ||
29 | + /** | ||
30 | + * 根据id获取活期账户汇报数据详情 | ||
31 | + * @param id | ||
32 | + * @return | ||
33 | + * @throws Exception | ||
34 | + * ModelAndView | ||
35 | + */ | ||
36 | + @GetMapping(value="/getDetail") | ||
37 | + @ApiOperation(value="根据id获取活期账户汇报数据详情",httpMethod = "GET",notes = "根据id获取活期账户汇报数据详情") | ||
38 | + public CommonResult<WCurrentReport> getDetail(@ApiParam(name="id",value="业务对象主键", required = true)@RequestParam(required=true) String id) throws Exception{ | ||
39 | + return CommonResult.<WCurrentReport>ok().value(baseService.getDetail(id)); | ||
40 | + } | ||
41 | + /** | ||
42 | + * 新增,更新活期账户汇报 | ||
43 | + * @param wCurrentReport | ||
44 | + * @throws Exception | ||
45 | + * @return | ||
46 | + * @exception | ||
47 | + */ | ||
48 | + @PostMapping(value="/save") | ||
49 | + @ApiOperation(value = "新增,更新活期账户汇报数据", httpMethod = "POST", notes = "新增,更新活期账户汇报数据") | ||
50 | + public CommonResult<String> save(@ApiParam(name="WCurrentReport",value="活期账户汇报对象", required = true)@RequestBody WCurrentReport wCurrentReport) throws Exception{ | ||
51 | + String msg = StringUtil.isEmpty(wCurrentReport.getId()) ? "添加活期账户汇报成功" : "更新活期账户汇报成功"; | ||
52 | + baseService.createOrUpdate(wCurrentReport); | ||
53 | + return CommonResult.<String>ok().message(msg); | ||
54 | + } | ||
55 | +} |
backend/chkpower/src/main/java/com/hotent/chkpower/controller/WDailyFundsController.java
@@ -65,7 +65,6 @@ public class WDailyFundsController extends BaseController<WDailyFundsManager, WD | @@ -65,7 +65,6 @@ public class WDailyFundsController extends BaseController<WDailyFundsManager, WD | ||
65 | @PostMapping(value="/updateInsp") | 65 | @PostMapping(value="/updateInsp") |
66 | public CommonResult<String> updateInsp(@RequestBody WDailyFundsVo wDailyFundsList) throws Exception{ | 66 | public CommonResult<String> updateInsp(@RequestBody WDailyFundsVo wDailyFundsList) throws Exception{ |
67 | baseService.updateInsp(wDailyFundsList); | 67 | baseService.updateInsp(wDailyFundsList); |
68 | - | ||
69 | return CommonResult.<String>ok().message("成功"); | 68 | return CommonResult.<String>ok().message("成功"); |
70 | } | 69 | } |
71 | 70 |
backend/chkpower/src/main/java/com/hotent/chkpower/dao/WCurrentReportDao.java
0 → 100644
@@ -0,0 +1,20 @@ | @@ -0,0 +1,20 @@ | ||
1 | +package com.hotent.chkpower.dao; | ||
2 | + | ||
3 | +import com.hotent.chkpower.model.WCurrentReport; | ||
4 | +import com.baomidou.mybatisplus.core.mapper.BaseMapper; | ||
5 | +import org.apache.ibatis.annotations.Param; | ||
6 | + | ||
7 | +import java.time.LocalDateTime; | ||
8 | +import java.util.List; | ||
9 | + | ||
10 | +/** | ||
11 | + * 活期账户汇报 Mapper 接口 | ||
12 | + * | ||
13 | + * @company 广州宏天软件股份有限公司 | ||
14 | + * @author cw | ||
15 | + * @since 2024-07-09 | ||
16 | + */ | ||
17 | +public interface WCurrentReportDao extends BaseMapper<WCurrentReport> { | ||
18 | + | ||
19 | + List<WCurrentReport> selectInspList(@Param("fDate") LocalDateTime fDate,@Param("fOrgId") String fOrgId); | ||
20 | +} |
backend/chkpower/src/main/java/com/hotent/chkpower/dao/WFinanceDao.java
@@ -18,4 +18,7 @@ public interface WFinanceDao extends BaseMapper<WFinance> { | @@ -18,4 +18,7 @@ public interface WFinanceDao extends BaseMapper<WFinance> { | ||
18 | 18 | ||
19 | List<HashMap<String, String>> getTransactionDetailsList(@Param("fOrgType") String fOrgType, @Param("fDate") String fDate); | 19 | List<HashMap<String, String>> getTransactionDetailsList(@Param("fOrgType") String fOrgType, @Param("fDate") String fDate); |
20 | 20 | ||
21 | + void updateInsp(WFinance wFinance); | ||
22 | + | ||
23 | + | ||
21 | } | 24 | } |
backend/chkpower/src/main/java/com/hotent/chkpower/manager/WCurrentReportManager.java
0 → 100644
@@ -0,0 +1,30 @@ | @@ -0,0 +1,30 @@ | ||
1 | +package com.hotent.chkpower.manager; | ||
2 | + | ||
3 | +import com.hotent.chkpower.model.WCurrentReport; | ||
4 | +import com.hotent.base.manager.BaseManager; | ||
5 | + | ||
6 | +import java.time.LocalDateTime; | ||
7 | + | ||
8 | +/** | ||
9 | + * 活期账户汇报 服务类 | ||
10 | + * | ||
11 | + * @company 广州宏天软件股份有限公司 | ||
12 | + * @author cw | ||
13 | + * @since 2024-07-09 | ||
14 | + */ | ||
15 | +public interface WCurrentReportManager extends BaseManager<WCurrentReport> { | ||
16 | + /** | ||
17 | + * 根据主键获取详情 | ||
18 | + * @param id | ||
19 | + * @return | ||
20 | + */ | ||
21 | + WCurrentReport getDetail(String id); | ||
22 | + /** | ||
23 | + * 新建、更新活期账户汇报 | ||
24 | + * @param wCurrentReport | ||
25 | + * @return | ||
26 | + */ | ||
27 | + void createOrUpdate(WCurrentReport wCurrentReport); | ||
28 | + | ||
29 | + void updateInsp(LocalDateTime fDate, String fOrgId, String fInspStatusName, String fInspNotes); | ||
30 | +} |
backend/chkpower/src/main/java/com/hotent/chkpower/manager/impl/WCurrentReportManagerImpl.java
0 → 100644
@@ -0,0 +1,63 @@ | @@ -0,0 +1,63 @@ | ||
1 | +package com.hotent.chkpower.manager.impl; | ||
2 | + | ||
3 | +import com.baomidou.mybatisplus.core.toolkit.Wrappers; | ||
4 | +import com.hotent.chkpower.model.WCurrentReport; | ||
5 | +import com.hotent.chkpower.dao.WCurrentReportDao; | ||
6 | +import com.hotent.chkpower.manager.WCurrentReportManager; | ||
7 | +import com.hotent.base.manager.impl.BaseManagerImpl; | ||
8 | +import com.hotent.chkpower.model.WDailyFunds; | ||
9 | +import com.hotent.runtime.script.ScriptImpl; | ||
10 | +import org.springframework.stereotype.Service; | ||
11 | +import org.springframework.transaction.annotation.Transactional; | ||
12 | +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; | ||
13 | + | ||
14 | +import java.time.LocalDateTime; | ||
15 | +import java.util.List; | ||
16 | +import javax.annotation.Resource; | ||
17 | +import com.hotent.base.util.BeanUtils; | ||
18 | + | ||
19 | + | ||
20 | +/** | ||
21 | + * 活期账户汇报 服务实现类 | ||
22 | + * | ||
23 | + * @company 广州宏天软件股份有限公司 | ||
24 | + * @author cw | ||
25 | + * @since 2024-07-09 | ||
26 | + */ | ||
27 | +@Service | ||
28 | +public class WCurrentReportManagerImpl extends BaseManagerImpl<WCurrentReportDao, WCurrentReport> implements WCurrentReportManager { | ||
29 | + @Resource | ||
30 | + private ScriptImpl scriptImpl; | ||
31 | + @Override | ||
32 | + public WCurrentReport getDetail(String id) { | ||
33 | + WCurrentReport wCurrentReport = this.get(id); | ||
34 | + | ||
35 | + | ||
36 | + return wCurrentReport; | ||
37 | + } | ||
38 | + @Override | ||
39 | + @Transactional | ||
40 | + public void createOrUpdate(WCurrentReport wCurrentReport) { | ||
41 | + //新建或更新 | ||
42 | + this.saveOrUpdate(wCurrentReport); | ||
43 | + } | ||
44 | + | ||
45 | + @Override | ||
46 | + public void updateInsp(LocalDateTime fDate, String fOrgId, String fInspStatusName, String fInspNotes) { | ||
47 | +// List<WCurrentReport> wCurrentReports = baseMapper.selectInspList(Wrappers.<WCurrentReport>lambdaQuery() | ||
48 | +// .apply("DATE(F_date) = DATE('{0}') and id_ in (SELECT a.ref_id_ FROM w_current a WHERE DATE(a.F_date) = DATE('{1}') and a.F_org_id ='{2}')", fDate, fDate, fOrgId)); | ||
49 | + | ||
50 | + List<WCurrentReport> wCurrentReports = baseMapper.selectInspList(fDate,fOrgId); | ||
51 | + | ||
52 | + for (WCurrentReport wCurrentReport : wCurrentReports) { | ||
53 | + baseMapper.update(null,Wrappers.<WCurrentReport>lambdaUpdate() | ||
54 | + .set(WCurrentReport::getFUpdateBy, scriptImpl.getCurrentUserName()) | ||
55 | + .set(WCurrentReport::getFUpdateId, scriptImpl.getCurrentUserId()) | ||
56 | + .set(WCurrentReport::getFInspStatusName, fInspStatusName) | ||
57 | + .set(WCurrentReport::getFInspTime, LocalDateTime.now()) | ||
58 | + .set(WCurrentReport::getFInspNotes,fInspNotes) | ||
59 | + .eq(WCurrentReport::getId, wCurrentReport.getId()) | ||
60 | + ); | ||
61 | + } | ||
62 | + } | ||
63 | +} |
backend/chkpower/src/main/java/com/hotent/chkpower/manager/impl/WDailyFundsManagerImpl.java
@@ -2,11 +2,17 @@ package com.hotent.chkpower.manager.impl; | @@ -2,11 +2,17 @@ package com.hotent.chkpower.manager.impl; | ||
2 | 2 | ||
3 | import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; | 3 | import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; |
4 | import com.baomidou.mybatisplus.core.toolkit.Wrappers; | 4 | import com.baomidou.mybatisplus.core.toolkit.Wrappers; |
5 | +import com.hotent.chkpower.dao.WCurrentReportDao; | ||
6 | +import com.hotent.chkpower.dao.WFinanceDao; | ||
7 | +import com.hotent.chkpower.manager.WCurrentReportManager; | ||
8 | +import com.hotent.chkpower.manager.WFinanceManager; | ||
5 | import com.hotent.chkpower.model.WCurrent; | 9 | import com.hotent.chkpower.model.WCurrent; |
10 | +import com.hotent.chkpower.model.WCurrentReport; | ||
6 | import com.hotent.chkpower.model.WDailyFunds; | 11 | import com.hotent.chkpower.model.WDailyFunds; |
7 | import com.hotent.chkpower.dao.WDailyFundsDao; | 12 | import com.hotent.chkpower.dao.WDailyFundsDao; |
8 | import com.hotent.chkpower.manager.WDailyFundsManager; | 13 | import com.hotent.chkpower.manager.WDailyFundsManager; |
9 | import com.hotent.base.manager.impl.BaseManagerImpl; | 14 | import com.hotent.base.manager.impl.BaseManagerImpl; |
15 | +import com.hotent.chkpower.model.WFinance; | ||
10 | import com.hotent.chkpower.vo.WDailyFundsVo; | 16 | import com.hotent.chkpower.vo.WDailyFundsVo; |
11 | import com.hotent.runtime.script.ScriptImpl; | 17 | import com.hotent.runtime.script.ScriptImpl; |
12 | import org.springframework.stereotype.Service; | 18 | import org.springframework.stereotype.Service; |
@@ -29,6 +35,12 @@ import java.util.List; | @@ -29,6 +35,12 @@ import java.util.List; | ||
29 | public class WDailyFundsManagerImpl extends BaseManagerImpl<WDailyFundsDao, WDailyFunds> implements WDailyFundsManager { | 35 | public class WDailyFundsManagerImpl extends BaseManagerImpl<WDailyFundsDao, WDailyFunds> implements WDailyFundsManager { |
30 | @Resource | 36 | @Resource |
31 | private ScriptImpl scriptImpl; | 37 | private ScriptImpl scriptImpl; |
38 | + @Resource | ||
39 | + private WCurrentReportManager wCurrentReportManager; | ||
40 | + @Resource | ||
41 | + private WFinanceManager wFinanceManager; | ||
42 | + @Resource | ||
43 | + private WFinanceDao wFinanceDao; | ||
32 | 44 | ||
33 | @Override | 45 | @Override |
34 | public WDailyFunds getDetail(String id) { | 46 | public WDailyFunds getDetail(String id) { |
@@ -102,6 +114,28 @@ public class WDailyFundsManagerImpl extends BaseManagerImpl<WDailyFundsDao, WDai | @@ -102,6 +114,28 @@ public class WDailyFundsManagerImpl extends BaseManagerImpl<WDailyFundsDao, WDai | ||
102 | .set(WDailyFunds::getFInspNotes, wDailyFundsList.getfInspNotes()) | 114 | .set(WDailyFunds::getFInspNotes, wDailyFundsList.getfInspNotes()) |
103 | .eq(WDailyFunds::getId, wDailyFund.getId()) | 115 | .eq(WDailyFunds::getId, wDailyFund.getId()) |
104 | ); | 116 | ); |
117 | + | ||
118 | + | ||
119 | + WFinance wFinance = new WFinance(); | ||
120 | + wFinance.setFUpdateBy(scriptImpl.getCurrentUserName()); | ||
121 | + wFinance.setFUpdateId(scriptImpl.getCurrentUserId()); | ||
122 | + wFinance.setFInspStatusName(wDailyFundsList.getfInspStatusName()); | ||
123 | + wFinance.setFInspTime(LocalDateTime.now()); | ||
124 | + wFinance.setFInspNotes(wDailyFundsList.getfInspNotes()); | ||
125 | + wFinance.setFDate(wDailyFund.getFDate()); | ||
126 | + wFinance.setFOrgId(wDailyFund.getFOrgId()); | ||
127 | + wFinanceDao.updateInsp(wFinance); | ||
128 | + | ||
129 | +// wFinanceManager.updateInsp(null,Wrappers.<WFinance>lambdaUpdate() | ||
130 | +// .set(WFinance::getFUpdateBy, scriptImpl.getCurrentUserName()) | ||
131 | +// .set(WFinance::getFUpdateId, scriptImpl.getCurrentUserId()) | ||
132 | +// .set(WFinance::getFInspStatusName, wDailyFundsList.getfInspStatusName()) | ||
133 | +// .set(WFinance::getFInspTime, LocalDateTime.now()) | ||
134 | +// .set(WFinance::getFInspNotes, wDailyFundsList.getfInspNotes()) | ||
135 | +// .apply("DATE(F_date) = DATE(?)", wDailyFund.getFDate().toLocalDate()) | ||
136 | +// .eq(WFinance::getFOrgId, wDailyFund.getFOrgId())); | ||
137 | + | ||
138 | + wCurrentReportManager.updateInsp(wDailyFund.getFDate(),wDailyFund.getFOrgId(),wDailyFundsList.getfInspStatusName(),wDailyFundsList.getfInspNotes()); | ||
105 | } | 139 | } |
106 | } | 140 | } |
107 | 141 |
backend/chkpower/src/main/java/com/hotent/chkpower/model/WCurrentReport.java
0 → 100644
@@ -0,0 +1,258 @@ | @@ -0,0 +1,258 @@ | ||
1 | +package com.hotent.chkpower.model; | ||
2 | + | ||
3 | +import com.baomidou.mybatisplus.annotation.IdType; | ||
4 | +import com.hotent.base.entity.BaseModel; | ||
5 | +import com.baomidou.mybatisplus.extension.activerecord.Model; | ||
6 | +import com.baomidou.mybatisplus.annotation.TableId; | ||
7 | +import java.time.LocalDateTime; | ||
8 | +import com.baomidou.mybatisplus.annotation.TableField; | ||
9 | +import java.io.Serializable; | ||
10 | +import io.swagger.annotations.ApiModel; | ||
11 | +import io.swagger.annotations.ApiModelProperty; | ||
12 | +import com.fasterxml.jackson.annotation.JsonProperty; | ||
13 | +/** | ||
14 | + * 活期账户汇报 | ||
15 | + * | ||
16 | + * @company 广州宏天软件股份有限公司 | ||
17 | + * @author cw | ||
18 | + * @since 2024-07-09 | ||
19 | + */ | ||
20 | +@ApiModel(value="WCurrentReport对象", description="活期账户汇报") | ||
21 | +public class WCurrentReport extends BaseModel<WCurrentReport> { | ||
22 | + | ||
23 | + private static final long serialVersionUID = 1L; | ||
24 | + @ApiModelProperty(value = "主键") | ||
25 | + @TableId(value = "ID_", type = IdType.ASSIGN_ID) | ||
26 | + @JsonProperty("id") | ||
27 | + private String id; | ||
28 | + | ||
29 | + @ApiModelProperty(value = "外键") | ||
30 | + @TableField("REF_ID_") | ||
31 | + @JsonProperty("refId") | ||
32 | + private String refId; | ||
33 | + | ||
34 | + @ApiModelProperty(value = "备注") | ||
35 | + @TableField("F_notes") | ||
36 | + @JsonProperty("fNotes") | ||
37 | + private String fNotes; | ||
38 | + | ||
39 | + @ApiModelProperty(value = "创建时间") | ||
40 | + @TableField("F_create_time") | ||
41 | + @JsonProperty("fCreateTime") | ||
42 | + private LocalDateTime fCreateTime; | ||
43 | + | ||
44 | + @ApiModelProperty(value = "创建人") | ||
45 | + @TableField("F_create_by") | ||
46 | + @JsonProperty("fCreateBy") | ||
47 | + private String fCreateBy; | ||
48 | + | ||
49 | + @ApiModelProperty(value = "创建人id") | ||
50 | + @TableField("F_create_id") | ||
51 | + @JsonProperty("fCreateId") | ||
52 | + private String fCreateId; | ||
53 | + | ||
54 | + @ApiModelProperty(value = "核对时间") | ||
55 | + @TableField("F_insp_time") | ||
56 | + @JsonProperty("fInspTime") | ||
57 | + private LocalDateTime fInspTime; | ||
58 | + | ||
59 | + @ApiModelProperty(value = "核对说明备注") | ||
60 | + @TableField("F_insp_notes") | ||
61 | + @JsonProperty("fInspNotes") | ||
62 | + private String fInspNotes; | ||
63 | + | ||
64 | + @ApiModelProperty(value = "核对人") | ||
65 | + @TableField("F_insp_by") | ||
66 | + @JsonProperty("fInspBy") | ||
67 | + private String fInspBy; | ||
68 | + | ||
69 | + @ApiModelProperty(value = "核对人ID") | ||
70 | + @TableField("F_insp_by_id") | ||
71 | + @JsonProperty("fInspById") | ||
72 | + private String fInspById; | ||
73 | + | ||
74 | + @ApiModelProperty(value = "修改人") | ||
75 | + @TableField("F_update_by") | ||
76 | + @JsonProperty("fUpdateBy") | ||
77 | + private String fUpdateBy; | ||
78 | + | ||
79 | + @ApiModelProperty(value = "修改人id") | ||
80 | + @TableField("F_update_id") | ||
81 | + @JsonProperty("fUpdateId") | ||
82 | + private String fUpdateId; | ||
83 | + | ||
84 | + @ApiModelProperty(value = "修改时间") | ||
85 | + @TableField("F_update_time") | ||
86 | + @JsonProperty("fUpdateTime") | ||
87 | + private LocalDateTime fUpdateTime; | ||
88 | + | ||
89 | + @ApiModelProperty(value = "核对状态") | ||
90 | + @TableField("F_insp_status_name") | ||
91 | + @JsonProperty("fInspStatusName") | ||
92 | + private String fInspStatusName; | ||
93 | + | ||
94 | + @ApiModelProperty(value = "核对人ID") | ||
95 | + @TableField("F_insp_id") | ||
96 | + @JsonProperty("fInspId") | ||
97 | + private String fInspId; | ||
98 | + | ||
99 | + @ApiModelProperty(value = "日期") | ||
100 | + @TableField("F_date") | ||
101 | + @JsonProperty("fDate") | ||
102 | + private LocalDateTime fDate; | ||
103 | + | ||
104 | + @ApiModelProperty(value = "表单数据版本") | ||
105 | + @TableField("F_form_data_rev_") | ||
106 | + @JsonProperty("fFormDataRev") | ||
107 | + private Long fFormDataRev; | ||
108 | + | ||
109 | + | ||
110 | + public String getId() { | ||
111 | + return id; | ||
112 | + } | ||
113 | + | ||
114 | + public void setId(String id) { | ||
115 | + this.id = id; | ||
116 | + } | ||
117 | + public String getRefId() { | ||
118 | + return refId; | ||
119 | + } | ||
120 | + | ||
121 | + public void setRefId(String refId) { | ||
122 | + this.refId = refId; | ||
123 | + } | ||
124 | + public String getFNotes() { | ||
125 | + return fNotes; | ||
126 | + } | ||
127 | + | ||
128 | + public void setFNotes(String fNotes) { | ||
129 | + this.fNotes = fNotes; | ||
130 | + } | ||
131 | + public LocalDateTime getFCreateTime() { | ||
132 | + return fCreateTime; | ||
133 | + } | ||
134 | + | ||
135 | + public void setFCreateTime(LocalDateTime fCreateTime) { | ||
136 | + this.fCreateTime = fCreateTime; | ||
137 | + } | ||
138 | + public String getFCreateBy() { | ||
139 | + return fCreateBy; | ||
140 | + } | ||
141 | + | ||
142 | + public void setFCreateBy(String fCreateBy) { | ||
143 | + this.fCreateBy = fCreateBy; | ||
144 | + } | ||
145 | + public String getFCreateId() { | ||
146 | + return fCreateId; | ||
147 | + } | ||
148 | + | ||
149 | + public void setFCreateId(String fCreateId) { | ||
150 | + this.fCreateId = fCreateId; | ||
151 | + } | ||
152 | + public LocalDateTime getFInspTime() { | ||
153 | + return fInspTime; | ||
154 | + } | ||
155 | + | ||
156 | + public void setFInspTime(LocalDateTime fInspTime) { | ||
157 | + this.fInspTime = fInspTime; | ||
158 | + } | ||
159 | + public String getFInspNotes() { | ||
160 | + return fInspNotes; | ||
161 | + } | ||
162 | + | ||
163 | + public void setFInspNotes(String fInspNotes) { | ||
164 | + this.fInspNotes = fInspNotes; | ||
165 | + } | ||
166 | + public String getFInspBy() { | ||
167 | + return fInspBy; | ||
168 | + } | ||
169 | + | ||
170 | + public void setFInspBy(String fInspBy) { | ||
171 | + this.fInspBy = fInspBy; | ||
172 | + } | ||
173 | + public String getFInspById() { | ||
174 | + return fInspById; | ||
175 | + } | ||
176 | + | ||
177 | + public void setFInspById(String fInspById) { | ||
178 | + this.fInspById = fInspById; | ||
179 | + } | ||
180 | + public String getFUpdateBy() { | ||
181 | + return fUpdateBy; | ||
182 | + } | ||
183 | + | ||
184 | + public void setFUpdateBy(String fUpdateBy) { | ||
185 | + this.fUpdateBy = fUpdateBy; | ||
186 | + } | ||
187 | + public String getFUpdateId() { | ||
188 | + return fUpdateId; | ||
189 | + } | ||
190 | + | ||
191 | + public void setFUpdateId(String fUpdateId) { | ||
192 | + this.fUpdateId = fUpdateId; | ||
193 | + } | ||
194 | + public LocalDateTime getFUpdateTime() { | ||
195 | + return fUpdateTime; | ||
196 | + } | ||
197 | + | ||
198 | + public void setFUpdateTime(LocalDateTime fUpdateTime) { | ||
199 | + this.fUpdateTime = fUpdateTime; | ||
200 | + } | ||
201 | + public String getFInspStatusName() { | ||
202 | + return fInspStatusName; | ||
203 | + } | ||
204 | + | ||
205 | + public void setFInspStatusName(String fInspStatusName) { | ||
206 | + this.fInspStatusName = fInspStatusName; | ||
207 | + } | ||
208 | + public String getFInspId() { | ||
209 | + return fInspId; | ||
210 | + } | ||
211 | + | ||
212 | + public void setFInspId(String fInspId) { | ||
213 | + this.fInspId = fInspId; | ||
214 | + } | ||
215 | + public LocalDateTime getFDate() { | ||
216 | + return fDate; | ||
217 | + } | ||
218 | + | ||
219 | + public void setFDate(LocalDateTime fDate) { | ||
220 | + this.fDate = fDate; | ||
221 | + } | ||
222 | + public Long getFFormDataRev() { | ||
223 | + return fFormDataRev; | ||
224 | + } | ||
225 | + | ||
226 | + public void setFFormDataRev(Long fFormDataRev) { | ||
227 | + this.fFormDataRev = fFormDataRev; | ||
228 | + } | ||
229 | + | ||
230 | + | ||
231 | + @Override | ||
232 | + protected Serializable pkVal() { | ||
233 | + return this.id; | ||
234 | + } | ||
235 | + | ||
236 | + @Override | ||
237 | + public String toString() { | ||
238 | + return "WCurrentReport{" + | ||
239 | + "id=" + id + | ||
240 | + ", refId=" + refId + | ||
241 | + ", fNotes=" + fNotes + | ||
242 | + ", fCreateTime=" + fCreateTime + | ||
243 | + ", fCreateBy=" + fCreateBy + | ||
244 | + ", fCreateId=" + fCreateId + | ||
245 | + ", fInspTime=" + fInspTime + | ||
246 | + ", fInspNotes=" + fInspNotes + | ||
247 | + ", fInspBy=" + fInspBy + | ||
248 | + ", fInspById=" + fInspById + | ||
249 | + ", fUpdateBy=" + fUpdateBy + | ||
250 | + ", fUpdateId=" + fUpdateId + | ||
251 | + ", fUpdateTime=" + fUpdateTime + | ||
252 | + ", fInspStatusName=" + fInspStatusName + | ||
253 | + ", fInspId=" + fInspId + | ||
254 | + ", fDate=" + fDate + | ||
255 | + ", fFormDataRev=" + fFormDataRev + | ||
256 | + "}"; | ||
257 | + } | ||
258 | +} |
backend/chkpower/src/main/resources/mapper/WCurrentReportMapper.xml
0 → 100644
@@ -0,0 +1,63 @@ | @@ -0,0 +1,63 @@ | ||
1 | +<?xml version="1.0" encoding="UTF-8"?> | ||
2 | +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> | ||
3 | +<mapper namespace="com.hotent.chkpower.dao.WCurrentReportDao"> | ||
4 | + | ||
5 | + <!-- 通用查询映射结果 --> | ||
6 | + <resultMap id="BaseResultMap" type="com.hotent.chkpower.model.WCurrentReport"> | ||
7 | + <id column="ID_" property="id" /> | ||
8 | + <result column="REF_ID_" property="refId" /> | ||
9 | + <result column="F_notes" property="fNotes" /> | ||
10 | + <result column="F_create_time" property="fCreateTime" /> | ||
11 | + <result column="F_create_by" property="fCreateBy" /> | ||
12 | + <result column="F_create_id" property="fCreateId" /> | ||
13 | + <result column="F_insp_time" property="fInspTime" /> | ||
14 | + <result column="F_insp_notes" property="fInspNotes" /> | ||
15 | + <result column="F_insp_by" property="fInspBy" /> | ||
16 | + <result column="F_insp_by_id" property="fInspById" /> | ||
17 | + <result column="F_update_by" property="fUpdateBy" /> | ||
18 | + <result column="F_update_id" property="fUpdateId" /> | ||
19 | + <result column="F_update_time" property="fUpdateTime" /> | ||
20 | + <result column="F_insp_status_name" property="fInspStatusName" /> | ||
21 | + <result column="F_insp_id" property="fInspId" /> | ||
22 | + <result column="F_date" property="fDate" /> | ||
23 | + <result column="F_form_data_rev_" property="fFormDataRev" /> | ||
24 | + </resultMap> | ||
25 | + | ||
26 | + <!-- 通用查询结果列 --> | ||
27 | + <sql id="Base_Column_List"> | ||
28 | + ID_, REF_ID_, F_notes, F_create_time, F_create_by, F_create_id, F_insp_time, F_insp_notes, F_insp_by, F_insp_by_id, F_update_by, F_update_id, F_update_time, F_insp_status_name, F_insp_id, F_date, F_form_data_rev_ | ||
29 | + </sql> | ||
30 | + | ||
31 | + <select id="selectPage" resultMap="BaseResultMap"> | ||
32 | + select | ||
33 | + <include refid="Base_Column_List"/> | ||
34 | + from | ||
35 | + w_current_report | ||
36 | + ${ew.customSqlSegment} | ||
37 | + </select> | ||
38 | + | ||
39 | + <select id="selectList" resultMap="BaseResultMap"> | ||
40 | + select | ||
41 | + <include refid="Base_Column_List"/> | ||
42 | + from | ||
43 | + w_current_report | ||
44 | + ${ew.customSqlSegment} | ||
45 | + </select> | ||
46 | + | ||
47 | + <select id="selectById" resultMap="BaseResultMap"> | ||
48 | + select | ||
49 | + <include refid="Base_Column_List"/> | ||
50 | + from | ||
51 | + w_current_report | ||
52 | + where | ||
53 | + ID_ = #{id} | ||
54 | + </select> | ||
55 | + | ||
56 | + <select id="selectInspList" resultMap="BaseResultMap"> | ||
57 | + select | ||
58 | + <include refid="Base_Column_List"/> | ||
59 | + from w_current_report | ||
60 | + WHERE 1=1 and DATE(F_date) = DATE(#{fDate}) | ||
61 | + and id_ in (SELECT a.ref_id_ FROM w_current a WHERE DATE(a.F_date) = DATE(#{fDate}) and a.F_org_id =#{fOrgId}) | ||
62 | + </select> | ||
63 | +</mapper> |
backend/chkpower/src/main/resources/mapper/WFinanceMapper.xml
@@ -72,4 +72,18 @@ | @@ -72,4 +72,18 @@ | ||
72 | AND acc.F_org_type= #{fOrgType} | 72 | AND acc.F_org_type= #{fOrgType} |
73 | ORDER BY org.ORDER_NO_ ASC | 73 | ORDER BY org.ORDER_NO_ ASC |
74 | </select> | 74 | </select> |
75 | + | ||
76 | + <update id="updateInsp" parameterType="com.hotent.chkpower.model.WFinance"> | ||
77 | + UPDATE w_finance | ||
78 | + SET F_insp_status_name = #{fInspStatusName}, | ||
79 | + F_insp_time = #{fInspTime}, | ||
80 | + F_insp_notes = #{fInspNotes}, | ||
81 | + F_insp_id = #{fInspId}, | ||
82 | + F_insp_by = #{fInspBy}, | ||
83 | + F_update_time = #{fUpdateTime}, | ||
84 | + F_update_by = #{fUpdateBy}, | ||
85 | + F_update_id = #{fUpdateId} | ||
86 | + WHERE DATE(F_date) = DATE(#{fDate}) | ||
87 | + AND F_org_id = #{fOrgId} | ||
88 | + </update> | ||
75 | </mapper> | 89 | </mapper> |
frontend/front/src/components/tableSlot/dailyFunds/updateInspBtn.vue
0 → 100644
@@ -0,0 +1,120 @@ | @@ -0,0 +1,120 @@ | ||
1 | +<template> | ||
2 | + <div> | ||
3 | + <el-button @click="dialogVisible = !dialogVisible">批量复核</el-button> | ||
4 | + <el-dialog title="批量复核" :visible.sync="dialogVisible" width="30%"> | ||
5 | + <el-form ref="form" label-width="120px"> | ||
6 | + <el-form-item label="复核状态"> | ||
7 | + <el-select v-model="fInspStatusName" placeholder="请选择" style="width: 100%"> | ||
8 | + <el-option label="同意" value="同意"></el-option> | ||
9 | + <el-option label="不同意" value="不同意"></el-option> | ||
10 | + </el-select> | ||
11 | + </el-form-item> | ||
12 | + <el-form-item label="复核备注"> | ||
13 | + <el-input v-model="fInspNotes"></el-input> | ||
14 | + </el-form-item> | ||
15 | + </el-form> | ||
16 | + <span slot="footer"> | ||
17 | + <el-button @click="dialogVisible = false">取 消</el-button> | ||
18 | + <el-button type="primary" @click="onSubmit">确 认</el-button> | ||
19 | + </span> | ||
20 | + </el-dialog> | ||
21 | + </div> | ||
22 | +</template> | ||
23 | +<script> | ||
24 | +import {updateInsp} from '@/api/service/dailyFunds' | ||
25 | +import moment from 'moment' | ||
26 | + | ||
27 | +export default { | ||
28 | + props: { | ||
29 | + row: { | ||
30 | + type: Object | ||
31 | + }, | ||
32 | + column: { | ||
33 | + type: Object | ||
34 | + }, | ||
35 | + index: { | ||
36 | + type: String | ||
37 | + }, | ||
38 | + desc: { | ||
39 | + type: String | ||
40 | + }, | ||
41 | + selectRows: { | ||
42 | + type: Object | ||
43 | + } | ||
44 | + }, | ||
45 | + | ||
46 | + data() { | ||
47 | + return { | ||
48 | + dialogVisible: false, | ||
49 | + fInspStatusName: null, | ||
50 | + fInspNotes: null, | ||
51 | + }; | ||
52 | + }, | ||
53 | + | ||
54 | + created() { | ||
55 | + | ||
56 | + }, | ||
57 | + methods: { | ||
58 | + onSubmit() { | ||
59 | + | ||
60 | + console.log('selectRows', this.selectRows); | ||
61 | + if (!this.selectRows || this.selectRows.length == 0) { | ||
62 | + this.$message.error('请选择数据!'); | ||
63 | + return false; | ||
64 | + } else { | ||
65 | + this.$confirm('是否确认批量复核1?', '提示', { | ||
66 | + confirmButtonText: '确定', | ||
67 | + cancelButtonText: '取消', | ||
68 | + type: 'warning' | ||
69 | + }).then(() => { | ||
70 | + let wDailyFundsList = []; | ||
71 | + this.selectRows.forEach(d => { | ||
72 | + wDailyFundsList.push({ | ||
73 | + id: d.id_, | ||
74 | + fDate: d.wdailyfundsfdate + " 00:00:00", | ||
75 | + fOrgName: d.wdailyfundsforgname, | ||
76 | + fOrgId: d.wdailyfundsforgid, | ||
77 | + fOrgType: d.wdailyfundsforgtype | ||
78 | + }) | ||
79 | + }) | ||
80 | + updateInsp({ | ||
81 | + wDailyFundsList: wDailyFundsList, | ||
82 | + fInspStatusName: this.fInspStatusName, | ||
83 | + fInspNotes: this.fInspNotes | ||
84 | + }).then((res) => { | ||
85 | + if (res.state) { | ||
86 | + this.$message.success(res.message) | ||
87 | + this.$emit("RefreshTable"); | ||
88 | + this.dialogVisible = false; | ||
89 | + } else { | ||
90 | + this.$emit("RefreshTable"); | ||
91 | + this.$message.warning(res.message) | ||
92 | + this.dialogVisible = false; | ||
93 | + } | ||
94 | + }) | ||
95 | + }); | ||
96 | + } | ||
97 | + }, | ||
98 | + onClick() { | ||
99 | + // console.log('selectRows',this.selectRows); | ||
100 | + // console.log('row',this.row); | ||
101 | + // console.log('column',this.column); | ||
102 | + // console.log('index',this.index); | ||
103 | + // console.log('desc',this.desc); | ||
104 | + } | ||
105 | + } | ||
106 | +} | ||
107 | +</script> | ||
108 | + | ||
109 | + | ||
110 | +<style scoped lang='scss'> | ||
111 | +::v-deep { | ||
112 | + .el-dialog__footer { | ||
113 | + text-align: center !important; | ||
114 | + | ||
115 | + .el-button { | ||
116 | + margin-left: 20px; | ||
117 | + } | ||
118 | + } | ||
119 | +} | ||
120 | +</style> |