|
@@ -207,24 +207,26 @@ public class TTargetagreementController extends BaseController
|
|
|
map.put("dept", dept);
|
|
|
List<SysDictData> partners = iSysDictTypeService.selectDictDataByType("PARTNERS");
|
|
|
List<TTargetyardstick> tTargetyardsticks = tTargetyardstickService.selectTTargetyardstickByAgreementId(Long.parseLong(id));
|
|
|
- for (TTargetyardstick y : tTargetyardsticks) {
|
|
|
- if (y.getPartners() != null) {
|
|
|
- String[] partner = y.getPartners().split(",");
|
|
|
- String partnerLabel = "";
|
|
|
- for (int i = 0; i < partner.length; i++) {
|
|
|
- String pLabel = "";
|
|
|
- for (SysDictData p : partners) {
|
|
|
- if (p.getDictValue().equals(partner[i])) {
|
|
|
- pLabel = p.getDictLabel();
|
|
|
+ if (!tTargetagreement.getActualpost().equals("24")) {
|
|
|
+ for (TTargetyardstick y : tTargetyardsticks) {
|
|
|
+ if (y.getPartners() != null) {
|
|
|
+ String[] partner = y.getPartners().split(",");
|
|
|
+ String partnerLabel = "";
|
|
|
+ for (int i = 0; i < partner.length; i++) {
|
|
|
+ String pLabel = "";
|
|
|
+ for (SysDictData p : partners) {
|
|
|
+ if (p.getDictValue().equals(partner[i])) {
|
|
|
+ pLabel = p.getDictLabel();
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (i == 0) {
|
|
|
+ partnerLabel = pLabel;
|
|
|
+ }else {
|
|
|
+ partnerLabel = partnerLabel + "," + pLabel;
|
|
|
}
|
|
|
}
|
|
|
- if (i == 0) {
|
|
|
- partnerLabel = pLabel;
|
|
|
- }else {
|
|
|
- partnerLabel = partnerLabel + "," + pLabel;
|
|
|
- }
|
|
|
+ y.setPartners(partnerLabel);
|
|
|
}
|
|
|
- y.setPartners(partnerLabel);
|
|
|
}
|
|
|
}
|
|
|
map.put("TTargetyardstick", tTargetyardsticks);
|