Merge branch '陈航-修改老尚提出的问题-2' of sckj/mz-cloud into master

ruoyi-modules/mz-organization-yggl/src/main/java/com/ruoyi/organization/domain/YljgYgJbxx.java

@@ -313,4 +313,8 @@ public class YljgYgJbxx extends BaseEntity
     @TableField(exist = false)
     private String jtffZtCx;
 
+    @ApiModelProperty(value = "合同信息")
+    @TableField(exist = false)
+    private String htxxUrl;
+
 }

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

@@ -136,26 +136,29 @@ public class YljgYgJbxxServiceImpl implements IYljgYgJbxxService
             }
             if (ObjectUtils.isNotEmpty(oldYg.get("hlyCynx"))){ // 3.岗位津贴
                 String hlyCynx = oldYg.get("hlyCynx").toString();
-                oldYg.put("gwTotalMoney", 12000);
                 oldYg.put("gwYear1", 1200);
                 oldYg.put("gwYear2", 1800);
-                oldYg.put("gwYear3", 2400);
-                oldYg.put("gwYear4", 3000);
-                oldYg.put("gwYear5", 3600);
                 switch (hlyCynx) {
                     case "0":
+                        oldYg.put("gwTotalMoney", 3000);
                         oldYg.put("gwStart", Integer.parseInt(oldYg.get("yearNow").toString())+3);
                         break;
                     case "1":
+                        oldYg.put("gwYear3", 2400);
+                        oldYg.put("gwTotalMoney", 5400);
                         oldYg.put("gwStart", Integer.parseInt(oldYg.get("yearNow").toString())+2);
                         break;
                     case "2":
+                        oldYg.put("gwYear3", 2400);
+                        oldYg.put("gwYear4", 3000);
+                        oldYg.put("gwTotalMoney", 8400);
                         oldYg.put("gwStart", Integer.parseInt(oldYg.get("yearNow").toString())+1);
                         break;
-                    case "3":
-                        oldYg.put("gwStart", Integer.parseInt(oldYg.get("yearNow").toString()));
-                        break;
                     default:
+                        oldYg.put("gwYear3", 2400);
+                        oldYg.put("gwYear4", 3000);
+                        oldYg.put("gwYear5", 3600);
+                        oldYg.put("gwTotalMoney", 12000);
 //                        oldYg.put("gwStart", Integer.parseInt(oldYg.get("gwStart").toString()));
                         oldYg.put("gwStart", Integer.parseInt(oldYg.get("yearNow").toString()));
                         break;

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

@@ -98,6 +98,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateUnit"    column="update_unit"    />
         <result property="updateUnitName"    column="update_unit_name"    />
         <result property="zzmc"    column="zzmc"    />
+        <result property="htxxUrl"    column="htxx_url"    />
     </resultMap>
 
     <sql id="selectYljgYgJbxxVo">
@@ -175,6 +176,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         a.id, xm, a.sfzlx, a.sfzhm, a.csrq, a.cyrq, a.xb, a.lxdh, a.whcd, a.shbn,
         a.zzzt, a.lzsj, a.rzsj, a.zylx, a.zylx_qt, a.gwlx, a.jtff_zt, a.is_qy,
         a.is_hlyyzs, a.is_jnsb, a.hlydj, a.gq_hlydj, a.jg_id, a.zw, a.sfzhm_url, a.whcd_url,
+        ( SELECT GROUP_CONCAT(htxx_url) FROM YLJG_YG_HTXX WHERE cyry_id = a.id ) AS htxx_url,
         a.create_time_str, a.create_user_id, a.create_by, a.create_unit,a.create_tounit,a.create_bmjsc,a.create_qhjsc, a.create_unit_name,
         a.update_time_str, a.update_user_id, a.update_by, a.update_unit, a.update_unit_name,
         b.zzmc, a.is_scrz, a.is_scrz_url, a.is_sybz, a.is_tsknqt, a.hdyr_jlms, a.hly_jtff_shyj, a.hly_jtff_shrxm

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

@@ -78,6 +78,8 @@
 								<td colspan="2">
 									<file-upload v-model="baseInfo.isScrzUrl" :isFile="false" />
 								</td>
+                <td>合同附件：</td>
+                <td colspan="2"><file-upload v-model="baseInfo.htxxUrl" :isFile="false" /></td>
 							</tr>
 						</table>
 					</el-tab-pane>
@@ -126,14 +128,14 @@
 								<td>{{ subsidyInfo.gwYear1 }}元</td>
 								<td>第二年：</td>
 								<td>{{ subsidyInfo.gwYear2 }}元</td>
-								<td>第三年：</td>
-								<td>{{ subsidyInfo.gwYear3 }}元</td>
+								<td v-if="subsidyInfo.gwYear3!=null">第三年：</td>
+								<td v-if="subsidyInfo.gwYear3!=null">{{ subsidyInfo.gwYear3 }}元</td>
 							</tr>
 							<tr>
-								<td>第四年：</td>
-								<td>{{ subsidyInfo.gwYear4 }}元</td>
-								<td>第五年：</td>
-								<td>{{ subsidyInfo.gwYear5 }}元</td>
+								<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>
 
@@ -266,6 +268,7 @@ export default {
 				sfzhmUrl: null,
 				whcdUrl: null,
 				isScrzUrl: null,
+				htxxUrl: null,
 			},
 			// 津贴信息
 			subsidyInfo: {

ruoyi-ui/src/views/organization/yggl/hlyJt/index.vue

@@ -202,6 +202,8 @@
 						<tr v-if="dataDetails.zylx == '01'">
 							<td>是否应届毕业生(含三年以内)证明文件：</td>
 							<td colspan="2"><file-upload v-model="dataDetails.isScrzUrl" :isFile="false" /></td>
+              <td>合同附件：</td>
+              <td colspan="2"><file-upload v-model="dataDetails.htxxUrl" :isFile="false" /></td>
 						</tr>
 					</table>
 				</el-tab-pane>

ruoyi-ui/src/views/organization/yggl/ygJbxx/index.vue

@@ -488,6 +488,8 @@
 		        <tr v-if="dataDetails.zylx == '01'">
 			        <td>是否应届毕业生(含三年以内)证明文件：</td>
 			        <td colspan="2"><file-upload v-model="dataDetails.isScrzUrl" :isFile="false" /></td>
+              <td>合同附件：</td>
+              <td colspan="2"><file-upload v-model="dataDetails.htxxUrl" :isFile="false" /></td>
 		        </tr>
 	        </table>
         </el-tab-pane>

ruoyi-ui/src/views/search/xxcx/hlycx/index.vue

@@ -127,7 +127,6 @@
 								type="text"
 								icon="el-icon-edit"
 								@click="handleDetails(scope.row)"
-								v-hasPermi="['business:hlyJt:query']"
 							>详情
 							</el-button>
 						</template>

ruoyi-ui/src/views/search/xxtj/glbttj/index.vue

@@ -39,34 +39,34 @@
 							</el-table-column>
 							<el-table-column label="总金额" align="center" prop="zje" />
 							<el-table-column label="80-89周岁" align="center">
-								<el-table-column label="省厅补发人/月" align="center" prop="stbfzrsE" />
-								<el-table-column label="省厅发放金额" align="center" prop="stzjeE" />
-								<el-table-column label="省厅补发金额" align="center" prop="stbfzjeE" />
-								<el-table-column label="市级补发人/月" align="center" prop="sjbfzrsE" />
-								<el-table-column label="市级发放金额" align="center" prop="sjzjeE" />
-								<el-table-column label="市级补发金额" align="center" prop="sjbfzjeE" />
+<!--								<el-table-column label="省厅补发人/月" align="center" prop="stbfzrsE" />-->
+<!--								<el-table-column label="省厅发放金额" align="center" prop="stzjeE" />-->
+<!--								<el-table-column label="省厅补发金额" align="center" prop="stbfzjeE" />-->
+<!--								<el-table-column label="市级补发人/月" align="center" prop="sjbfzrsE" />-->
+<!--								<el-table-column label="市级发放金额" align="center" prop="sjzjeE" />-->
+<!--								<el-table-column label="市级补发金额" align="center" prop="sjbfzjeE" />-->
 								<el-table-column label="区县补发人/月" align="center" prop="qxbfzrsE" />
 								<el-table-column label="区县发放金额" align="center" prop="qxzjeE" />
 								<el-table-column label="区县补发金额" align="center" prop="qxbfzjeE" />
 							</el-table-column>
 							<el-table-column label="90-99周岁" align="center">
-								<el-table-column label="省厅补发人/月" align="center" prop="stbfzrsN" />
-								<el-table-column label="省厅发放金额" align="center" prop="stzjeN" />
-								<el-table-column label="省厅补发金额" align="center" prop="stbfzjeN" />
-								<el-table-column label="市级补发人/月" align="center" prop="sjbfzrsN" />
-								<el-table-column label="市级发放金额" align="center" prop="sjzjeN" />
-								<el-table-column label="市级补发金额" align="center" prop="sjbfzjeN" />
+<!--								<el-table-column label="省厅补发人/月" align="center" prop="stbfzrsN" />-->
+<!--								<el-table-column label="省厅发放金额" align="center" prop="stzjeN" />-->
+<!--								<el-table-column label="省厅补发金额" align="center" prop="stbfzjeN" />-->
+<!--								<el-table-column label="市级补发人/月" align="center" prop="sjbfzrsN" />-->
+<!--								<el-table-column label="市级发放金额" align="center" prop="sjzjeN" />-->
+<!--								<el-table-column label="市级补发金额" align="center" prop="sjbfzjeN" />-->
 								<el-table-column label="区县补发人/月" align="center" prop="qxbfzrsN" />
 								<el-table-column label="区县发放金额" align="center" prop="qxzjeN" />
 								<el-table-column label="区县补发金额" align="center" prop="qxbfzjeN" />
 							</el-table-column>
 							<el-table-column label="100周岁及以上" align="center">
-								<el-table-column label="省厅补发人/月" align="center" prop="stbfzrsH" />
-								<el-table-column label="省厅发放金额" align="center" prop="stzjeH" />
-								<el-table-column label="省厅补发金额" align="center" prop="stbfzjeH" />
-								<el-table-column label="市级补发人/月" align="center" prop="sjbfzrsH" />
-								<el-table-column label="市级发放金额" align="center" prop="sjzjeH" />
-								<el-table-column label="市级补发金额" align="center" prop="sjbfzjeH" />
+<!--								<el-table-column label="省厅补发人/月" align="center" prop="stbfzrsH" />-->
+<!--								<el-table-column label="省厅发放金额" align="center" prop="stzjeH" />-->
+<!--								<el-table-column label="省厅补发金额" align="center" prop="stbfzjeH" />-->
+<!--								<el-table-column label="市级补发人/月" align="center" prop="sjbfzrsH" />-->
+<!--								<el-table-column label="市级发放金额" align="center" prop="sjzjeH" />-->
+<!--								<el-table-column label="市级补发金额" align="center" prop="sjbfzjeH" />-->
 								<el-table-column label="区县补发人/月" align="center" prop="qxbfzrsH" />
 								<el-table-column label="区县发放金额" align="center" prop="qxzjeH" />
 								<el-table-column label="区县补发金额" align="center" prop="qxbfzjeH" />
@@ -140,12 +140,12 @@ export default {
 					{ label: '总金额', prop: 'zje', width: '' },
 					{
 						label: '80-89周岁', width: '', data: [
-							{ label: '省厅补发人/月', prop: 'stbfzrsE', width: '' },
-							{ label: '省厅发放金额', prop: 'stzjeE', width: '' },
-							{ label: '省厅补发金额', prop: 'stbfzjeE', width: '' },
-							{ label: '市级补发人/月', prop: 'sjbfzrsE', width: '' },
-							{ label: '市级发放金额', prop: 'sjzjeE', width: '' },
-							{ label: '市级补发金额', prop: 'sjbfzjeE', width: '' },
+							// { label: '省厅补发人/月', prop: 'stbfzrsE', width: '' },
+							// { label: '省厅发放金额', prop: 'stzjeE', width: '' },
+							// { label: '省厅补发金额', prop: 'stbfzjeE', width: '' },
+							// { label: '市级补发人/月', prop: 'sjbfzrsE', width: '' },
+							// { label: '市级发放金额', prop: 'sjzjeE', width: '' },
+							// { label: '市级补发金额', prop: 'sjbfzjeE', width: '' },
 							{ label: '区县补发人/月', prop: 'qxbfzrsE', width: '' },
 							{ label: '区县发放金额', prop: 'qxzjeE', width: '' },
 							{ label: '区县补发金额', prop: 'qxbfzjeE', width: '' },
@@ -153,12 +153,12 @@ export default {
 					},
 					{
 						label: '90-99周岁', width: '', data: [
-							{ label: '省厅补发人/月', prop: 'stbfzrsN', width: '' },
-							{ label: '省厅发放金额', prop: 'stzjeN', width: '' },
-							{ label: '省厅补发金额', prop: 'stbfzjeN', width: '' },
-							{ label: '市级补发人/月', prop: 'sjbfzrsN', width: '' },
-							{ label: '市级发放金额', prop: 'sjzjeN', width: '' },
-							{ label: '市级补发金额', prop: 'sjbfzjeN', width: '' },
+							// { label: '省厅补发人/月', prop: 'stbfzrsN', width: '' },
+							// { label: '省厅发放金额', prop: 'stzjeN', width: '' },
+							// { label: '省厅补发金额', prop: 'stbfzjeN', width: '' },
+							// { label: '市级补发人/月', prop: 'sjbfzrsN', width: '' },
+							// { label: '市级发放金额', prop: 'sjzjeN', width: '' },
+							// { label: '市级补发金额', prop: 'sjbfzjeN', width: '' },
 							{ label: '区县补发人/月', prop: 'qxbfzrsN', width: '' },
 							{ label: '区县发放金额', prop: 'qxzjeN', width: '' },
 							{ label: '区县补发金额', prop: 'qxbfzjeN', width: '' },
@@ -166,12 +166,12 @@ export default {
 					},
 					{
 						label: '100周岁以上', width: '', data: [
-							{ label: '省厅补发人/月', prop: 'stbfzrsH', width: '' },
-							{ label: '省厅发放金额', prop: 'stzjeH', width: '' },
-							{ label: '省厅补发金额', prop: 'stbfzjeH', width: '' },
-							{ label: '市级补发人/月', prop: 'sjbfzrsH', width: '' },
-							{ label: '市级发放金额', prop: 'sjzjeH', width: '' },
-							{ label: '市级补发金额', prop: 'sjbfzjeH', width: '' },
+							// { label: '省厅补发人/月', prop: 'stbfzrsH', width: '' },
+							// { label: '省厅发放金额', prop: 'stzjeH', width: '' },
+							// { label: '省厅补发金额', prop: 'stbfzjeH', width: '' },
+							// { label: '市级补发人/月', prop: 'sjbfzrsH', width: '' },
+							// { label: '市级发放金额', prop: 'sjzjeH', width: '' },
+							// { label: '市级补发金额', prop: 'sjbfzjeH', width: '' },
 							{ label: '区县补发人/月', prop: 'qxbfzrsH', width: '' },
 							{ label: '区县发放金额', prop: 'qxzjeH', width: '' },
 							{ label: '区县补发金额', prop: 'qxbfzjeH', width: '' },