hwf453
/
DYWOA
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复 巡检详情 单位不显示

Browse Source
master
harry 1 year ago
parent 840d68a351
commit 6d620ed42d
6 changed files with 49 additions and 76 deletions
Show Stats Download Patch File Download Diff File

28
app/src/main/java/com/rehome/dywoa/Contans.java
Unescape Escape View File

@ -3,25 +3,25 @@ package com.rehome.dywoa;
public class Contans {
public static String IP = "http://192.168.2.115:8601/";
public static String IP_INTRANET = "http://192.168.2.115:8601/";
public static String IP_EXTRANET = "http://192.168.2.115:8601/";
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 IP = "http://192.168.2.115:8601/";
// public static String IP_INTRANET = "http://192.168.2.115:8601/";
// public static String IP_EXTRANET = "http://192.168.2.115:8601/";
// public static String SIS_TOKEN_IP = "https://sis.dywzhny.com.cn/";
// public static String BI_TOKEN_IP = "https://bi.dywzhny.com.cn/";
//APP登录接口厂内服务器IP
// public static String IP = "https://app.dywzhny.com.cn/";
// //app内网
// public static String IP_INTRANET = "https://app.dywzhny.com.cn/";
// //app外网
// public static String IP_EXTRANET = "https://app.dywzhny.com.cn/";
// //SIS系统厂内IP
// public static String SIS_TOKEN_IP = "https://sis.dywzhny.com.cn/";
// //BI
// public static String BI_TOKEN_IP = "https://bi.dywzhny.com.cn/";
public static String IP = "https://app.dywzhny.com.cn/";
//app内网
public static String IP_INTRANET = "https://app.dywzhny.com.cn/";
//app外网
public static String IP_EXTRANET = "https://app.dywzhny.com.cn/";
//SIS系统厂内IP
public static String SIS_TOKEN_IP = "https://sis.dywzhny.com.cn/";
//BI
public static String BI_TOKEN_IP = "https://bi.dywzhny.com.cn/";

10
app/src/main/java/com/rehome/dywoa/ui/activity/LoginActivity.kt
Unescape Escape View File

@ -206,11 +206,13 @@ class LoginActivity : BaseActivityOaToolbarViewBinding<ActivityLoginBinding>() {
// binding.etUsername.setText("ceshi1")
// binding.etPassword.setText("A000000a.")
binding.etUsername.setText("CY00005")
binding.etPassword.setText("A000000a.")
// binding.etUsername.setText("CY00005")
// binding.etPassword.setText("A000000a.")
// binding.etUsername.setText("TD00003")
// binding.etPassword.setText("A000000a.")
// binding.etUsername.setText("CY00011")
// binding.etPassword.setText("A000000a")
// binding.etUsername.setText("371543")

27
app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/SbxdjglActivity.java
Unescape Escape View File

@ -153,25 +153,14 @@ public class SbxdjglActivity extends BaseActivity2 {
}
param.put("Action", "DJ_DJGL_GET");
// if(firstDeparment!=null&&firstDeparment.equals("工程部")){
// //工程部
// if(TextUtils.isEmpty(secondDeparment)){
// //工程部下无二级部门，工程部领导,查全部数据
// }else{
// param.put("firstDeparment", firstDeparment);
// param.put("secondDeparment", secondDeparment);
// param.put("firstDeparmentId", firstDeparmentId);
// param.put("secondDeparmentId", secondDeparmentId);
// }
// }else{
// //其它部门
// if(App.getInstance().getUserInfo().getManid().equals("371522")){
//
// }else{
// return;
// }
// }
if(!TextUtils.isEmpty(firstDeparment)){
if(firstDeparment.equals("设备部")||firstDeparment.equals("承包商")||firstDeparment.equals("粤电服大亚湾项目部")){
param.put("firstDeparment", firstDeparment);
param.put("secondDeparment", secondDeparment);
param.put("firstDeparmentId", firstDeparmentId);
param.put("secondDeparmentId", secondDeparmentId);
}
}
String json = new Gson().toJson(param);
showLog(json);

52
app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/XzjhFragment.java
Unescape Escape View File

@ -279,24 +279,14 @@ public class XzjhFragment extends BaseFragment {
}
param.put("Action", "DJ_DJGL_GET");
// if(firstDeparment!=null&&firstDeparment.equals("工程部")){
// //工程部
// if(TextUtils.isEmpty(secondDeparment)){
// //工程部下无二级部门，工程部领导,查全部数据
// }else{
// param.put("firstDeparment", firstDeparment);
// param.put("secondDeparment", secondDeparment);
// param.put("firstDeparmentId", firstDeparmentId);
// param.put("secondDeparmentId", secondDeparmentId);
// }
// }else{
// //其它部门
// if(App.getInstance().getUserInfo().getManid().equals("371522")){
//
// }else{
// return;
// }
// }
if(!TextUtils.isEmpty(firstDeparment)){
if(firstDeparment.equals("设备部")||firstDeparment.equals("承包商")||firstDeparment.equals("粤电服大亚湾项目部")){
param.put("firstDeparment", firstDeparment);
param.put("secondDeparment", secondDeparment);
param.put("firstDeparmentId", firstDeparmentId);
param.put("secondDeparmentId", secondDeparmentId);
}
}
String json = new Gson().toJson(param);
showLog(json);
@ -668,24 +658,14 @@ public class XzjhFragment extends BaseFragment {
}
param.put("Action", "DJ_DJGL_GET");
// if(firstDeparment!=null&&firstDeparment.equals("工程部")){
// //工程部
// if(TextUtils.isEmpty(secondDeparment)){
// //工程部下无二级部门，工程部领导,查全部数据
// }else{
// param.put("firstDeparment", firstDeparment);
// param.put("secondDeparment", secondDeparment);
// param.put("firstDeparmentId", firstDeparmentId);
// param.put("secondDeparmentId", secondDeparmentId);
// }
// }else{
// //其它部门
// if(App.getInstance().getUserInfo().getManid().equals("371522")){
//
// }else{
// return;
// }
// }
if(!TextUtils.isEmpty(firstDeparment)){
if(firstDeparment.equals("设备部")||firstDeparment.equals("承包商")||firstDeparment.equals("粤电服大亚湾项目部")){
param.put("firstDeparment", firstDeparment);
param.put("secondDeparment", secondDeparment);
param.put("firstDeparmentId", firstDeparmentId);
param.put("secondDeparmentId", secondDeparmentId);
}
}
String json = new Gson().toJson(param);
showLog(json);

6
app/src/main/java/com/rehome/dywoa/ui/activity/sbxj/XJCJFragment.java
Unescape Escape View File

@ -185,6 +185,7 @@ public class XJCJFragment extends BaseFragment {
if(info!=null){
showLog(GsonUtils.GsonString(info));
showLog(info.getDw());
}
tvBjmc.setText(info.getBJMC());
@ -203,6 +204,7 @@ public class XJCJFragment extends BaseFragment {
tv_lower_action.setText(info.getLOWERACTION());
tv_upper_warning.setText(info.getUPPERWARNING());
tv_lower_warning.setText(info.getLOWERWARNING());
tv_kks.setText(info.getKksCode());
tv_point_type.setText(info.getPOINTNAME());
tv_kks_desc.setText(info.getKksDesc());
@ -216,10 +218,10 @@ public class XJCJFragment extends BaseFragment {
ll_warnning.setVisibility(View.VISIBLE);
ll_check_option.setVisibility(View.VISIBLE);
if(TextUtils.isEmpty(info.getDw())){
if(TextUtils.isEmpty(info.getUNITOFMEASURE())){
tv_dw.setText("");
}else{
tv_dw.setText(info.getDw());
tv_dw.setText(info.getUNITOFMEASURE());
}
}else{
tv_dw.setVisibility(View.INVISIBLE);

2
app/src/main/java/com/rehome/dywoa/ui/activity/sbxj/XzxsjhFragment.java
Unescape Escape View File

@ -342,7 +342,7 @@ public class XzxsjhFragment extends BaseFragment {
selectCount = 0;
dialog.cancel();
xjjhs.clear();
xjjhs.addAll(where("download = ?", "0").find(Xjjh.class));
xjjhs.addAll(where("download = ? and username = ?", "0",username).find(Xjjh.class));
if (adapter != null) {
cb.setChecked(false);
adapter.notifyDataSetChanged();

Write Preview
Loading…
Cancel
Save