sxyanzhu
/
jhprjv2
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhprjv2 into dev

dev
姜玉琦 2024-12-04 21:57:18 +08:00
parent 6d14455417 907e27c6a1
commit 9d3cbc5237
5 changed files with 48 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ruoyi-admin/src/main/resources/application-druid.yml
View File

@ -49,12 +49,12 @@ spring:
druid:
# 主库数据源
master:
url: jdbc:mysql://62.234.3.186:3306/yanzhu_jh_2024?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
#password: Sxyanzhu@cf123
url: jdbc:mysql://192.168.126.19:3306/yanzhu_jh?useSSL=false&characterEncoding=UTF-8&serverTimezone=GMT%2B8
#username: root
#password: hadoopspring123
password: hadoopspring123
# 从库数据源
slave:
# 从数据源开关/默认关闭

4
ruoyi-ui/src/views/project/unitpay/index.vue
View File

@ -27,7 +27,7 @@
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button type="success" v-if="total>0" @click="doExport">导出</el-button>
<el-button type="success" v-if="total>0" @click="doExport" v-hasPermi="['project:unitpay:export']">导出</el-button>
</el-form-item>
</el-form>
@ -189,7 +189,7 @@ export default {
postData.attendanceTime=this.$dt(this.queryParams.attendanceDay1).format("YYYY-MM-DD");
}
if(this.queryParams.attendanceDay2){
postData.attendanceOutTime=this.$dt(this.queryParams.attendanceDay1).format("YYYY-MM-DD");
postData.attendanceOutTime=this.$dt(this.queryParams.attendanceDay2).format("YYYY-MM-DD");
}
return postData;
},

44
yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectAttendanceUnitpayController.java
View File

@ -79,8 +79,11 @@ public class SurProjectAttendanceUnitpayController extends BaseController
attWhere.setYear(year);
}
List<SurProjectAttendanceData> list = surProjectAttendanceDataService.selectSurProjectAttendanceDataListByDate(attWhere);
if(list.size()==0){
return getDataTable(list);
}
SurProjectAttendanceUnitpay payWhere=new SurProjectAttendanceUnitpay();
payWhere.setCfgId(attWhere.getCfgid());
payWhere.setCfgId(list.get(0).getCfgid());
List<SurProjectAttendanceUnitpay> payList= surProjectAttendanceUnitpayService.selectSurProjectAttendanceUnitpayList(payWhere);
for(SurProjectAttendanceData it :list){
it.setDays(1l);
@ -105,8 +108,11 @@ public class SurProjectAttendanceUnitpayController extends BaseController
attWhere.setYear(year);
}
List<SurProjectAttendanceData> list = surProjectAttendanceDataService.selectSurProjectAttendanceDataList(attWhere);
if(list.size()==0){
return getDataTable(list);
}
SurProjectAttendanceUnitpay payWhere=new SurProjectAttendanceUnitpay();
payWhere.setCfgId(attWhere.getCfgid());
payWhere.setCfgId(list.get(0).getCfgid());
List<SurProjectAttendanceUnitpay> payList= surProjectAttendanceUnitpayService.selectSurProjectAttendanceUnitpayList(payWhere);
for(SurProjectAttendanceData it :list){
it.setDays(1l);
@ -132,8 +138,11 @@ public class SurProjectAttendanceUnitpayController extends BaseController
attWhere.setYear(year);
}
List<SurProjectAttendanceData> list = surProjectAttendanceDataService.selectSurProjectAttendanceDataListByMonth(attWhere);
if(list.size()==0){
return getDataTable(list);
}
SurProjectAttendanceUnitpay payWhere=new SurProjectAttendanceUnitpay();
payWhere.setCfgId(attWhere.getCfgid());
payWhere.setCfgId(list.get(0).getCfgid());
List<SurProjectAttendanceUnitpay> payList= surProjectAttendanceUnitpayService.selectSurProjectAttendanceUnitpayList(payWhere);
for(SurProjectAttendanceData it :list){
it.setPay(surProjectAttendanceUnitpayService.getPay(payList,it));
@ -158,8 +167,11 @@ public class SurProjectAttendanceUnitpayController extends BaseController
attWhere.setYear(year);
}
List<SurProjectAttendanceData> list = surProjectAttendanceDataService.selectSurProjectAttendanceDataListByMonth(attWhere);
if(list.size()==0){
return getDataTable(list);
}
SurProjectAttendanceUnitpay payWhere=new SurProjectAttendanceUnitpay();
payWhere.setCfgId(attWhere.getCfgid());
payWhere.setCfgId(list.get(0).getCfgid());
List<SurProjectAttendanceUnitpay> payList= surProjectAttendanceUnitpayService.selectSurProjectAttendanceUnitpayList(payWhere);
for(SurProjectAttendanceData it :list){
it.setPay(surProjectAttendanceUnitpayService.getPay(payList,it));
@ -185,7 +197,11 @@ public class SurProjectAttendanceUnitpayController extends BaseController
}
List<SurProjectAttendanceData> list = surProjectAttendanceDataService.selectSurProjectAttendanceDataListByDate(attWhere);
SurProjectAttendanceUnitpay payWhere=new SurProjectAttendanceUnitpay();
payWhere.setCfgId(attWhere.getCfgid());
if(list.size()>0){
payWhere.setCfgId(list.get(0).getCfgid());
}else {
payWhere.setCfgId(attWhere.getCfgid());
}
List<SurProjectAttendanceUnitpay> payList= surProjectAttendanceUnitpayService.selectSurProjectAttendanceUnitpayList(payWhere);
List<ExportAttendancDay> exportList=new ArrayList<ExportAttendancDay>();
for(SurProjectAttendanceData it :list){
@ -216,7 +232,11 @@ public class SurProjectAttendanceUnitpayController extends BaseController
}
List<SurProjectAttendanceData> list = surProjectAttendanceDataService.selectSurProjectAttendanceDataListByMonth(attWhere);
SurProjectAttendanceUnitpay payWhere=new SurProjectAttendanceUnitpay();
payWhere.setCfgId(attWhere.getCfgid());
if(list.size()>0){
payWhere.setCfgId(list.get(0).getCfgid());
}else {
payWhere.setCfgId(attWhere.getCfgid());
}
List<SurProjectAttendanceUnitpay> payList= surProjectAttendanceUnitpayService.selectSurProjectAttendanceUnitpayList(payWhere);
List<ExportAttendancMonth> exportList=new ArrayList<>();
for(SurProjectAttendanceData it :list){
@ -242,7 +262,11 @@ public class SurProjectAttendanceUnitpayController extends BaseController
}
List<SurProjectAttendanceData> list = surProjectAttendanceDataService.selectSurProjectAttendanceDataListByMonth(attWhere);
SurProjectAttendanceUnitpay payWhere=new SurProjectAttendanceUnitpay();
payWhere.setCfgId(attWhere.getCfgid());
if(list.size()>0){
payWhere.setCfgId(list.get(0).getCfgid());
}else {
payWhere.setCfgId(attWhere.getCfgid());
}
List<SurProjectAttendanceUnitpay> payList= surProjectAttendanceUnitpayService.selectSurProjectAttendanceUnitpayList(payWhere);
List<ExportAttendancMonth> exportList=new ArrayList<>();
for(SurProjectAttendanceData it :list){
@ -269,7 +293,11 @@ public class SurProjectAttendanceUnitpayController extends BaseController
}
List<SurProjectAttendanceData> list = surProjectAttendanceDataService.selectSurProjectAttendanceDataList(attWhere);
SurProjectAttendanceUnitpay payWhere=new SurProjectAttendanceUnitpay();
payWhere.setCfgId(attWhere.getCfgid());
if(list.size()>0){
payWhere.setCfgId(list.get(0).getCfgid());
}else {
payWhere.setCfgId(attWhere.getCfgid());
}
List<SurProjectAttendanceUnitpay> payList= surProjectAttendanceUnitpayService.selectSurProjectAttendanceUnitpayList(payWhere);
List<ExportAttendancDay> exportList=new ArrayList<ExportAttendancDay>();
for(SurProjectAttendanceData it :list){

6
yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/vo/ExportAttendancMonth.java
View File

@ -45,7 +45,11 @@ public class ExportAttendancMonth {
d.workTypeName = it.getWorkTypeName();
d.pay=BigDecimal.valueOf(it.getPay()/100.0);
d.days=it.getDays();
d.unitPay=BigDecimal.valueOf(it.getUnitPay()/100.0);
if(it.getUnitPay()!=null){
d.unitPay=BigDecimal.valueOf(it.getUnitPay()/100.0);
}else{
d.unitPay=BigDecimal.ZERO;
}
return d;
}

2
yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceUnitpayMapper.xml
View File

@ -41,7 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="initList" parameterType="SurProjectAttendanceUnitpay" resultMap="SurProjectAttendanceUnitpayResult">
select a.cfgId,a.groupName,a.workTypeCode,a.workTypeName
from sur_project_attendance_data_${year} a
where a.cfgId=23
where a.cfgId=#{cfgId}
group by a.cfgId, a.groupName,a.workTypeCode,a.workTypeName
</select>
<select id="selectSurProjectAttendanceUnitpayById" parameterType="Long" resultMap="SurProjectAttendanceUnitpayResult">