From febcc1e771b44f468867183201a7d666391973c6 Mon Sep 17 00:00:00 2001 From: xuxinyuan Date: Tue, 4 Jun 2019 15:57:47 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=B7=A5=E8=B5=84=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E8=A1=A8=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/wages/entity/WagesRecord.java | 57 ++++++++++++++++++- .../mappings/modules/wages/WagesRecordDao.xml | 21 +++++-- .../views/modules/wages/wagesRecordList.html | 31 ++++++++-- 3 files changed, 95 insertions(+), 14 deletions(-) diff --git a/jsite-web/src/main/java/com/jsite/modules/wages/entity/WagesRecord.java b/jsite-web/src/main/java/com/jsite/modules/wages/entity/WagesRecord.java index 7676cf29..bf04431b 100644 --- a/jsite-web/src/main/java/com/jsite/modules/wages/entity/WagesRecord.java +++ b/jsite-web/src/main/java/com/jsite/modules/wages/entity/WagesRecord.java @@ -52,8 +52,13 @@ public class WagesRecord extends DataEntity { private Double wagesReal; // 实发工资 private String finishState; // 工资表完结状态 - - // + private Double beginWagesTotal; // 应发工资最低 + private Double endWagesTotal; // 应发工资最高 + private Double beginWagesReal; // 实发工资最低 + private Double endWagesReal; // 实发工资最高 + private Double beginHousingFund; // 住房公积金最低 + private Double endHousingFund; // 住房公积金最高 + // private Double performanceScore; private Double multiple; private Double additionalDeduction; @@ -440,4 +445,52 @@ public class WagesRecord extends DataEntity { public void setCompanyId(String companyId) { this.companyId = companyId; } + + public Double getBeginWagesTotal() { + return beginWagesTotal; + } + + public void setBeginWagesTotal(Double beginWagesTotal) { + this.beginWagesTotal = beginWagesTotal; + } + + public Double getEndWagesTotal() { + return endWagesTotal; + } + + public void setEndWagesTotal(Double endWagesTotal) { + this.endWagesTotal = endWagesTotal; + } + + public Double getBeginWagesReal() { + return beginWagesReal; + } + + public void setBeginWagesReal(Double beginWagesReal) { + this.beginWagesReal = beginWagesReal; + } + + public Double getEndWagesReal() { + return endWagesReal; + } + + public void setEndWagesReal(Double endWagesReal) { + this.endWagesReal = endWagesReal; + } + + public Double getBeginHousingFund() { + return beginHousingFund; + } + + public void setBeginHousingFund(Double beginHousingFund) { + this.beginHousingFund = beginHousingFund; + } + + public Double getEndHousingFund() { + return endHousingFund; + } + + public void setEndHousingFund(Double endHousingFund) { + this.endHousingFund = endHousingFund; + } } \ No newline at end of file diff --git a/jsite-web/src/main/resources/mappings/modules/wages/WagesRecordDao.xml b/jsite-web/src/main/resources/mappings/modules/wages/WagesRecordDao.xml index cbfedfb5..42976989 100644 --- a/jsite-web/src/main/resources/mappings/modules/wages/WagesRecordDao.xml +++ b/jsite-web/src/main/resources/mappings/modules/wages/WagesRecordDao.xml @@ -133,14 +133,23 @@ AND a.month = #{month} - - AND a.wages_total = #{wagesTotal} + + AND a.wages_total = ]]> #{beginWagesTotal} - - AND a.wages_real = #{wagesReal} + + AND a.wages_total #{endWagesTotal} - - AND a.housing_fund = #{housingFund} + + AND a.wages_real = ]]> #{beginWagesReal} + + + AND a.wages_real #{endWagesReal} + + + AND a.housing_fund = ]]> #{beginHousingFund} + + + AND a.housing_fund #{endHousingFund} diff --git a/jsite-web/src/main/resources/views/modules/wages/wagesRecordList.html b/jsite-web/src/main/resources/views/modules/wages/wagesRecordList.html index 1bbe0481..233d1e5d 100644 --- a/jsite-web/src/main/resources/views/modules/wages/wagesRecordList.html +++ b/jsite-web/src/main/resources/views/modules/wages/wagesRecordList.html @@ -52,21 +52,39 @@
- +
- + <#form:input id="beginWagesTotal" path="beginWagesTotal" class="form-control " />
- +
- + <#form:input id="endWagesTotal" path="endWagesTotal" class="form-control " />
- +
- + <#form:input id="beginWagesReal" path="beginWagesReal" class="form-control " /> +
+
+
+ +
+ <#form:input id="endWagesReal" path="endWagesReal" class="form-control " /> +
+
+
+ +
+ <#form:input id="beginHousingFund" path="beginHousingFund" class="form-control " /> +
+
+
+ +
+ <#form:input id="endHousingFund" path="endHousingFund" class="form-control " />
@@ -97,6 +115,7 @@ $('#dataGrid').dataGrid({ {header:'税前工资', name:'wagesPretax', index:'a.wages_pretax', width:90, align:"center"}, {header:'个税', name:'wagesIncomeTax', index:'a.wages_income_tax', width:90, align:"center"}, {header:'实发工资', name:'wagesReal', index:'a.wages_real', width:90, align:"center"}, + // {header:'公积金', name:'housingFund', index:'a.housing_fund', width:90, align:"center"}, {header:'更新时间', name:'updateDate', index:'a.update_date', width:90, align:"center", formatter:"date"}, {header:'完结状态', name:'finishState', index:'a.finish_state', width:90, align:"center", formatter:function(val, obj, row, act){ if(val == '0') { -- Gitee From 9421e14bb57c6d5427519887ae9d0d3e2fbb451d Mon Sep 17 00:00:00 2001 From: xuxinyuan Date: Tue, 4 Jun 2019 16:42:30 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=A4=BE=E4=BF=9D=E5=85=AC=E7=A7=AF?= =?UTF-8?q?=E9=87=91=E6=B7=BB=E5=8A=A0=E8=8C=83=E5=9B=B4=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/wages/entity/WagesSocialFun.java | 37 +++++++++++++++++++ .../modules/wages/WagesSocialFunDao.xml | 12 ++++++ .../modules/wages/wagesSocialFunList.html | 24 ++++++++++++ 3 files changed, 73 insertions(+) diff --git a/jsite-web/src/main/java/com/jsite/modules/wages/entity/WagesSocialFun.java b/jsite-web/src/main/java/com/jsite/modules/wages/entity/WagesSocialFun.java index e070e9a3..b2a48cda 100644 --- a/jsite-web/src/main/java/com/jsite/modules/wages/entity/WagesSocialFun.java +++ b/jsite-web/src/main/java/com/jsite/modules/wages/entity/WagesSocialFun.java @@ -48,6 +48,11 @@ public class WagesSocialFun extends DataEntity { private Double serviceCost; // 服务费 private String delegatedCompany; // 委托单位 private String socialFundStatus; //社保公积金状态 + + private Double beginSocialUnitPay; //社保单位缴费大于 + private Double endSocialUnitPay; //社保单位缴费小于 + private Double beginFundCompanyPay; //公积金单位缴费大于 + private Double endFundCompanyPay; //公积金单位缴费小于 public WagesSocialFun() { super(); @@ -309,4 +314,36 @@ public class WagesSocialFun extends DataEntity { public void setSocialFundStatus(String socialFundStatus) { this.socialFundStatus = socialFundStatus; } + + public Double getBeginSocialUnitPay() { + return beginSocialUnitPay; + } + + public void setBeginSocialUnitPay(Double beginSocialUnitPay) { + this.beginSocialUnitPay = beginSocialUnitPay; + } + + public Double getEndSocialUnitPay() { + return endSocialUnitPay; + } + + public void setEndSocialUnitPay(Double endSocialUnitPay) { + this.endSocialUnitPay = endSocialUnitPay; + } + + public Double getBeginFundCompanyPay() { + return beginFundCompanyPay; + } + + public void setBeginFundCompanyPay(Double beginFundCompanyPay) { + this.beginFundCompanyPay = beginFundCompanyPay; + } + + public Double getEndFundCompanyPay() { + return endFundCompanyPay; + } + + public void setEndFundCompanyPay(Double endFundCompanyPay) { + this.endFundCompanyPay = endFundCompanyPay; + } } \ No newline at end of file diff --git a/jsite-web/src/main/resources/mappings/modules/wages/WagesSocialFunDao.xml b/jsite-web/src/main/resources/mappings/modules/wages/WagesSocialFunDao.xml index fb024746..81f842c0 100644 --- a/jsite-web/src/main/resources/mappings/modules/wages/WagesSocialFunDao.xml +++ b/jsite-web/src/main/resources/mappings/modules/wages/WagesSocialFunDao.xml @@ -101,6 +101,18 @@ AND a.month = #{month} + + AND a.social_unit_pay = ]]> #{beginSocialUnitPay} + + + AND a.social_unit_pay #{endSocialUnitPay} + + + AND a.fund_company_pay = ]]> #{beginFundCompanyPay} + + + AND a.fund_company_pay #{endFundCompanyPay} + AND a.fund_num LIKE '%'||#{fundNum}||'%' diff --git a/jsite-web/src/main/resources/views/modules/wages/wagesSocialFunList.html b/jsite-web/src/main/resources/views/modules/wages/wagesSocialFunList.html index fa7ea001..3d3994de 100644 --- a/jsite-web/src/main/resources/views/modules/wages/wagesSocialFunList.html +++ b/jsite-web/src/main/resources/views/modules/wages/wagesSocialFunList.html @@ -54,6 +54,30 @@ <#form:select id="socialFundStatus" path="socialFundStatus" name="label" data="getDictList:social_fund_status" class="form-control " />
+
+ +
+ <#form:input id="beginSocialUnitPay" path="beginSocialUnitPay" class="form-control " /> +
+
+
+ +
+ <#form:input id="endSocialUnitPay" path="endSocialUnitPay" class="form-control " /> +
+
+
+ +
+ <#form:input id="beginFundCompanyPay" path="beginFundCompanyPay" class="form-control " /> +
+
+
+ +
+ <#form:input id="endFundCompanyPay" path="endFundCompanyPay" class="form-control " /> +
+
-- Gitee From 3aabe9e85ed70786f3e04bee17f56672d4b85ca2 Mon Sep 17 00:00:00 2001 From: xuxinyuan Date: Tue, 4 Jun 2019 16:57:38 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=A4=BE=E4=BF=9D=E5=85=AC=E7=A7=AF?= =?UTF-8?q?=E9=87=91=E5=A4=96=E8=A1=A8=E6=B7=BB=E5=8A=A0=E8=8C=83=E5=9B=B4?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wages/entity/WagesSocialSecurity.java | 19 +++++++++++++++++++ .../modules/wages/WagesSocialSecurityDao.xml | 6 ++++++ .../wages/wagesSocialSecurityList.html | 14 +++++++++++++- 3 files changed, 38 insertions(+), 1 deletion(-) diff --git a/jsite-web/src/main/java/com/jsite/modules/wages/entity/WagesSocialSecurity.java b/jsite-web/src/main/java/com/jsite/modules/wages/entity/WagesSocialSecurity.java index 7b92ef12..dc628806 100644 --- a/jsite-web/src/main/java/com/jsite/modules/wages/entity/WagesSocialSecurity.java +++ b/jsite-web/src/main/java/com/jsite/modules/wages/entity/WagesSocialSecurity.java @@ -32,6 +32,9 @@ public class WagesSocialSecurity extends DataEntity { private WagesProject project; // 所属项目ID + private Double beginPerformanceScore; //绩效分数大于 + private Double endPerformanceScore; //绩效分数小于 + public WagesSocialSecurity() { super(); } @@ -143,4 +146,20 @@ public class WagesSocialSecurity extends DataEntity { public void setProject(WagesProject project) { this.project = project; } + + public Double getBeginPerformanceScore() { + return beginPerformanceScore; + } + + public void setBeginPerformanceScore(Double beginPerformanceScore) { + this.beginPerformanceScore = beginPerformanceScore; + } + + public Double getEndPerformanceScore() { + return endPerformanceScore; + } + + public void setEndPerformanceScore(Double endPerformanceScore) { + this.endPerformanceScore = endPerformanceScore; + } } \ No newline at end of file diff --git a/jsite-web/src/main/resources/mappings/modules/wages/WagesSocialSecurityDao.xml b/jsite-web/src/main/resources/mappings/modules/wages/WagesSocialSecurityDao.xml index 86e23e09..d94ed23b 100644 --- a/jsite-web/src/main/resources/mappings/modules/wages/WagesSocialSecurityDao.xml +++ b/jsite-web/src/main/resources/mappings/modules/wages/WagesSocialSecurityDao.xml @@ -106,6 +106,12 @@ AND f.month = #{month} + + AND a.performance_score = ]]> #{beginPerformanceScore} + + + AND a.performance_score #{endPerformanceScore} + diff --git a/jsite-web/src/main/resources/views/modules/wages/wagesSocialSecurityList.html b/jsite-web/src/main/resources/views/modules/wages/wagesSocialSecurityList.html index 4a16943d..d32f232e 100644 --- a/jsite-web/src/main/resources/views/modules/wages/wagesSocialSecurityList.html +++ b/jsite-web/src/main/resources/views/modules/wages/wagesSocialSecurityList.html @@ -43,7 +43,19 @@ <#form:select path="month" name="label" data="getDictList:month" class="form-control " />
- +
+ +
+ <#form:input id="beginPerformanceScore" path="beginPerformanceScore" class="form-control " /> +
+
+
+ +
+ <#form:input id="endPerformanceScore" path="endPerformanceScore" class="form-control " /> +
+
+
-- Gitee