app bug 修改
This commit is contained in:
parent
45f7a6d1df
commit
5549214ead
|
|
@ -502,9 +502,15 @@ public class ContractDetailsFragment extends BaseFragment implements ClickUtils.
|
|||
* 是否为小包干
|
||||
*/
|
||||
private void initIsXbgGroupSpinner() {
|
||||
Bundle bundle = getArguments();
|
||||
String isXbg = bundle.getString("isXbg");
|
||||
List<String> strList = new ArrayList<String>();
|
||||
strList.add("是");
|
||||
strList.add("否");
|
||||
if("是".equals(isXbg)){
|
||||
strList.add("是");
|
||||
strList.add("否");
|
||||
}else{
|
||||
strList.add("否");
|
||||
}
|
||||
ArrayAdapter<String> adpter = new CustomAdpter<String>(getActivity(), android.R.layout.simple_spinner_item, strList) {
|
||||
|
||||
};
|
||||
|
|
|
|||
|
|
@ -73,6 +73,11 @@ public class ContractVideoConfirmFragment extends BaseFragment implements ClickU
|
|||
*/
|
||||
String identity = "";
|
||||
|
||||
/**
|
||||
* isXbg 是,非
|
||||
*/
|
||||
String isXbg = "";
|
||||
|
||||
@Override
|
||||
protected int getLayoutId() {
|
||||
return R.layout.activity_contract_video_confirm;
|
||||
|
|
@ -119,6 +124,7 @@ public class ContractVideoConfirmFragment extends BaseFragment implements ClickU
|
|||
bundle.putString("type", "check");
|
||||
bundle.putSerializable("contractBean", bean);
|
||||
bundle.putString("identity", identity);
|
||||
bundle.putString("isXbg", isXbg);
|
||||
openNewPage("电子合同信息", bundle);
|
||||
}
|
||||
});
|
||||
|
|
@ -137,8 +143,9 @@ public class ContractVideoConfirmFragment extends BaseFragment implements ClickU
|
|||
JSONObject jsonObject = JsonHelper.jsonStrToJsonObj(result);
|
||||
System.out.println(jsonObject.get("resMsg"));
|
||||
if (jsonObject.get("resMsg").equals("非小包干班组")) {
|
||||
|
||||
isXbg = "非";
|
||||
} else {
|
||||
isXbg = "是";
|
||||
AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
|
||||
View custom = LayoutInflater.from(getContext()).inflate(R.layout.dialog_xbg_contract, null);
|
||||
final SuperButton cancel = custom.findViewById(R.id.cancel);
|
||||
|
|
|
|||
|
|
@ -917,7 +917,7 @@ public class FaceAttendanceFragment extends BaseFragment implements ViewTreeObse
|
|||
System.out.println("idCardInfo=" + idCardInfo);
|
||||
// 判断是否签订合同
|
||||
if ("0".equals(idCardInfo.getIsXbg())) {
|
||||
XToastUtils.error(compareResult.getUserName() + "未签订小包干协议!请打计日卡,或者重新签订合同!");
|
||||
XToastUtils.error("打卡失败,"+compareResult.getUserName() + "未签订小包干协议!请打计日卡,或者重新签订合同!");
|
||||
} else {
|
||||
faceAttendanceDao.addFaceAttendance(attendanceBean);
|
||||
XToastUtils.success(compareResult.getUserName() + "考勤成功");
|
||||
|
|
|
|||
Loading…
Reference in New Issue