护理员岗位补贴修改

ruoyi-modules/mz-organization-yggl/src/main/java/com/ruoyi/organization/service/impl/YljgYgJbxxServiceImpl.java

@@ -145,10 +145,13 @@ public class YljgYgJbxxServiceImpl implements IYljgYgJbxxService
                 String year3 = oldYg.get("gwbt").toString().split(",")[2];
                 String year4 = oldYg.get("gwbt").toString().split(",")[3];
                 String year5 = oldYg.get("gwbt").toString().split(",")[4];
-               int gwTotalMoney = Integer.parseInt(year1) + Integer.parseInt(year2) + Integer.parseInt(year3)
-                        + Integer.parseInt(year4) + Integer.parseInt(year5);
-                switch (ffYear) {
-                    case "2023":
+//               int gwTotalMoney = Integer.parseInt(year1) + Integer.parseInt(year2) + Integer.parseInt(year3)
+//                        + Integer.parseInt(year4) + Integer.parseInt(year5);
+
+                // 改成2024年岗位补贴钱数 2024-12-30-CH
+                // 等2025年算的时候 改成year3
+                int gwTotalMoney = Integer.parseInt(year2);
+
                         oldYg.put("gwYear1", year1);
                         oldYg.put("gwYear2", year2);
                         oldYg.put("gwYear3", year3);
@@ -156,34 +159,43 @@ public class YljgYgJbxxServiceImpl implements IYljgYgJbxxService
                         oldYg.put("gwYear5", year5);
                         oldYg.put("gwTotalMoney", gwTotalMoney);
                         oldYg.put("gwStart", Integer.parseInt(oldYg.get("ffYear").toString()));
-                        break;
-                    case "2024":
-                        oldYg.put("gwYear1", year1);
-                        oldYg.put("gwYear2", year2);
-                        oldYg.put("gwYear3", year3);
-                        oldYg.put("gwYear4", year4);
-                        oldYg.put("gwTotalMoney", gwTotalMoney);
-                        oldYg.put("gwStart", Integer.parseInt(oldYg.get("ffYear").toString()));
-                        break;
-                    case "2025":
-                        oldYg.put("gwYear1", year1);
-                        oldYg.put("gwYear2", year2);
-                        oldYg.put("gwYear3", year3);
-                        oldYg.put("gwTotalMoney", gwTotalMoney);
-                        oldYg.put("gwStart", Integer.parseInt(oldYg.get("ffYear").toString()));
-                        break;
-                    case "2026":
-                        oldYg.put("gwYear1", year1);
-                        oldYg.put("gwYear2", year2);
-                        oldYg.put("gwTotalMoney", gwTotalMoney);
-                        oldYg.put("gwStart", Integer.parseInt(oldYg.get("ffYear").toString()));
-                        break;
-                    case "2027":
-                        oldYg.put("gwYear1", year1);
-                        oldYg.put("gwTotalMoney", gwTotalMoney);
-                        oldYg.put("gwStart", Integer.parseInt(oldYg.get("ffYear").toString()));
-                        break;
-                }
+//                switch (ffYear) {
+//                    case "2023":
+//                        oldYg.put("gwYear1", year1);
+//                        oldYg.put("gwYear2", year2);
+//                        oldYg.put("gwYear3", year3);
+//                        oldYg.put("gwYear4", year4);
+//                        oldYg.put("gwYear5", year5);
+//                        oldYg.put("gwTotalMoney", gwTotalMoney);
+//                        oldYg.put("gwStart", Integer.parseInt(oldYg.get("ffYear").toString()));
+//                        break;
+//                    case "2024":
+//                        oldYg.put("gwYear1", year1);
+//                        oldYg.put("gwYear2", year2);
+//                        oldYg.put("gwYear3", year3);
+//                        oldYg.put("gwYear4", year4);
+//                        oldYg.put("gwTotalMoney", gwTotalMoney);
+//                        oldYg.put("gwStart", Integer.parseInt(oldYg.get("ffYear").toString()));
+//                        break;
+//                    case "2025":
+//                        oldYg.put("gwYear1", year1);
+//                        oldYg.put("gwYear2", year2);
+//                        oldYg.put("gwYear3", year3);
+//                        oldYg.put("gwTotalMoney", gwTotalMoney);
+//                        oldYg.put("gwStart", Integer.parseInt(oldYg.get("ffYear").toString()));
+//                        break;
+//                    case "2026":
+//                        oldYg.put("gwYear1", year1);
+//                        oldYg.put("gwYear2", year2);
+//                        oldYg.put("gwTotalMoney", gwTotalMoney);
+//                        oldYg.put("gwStart", Integer.parseInt(oldYg.get("ffYear").toString()));
+//                        break;
+//                    case "2027":
+//                        oldYg.put("gwYear1", year1);
+//                        oldYg.put("gwTotalMoney", gwTotalMoney);
+//                        oldYg.put("gwStart", Integer.parseInt(oldYg.get("ffYear").toString()));
+//                        break;
+//                }
             }
 
             if (ObjectUtils.isNotEmpty(oldYg.get("jtffZt"))){ // 4.获得荣誉（【护理员职业技能大赛】中获得证书）
@@ -282,6 +294,9 @@ public class YljgYgJbxxServiceImpl implements IYljgYgJbxxService
     public int updateYljgYgJbxx(YljgYgJbxx yljgYgJbxx)
     {
         insertYljgYgJbxxUpdateHi(yljgYgJbxx.getId());
+        if(StringUtils.isNotBlank(yljgYgJbxx.getLzsj())){
+
+        }
         return yljgYgJbxxMapper.updateYljgYgJbxx(yljgYgJbxx);
     }
 

ruoyi-modules/mz-organization-yggl/src/main/resources/mapper/organization/YljgYgJbxxMapper.xml

@@ -188,7 +188,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AND a.is_jnsb = '1'
             AND a.btkssj IS NOT NULL
             AND a.state = '1'
-            AND a.zzzt = '1'
+--             AND a.zzzt = '1'
             AND a.jg_id in (
             SELECT id FROM YLJG_JCXX
             WHERE SCZT='01'
@@ -279,19 +279,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             ) as ffyfAll,
             (
             CASE
-            WHEN TIMESTAMPDIFF(MONTH, if(btkssj <= 20200101,'20230101',DATE_FORMAT(DATE_ADD(btkssj, INTERVAL 3 YEAR),'%Y-%m-%d')), DATE_FORMAT(btjssj,'%Y-%m-%d')) <= 0
+            WHEN TIMESTAMPDIFF(MONTH, if(btkssj < 20200101,'20221201',DATE_FORMAT(DATE_ADD(CONCAT(SUBSTRING(btkssj,1,6),'01'), INTERVAL 3 YEAR),'%Y-%m-%d')), DATE_FORMAT(btjssj,'%Y-%m-%d')) <= 0
             THEN 0
-            WHEN TIMESTAMPDIFF(MONTH, if(btkssj <= 20200101,'20230101',DATE_FORMAT(DATE_ADD(btkssj, INTERVAL 3 YEAR),'%Y-%m-%d')), DATE_FORMAT(btjssj,'%Y-%m-%d')) > 0
-            AND TIMESTAMPDIFF(MONTH, if(btkssj <= 20200101,'20230101',DATE_FORMAT(DATE_ADD(btkssj, INTERVAL 3 YEAR),'%Y-%m-%d')), DATE_FORMAT(btjssj,'%Y-%m-%d')) <=60
-            THEN TIMESTAMPDIFF(MONTH, if(btkssj <= 20200101,'20230101',DATE_FORMAT(DATE_ADD(btkssj, INTERVAL 3 YEAR),'%Y-%m-%d')), DATE_FORMAT(btjssj,'%Y-%m-%d')) + 1
-            WHEN TIMESTAMPDIFF(MONTH, if(btkssj <= 20200101,'20230101',DATE_FORMAT(DATE_ADD(btkssj, INTERVAL 3 YEAR),'%Y-%m-%d')), DATE_FORMAT(btjssj,'%Y-%m-%d')) >60
+            WHEN TIMESTAMPDIFF(MONTH, if(btkssj < 20200101,'20221201',DATE_FORMAT(DATE_ADD(CONCAT(SUBSTRING(btkssj,1,6),'01'), INTERVAL 3 YEAR),'%Y-%m-%d')), DATE_FORMAT(btjssj,'%Y-%m-%d')) > 0
+            AND TIMESTAMPDIFF(MONTH, if(btkssj < 20200101,'20221201',DATE_FORMAT(DATE_ADD(CONCAT(SUBSTRING(btkssj,1,6),'01'), INTERVAL 3 YEAR),'%Y-%m-%d')), DATE_FORMAT(btjssj,'%Y-%m-%d')) <=60
+            THEN TIMESTAMPDIFF(MONTH, if(btkssj < 20200101,'20221201',DATE_FORMAT(DATE_ADD(CONCAT(SUBSTRING(btkssj,1,6),'01'), INTERVAL 3 YEAR),'%Y-%m-%d')), DATE_FORMAT(btjssj,'%Y-%m-%d'))
+            WHEN TIMESTAMPDIFF(MONTH, if(btkssj < 20200101,'20221201',DATE_FORMAT(DATE_ADD(CONCAT(SUBSTRING(btkssj,1,6),'01'), INTERVAL 3 YEAR),'%Y-%m-%d')), DATE_FORMAT(btjssj,'%Y-%m-%d')) >60
             THEN 60
             ELSE 0
             END
             ) as ffyf, is_hlyyzs as isHlyyzs, jg_id, btkssj,
             if(btkssj <= 20200101,'2023',DATE_FORMAT(DATE_ADD(btkssj, INTERVAL 3 YEAR),'%Y')) as ffYear,
             DATE_FORMAT(btkssj,'%Y%m') as htrqYM,
-            if(btkssj <= 20200101,'202301',DATE_FORMAT(DATE_ADD(btkssj, INTERVAL 3 YEAR),'%Y%m')) as ffrq,
+            if(btkssj < 20200101,'202301',DATE_FORMAT(DATE_ADD(DATE_ADD(btkssj,INTERVAL 1 MONTH ), INTERVAL 3 YEAR),'%Y%m')) as ffrq,
             DATE_FORMAT(btkssj,'%Y') AS htStartYear, hlydj, IFNULL(a.hdyr_jlms,'暂无信息') as hdyrJlms,
             (CASE
             WHEN a.is_scrz = '1' AND a.whcd = '20' THEN 1

ruoyi-ui/Dockerfile

@@ -13,7 +13,7 @@ RUN npm install
 
 ADD . /code
 
-RUN npm run build:dev
+RUN npm run build:prod
 
 #环境变量写在build后面否则找不到指令
 ENV PROJECT_ENV production

ruoyi-ui/src/views/business/btgl/hlyJt/detail.vue

@@ -83,25 +83,27 @@
 					</el-tab-pane>
 					<el-tab-pane label="津贴信息" name="second">
 						<h3>入职津贴</h3>
-						<table>
+						<table v-if="subsidyInfo.rzTotalMoney>0">
 							<tr>
 								<td>奖励类型：</td>
 								<td colspan="3">{{ translateDict('XZ123', subsidyInfo.rzjtLx) }}</td>
-								<td>总发放金额：</td>
-								<td>{{ subsidyInfo.rzTotalMoney }}元</td>
 							</tr>
 							<tr>
-								<td>第一年：</td>
-								<td>{{ subsidyInfo.rzYear1 }}元</td>
-								<td>第二年：</td>
+<!--								<td>第一年：</td>-->
+<!--								<td>{{ subsidyInfo.rzYear1 }}元</td>-->
+                <td>总发放金额：</td>
+                <td>{{ subsidyInfo.rzTotalMoney }}元</td>
+								<td>2024年：</td>
 								<td>{{ subsidyInfo.rzYear2 }}元</td>
-								<td>第三年：</td>
-								<td>{{ subsidyInfo.rzYear3 }}元</td>
+<!--								<td>第三年：</td>-->
+<!--								<td>{{ subsidyInfo.rzYear3 }}元</td>-->
 							</tr>
 						</table>
+            <p class="nothing" v-else>该员工不符合入职津贴奖励</p>
 
 						<h3>技能奖励津贴</h3>
-						<table v-if="baseInfo.isHlyyzs">
+<!--						<table v-if="baseInfo.isHlyyzs">-->
+						<table v-if="subsidyInfo.hlydjJtjl">
 							<tr>
 								<td>护理员等级：</td>
 								<td>{{ translateDict('CH020', subsidyInfo.hlydj) }}</td>
@@ -109,33 +111,35 @@
 								<td>{{ subsidyInfo.hlydjJtjl }}元</td>
 							</tr>
 						</table>
-						<p class="nothing" v-else>该员工暂不享受技能等级奖励津贴</p>
+						<p class="nothing" v-else>因该护理员无技能等级证书，所以该员工不符合技能等级津贴奖励</p>
 
 						<h3>岗位津贴</h3>
-						<table>
-							<tr>
-<!--								<td>护理员从业年限：</td>-->
-<!--								<td>{{ subsidyInfo.hlyCynx }}年</td>-->
-								<td>岗位津贴总额：</td>
-								<td>{{ subsidyInfo.gwTotalMoney }}元</td>
-								<td>岗位津贴发放开始时间</td>
-								<td>{{ subsidyInfo.gwStart }}年</td>
-							</tr>
-							<tr>
-								<td>第一年：</td>
-								<td>{{ subsidyInfo.gwYear1 }}元</td>
-								<td>第二年：</td>
-								<td>{{ subsidyInfo.gwYear2 }}元</td>
-								<td v-if="subsidyInfo.gwYear3!=null">第三年：</td>
-								<td v-if="subsidyInfo.gwYear3!=null">{{ subsidyInfo.gwYear3 }}元</td>
-							</tr>
-							<tr>
-								<td v-if="subsidyInfo.gwYear4!=null">第四年：</td>
-								<td v-if="subsidyInfo.gwYear4!=null">{{ subsidyInfo.gwYear4 }}元</td>
-								<td v-if="subsidyInfo.gwYear5!=null">第五年：</td>
-								<td v-if="subsidyInfo.gwYear5!=null">{{ subsidyInfo.gwYear5 }}元</td>
-							</tr>
-						</table>
+            <div v-if="subsidyInfo.gwTotalMoney">
+              <table>
+                <tr>
+                  <td>岗位津贴发放时间</td>
+                  <td>{{ 2024 }}年</td>
+                  <td>岗位津贴金额：</td>
+                  <td>{{ subsidyInfo.gwTotalMoney }}元</td>
+                </tr>
+<!--                <tr>-->
+<!--                  <td>第一年：</td>-->
+<!--                  <td>{{ subsidyInfo.gwYear1 }}元</td>-->
+<!--                  <td>第二年：</td>-->
+<!--                  <td>{{ subsidyInfo.gwYear2 }}元</td>-->
+<!--                  <td v-if="subsidyInfo.gwYear3!=null">第三年：</td>-->
+<!--                  <td v-if="subsidyInfo.gwYear3!=null">{{ subsidyInfo.gwYear3 }}元</td>-->
+<!--                </tr>-->
+<!--                <tr>-->
+<!--                  <td v-if="subsidyInfo.gwYear4!=null">第四年：</td>-->
+<!--                  <td v-if="subsidyInfo.gwYear4!=null">{{ subsidyInfo.gwYear4 }}元</td>-->
+<!--                  <td v-if="subsidyInfo.gwYear5!=null">第五年：</td>-->
+<!--                  <td v-if="subsidyInfo.gwYear5!=null">{{ subsidyInfo.gwYear5 }}元</td>-->
+<!--                </tr>-->
+              </table>
+            </div>
+<!--            <p v-else class="nothing">该员工因无合同信息,所以不符合岗位津贴奖励</p>-->
+            <p v-else class="nothing">该员工不符合岗位津贴奖励</p>
 
 						<h3>荣誉奖励</h3>
 						<el-form :model="checkForm" ref="checkForm" :rules="checkRules" label-position="right">
@@ -177,7 +181,7 @@
 									:limit.sync="zsParams.pageSize" @pagination="getList"
 								/>
 							</div>
-							<p v-else class="nothing">该员工暂不享受荣誉奖励津贴</p>
+							<p v-else class="nothing">该员工暂不符合荣誉奖励</p>
 
 							<h3>审核信息</h3>
 							<div class="formFlex">