From cfb7c312bcf748020905d4ed6389e9f9565ef177 Mon Sep 17 00:00:00 2001 From: lijun Date: Sun, 10 Nov 2024 23:48:52 +0800 Subject: [PATCH 1/4] update code --- bin/clean | 1 + bin/package | 1 + bin/run | 14 + pom.xml | 6 + .../src/main/resources/application-druid.yml | 8 +- ruoyi-ui/src/api/project/unitpay.js | 44 +++ ruoyi-ui/src/views/project/unitpay/index.vue | 374 ++++++++++++++++++ ...SurProjectAttendanceUnitpayController.java | 104 +++++ .../domain/SurProjectAttendanceUnitpay.java | 140 +++++++ .../SurProjectAttendanceUnitpayMapper.java | 61 +++ .../ISurProjectAttendanceUnitpayService.java | 61 +++ ...urProjectAttendanceUnitpayServiceImpl.java | 98 +++++ .../SurProjectAttendanceUnitpayMapper.xml | 106 +++++ 13 files changed, 1014 insertions(+), 4 deletions(-) create mode 100755 bin/clean create mode 100755 bin/package create mode 100755 bin/run create mode 100644 ruoyi-ui/src/api/project/unitpay.js create mode 100644 ruoyi-ui/src/views/project/unitpay/index.vue create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectAttendanceUnitpayController.java create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectAttendanceUnitpay.java create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectAttendanceUnitpayMapper.java create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectAttendanceUnitpayService.java create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAttendanceUnitpayServiceImpl.java create mode 100644 yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceUnitpayMapper.xml diff --git a/bin/clean b/bin/clean new file mode 100755 index 00000000..2f3d3e51 --- /dev/null +++ b/bin/clean @@ -0,0 +1 @@ +mvn clean \ No newline at end of file diff --git a/bin/package b/bin/package new file mode 100755 index 00000000..502174cd --- /dev/null +++ b/bin/package @@ -0,0 +1 @@ +mvn clean package -Dmaven.test.skip=true \ No newline at end of file diff --git a/bin/run b/bin/run new file mode 100755 index 00000000..90073a82 --- /dev/null +++ b/bin/run @@ -0,0 +1,14 @@ +@echo off +echo. +echo [信息] 运行Web工程。 +echo. + +cd %~dp0 +cd ../ruoyi-admin/target + +set JAVA_OPTS=-Xms256m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m + +java -jar %JAVA_OPTS% ruoyi-admin.jar + +cd bin +pause \ No newline at end of file diff --git a/pom.xml b/pom.xml index 39d4ae71..56afc599 100644 --- a/pom.xml +++ b/pom.xml @@ -194,6 +194,12 @@ 3.4.0 + + org.projectlombok + lombok + true + 1.18.30 + diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index ff1d1eb4..0406b88e 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -49,12 +49,12 @@ spring: druid: # 涓诲簱鏁版嵁婧 master: - #url: jdbc:mysql://62.234.3.186:3306/yanzhu_jh?useSSL=false&characterEncoding=UTF-8&serverTimezone=GMT%2B8 + url: jdbc:mysql://62.234.3.186:3306/yanzhu_jh_test?useSSL=false&characterEncoding=UTF-8&serverTimezone=GMT%2B8 username: root - #password: Sxyanzhu@cf123 - url: jdbc:mysql://192.168.126.19:3306/yanzhu_jh_test2024?useSSL=false&characterEncoding=UTF-8&serverTimezone=GMT%2B8 + password: Sxyanzhu@cf123 + #url: jdbc:mysql://192.168.126.19:3306/yanzhu_jh_test2024?useSSL=false&characterEncoding=UTF-8&serverTimezone=GMT%2B8 #username: root - password: hadoopspring123 + #password: hadoopspring123 # 浠庡簱鏁版嵁婧 slave: # 浠庢暟鎹簮寮鍏/榛樿鍏抽棴 diff --git a/ruoyi-ui/src/api/project/unitpay.js b/ruoyi-ui/src/api/project/unitpay.js new file mode 100644 index 00000000..b0e90fcb --- /dev/null +++ b/ruoyi-ui/src/api/project/unitpay.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 鏌ヨ鍔宠祫绠＄悊鍒楄〃 +export function listUnitpay(query) { + return request({ + url: '/project/unitpay/list', + method: 'get', + params: query + }) +} + +// 鏌ヨ鍔宠祫绠＄悊璇︾粏 +export function getUnitpay(id) { + return request({ + url: '/project/unitpay/' + id, + method: 'get' + }) +} + +// 鏂板鍔宠祫绠＄悊 +export function addUnitpay(data) { + return request({ + url: '/project/unitpay', + method: 'post', + data: data + }) +} + +// 淇敼鍔宠祫绠＄悊 +export function updateUnitpay(data) { + return request({ + url: '/project/unitpay', + method: 'put', + data: data + }) +} + +// 鍒犻櫎鍔宠祫绠＄悊 +export function delUnitpay(id) { + return request({ + url: '/project/unitpay/' + id, + method: 'delete' + }) +} diff --git a/ruoyi-ui/src/views/project/unitpay/index.vue b/ruoyi-ui/src/views/project/unitpay/index.vue new file mode 100644 index 00000000..4513d8d6 --- /dev/null +++ b/ruoyi-ui/src/views/project/unitpay/index.vue @@ -0,0 +1,374 @@ + + + diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectAttendanceUnitpayController.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectAttendanceUnitpayController.java new file mode 100644 index 00000000..e3c211b6 --- /dev/null +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectAttendanceUnitpayController.java @@ -0,0 +1,104 @@ +package com.yanzhu.jh.project.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.enums.BusinessType; +import com.yanzhu.jh.project.domain.SurProjectAttendanceUnitpay; +import com.yanzhu.jh.project.service.ISurProjectAttendanceUnitpayService; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 鍔宠祫绠＄悊Controller + * + * @author ruoyi + * @date 2024-11-10 + */ +@RestController +@RequestMapping("/project/unitpay") +public class SurProjectAttendanceUnitpayController extends BaseController +{ + @Autowired + private ISurProjectAttendanceUnitpayService surProjectAttendanceUnitpayService; + + /** + * 鏌ヨ鍔宠祫绠＄悊鍒楄〃 + */ + @PreAuthorize("@ss.hasPermi('project:unitpay:list')") + @GetMapping("/list") + public TableDataInfo list(SurProjectAttendanceUnitpay surProjectAttendanceUnitpay) + { + startPage(); + List list = surProjectAttendanceUnitpayService.selectSurProjectAttendanceUnitpayList(surProjectAttendanceUnitpay); + return getDataTable(list); + } + + /** + * 瀵煎嚭鍔宠祫绠＄悊鍒楄〃 + */ + @PreAuthorize("@ss.hasPermi('project:unitpay:export')") + @Log(title = "鍔宠祫绠＄悊", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, SurProjectAttendanceUnitpay surProjectAttendanceUnitpay) + { + List list = surProjectAttendanceUnitpayService.selectSurProjectAttendanceUnitpayList(surProjectAttendanceUnitpay); + ExcelUtil util = new ExcelUtil(SurProjectAttendanceUnitpay.class); + util.exportExcel(response, list, "鍔宠祫绠＄悊鏁版嵁"); + } + + /** + * 鑾峰彇鍔宠祫绠＄悊璇︾粏淇℃伅 + */ + @PreAuthorize("@ss.hasPermi('project:unitpay:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return success(surProjectAttendanceUnitpayService.selectSurProjectAttendanceUnitpayById(id)); + } + + /** + * 鏂板鍔宠祫绠＄悊 + */ + @PreAuthorize("@ss.hasPermi('project:unitpay:add')") + @Log(title = "鍔宠祫绠＄悊", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody SurProjectAttendanceUnitpay surProjectAttendanceUnitpay) + { + return toAjax(surProjectAttendanceUnitpayService.insertSurProjectAttendanceUnitpay(surProjectAttendanceUnitpay)); + } + + /** + * 淇敼鍔宠祫绠＄悊 + */ + @PreAuthorize("@ss.hasPermi('project:unitpay:edit')") + @Log(title = "鍔宠祫绠＄悊", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody SurProjectAttendanceUnitpay surProjectAttendanceUnitpay) + { + return toAjax(surProjectAttendanceUnitpayService.updateSurProjectAttendanceUnitpay(surProjectAttendanceUnitpay)); + } + + /** + * 鍒犻櫎鍔宠祫绠＄悊 + */ + @PreAuthorize("@ss.hasPermi('project:unitpay:remove')") + @Log(title = "鍔宠祫绠＄悊", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(surProjectAttendanceUnitpayService.deleteSurProjectAttendanceUnitpayByIds(ids)); + } +} diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectAttendanceUnitpay.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectAttendanceUnitpay.java new file mode 100644 index 00000000..b98adf95 --- /dev/null +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectAttendanceUnitpay.java @@ -0,0 +1,140 @@ +package com.yanzhu.jh.project.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 鍔宠祫绠＄悊瀵硅薄 sur_project_attendance_unitpay + * + * @author ruoyi + * @date 2024-11-10 + */ +public class SurProjectAttendanceUnitpay extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** $column.columnComment */ + private Long id; + + /** 閰嶇疆ID */ + @Excel(name = "閰嶇疆ID") + private Long cfgId; + + /** 鐝粍ID */ + @Excel(name = "鐝粍ID") + private String groupId; + + /** 鐝粍鍚嶇О */ + @Excel(name = "鐝粍鍚嶇О") + private String groupName; + + /** 宸ョ缂栫爜 */ + @Excel(name = "宸ョ缂栫爜") + private String workTypeCode; + + /** 宸ョ */ + @Excel(name = "宸ョ") + private String workTypeName; + + /** 宸ヨ祫 */ + @Excel(name = "宸ヨ祫") + private Long unitPay; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long isDel; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setCfgId(Long cfgId) + { + this.cfgId = cfgId; + } + + public Long getCfgId() + { + return cfgId; + } + public void setGroupId(String groupId) + { + this.groupId = groupId; + } + + public String getGroupId() + { + return groupId; + } + public void setGroupName(String groupName) + { + this.groupName = groupName; + } + + public String getGroupName() + { + return groupName; + } + public void setWorkTypeCode(String workTypeCode) + { + this.workTypeCode = workTypeCode; + } + + public String getWorkTypeCode() + { + return workTypeCode; + } + public void setWorkTypeName(String workTypeName) + { + this.workTypeName = workTypeName; + } + + public String getWorkTypeName() + { + return workTypeName; + } + public void setUnitPay(Long unitPay) + { + this.unitPay = unitPay; + } + + public Long getUnitPay() + { + return unitPay; + } + public void setIsDel(Long isDel) + { + this.isDel = isDel; + } + + public Long getIsDel() + { + return isDel; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("cfgId", getCfgId()) + .append("groupId", getGroupId()) + .append("groupName", getGroupName()) + .append("workTypeCode", getWorkTypeCode()) + .append("workTypeName", getWorkTypeName()) + .append("unitPay", getUnitPay()) + .append("remark", getRemark()) + .append("isDel", getIsDel()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectAttendanceUnitpayMapper.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectAttendanceUnitpayMapper.java new file mode 100644 index 00000000..040143c5 --- /dev/null +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectAttendanceUnitpayMapper.java @@ -0,0 +1,61 @@ +package com.yanzhu.jh.project.mapper; + +import java.util.List; +import com.yanzhu.jh.project.domain.SurProjectAttendanceUnitpay; + +/** + * 鍔宠祫绠＄悊Mapper鎺ュ彛 + * + * @author ruoyi + * @date 2024-11-10 + */ +public interface SurProjectAttendanceUnitpayMapper +{ + /** + * 鏌ヨ鍔宠祫绠＄悊 + * + * @param id 鍔宠祫绠＄悊涓婚敭 + * @return 鍔宠祫绠＄悊 + */ + public SurProjectAttendanceUnitpay selectSurProjectAttendanceUnitpayById(Long id); + + /** + * 鏌ヨ鍔宠祫绠＄悊鍒楄〃 + * + * @param surProjectAttendanceUnitpay 鍔宠祫绠＄悊 + * @return 鍔宠祫绠＄悊闆嗗悎 + */ + public List selectSurProjectAttendanceUnitpayList(SurProjectAttendanceUnitpay surProjectAttendanceUnitpay); + + /** + * 鏂板鍔宠祫绠＄悊 + * + * @param surProjectAttendanceUnitpay 鍔宠祫绠＄悊 + * @return 缁撴灉 + */ + public int insertSurProjectAttendanceUnitpay(SurProjectAttendanceUnitpay surProjectAttendanceUnitpay); + + /** + * 淇敼鍔宠祫绠＄悊 + * + * @param surProjectAttendanceUnitpay 鍔宠祫绠＄悊 + * @return 缁撴灉 + */ + public int updateSurProjectAttendanceUnitpay(SurProjectAttendanceUnitpay surProjectAttendanceUnitpay); + + /** + * 鍒犻櫎鍔宠祫绠＄悊 + * + * @param id 鍔宠祫绠＄悊涓婚敭 + * @return 缁撴灉 + */ + public int deleteSurProjectAttendanceUnitpayById(Long id); + + /** + * 鎵归噺鍒犻櫎鍔宠祫绠＄悊 + * + * @param ids 闇瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎 + * @return 缁撴灉 + */ + public int deleteSurProjectAttendanceUnitpayByIds(Long[] ids); +} diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectAttendanceUnitpayService.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectAttendanceUnitpayService.java new file mode 100644 index 00000000..43fdbcbb --- /dev/null +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectAttendanceUnitpayService.java @@ -0,0 +1,61 @@ +package com.yanzhu.jh.project.service; + +import java.util.List; +import com.yanzhu.jh.project.domain.SurProjectAttendanceUnitpay; + +/** + * 鍔宠祫绠＄悊Service鎺ュ彛 + * + * @author ruoyi + * @date 2024-11-10 + */ +public interface ISurProjectAttendanceUnitpayService +{ + /** + * 鏌ヨ鍔宠祫绠＄悊 + * + * @param id 鍔宠祫绠＄悊涓婚敭 + * @return 鍔宠祫绠＄悊 + */ + public SurProjectAttendanceUnitpay selectSurProjectAttendanceUnitpayById(Long id); + + /** + * 鏌ヨ鍔宠祫绠＄悊鍒楄〃 + * + * @param surProjectAttendanceUnitpay 鍔宠祫绠＄悊 + * @return 鍔宠祫绠＄悊闆嗗悎 + */ + public List selectSurProjectAttendanceUnitpayList(SurProjectAttendanceUnitpay surProjectAttendanceUnitpay); + + /** + * 鏂板鍔宠祫绠＄悊 + * + * @param surProjectAttendanceUnitpay 鍔宠祫绠＄悊 + * @return 缁撴灉 + */ + public int insertSurProjectAttendanceUnitpay(SurProjectAttendanceUnitpay surProjectAttendanceUnitpay); + + /** + * 淇敼鍔宠祫绠＄悊 + * + * @param surProjectAttendanceUnitpay 鍔宠祫绠＄悊 + * @return 缁撴灉 + */ + public int updateSurProjectAttendanceUnitpay(SurProjectAttendanceUnitpay surProjectAttendanceUnitpay); + + /** + * 鎵归噺鍒犻櫎鍔宠祫绠＄悊 + * + * @param ids 闇瑕佸垹闄ょ殑鍔宠祫绠＄悊涓婚敭闆嗗悎 + * @return 缁撴灉 + */ + public int deleteSurProjectAttendanceUnitpayByIds(Long[] ids); + + /** + * 鍒犻櫎鍔宠祫绠＄悊淇℃伅 + * + * @param id 鍔宠祫绠＄悊涓婚敭 + * @return 缁撴灉 + */ + public int deleteSurProjectAttendanceUnitpayById(Long id); +} diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAttendanceUnitpayServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAttendanceUnitpayServiceImpl.java new file mode 100644 index 00000000..eb4d05d4 --- /dev/null +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAttendanceUnitpayServiceImpl.java @@ -0,0 +1,98 @@ +package com.yanzhu.jh.project.service.impl; + +import java.util.List; +import com.ruoyi.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.yanzhu.jh.project.mapper.SurProjectAttendanceUnitpayMapper; +import com.yanzhu.jh.project.domain.SurProjectAttendanceUnitpay; +import com.yanzhu.jh.project.service.ISurProjectAttendanceUnitpayService; +import com.ruoyi.common.utils.SecurityUtils; +/** + * 鍔宠祫绠＄悊Service涓氬姟灞傚鐞 + * + * @author ruoyi + * @date 2024-11-10 + */ +@Service +public class SurProjectAttendanceUnitpayServiceImpl implements ISurProjectAttendanceUnitpayService +{ + @Autowired + private SurProjectAttendanceUnitpayMapper surProjectAttendanceUnitpayMapper; + + /** + * 鏌ヨ鍔宠祫绠＄悊 + * + * @param id 鍔宠祫绠＄悊涓婚敭 + * @return 鍔宠祫绠＄悊 + */ + @Override + public SurProjectAttendanceUnitpay selectSurProjectAttendanceUnitpayById(Long id) + { + return surProjectAttendanceUnitpayMapper.selectSurProjectAttendanceUnitpayById(id); + } + + /** + * 鏌ヨ鍔宠祫绠＄悊鍒楄〃 + * + * @param surProjectAttendanceUnitpay 鍔宠祫绠＄悊 + * @return 鍔宠祫绠＄悊 + */ + @Override + public List selectSurProjectAttendanceUnitpayList(SurProjectAttendanceUnitpay surProjectAttendanceUnitpay) + { + return surProjectAttendanceUnitpayMapper.selectSurProjectAttendanceUnitpayList(surProjectAttendanceUnitpay); + } + + /** + * 鏂板鍔宠祫绠＄悊 + * + * @param surProjectAttendanceUnitpay 鍔宠祫绠＄悊 + * @return 缁撴灉 + */ + @Override + public int insertSurProjectAttendanceUnitpay(SurProjectAttendanceUnitpay surProjectAttendanceUnitpay) + { + surProjectAttendanceUnitpay.setCreateBy(SecurityUtils.getUsername()); + surProjectAttendanceUnitpay.setCreateTime(DateUtils.getNowDate()); + return surProjectAttendanceUnitpayMapper.insertSurProjectAttendanceUnitpay(surProjectAttendanceUnitpay); + } + + /** + * 淇敼鍔宠祫绠＄悊 + * + * @param surProjectAttendanceUnitpay 鍔宠祫绠＄悊 + * @return 缁撴灉 + */ + @Override + public int updateSurProjectAttendanceUnitpay(SurProjectAttendanceUnitpay surProjectAttendanceUnitpay) + { + surProjectAttendanceUnitpay.setUpdateBy(SecurityUtils.getUsername()); + surProjectAttendanceUnitpay.setUpdateTime(DateUtils.getNowDate()); + return surProjectAttendanceUnitpayMapper.updateSurProjectAttendanceUnitpay(surProjectAttendanceUnitpay); + } + + /** + * 鎵归噺鍒犻櫎鍔宠祫绠＄悊 + * + * @param ids 闇瑕佸垹闄ょ殑鍔宠祫绠＄悊涓婚敭 + * @return 缁撴灉 + */ + @Override + public int deleteSurProjectAttendanceUnitpayByIds(Long[] ids) + { + return surProjectAttendanceUnitpayMapper.deleteSurProjectAttendanceUnitpayByIds(ids); + } + + /** + * 鍒犻櫎鍔宠祫绠＄悊淇℃伅 + * + * @param id 鍔宠祫绠＄悊涓婚敭 + * @return 缁撴灉 + */ + @Override + public int deleteSurProjectAttendanceUnitpayById(Long id) + { + return surProjectAttendanceUnitpayMapper.deleteSurProjectAttendanceUnitpayById(id); + } +} diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceUnitpayMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceUnitpayMapper.xml new file mode 100644 index 00000000..c02d6551 --- /dev/null +++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceUnitpayMapper.xml @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + + + + + + + + select id, cfgId, groupId, groupName, workTypeCode, workTypeName, unitPay, remark, is_del, create_by, create_time, update_by, update_time from sur_project_attendance_unitpay + + + + + + + + insert into sur_project_attendance_unitpay + + cfgId, + groupId, + groupName, + workTypeCode, + workTypeName, + unitPay, + remark, + is_del, + create_by, + create_time, + update_by, + update_time, + + + #{cfgId}, + #{groupId}, + #{groupName}, + #{workTypeCode}, + #{workTypeName}, + #{unitPay}, + #{remark}, + #{isDel}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update sur_project_attendance_unitpay + + cfgId = #{cfgId}, + groupId = #{groupId}, + groupName = #{groupName}, + workTypeCode = #{workTypeCode}, + workTypeName = #{workTypeName}, + unitPay = #{unitPay}, + remark = #{remark}, + is_del = #{isDel}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where id = #{id} + + + + delete from sur_project_attendance_unitpay where id = #{id} + + + + delete from sur_project_attendance_unitpay where id in + + #{id} + + + \ No newline at end of file From ddf8ffb4188c4abfff4e8862916454386e9a33ca Mon Sep 17 00:00:00 2001 From: lijun Date: Wed, 13 Nov 2024 22:08:39 +0800 Subject: [PATCH 2/4] =?UTF-8?q?update=20code=20=E5=A2=9E=E5=8A=A0=E5=8A=B3?= =?UTF-8?q?=E5=8A=A1=E5=B7=A5=E8=B5=84=E7=AE=A1=E7=90=86=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-druid.yml | 2 +- ruoyi-ui/src/api/project/unitpay.js | 18 +++ ruoyi-ui/src/assets/styles/ruoyi.scss | 4 +- .../src/views/project/surProject/index.vue | 12 +- .../surProjectAttendance/attendanceDrawer.vue | 72 +++------ ruoyi-ui/src/views/project/unitpay/dayPay.vue | 141 +++++++++++++++++ ruoyi-ui/src/views/project/unitpay/index.vue | 127 ++++----------- .../src/views/project/unitpay/monthPay.vue | 146 ++++++++++++++++++ .../src/views/project/unitpay/paySetting.vue | 89 +++++++++++ .../views/project/unitpay/unitpayDrawer.vue | 90 +++++++++++ ...SurProjectAttendanceUnitpayController.java | 77 ++++++++- .../domain/SurProjectAttendanceData.java | 36 +++++ .../domain/SurProjectAttendanceUnitpay.java | 10 ++ .../SurProjectAttendanceDataMapper.java | 4 + .../SurProjectAttendanceUnitpayMapper.java | 2 + .../ISurProjectAttendanceDataService.java | 4 + .../ISurProjectAttendanceUnitpayService.java | 8 + .../SurProjectAttendanceDataServiceImpl.java | 10 ++ ...urProjectAttendanceUnitpayServiceImpl.java | 52 +++++++ .../SurProjectAttendanceDataMapper.xml | 63 +++++++- .../SurProjectAttendanceUnitpayMapper.xml | 11 +- yarn.lock | 4 + 22 files changed, 813 insertions(+), 169 deletions(-) create mode 100644 ruoyi-ui/src/views/project/unitpay/dayPay.vue create mode 100644 ruoyi-ui/src/views/project/unitpay/monthPay.vue create mode 100644 ruoyi-ui/src/views/project/unitpay/paySetting.vue create mode 100644 ruoyi-ui/src/views/project/unitpay/unitpayDrawer.vue create mode 100644 yarn.lock diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index 0406b88e..79f4367d 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -49,7 +49,7 @@ spring: druid: # 涓诲簱鏁版嵁婧 master: - url: jdbc:mysql://62.234.3.186:3306/yanzhu_jh_test?useSSL=false&characterEncoding=UTF-8&serverTimezone=GMT%2B8 + url: jdbc:mysql://62.234.3.186:3306/yanzhu_jh_2024?useSSL=false&characterEncoding=UTF-8&serverTimezone=GMT%2B8 username: root password: Sxyanzhu@cf123 #url: jdbc:mysql://192.168.126.19:3306/yanzhu_jh_test2024?useSSL=false&characterEncoding=UTF-8&serverTimezone=GMT%2B8 diff --git a/ruoyi-ui/src/api/project/unitpay.js b/ruoyi-ui/src/api/project/unitpay.js index b0e90fcb..8a42972b 100644 --- a/ruoyi-ui/src/api/project/unitpay.js +++ b/ruoyi-ui/src/api/project/unitpay.js @@ -9,6 +9,24 @@ export function listUnitpay(query) { }) } +// 鏌ヨ鍔宠祫绠＄悊鍒楄〃 +export function listByDay(query) { + return request({ + url: '/project/unitpay/listByDay', + method: 'get', + params: query + }) +} + +// 鏌ヨ鍔宠祫绠＄悊鍒楄〃 +export function listByMonth(query) { + return request({ + url: '/project/unitpay/listByMonth', + method: 'get', + params: query + }) +} + // 鏌ヨ鍔宠祫绠＄悊璇︾粏 export function getUnitpay(id) { return request({ diff --git a/ruoyi-ui/src/assets/styles/ruoyi.scss b/ruoyi-ui/src/assets/styles/ruoyi.scss index f7d01880..24d01ea6 100644 --- a/ruoyi-ui/src/assets/styles/ruoyi.scss +++ b/ruoyi-ui/src/assets/styles/ruoyi.scss @@ -104,7 +104,7 @@ /** 琛ㄦ牸甯冨眬 **/ .pagination-container { position: relative; - height: 25px; + height: 40px; margin-bottom: 10px; margin-top: 15px; padding: 10px 20px !important; @@ -294,4 +294,4 @@ line-height: 20px; font-size: 13px; background: url("https://szgcwx.jhncidg.com/staticFiles/img/WEB_345B9059DAD1492EB37EC4814EB340F0.png") no-repeat center/100% 100%; - } \ No newline at end of file + } diff --git a/ruoyi-ui/src/views/project/surProject/index.vue b/ruoyi-ui/src/views/project/surProject/index.vue index 3bda782f..881d77ba 100644 --- a/ruoyi-ui/src/views/project/surProject/index.vue +++ b/ruoyi-ui/src/views/project/surProject/index.vue @@ -78,7 +78,7 @@ - @@ -433,6 +436,7 @@ import aiBoxVideoConfigDrawer from '@/views/video/aiBoxProjectConfig/aiBoxVideoC import prjPhotographyDrawer from '@/views/video/prjphotography/prjPhotographyDrawer.vue' import projectDesignDrawer from '@/views/project/projectDesign/projectDesignDrawer.vue'; import CommitteeDrawer from '@/views/project/projectCommittee/projectCommitteeDrawer.vue' +import UnitPayDrawer from '@/views/project/unitpay/unitpayDrawer.vue'; import { checkPermi, checkRole } from "@/utils/permission"; // 鏉冮檺鍒ゆ柇鍑芥暟 import pitImageDrawer from '@/views/device/pitSurveyPoint/pitImageDrawer.vue' @@ -461,7 +465,8 @@ export default { prjPhotographyDrawer, projectDesignDrawer, CommitteeDrawer, - pitImageDrawer + pitImageDrawer, + UnitPayDrawer }, dicts: [ "sur_project_xmjd", @@ -732,6 +737,9 @@ export default { case "handlePitImage": this.$refs.pigImgDrawer.show(row); break; + case "handleUnitPay": + this.$refs.unitPayDrawer.show(row); + break; default: break; } diff --git a/ruoyi-ui/src/views/project/surProjectAttendance/attendanceDrawer.vue b/ruoyi-ui/src/views/project/surProjectAttendance/attendanceDrawer.vue index 5e2b2ff8..7bdba6d8 100644 --- a/ruoyi-ui/src/views/project/surProjectAttendance/attendanceDrawer.vue +++ b/ruoyi-ui/src/views/project/surProjectAttendance/attendanceDrawer.vue @@ -1,81 +1,45 @@