巡检免检申请完成。

master
wenfei 9 months ago
parent 06ba8b2a74
commit 69a3330bc1

@ -79,6 +79,7 @@
tools:targetApi="s"> tools:targetApi="s">
<activity <activity
android:name=".ui.activity.LoginActivity" android:name=".ui.activity.LoginActivity"
android:exported="true" android:exported="true"
@ -269,6 +270,18 @@
android:name=".ui.activity.sbxdjgl.MjApplySubmitActivity" android:name=".ui.activity.sbxdjgl.MjApplySubmitActivity"
android:exported="false" android:exported="false"
android:screenOrientation="portrait" /> android:screenOrientation="portrait" />
<activity
android:name=".ui.activity.sbxj.XjMjApplyActivity"
android:exported="false"
android:screenOrientation="portrait" />
<activity
android:name=".ui.activity.sbxj.XjMjApplySubmitActivity"
android:exported="false"
android:screenOrientation="portrait" />
<activity
android:name=".ui.activity.sbxj.XjMjApplyManageActivity"
android:exported="false"
android:screenOrientation="portrait" />
<activity <activity
android:name=".ui.activity.sbxdjgl.QxgdListActivity" android:name=".ui.activity.sbxdjgl.QxgdListActivity"
android:exported="false" android:exported="false"

@ -3,9 +3,9 @@ package com.rehome.dywoa;
public class Contans { public class Contans {
// public static String IP = "http://192.168.2.115:8601/"; // public static String IP = "http://192.168.2.84:8601/";
// public static String IP_INTRANET = "http://192.168.2.115:8601/"; // public static String IP_INTRANET = "http://192.168.2.84:8601/";
// public static String IP_EXTRANET = "http://192.168.2.115:8601/"; // public static String IP_EXTRANET = "http://192.168.2.84:8601/";
// public static String SIS_TOKEN_IP = "https://sis.dywzhny.com.cn/"; // public static String SIS_TOKEN_IP = "https://sis.dywzhny.com.cn/";
// public static String BI_TOKEN_IP = "https://bi.dywzhny.com.cn/"; // public static String BI_TOKEN_IP = "https://bi.dywzhny.com.cn/";
@ -80,7 +80,7 @@ public class Contans {
public static String YHPC = "AJH/AJH_YHPCSC.ashx";//隐患排查 public static String YHPC = "AJH/AJH_YHPCSC.ashx";//隐患排查
//-----------------------免检申请---------------------// //-----------------------点检免检申请---------------------//
//获取漏检列表 //获取漏检列表
public static final String GET_NEED_MJ_LIST = "api/app/pointTask/getNoCheckPointTaskList"; public static final String GET_NEED_MJ_LIST = "api/app/pointTask/getNoCheckPointTaskList";
//public static final String GET_NEED_MJ_LIST = "api/app/pointTask/getNoCheckPointTaskList"; //public static final String GET_NEED_MJ_LIST = "api/app/pointTask/getNoCheckPointTaskList";
@ -88,7 +88,16 @@ public class Contans {
public static final String SUBMIT_MJ_APPLY_API = "api/app/pointTask/sendCheckExempt"; public static final String SUBMIT_MJ_APPLY_API = "api/app/pointTask/sendCheckExempt";
//获取免检申请管理 //获取免检申请管理
public static final String GET_NEED_MJ_MANAGE_LIST = "api/app/pointTask/selectMissPointTaskList"; public static final String GET_NEED_MJ_MANAGE_LIST = "api/app/pointTask/selectMissPointTaskList";
//-----------------------免检申请---------------------// //-----------------------点检免检申请---------------------//
//-----------------------巡检免检申请---------------------//
//获取漏检列表
public static final String GET_NEED_XJ_MJ_LIST = "api/app/task/getNoCheckPointTaskList";
//public static final String GET_NEED_MJ_LIST = "api/app/pointTask/getNoCheckPointTaskList";
//提交免检申请
public static final String SUBMIT_XJ_MJ_APPLY_API = "api/app/task/sendCheckExempt";
//获取免检申请管理
public static final String GET_NEED_XJ_MJ_MANAGE_LIST = "api/app/task/selectMissPointTaskList";
//-----------------------巡检免检申请---------------------//
// ========================= 用于判断是哪个界面传过的数据 =========================// // ========================= 用于判断是哪个界面传过的数据 =========================//

@ -3,6 +3,7 @@ package com.rehome.dywoa.adapter
import android.content.Context import android.content.Context
import android.text.TextUtils
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
@ -38,6 +39,24 @@ class MjApplyManageAdapter(var context: Context,
binding.tvSqsj.text = item.applyTime binding.tvSqsj.text = item.applyTime
binding.tvSqbm.text = item.department binding.tvSqbm.text = item.department
binding.tvReason.text = item.reason binding.tvReason.text = item.reason
binding.tvJhmc.text = item.jhmc
binding.tvZxsj.text = item.zxsj
if(TextUtils.isEmpty(item.jhmc)){
binding.tvJhmc.text = ""
}else{
binding.tvJhmc.text = item.jhmc
}
if(TextUtils.isEmpty(item.zxsj)){
binding.tvZxsj.text = ""
}else{
binding.tvZxsj.text = item.zxsj
}
if(TextUtils.isEmpty(item.mjds)){
binding.tvMjds.text = ""
}else{
binding.tvMjds.text = item.mjds
}
if("审批通过" == item.status){ if("审批通过" == item.status){

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save