|
@@ -13,6 +13,7 @@ import com.qunzhixinxi.hnqz.admin.entity.model.excel.WmSettlePackageSettleExcelM
|
|
|
import com.qunzhixinxi.hnqz.admin.entity.output.WmTaskSettleNoteOutput;
|
|
|
import com.qunzhixinxi.hnqz.admin.enums.PackageTypeEnum;
|
|
|
import com.qunzhixinxi.hnqz.admin.enums.SettleStatusEnum;
|
|
|
+import com.qunzhixinxi.hnqz.admin.enums.SubjectLocation;
|
|
|
import com.qunzhixinxi.hnqz.admin.enums.SubjectTypeEnum;
|
|
|
import com.qunzhixinxi.hnqz.admin.service.WmScorePackageService;
|
|
|
import com.qunzhixinxi.hnqz.admin.service.WmScorePackageSettleNoteService;
|
|
@@ -98,6 +99,9 @@ public class WmScorePackageSettleNoteController {
|
|
|
if (output.getSubjectLocation() != null) {
|
|
|
output.setSubjectLocationName(output.getSubjectLocation().getDescription());
|
|
|
}
|
|
|
+ if (SubjectLocation.MAH_SETTLE.equals(scorePackage.getLocation())) {
|
|
|
+ output.setUsername(null);
|
|
|
+ }
|
|
|
});
|
|
|
return R.ok(settlePage2);
|
|
|
}
|
|
@@ -107,6 +111,9 @@ public class WmScorePackageSettleNoteController {
|
|
|
if (output.getSubjectLocation() != null) {
|
|
|
output.setSubjectLocationName(output.getSubjectLocation().getDescription());
|
|
|
}
|
|
|
+ if (SubjectLocation.MAH_SETTLE.equals(scorePackage.getLocation())) {
|
|
|
+ output.setUsername(null);
|
|
|
+ }
|
|
|
});
|
|
|
return R.ok(settlePage);
|
|
|
}
|